diff --git a/src/Makefile b/src/Makefile
index aa23f35..12c4df2 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -26,16 +26,50 @@ clean:
 	- rm -f compile_time.o
 	- rm -f 8inst_c.h
 	- rm -f 16inst_c.h
-	- rm -rf ../GSport.app
-	- rm -rf ../GSportDmg
 
 specials: 8inst_s 16inst_s 8size 16size 8inst_c 16inst_c size_c size_s
 
 specials_clean:
 	rm -f 8inst_s 16inst_s 8size 16size 8inst_c 16inst_c size_c size_s
 
+# Linux/OSX SDL builds
+gsplus: $(OBJECTS) compile_time.o
+	$(LD) $(CCOPTS) $(LDOPTS) $(OBJECTS) compile_time.o $(LDFLAGS) -o $(NAME)$(SUFFIX) $(EXTRA_LIBS) 
+	echo $(OBJECTS)
+	cp gsplus ..
+	cp gsplus ../bin/osx
 
-# Mac builds:
+# Linux/OSX XWindows builds
+gsplusx: $(OBJECTS) compile_time.o
+	$(LD) $(CCOPTS) $(LDOPTS) $(OBJECTS) compile_time.o $(LDFLAGS) -o $(NAME)$(SUFFIX) $(XLIBS) $(EXTRA_LIBS) -lX11
+	echo $(OBJECTS)
+	mv gsplusx ..
+
+# NOT CURRENTLY SUPPORTED 
+# Linux framebuffer builds:
+gsplusfb: $(OBJECTS) compile_time.o
+	$(LD) $(CCOPTS) $(LDOPTS) $(OBJECTS) compile_time.o $(LDFLAGS) -o $(NAME)$(SUFFIX) $(EXTRA_LIBS)
+	echo $(OBJECTS)
+	mv gsplusfb ..
+	cp -f ../config.template ../config.txt 
+
+# NOT CURRENTLY SUPPORTED 
+# Mingw32 (native windows) builds:
+gsport.exe: $(OBJECTS) compile_time.o
+	g++ $(CCOPTS) $(LDOPTS) $(OBJECTS) compile_time.o $(LDFLAGS) -o $(NAME)$(SUFFIX) $(EXTRA_LIBS) -lwinmm -lgdi32 -ldsound -lcomctl32 -lws2_32 -lshell32
+	mkdir -p ../GSport.app/lib
+	cp -f gsport.exe ../GSport.app/GSport.exe
+	cp -f ../config.template ../GSport.app/config.txt
+	cp -f ../lib/*.ttf ../GSport.app/lib
+	cp -f ../lib/arch/win32/*.dll ../GSport.app
+	cp -f ../lib/NoBoot.po ../GSport.app
+	cp -f GSport.bat ../GSport.app/GSport.bat
+	cp -f parallel.rom ../GSport.app
+	cp -f ../COPYING.txt ../GSport.app
+	cp -f ../GSport.html ../GSport.app
+
+# NOT CURRENTLY SUPPORTED 
+# Mac build - old style (deprecated)
 gsportmac: $(OBJECTS) compile_time.o
 	$(CC) $(CCOPTS) $(LDOPTS) $(OBJECTS) compile_time.o $(LDFLAGS) -o gsport $(EXTRA_LIBS)
 	mkdir -p ../GSport.app/Contents/Resources/English.lproj/main.nib
@@ -61,40 +95,6 @@ gsportmac: $(OBJECTS) compile_time.o
 	cp ../GSport.html ../GSportDmg/GSport/GSport.html
 	arch/mac/makedmg.sh .. GSportDmg GSport GSport 7
 
-# OSX builds
-gsplus: $(OBJECTS) compile_time.o
-	$(LD) $(CCOPTS) $(LDOPTS) $(OBJECTS) compile_time.o $(LDFLAGS) -o $(NAME)$(SUFFIX) $(EXTRA_LIBS) 
-	echo $(OBJECTS)
-	cp gsplus ..
-	cp gsplus ../bin/osx
-
-# Linux/OSX XWindows builds
-gsportx: $(OBJECTS) compile_time.o
-	$(LD) $(CCOPTS) $(LDOPTS) $(OBJECTS) compile_time.o $(LDFLAGS) -o $(NAME)$(SUFFIX) $(XLIBS) $(EXTRA_LIBS) -lX11
-	echo $(OBJECTS)
-	mv gsportx ..
-
-# Linux framebuffer builds:
-gsportfb: $(OBJECTS) compile_time.o
-	$(LD) $(CCOPTS) $(LDOPTS) $(OBJECTS) compile_time.o $(LDFLAGS) -o $(NAME)$(SUFFIX) $(EXTRA_LIBS)
-	echo $(OBJECTS)
-	mv gsportfb ..
-	cp -f ../config.template ../config.txt 
-
-# Mingw32 (native windows) builds:
-gsport.exe: $(OBJECTS) compile_time.o
-	g++ $(CCOPTS) $(LDOPTS) $(OBJECTS) compile_time.o $(LDFLAGS) -o $(NAME)$(SUFFIX) $(EXTRA_LIBS) -lwinmm -lgdi32 -ldsound -lcomctl32 -lws2_32 -lshell32
-	mkdir -p ../GSport.app/lib
-	cp -f gsport.exe ../GSport.app/GSport.exe
-	cp -f ../config.template ../GSport.app/config.txt
-	cp -f ../lib/*.ttf ../GSport.app/lib
-	cp -f ../lib/arch/win32/*.dll ../GSport.app
-	cp -f ../lib/NoBoot.po ../GSport.app
-	cp -f GSport.bat ../GSport.app/GSport.bat
-	cp -f parallel.rom ../GSport.app
-	cp -f ../COPYING.txt ../GSport.app
-	cp -f ../GSport.html ../GSport.app
-
 8inst_c.h: instable.h
 	$(PERL) make_inst c 8 instable.h > 8inst_c.h
 
diff --git a/src/vars_osx_x11 b/src/vars_osx_x11
index c64d100..b4449eb 100644
--- a/src/vars_osx_x11
+++ b/src/vars_osx_x11
@@ -1,21 +1,20 @@
-TARGET = gsportx
-OBJECTS = $(OBJECTS1) $(TFEOBJ) $(ATOBJ) $(PCAPOBJ) xdriver.o
+TARGET = gsplusx
+NAME = gsportx
+PERL = perl
 CC = clang
-#CCOPTS = -O2 -Wall -fomit-frame-pointer -std=gnu99 -arch=i686 -DHAVE_SDL -DHAVE_TFE -DHAVE_ATBRIDGE -DTOGGLE_STATUS -I/usr/include/SDL -I/usr/include/freetype2
-#CPPOPTS = -O2 -DHAVE_TFE -DHAVE_SDL -DTOGGLE_STATUS -DHAVE_ATBRIDGE -I/usr/include/freetype2 -I/usr/include/SDL2
+LD = g++
+AS = cc
 
+
+OBJECTS = $(OBJECTS1) $(TFEOBJ) $(ATOBJ) $(PCAPOBJ) xdriver.o
 CCOPTS = -O2 -Wall -fomit-frame-pointer -std=gnu99 -DHAVE_SDL -DTOGGLE_STATUS -I/usr/local/include/SDL2 -I/usr/local/include/freetype2 -L/usr/X11/lib
 CPPOPTS = -O2 -DHAVE_TFE -DHAVE_SDL -DTOGGLE_STATUS -I/usr/local/include/freetype2 -I/usr/local/include/SDL2
 OPTS = -DGSPORT_LITTLE_ENDIAN 
 SUFFIX =
-NAME = gsportx
 LDFLAGS =
 LDOPTS =
-LD = g++
 EXTRA_LIBS = -lX11 -lfreetype -lSDL2 -lpcap -lXext
 EXTRA_SPECIALS =
 
-AS = cc
-PERL = perl
 
 XOPTS = -I/usr/X11/include
diff --git a/src/vars_fbrpilinux b/src/vars_rpilinux_fb
similarity index 94%
rename from src/vars_fbrpilinux
rename to src/vars_rpilinux_fb
index 8c8c036..48b2653 100644
--- a/src/vars_fbrpilinux
+++ b/src/vars_rpilinux_fb
@@ -1,4 +1,4 @@
-TARGET = gsportfb
+TARGET = gsplusfb
 OBJECTS = $(OBJECTS1) $(TFEOBJ) $(ATOBJ) $(PCAPOBJ) fbdriver.o
 CC = gcc
 CCOPTS = -O2 -Wall -fomit-frame-pointer -std=gnu99 -march=armv6
diff --git a/src/vars_x86linux_sdl b/src/vars_x86linux_sdl
index 310ce5f..ce23d28 100644
--- a/src/vars_x86linux_sdl
+++ b/src/vars_x86linux_sdl
@@ -1,5 +1,5 @@
-TARGET = gsportx
-NAME = gsportx
+TARGET = gsplusx
+NAME = gsplusx
 PERL = perl
 CC = gcc
 LD = g++