diff --git a/Projects/Simba/Makefile.i386-linux b/Projects/Simba/Makefile.i386-linux
new file mode 100644
index 0000000..4b75e07
--- /dev/null
+++ b/Projects/Simba/Makefile.i386-linux
@@ -0,0 +1,35 @@
+#$ fpc  -MObjFPC -Scgi -O2 -OoREGVAR -gl -vewnhi -l -Fu../../Units/MMLCore/ -Fu../../Units/MMLAddon/ -Fu../../Units/PascalScript/ -Fu../../Units/Misc/ -Fu../../../lazarus/components/synedit/units/x86_64-linux/ -Fu../../../lazarus/ideintf/units/x86_64-linux/ -Fu../../../lazarus/lcl/units/x86_64-linux/ -Fu../../../lazarus/lcl/units/x86_64-linux/gtk2/ -Fu../../../lazarus/packager/units/x86_64-linux/ -Fu. -oSAMufasaGUI -dUseCThreads -dM_MEMORY_DEBUG -dLCL -dLCLgtk2 Simba.lpr
+
+.PHONY: default clean
+
+#Set these ----------
+platform := i386-linux
+widgetset := gtk2
+#lazaruspath := /usr/lib/lazarus/0.9.28.2
+lazaruspath := /home/mopar/simba/lazarus
+
+#-dUseCThreads on linux, none on windows. :) 
+platformdefines := -dUseCThreads
+#End set there -------
+
+CC := fpc
+build := $(CC)
+binary := Simba.$(platform)
+flags := -Pi386 -Xd -MObjFPC -Scgi -O2 -OoREGVAR -gl -vewnhi -l -Fu.
+defines := $(platformdefines) -dM_MEMORY_DEBUG -dLCL -dLCL$(widgetset)
+units := -Fu../../Units/MMLCore/ -Fu../../Units/MMLAddon/ -Fu../../Units/MMLAddon/PSInc/ -Fu../../Units/PascalScript/ -Fu../../Units/Misc/ -Fu../../Units/Linux/ -Fu../../Units/Synapse/ -Fu../../Units/RUTIS/
+
+
+
+lclplatpath := $(lazaruspath)/lcl/units/$(platform)/
+
+lazarusunits := -Fu$(lazaruspath)/components/synedit/units/$(platform)/ -Fu$(lazaruspath)ideintf/units/$(platform)/ -Fu$(lclplatpath) -Fu$(lclplatpath)$(widgetset)/ -Fu$(lazaruspath)/packager/units/$(platform)/ -Fu$(lazaruspath)/components/mouseandkeyinput/
+
+default: $(binary)
+
+clean:
+	rm -f *.o *.ppu $(binary) 
+
+$(binary):
+	$(CC) $(flags) $(units) $(lazarusunits) -o$(binary) $(defines) Simba.lpr
+	strip $(binary) 
diff --git a/Projects/Simba/Makefile.win b/Projects/Simba/Makefile.win32
similarity index 70%
rename from Projects/Simba/Makefile.win
rename to Projects/Simba/Makefile.win32
index 7ba8429..c712409 100644
--- a/Projects/Simba/Makefile.win
+++ b/Projects/Simba/Makefile.win32
@@ -5,26 +5,27 @@
 #Set these ----------
 platform := i386-win32
 widgetset := win32
-lazaruspath := "C:\path\to\lazarus"
+#lazaruspath := /usr/lib/lazarus/0.9.28.2
+lazaruspath := /home/mopar/simba/lazarus
 
 CC := fpc
 build := $(CC)
-binary := SAMufasaGUI
-flags := -MObjFPC -Scgi -O2 -OoREGVAR -gl -vewnhi -l -Fu.
+binary := Simba.$(platform).exe
+flags := -Twin32 -Pi386 -MObjFPC -Scgi -O2 -OoREGVAR -gl -vewnhi -l -Fu.
 defines := $(platformdefines) -dM_MEMORY_DEBUG -dLCL -dLCL$(widgetset)
-units := -Fu../../Units/MMLCore/ -Fu../../Units/MMLAddon/ -Fu../../Units/PascalScript/ -Fu../../Units/Misc/
+units := -Fu../../Units/MMLCore/ -Fu../../Units/MMLAddon/ -Fu../../Units/MMLAddon/PSInc/ -Fu../../Units/PascalScript/ -Fu../../Units/Misc/ -Fu../../Units/Linux/ -Fu../../Units/Synapse/ -Fu../../Units/RUTIS/
 
 
 
 lclplatpath := $(lazaruspath)/lcl/units/$(platform)/
 
-lazarusunits := -Fu$(lazaruspath)/components/synedit/units/$(platform)/ -Fu$(lazaruspath)ideintf/units/$(platform)/ -Fu$(lclplatpath) -Fu$(lclplatpath)$(widgetset)/ -Fu$(lazaruspath)/packager/units/$(platform)/
+lazarusunits := -Fu$(lazaruspath)/components/synedit/units/$(platform)/ -Fu$(lazaruspath)ideintf/units/$(platform)/ -Fu$(lclplatpath) -Fu$(lclplatpath)$(widgetset)/ -Fu$(lazaruspath)/packager/units/$(platform)/ -Fu$(lazaruspath)/components/mouseandkeyinput/
 
 default: $(binary)
 
 clean:
-	#Zoek zelf ff uit
-	del $(binary) 
+	rm -f *.o *.ppu $(binary) 
 
 $(binary):
