diff --git a/template/JabyEngine-PSX_Game/#{ProjectName}.code-workspace b/template/JabyEngine-PSX_Game/#{ProjectName}.code-workspace
index 9ee08666..1e6f6d38 100644
--- a/template/JabyEngine-PSX_Game/#{ProjectName}.code-workspace
+++ b/template/JabyEngine-PSX_Game/#{ProjectName}.code-workspace
@@ -11,19 +11,22 @@
 			{
 				"label": "build",
 				"type": "shell",
-				"command": "wsl make ${input:target} BUILD_PROFILE=${input:build profile} JABY_ENGINE_DIR=../${config:jaby_engine_path}",
+				"command": "wsl make ${input:target} BUILD_PROFILE=${input:build profile} JABY_ENGINE_DIR=$(wslpath ${env:JABY_ENGINE_PATH})",
 				"group": {
 					"kind": "build",
 					"isDefault": true
 				},
 				"options": {
-					"cwd": "application"
+					"cwd": "application",
+					"env": {
+						"PATH": "${env:JABY_ENGINE_PATH}/bin;${env:PATH}"
+					}
 				}
 			},
 			{
 				"label": "cdgen",
 				"type": "shell",
-				"command": "${config:jaby_engine_path}/bin/psxcdgen.exe iso/Config.xml",
+				"command": "${env:JABY_ENGINE_PATH}/bin/psxcdgen_ex.exe --list iso/#{ProjectName}.lba -o iso/#{ProjectName} psx bin-cue iso/Config.xml",
 				"group": {
 					"kind": "build",
 					"isDefault": true
@@ -46,7 +49,7 @@
 				"type": "pickString",
 				"options": ["debug", "release"],
 				"default": "release",
-				"description": "the build profile for #{ProjectName}"
+				"description": "The build profile for #{ProjectName}"
 			},
 			{
 				"id": "target",
@@ -58,6 +61,17 @@
 		]
 	},
 	"settings": {
-		"jaby_engine_path": "#{JabyEnginePath}",
+		"C_Cpp.default.includePath": [
+			"${env:JABY_ENGINE_PATH}/include"
+            ],
+		"C_Cpp.default.compilerPath": "",
+		"C_Cpp.default.cStandard": "c17",
+        "C_Cpp.default.cppStandard": "c++20",
+		"C_Cpp.default.intelliSenseMode": "linux-gcc-x86",
+        "C_Cpp.default.compilerArgs": [
+            ],
+		"C_Cpp.default.defines": [
+			"JABYENGINE_PAL"
+            ],
 	}
 }
\ No newline at end of file
diff --git a/template/JabyEngine-PSX_Game/.gitignore b/template/JabyEngine-PSX_Game/.gitignore
index 5fb16184..fa0401e8 100644
--- a/template/JabyEngine-PSX_Game/.gitignore
+++ b/template/JabyEngine-PSX_Game/.gitignore
@@ -2,4 +2,5 @@
 *.cue
 *.d
 *.o
+*.lba
 **/bin
\ No newline at end of file
diff --git a/template/JabyEngine-PSX_Game/application/Makefile b/template/JabyEngine-PSX_Game/application/Makefile
index e05edbb7..16bd0518 100644
--- a/template/JabyEngine-PSX_Game/application/Makefile
+++ b/template/JabyEngine-PSX_Game/application/Makefile
@@ -1,10 +1,12 @@
 ARTIFACT  = #{ProjectName}
 BUILD_DIR = bin
 
+#OVERLAY_CONFIG = Overlays.json
+
 include $(JABY_ENGINE_DIR)/lib/Wildcard.mk
 SRCS  = $(call rwildcard, src, c cpp)
 
-LIBS = -L$(JABY_ENGINE_DIR)/lib/PSX-$(BUILD_PROFILE) -lJabyEngine
+INCLUDES += -I$(JABY_ENGINE_DIR)/include
 
 include $(JABY_ENGINE_DIR)/lib/Makefile
 include $(JABY_ENGINE_DIR)/lib/PSEXETarget.mk
