diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 864b7e4..74b88c7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -26,6 +26,8 @@ jobs:
     steps:
       - name: Git Checkout
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
       - name: Git Checkout / MPE / XPath / Tools
         uses: actions/checkout@v4
@@ -33,6 +35,16 @@ jobs:
           repository: andrewjswan/MPE
           path: MPE
 
+      - name: MP folder for MPEMaker
+        run: |
+          mkdir "C:\Team MediaPortal"
+        shell: cmd
+
+      - name: Link to MPEMaker
+        run: |
+          mklink /J "C:\Team MediaPortal\MediaPortal" "${{ github.workspace }}\MPE\MPEMaker"
+        shell: cmd
+
       - name: Update Known Extensions
         run: |
           MPEUpdater.exe
@@ -45,6 +57,12 @@ jobs:
         working-directory: ${{ github.workspace }}\builds
         shell: cmd
 
+      - name: Build MPE1
+        run: |
+          Create_Installer.bat
+        working-directory: ${{ github.workspace }}\scripts
+        shell: cmd
+ 
       - name: Get Version
         id: version
         run: |
@@ -52,12 +70,6 @@ jobs:
         working-directory: ${{ github.workspace }}\MPEI
         shell: cmd
 
-      - name: Build MPE1
-        run: |
-          "..\MPE\MPEMaker\MPEMaker.exe" "Titan Extended.xmp2" /B /UpdateXML
-        working-directory: ${{ github.workspace }}\MPEI
-        shell: cmd
- 
       - name: Upload Artifact / MPE1
         uses: actions/upload-artifact@v4
         with:
diff --git a/MPEI/Titan Extended.xmp2 b/MPEI/Titan Extended.xmp2
index 6699246..19a4034 100644
--- a/MPEI/Titan Extended.xmp2	
+++ b/MPEI/Titan Extended.xmp2	
@@ -4849,7 +4849,7 @@ Click Next to continue or Cancel to exit Setup.</Value>
       <Major>5</Major>
       <Minor>0</Minor>
       <Build>1</Build>
-      <Revision>5</Revision>
+      <Revision>116</Revision>
     </Version>
     <ExtensionDescription>Titan Extended adds support for a variety of community plugins to the Titan skin.
 
@@ -4860,7 +4860,7 @@ The Titan skin is included in MediaPortal, starting with version 1.3.0 beta.</Ex
 Add DWHD Theme by catavolt (experemental)</VersionDescription>
     <DevelopmentStatus>Stable</DevelopmentStatus>
     <OnlineLocation>https://github.com/MediaPortal/TitanExtended/releases/download/v[Version]/Titan.Extended-[Version].mpe1</OnlineLocation>
-    <ReleaseDate>2024-03-25T21:21:21</ReleaseDate>
+    <ReleaseDate>2024-03-26T13:07:34.1555589+02:00</ReleaseDate>
     <Tags>titan, skin, widescreen</Tags>
     <PlatformCompatibility>AnyCPU</PlatformCompatibility>
     <Location>..\builds\Titan Extended-[Version].mpe1</Location>
diff --git a/scripts/Create_Installer.bat b/scripts/Create_Installer.bat
index 90ebebb..2b6f31e 100644
--- a/scripts/Create_Installer.bat
+++ b/scripts/Create_Installer.bat
@@ -3,14 +3,24 @@
 Title Creating MediaPortal Titan Extended Installer
 ECHO Creating MediaPortal Titan Extended Installer
 
+if "%programfiles(x86)%XXX"=="XXX" goto 32BIT
+    :: 64-bit
+    set PROGS=%programfiles(x86)%
+    goto CONT
+:32BIT
+    set PROGS=%ProgramFiles%
+:CONT
+
+IF NOT EXIST "%PROGS%\Team MediaPortal\MediaPortal\" SET PROGS=C:
+
 :: Get version from DLL
-FOR /F "tokens=*" %%a IN ('git rev-list HEAD --count') DO SET version=%%a 
+FOR /F "tokens=*" %%a IN ('git rev-list HEAD --count') DO SET version=%%a
 
 :: Trim version
-SET version=%version:~0,-1%
+SET version=%version: =%
 
 :: Set version
-SET version=5.0.0.%version%
+SET version=5.0.1.%version%
 
 :: Build MPE1
-"Tools\MPEMaker.exe" "..\MPEI\Titan Extended.xmp2" /B /V=%version% /UpdateXML
+"%PROGS%\Team MediaPortal\MediaPortal\MPEMaker.exe" "..\MPEI\Titan Extended.xmp2" /B /V=%version% /UpdateXML
diff --git a/scripts/Tools/CSScriptLibrary.dll b/scripts/Tools/CSScriptLibrary.dll
deleted file mode 100644
index 33be9ce..0000000
Binary files a/scripts/Tools/CSScriptLibrary.dll and /dev/null differ
diff --git a/scripts/Tools/Common.Utils.dll b/scripts/Tools/Common.Utils.dll
deleted file mode 100644
index a81b6ec..0000000
Binary files a/scripts/Tools/Common.Utils.dll and /dev/null differ
diff --git a/scripts/Tools/Dialogs.dll b/scripts/Tools/Dialogs.dll
deleted file mode 100644
index 1c348a2..0000000
Binary files a/scripts/Tools/Dialogs.dll and /dev/null differ
diff --git a/scripts/Tools/Ionic.Zip.dll b/scripts/Tools/Ionic.Zip.dll
deleted file mode 100644
index 4d9873c..0000000
Binary files a/scripts/Tools/Ionic.Zip.dll and /dev/null differ
diff --git a/scripts/Tools/MpeCore.dll b/scripts/Tools/MpeCore.dll
deleted file mode 100644
index e41f344..0000000
Binary files a/scripts/Tools/MpeCore.dll and /dev/null differ
diff --git a/scripts/Tools/Utils.dll b/scripts/Tools/Utils.dll
deleted file mode 100644
index 9fd841b..0000000
Binary files a/scripts/Tools/Utils.dll and /dev/null differ