-	$(CC) $(flags) $(units) $(lazarusunits) -o$(binary) $(defines) Simba.lpr 
+	$(CC) $(flags) $(units) $(lazarusunits) -o$(binary) $(defines) Simba.lpr
+	strip $(binary) 
diff --git a/Projects/Simba/Makefile.win64 b/Projects/Simba/Makefile.win64
new file mode 100644
index 0000000..873e2b5
--- /dev/null
+++ b/Projects/Simba/Makefile.win64
@@ -0,0 +1,31 @@
+#$ fpc  -MObjFPC -Scgi -O2 -OoREGVAR -gl -vewnhi -l -Fu../../Units/MMLCore/ -Fu../../Units/MMLAddon/ -Fu../../Units/PascalScript/ -Fu../../Units/Misc/ -Fu../../../lazarus/components/synedit/units/x86_64-linux/ -Fu../../../lazarus/ideintf/units/x86_64-linux/ -Fu../../../lazarus/lcl/units/x86_64-linux/ -Fu../../../lazarus/lcl/units/x86_64-linux/gtk2/ -Fu../../../lazarus/packager/units/x86_64-linux/ -Fu. -oSAMufasaGUI -dUseCThreads -dM_MEMORY_DEBUG -dLCL -dLCLgtk2 Simba.lpr
+
+.PHONY: default clean
+
+#Set these ----------
+platform := x86_64-win64
+widgetset := win32
+#lazaruspath := /usr/lib/lazarus/0.9.28.2
+lazaruspath := /home/mopar/simba/lazarus
+
+CC := fpc
+build := $(CC)
+binary := Simba.$(platform).exe
+flags := -Twin64 -Px86_64 -MObjFPC -Scgi -O2 -OoREGVAR -gl -vewnhi -l -Fu.
+defines := $(platformdefines) -dM_MEMORY_DEBUG -dLCL -dLCL$(widgetset)
+units := -Fu../../Units/MMLCore/ -Fu../../Units/MMLAddon/ -Fu../../Units/MMLAddon/PSInc/ -Fu../../Units/PascalScript/ -Fu../../Units/Misc/ -Fu../../Units/Linux/ -Fu../../Units/Synapse/ -Fu../../Units/RUTIS/
+
+
+
+lclplatpath := $(lazaruspath)/lcl/units/$(platform)/
+
+lazarusunits := -Fu$(lazaruspath)/components/synedit/units/$(platform)/ -Fu$(lazaruspath)ideintf/units/$(platform)/ -Fu$(lclplatpath) -Fu$(lclplatpath)$(widgetset)/ -Fu$(lazaruspath)/packager/units/$(platform)/ -Fu$(lazaruspath)/components/mouseandkeyinput/
+
+default: $(binary)
+
+clean:
+	rm -f *.o *.ppu $(binary) 
+
+$(binary):
+	$(CC) $(flags) $(units) $(lazarusunits) -o$(binary) $(defines) Simba.lpr
+	strip $(binary) 
diff --git a/Projects/Simba/Makefile b/Projects/Simba/Makefile.x86_64-linux
similarity index 74%
rename from Projects/Simba/Makefile
rename to Projects/Simba/Makefile.x86_64-linux
index 875ff1f..1a3225f 100644
--- a/Projects/Simba/Makefile
+++ b/Projects/Simba/Makefile.x86_64-linux
@@ -5,7 +5,8 @@
 #Set these ----------
 platform := x86_64-linux
 widgetset := gtk2
-lazaruspath := /home/merlijn/Programs/lazarus
+#lazaruspath := /usr/lib/lazarus/0.9.28.2
+lazaruspath := /home/mopar/simba/lazarus
 
 #-dUseCThreads on linux, none on windows. :) 
 platformdefines := -dUseCThreads
@@ -13,16 +14,16 @@ platformdefines := -dUseCThreads
 
 CC := fpc
 build := $(CC)
-binary := SAMufasaGUI
-flags := -MObjFPC -Scgi -O2 -OoREGVAR -gl -vewnhi -l -Fu.
+binary := Simba.$(platform)
+flags := -Px86_64 -MObjFPC -Scgi -O2 -OoREGVAR -gl -vewnhi -l -Fu.
 defines := $(platformdefines) -dM_MEMORY_DEBUG -dLCL -dLCL$(widgetset)
-units := -Fu../../Units/MMLCore/ -Fu../../Units/MMLAddon/ -Fu../../Units/PascalScript/ -Fu../../Units/Misc/
+units := -Fu../../Units/MMLCore/ -Fu../../Units/MMLAddon/ -Fu../../Units/MMLAddon/PSInc/ -Fu../../Units/PascalScript/ -Fu../../Units/Misc/ -Fu../../Units/Linux/ -Fu../../Units/Synapse/ -Fu../../Units/RUTIS/
 
 
 
 lclplatpath := $(lazaruspath)/lcl/units/$(platform)/
 
-lazarusunits := -Fu$(lazaruspath)/components/synedit/units/$(platform)/ -Fu$(lazaruspath)ideintf/units/$(platform)/ -Fu$(lclplatpath) -Fu$(lclplatpath)$(widgetset)/ -Fu$(lazaruspath)/packager/units/$(platform)/
+lazarusunits := -Fu$(lazaruspath)/components/synedit/units/$(platform)/ -Fu$(lazaruspath)ideintf/units/$(platform)/ -Fu$(lclplatpath) -Fu$(lclplatpath)$(widgetset)/ -Fu$(lazaruspath)/packager/units/$(platform)/ -Fu$(lazaruspath)/components/mouseandkeyinput/
 
 default: $(binary)
 
@@ -30,6 +31,6 @@ clean:
 	rm -f *.o *.ppu $(binary) 
 
 $(binary):
-	$(CC) $(flags) $(units) $(lazarusunits) -o$(binary) $(defines) Simba.lpr 
-	
-	-Fu/usr/local/share/lazarus/ideintf/units/x86_64-linux/
+	$(CC) $(flags) $(units) $(lazarusunits) -o$(binary) $(defines) Simba.lpr
+	strip $(binary) 
+