diff --git a/template/JabyEngine-PSX_Game/application/Overlays.json b/template/JabyEngine-PSX_Game/application/Overlays.json
new file mode 100644
index 00000000..5e779d49
--- /dev/null
+++ b/template/JabyEngine-PSX_Game/application/Overlays.json
@@ -0,0 +1,12 @@
+{
+    "slot_0": {
+        "main_area": {
+            "pattern": "bin/*/src/MainState/*.o"
+        }
+    },
+    "slot_1": {
+        "main_area2": {
+            "pattern": "bin/*/src/MainState2/*.o"
+        }
+    }
+}
\ No newline at end of file
diff --git a/template/JabyEngine-PSX_Game/application/src/main.cpp b/template/JabyEngine-PSX_Game/application/src/main.cpp
index e9cdae16..64bee7d0 100644
--- a/template/JabyEngine-PSX_Game/application/src/main.cpp
+++ b/template/JabyEngine-PSX_Game/application/src/main.cpp
@@ -1,3 +1,5 @@
-int main() {
-    return 0;
+#include <stdio.h>
+
+void main() {
+    printf("Hello Planschbecken!\n");
 }
\ No newline at end of file
diff --git a/template/JabyEngine-PSX_Game/iso/Config.xml b/template/JabyEngine-PSX_Game/iso/Config.xml
index 258c9a74..307f94fd 100644
--- a/template/JabyEngine-PSX_Game/iso/Config.xml
+++ b/template/JabyEngine-PSX_Game/iso/Config.xml
@@ -1,19 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<iso_project image_name="iso/#{ProjectName}.bin" cue_sheet="iso/#{ProjectName}.cue" no_xa="0">
-	<track type="data">
-		<identifiers
-			system			= "PLAYSTATION"
-			application		= "PLAYSTATION"
-			volume			= "MYDISC"
-			volume_set		= "MYDISC"
-			publisher		= "JABY"
-			data_preparer	= "MKPSXISO"
-			copyright		= "COPYLEFT"
-		/>
-		<license file="D:/RetroGameDev/PSX/PSYQ/psyq/cdgen/LCNSFILE/LICENSEE.DAT"/>
-		<directory_tree>
-			<file name="SYSTEM.CNF"   type="data" source="iso/System.cnf"/>
-			<file name="SCES_003.90"  type="data" source="application/bin/PSX-release/#{ProjectName}.psexe"/>
-		</directory_tree>
-	</track>
-</iso_project>
+<ISO_Project>
+    <Description>
+        <!--<Publisher>Jaby</Publisher>-->
+        <!--<License>%LICENSE_ENV_PATH%/LICENSEE.DAT</License>-->
+    </Description>
+    <Track>
+        <File    name="SYSTEM.CNF">iso/System.cnf</File>
+        <Main    name="XXXX_AAA.AA">application/bin/PSX-release/#{ProjectName}.psexe</Main>
+    </Track>
+</ISO_Project>
\ No newline at end of file
diff --git a/template/JabyEngine-PSX_Game/iso/System.cnf b/template/JabyEngine-PSX_Game/iso/System.cnf
index 22d980e8..bf22c6f7 100644
--- a/template/JabyEngine-PSX_Game/iso/System.cnf
+++ b/template/JabyEngine-PSX_Game/iso/System.cnf
@@ -1,4 +1,4 @@
-BOOT=cdrom:\SCES_003.90;1
+BOOT=cdrom:\XXXX_AAA.AA;1
 TCB=4
 EVENT=10
 STACK=801FFFF0
\ No newline at end of file
diff --git a/template/install.bat b/template/install.bat
new file mode 100644
index 00000000..2a89868b
--- /dev/null
+++ b/template/install.bat
@@ -0,0 +1,6 @@
+echo off
+set dst_name=JabyEngine-PSX_Game
+set dst="%APPDATA%\Code\User\ProjectTemplates\%dst_name%"
+
+mkdir %dst%
+xcopy /s %dst_name% %dst%
\ No newline at end of file