diff --git a/CMakeLists.txt b/CMakeLists.txt
index 36ff99c4c..f3afaad4f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -113,7 +113,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
 set(CMAKE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
 
 # Set EXE names so the assets CMakeLists can refer to its target
-set(SRB2_SDL2_EXE_NAME ringracers CACHE STRING "Executable binary output name")
+set(SRB2_SDL2_EXE_NAME srb2kart-v2 CACHE STRING "Executable binary output name")
 
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/src)
 
diff --git a/srb2.png b/srb2.png
index dd84db0a0..fccde9c3f 100644
Binary files a/srb2.png and b/srb2.png differ
diff --git a/srb2banner.png b/srb2banner.png
index ee4d3230e..32fddb60b 100644
Binary files a/srb2banner.png and b/srb2banner.png differ
diff --git a/src/Makefile b/src/Makefile
index e48d1296d..2ac92d11b 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -247,7 +247,7 @@ endif
 
 # append branch name by default
 ifndef EXENAME
-base:=ringracers
+base:=srb2kart-v2
 branch:=$(shell git symbolic-ref -q --short HEAD)
 EXENAME:=$(base)$(call _,$(filter-out master,$(branch)))$(exesuffix)
 endif
diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index 750213201..2bd525ae1 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -279,10 +279,10 @@ consvar_t cv_seenames = CVAR_INIT ("seenames", "On", CV_SAVE, CV_OnOff, NULL);
 
 // names
 consvar_t cv_playername[MAXSPLITSCREENPLAYERS] = {
-	CVAR_INIT ("name", "Dr. Eggman", CV_SAVE|CV_CALL|CV_NOINIT, NULL, Name_OnChange),
+	CVAR_INIT ("name", "Sonic", CV_SAVE|CV_CALL|CV_NOINIT, NULL, Name_OnChange),
 	CVAR_INIT ("name2", "Tails", CV_SAVE|CV_CALL|CV_NOINIT, NULL, Name2_OnChange),
-	CVAR_INIT ("name3", "Sonic", CV_SAVE|CV_CALL|CV_NOINIT, NULL, Name3_OnChange),
-	CVAR_INIT ("name4", "Knuckles", CV_SAVE|CV_CALL|CV_NOINIT, NULL, Name4_OnChange)
+	CVAR_INIT ("name3", "Knuckles", CV_SAVE|CV_CALL|CV_NOINIT, NULL, Name3_OnChange),
+	CVAR_INIT ("name4", "Eggman", CV_SAVE|CV_CALL|CV_NOINIT, NULL, Name4_OnChange)
 };
 // player colors
 UINT16 lastgoodcolor[MAXSPLITSCREENPLAYERS] = {SKINCOLOR_BLUE, SKINCOLOR_BLUE, SKINCOLOR_BLUE, SKINCOLOR_BLUE};
diff --git a/src/dehacked.c b/src/dehacked.c
index dece393b4..c83586553 100644
--- a/src/dehacked.c
+++ b/src/dehacked.c
@@ -564,7 +564,7 @@ static void DEH_LoadDehackedFile(MYFILE *f, boolean mainfile)
 						ignorelines(f);
 					}
 				}
-				else if (fastcmp(word, "RINGRACERS"))
+				else if (fastcmp(word, "SRB2KART"))
 				{
 					if (isdigit(word2[0]))
 					{
@@ -583,14 +583,14 @@ static void DEH_LoadDehackedFile(MYFILE *f, boolean mainfile)
 					{
 						deh_warning(
 								"SRB2Kart version definition has incorrect format, "
-								"use \"RINGRACERS %d\"",
+								"use \"SRB2KART %d\"",
 								PATCHVERSION
 						);
 					}
 				}
-				else if (fastcmp(word, "SRB2KART"))
+				else if (fastcmp(word, "RINGRACERS"))
 				{
-					deh_warning("Patch is only compatible with SRB2Kart.");
+					deh_warning("Patch is only compatible with Ring Racers.");
 				}
 				else if (fastcmp(word, "SRB2"))
 				{
diff --git a/src/filesrch.c b/src/filesrch.c
index 1d8d7bb6b..053855b9b 100644
--- a/src/filesrch.c
+++ b/src/filesrch.c
@@ -312,7 +312,7 @@ closedir (DIR * dirp)
 
 static CV_PossibleValue_t addons_cons_t[] = {{0, "Default"},
 #if 1
-												{1, "HOME"}, {2, "RINGRACERS"},
+												{1, "HOME"}, {2, "SRB2KART"},
 #endif
 													{3, "CUSTOM"}, {0, NULL}};
 
diff --git a/src/m_misc.c b/src/m_misc.c
index a97996b0a..80c5a633d 100644
--- a/src/m_misc.c
+++ b/src/m_misc.c
@@ -697,21 +697,21 @@ static void M_CreateScreenShotPalette(void)
 
 #if NUMSCREENS > 2
 static const char *Newsnapshotfile(const char *pathname, const char *ext)
-{
-	static char freename[19] = "ringracersXXXX.ext";
+{								
+	static char freename[17] = "srb2kartXXXX.ext";
 	int i = 5000; // start in the middle: num screenshots divided by 2
 	int add = i; // how much to add or subtract if wrong; gets divided by 2 each time
 	int result; // -1 = guess too high, 0 = correct, 1 = guess too low
 
 	// find a file name to save it to
-	strcpy(freename+15,ext);
+	strcpy(freename+13,ext);
 
 	for (;;)
 	{
-		freename[10] = (char)('0' + (char)(i/1000));
-		freename[11] = (char)('0' + (char)((i/100)%10));
-		freename[12] = (char)('0' + (char)((i/10)%10));
-		freename[13] = (char)('0' + (char)(i%10));
+		freename[9] = (char)('0' + (char)(i/1000));
+		freename[10] = (char)('0' + (char)((i/100)%10));
+		freename[11] = (char)('0' + (char)((i/10)%10));
+		freename[12] = (char)('0' + (char)(i%10));
 
 		if (FIL_WriteFileOK(va(pandf,pathname,freename))) // access succeeds
 			result = 1; // too low
@@ -720,10 +720,10 @@ static const char *Newsnapshotfile(const char *pathname, const char *ext)
 			if (!i)
 				break; // not too high, so it must be equal! YAY!
 
-			freename[10] = (char)('0' + (char)((i-1)/1000));
-			freename[11] = (char)('0' + (char)(((i-1)/100)%10));
-			freename[12] = (char)('0' + (char)(((i-1)/10)%10));
-			freename[13] = (char)('0' + (char)((i-1)%10));
+			freename[9] = (char)('0' + (char)((i-1)/1000));
+			freename[10] = (char)('0' + (char)(((i-1)/100)%10));
+			freename[11] = (char)('0' + (char)(((i-1)/10)%10));
+			freename[12] = (char)('0' + (char)((i-1)%10));
 			if (!FIL_WriteFileOK(va(pandf,pathname,freename))) // access fails
 				result = -1; // too high
 			else
@@ -741,10 +741,10 @@ static const char *Newsnapshotfile(const char *pathname, const char *ext)
 			return NULL;
 	}
 
-	freename[10] = (char)('0' + (char)(i/1000));
-	freename[11] = (char)('0' + (char)((i/100)%10));
-	freename[12] = (char)('0' + (char)((i/10)%10));
-	freename[13] = (char)('0' + (char)(i%10));
+	freename[9] = (char)('0' + (char)(i/1000));
+	freename[10] = (char)('0' + (char)((i/100)%10));
+	freename[11] = (char)('0' + (char)((i/10)%10));
+	freename[12] = (char)('0' + (char)(i%10));
 
 	return freename;
 }
diff --git a/src/r_skins.h b/src/r_skins.h
index cffd54da8..2785c5546 100644
--- a/src/r_skins.h
+++ b/src/r_skins.h
@@ -25,10 +25,10 @@
 #define SKINNAMESIZE 16
 #define SKINRIVALS 3
 // should be all lowercase!! S_SKIN processing does a strlwr
-#define DEFAULTSKIN "eggman"
+#define DEFAULTSKIN "sonic"
 #define DEFAULTSKIN2 "tails" // secondary player
-#define DEFAULTSKIN3 "sonic" // third player
-#define DEFAULTSKIN4 "knuckles" // fourth player
+#define DEFAULTSKIN3 "knuckles" // third player
+#define DEFAULTSKIN4 "eggman" // fourth player
 
 /// The skin_t struct
 typedef struct
diff --git a/src/sdl/SDL_icon.xpm b/src/sdl/SDL_icon.xpm
index b0ae75d5b..0acac88ec 100644
--- a/src/sdl/SDL_icon.xpm
+++ b/src/sdl/SDL_icon.xpm
@@ -1,97 +1,100 @@
 /* XPM */
-static const char * SDL_icon_xpm[] = {
-"64 64 30 1",
+static const char *SDL_icon_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"64 64 32 1",
 " 	c None",
-".	c #000000",
-"+	c #FFFFFF",
-"@	c #B37347",
-"#	c #E39767",
-"$	c #FFCB97",
-"%	c #7F532F",
-"&	c #FFCFB3",
-"*	c #533F1F",
-"=	c #874307",
-"-	c #752900",
-";	c #5F0000",
-">	c #414183",
-",	c #9B5B13",
-"'	c #5252FF",
-")	c #21224E",
-"!	c #FF3F3F",
-"~	c #AF0000",
-"{	c #FF5F5F",
-"]	c #470000",
-"^	c #FFB78B",
+".	c #E7E7E7",
+"+	c #DFDFDF",
+"@	c #AFAFAF",
+"#	c #979797",
+"$	c #8F8F8F",
+"%	c #B7B7B7",
+"&	c #F7F7F7",
+"*	c #D7D7D7",
+"=	c #4F4F4F",
+"-	c #0F0F0F",
+";	c #070707",
+">	c #575757",
+",	c #C7C7C7",
+"'	c #676767",
+")	c #7F7F7F",
+"!	c #5F5F5F",
+"~	c #777777",
+"{	c #474747",
+"]	c #878787",
+"^	c #6F6F6F",
 "/	c #BFBFBF",
-"(	c #E4E4E4",
-"_	c #979797",
-":	c #7F0000",
-"<	c #C39B2F",
-"[	c #DF0000",
-"}	c #EBDB57",
-"|	c #FFFF00",
-"1	c #000000",
-"                        ++++++++++++++++                        ",
-"                        ++++++++++++++++                        ",
-"                        ++++++++++++++++                        ",
-"                        ++++++++++++++++                        ",
-"                ++++++++@@@@@@@@@@@@@@@@++++++++                ",
-"                ++++++++@@@@@@@@@@@@@@@@++++++++                ",
-"                ++++++++@@@@@@@@@@@@@@@@++++++++                ",
-"                ++++++++@@@@@@@@@@@@@@@@++++++++                ",
-"            ++++@@@@####$$$$$$$$$$$$$$$$####@@@@++++            ",
-"            ++++@@@@####$$$$$$$$$$$$$$$$####@@@@++++            ",
-"            ++++@@@@####$$$$$$$$$$$$$$$$####@@@@++++            ",
-"            ++++@@@@####$$$$$$$$$$$$$$$$####@@@@++++            ",
-"        ++++%%%%####$$$$&&&&++++++++&&&&$$$$####%%%%++++        ",
-"        ++++%%%%####$$$$&&&&++++++++&&&&$$$$####%%%%++++        ",
-"        ++++%%%%####$$$$&&&&++++++++&&&&$$$$####%%%%++++        ",
-"        ++++%%%%####$$$$&&&&++++++++&&&&$$$$####%%%%++++        ",
-"++++++++****@@@@$$$$$$$$$$$$&&&&&&&&$$$$$$$$$$$$@@@@****++++++++",
-"++++++++****@@@@$$$$$$$$$$$$&&&&&&&&$$$$$$$$$$$$@@@@****++++++++",
-"++++++++****@@@@$$$$$$$$$$$$&&&&&&&&$$$$$$$$$$$$@@@@****++++++++",
-"++++++++****@@@@$$$$$$$$$$$$&&&&&&&&$$$$$$$$$$$$@@@@****++++++++",
-"====----;;;;####$$$$>>>>>>>>$$$$$$$$>>>>>>>>$$$$####;;;;----====",
-"====----;;;;####$$$$>>>>>>>>$$$$$$$$>>>>>>>>$$$$####;;;;----====",
-"====----;;;;####$$$$>>>>>>>>$$$$$$$$>>>>>>>>$$$$####;;;;----====",
-"====----;;;;####$$$$>>>>>>>>$$$$$$$$>>>>>>>>$$$$####;;;;----====",
-",,,,,,,,====----@@@@''''''''########''''''''@@@@----====,,,,,,,,",
-",,,,,,,,====----@@@@''''''''########''''''''@@@@----====,,,,,,,,",
-",,,,,,,,====----@@@@''''''''########''''''''@@@@----====,,,,,,,,",
-",,,,,,,,====----@@@@''''''''########''''''''@@@@----====,,,,,,,,",
-"----====,,,,====----))))))))!!!!!!!!))))))))----====,,,,====----",
-"----====,,,,====----))))))))!!!!!!!!))))))))----====,,,,====----",
-"----====,,,,====----))))))))!!!!!!!!))))))))----====,,,,====----",
-"----====,,,,====----))))))))!!!!!!!!))))))))----====,,,,====----",
-",,,,,,,,,,,,,,,,,,,,====~~~~{{{{{{{{~~~~====,,,,,,,,,,,,,,,,,,,,",
-",,,,,,,,,,,,,,,,,,,,====~~~~{{{{{{{{~~~~====,,,,,,,,,,,,,,,,,,,,",
-",,,,,,,,,,,,,,,,,,,,====~~~~{{{{{{{{~~~~====,,,,,,,,,,,,,,,,,,,,",
-",,,,,,,,,,,,,,,,,,,,====~~~~{{{{{{{{~~~~====,,,,,,,,,,,,,,,,,,,,",
-"----------------------------{{{{{{{{----------------------------",
-"----------------------------{{{{{{{{----------------------------",
-"----------------------------{{{{{{{{----------------------------",
-"----------------------------{{{{{{{{----------------------------",
-"]]]];;;;----^^^^////((((____((((((((____((((////^^^^----;;;;]]]]",
-"]]]];;;;----^^^^////((((____((((((((____((((////^^^^----;;;;]]]]",
-"]]]];;;;----^^^^////((((____((((((((____((((////^^^^----;;;;]]]]",
-"]]]];;;;----^^^^////((((____((((((((____((((////^^^^----;;;;]]]]",
-"::::::::<<<<@@@@^^^^++++////++++++++////++++^^^^@@@@<<<<::::::::",
-"::::::::<<<<@@@@^^^^++++////++++++++////++++^^^^@@@@<<<<::::::::",
-"::::::::<<<<@@@@^^^^++++////++++++++////++++^^^^@@@@<<<<::::::::",
-"::::::::<<<<@@@@^^^^++++////++++++++////++++^^^^@@@@<<<<::::::::",
-"::::::::<<<<<<<<----####^^^^$$$$$$$$^^^^####----<<<<<<<<::::::::",
-"::::::::<<<<<<<<----####^^^^$$$$$$$$^^^^####----<<<<<<<<::::::::",
-"::::::::<<<<<<<<----####^^^^$$$$$$$$^^^^####----<<<<<<<<::::::::",
-"::::::::<<<<<<<<----####^^^^$$$$$$$$^^^^####----<<<<<<<<::::::::",
-"~~~~[[[[}}}}||||||||@@@@----------------@@@@||||||||}}}}[[[[~~~~",
-"~~~~[[[[}}}}||||||||@@@@----------------@@@@||||||||}}}}[[[[~~~~",
-"~~~~[[[[}}}}||||||||@@@@----------------@@@@||||||||}}}}[[[[~~~~",
-"~~~~[[[[}}}}||||||||@@@@----------------@@@@||||||||}}}}[[[[~~~~",
-"[[[[[[[[||||||||<<<<~~~~~~~~~~~~~~~~~~~~~~~~<<<<||||||||[[[[[[[[",
-"[[[[[[[[||||||||<<<<~~~~~~~~~~~~~~~~~~~~~~~~<<<<||||||||[[[[[[[[",
-"[[[[[[[[||||||||<<<<~~~~~~~~~~~~~~~~~~~~~~~~<<<<||||||||[[[[[[[[",
-"[[[[[[[[||||||||<<<<~~~~~~~~~~~~~~~~~~~~~~~~<<<<||||||||[[[[[[[[",
-"[[[[[[[[||||<<<<~~~~[[[[[[[[[[[[[[[[[[[[[[[[~~~~<<<<||||[[[[[[[[",
-"[[[[[[[[||||<<<<~~~~[[[[[[[[[[[[[[[[[[[[[[[[~~~~<<<<||||[[[[[[[[",
-"[[[[[[[[||||<<<<~~~~[[[[[[[[[[[[[[[[[[[[[[[[~~~~<<<<||||[[[[[[[[",
-"[[[[[[[[||||<<<<~~~~[[[[[[[[[[[[[[[[[[[[[[[[~~~~<<<<||||[[[[[[[["};
+"(	c #373737",
+"_	c #1F1F1F",
+":	c #272727",
+"<	c #2F2F2F",
+"[	c #3F3F3F",
+"}	c #EFEFEF",
+"|	c #A7A7A7",
+"1	c #9F9F9F",
+"2	c #171717",
+"3	c #CFCFCF",
+"                                                                ",
+"                       ....................                     ",
+"                     ...+@##$$$$###@%&.......                   ",
+"                    ..*=-;;;-;;;;;;;;@........                  ",
+"                   ..+-;;;;--;;;;;;;>..........                 ",
+"                  ...,')!!'~>{!)$)>'....*]>^%&..                ",
+"                 ../(__(>:{<)$![[[%&...^!!!!!~*.                ",
+"                ..@;;;;;({=]:;;;;;~..*_;;;;;;;_..               ",
+"                .}>;;;;;^#=;;;;;;>...<;;;;;;;;;|..              ",
+"               ..*1)))))%]))))))%&..1])))))))))#}.              ",
+"              ..%[;;;;;[2;;;;;;;:..#;;;2[[-;;;;;=..             ",
+"              .&:;[{;;;{;;;~={:;^.._;;'}...>;;;;;,.             ",
+"              .}<;;:{;_:2!'-;;;]*.&(_].|{=@.~___[/..            ",
+"             ..*$))]@%//,111111}..|1*.@1111@.3111|&.            ",
+"             .,:;;;;;'#^;;;;;;;]./;;+);;;;;;$*;;;;..            ",
+"             .^;;;;;;));;;;;;;;$.~;$*;;;;;;;-+^;;;#.            ",
+"            ..$;;;;;;>;;;;;;;;>}.^-.!;;;;;;;;)*:;;|.            ",
+"            .&@$|#)))|)))1||#]+..$/}]))))))))$.3))#..           ",
+"            .#;;;[{;->;-^[;;;;].~;@];;;;;;;;;;1#;;-}.           ",
+"            .{;;;;{<[:(~-;;;;;$.(-.<;;;;;;;;;;{};;;3.           ",
+"           ..);;;;;~~[!;;;;;;-/.>=.>;;;;;;;;;;2}^;:3.           ",
+"           .&#)))))$}@)))))))@.}]3.*))))))))))).,))..           ",
+"           .3;;;;;;;);;;;;;;;2+|;%.';;;;;;;;;;;]1;;1.           ",
+"           .1_(:;;;;{;;;[=[:;;.];}.);;;;;;;;;;;=,;;].           ",
+"           .%2-(!2;2{;_':;;;;).1;..+:;;;;;;;;;;_.;;1.           ",
+"           .+))))@1$1#@))))))3.,@...1))))))))))].1#3.           ",
+"           .{;;;;;^<>);;;;;;;-.[). .-;;;;;;;;;;;3{;#.           ",
+"           ._;;;;;-~];;;;;;;;;};#. ._;;;;;;;;;;;/^;#.           ",
+"           .$'!!!!!1]!!!!!!!!%}[,. .'[[[[[[[[[[[,|>}.           ",
+"          ..'{::___!{___:(>___:[@...~[[[[[[[[[[[1#{,.           ",
+"          .+;-<=(;;[:;;(=-;;;;;;;;;;;;;;;;;;;;;;;;;).           ",
+"          .*;;;;[=;[_;{(;;;;;;;;;;;;;;;;;;;;;;;;;;-#.           ",
+"          .&)!!!!)$]~)$!!!!!!!!!!!!!!!!!!!!!!!!!!!^+.           ",
+"          .&(_____!$)!____________________________<3.           ",
+"          .%;;;;;;;@|;;;;;;;;;;;;==))))))))))))))]*&.           ",
+"          .*22;;;;;({;;;;;_-;;;;%.&..................           ",
+"          .&+~#]!!!~]!=[!^>[[[[{}...                            ",
+"          ../__:^^:(!_[$>[[[[[[{+.                              ",
+"           .<;;;;<^2{;'2;;;;;;;;].                              ",
+"           .;;;;;;:~=>:;;;;;;;;;].                              ",
+"           .@!!!!!!]3|!!!!!!!!!!*.                              ",
+"           .#_______#_____:<____~..                             ",
+"           .^_{[_;;;=2;;;<<-;;;;;,..................            ",
+"           .@<;;{~2;_>;;((;;;;;;;3,-----------|.$-!.            ",
+"           ..@))))|@)|)$|)))))))#}&/))))))))))}./)/.            ",
+"           .&:;;;;;=>>;^;;;;;;;;;_.[;;;;;;;;;;^.{;|.            ",
+"           ..2;;;;;;{#<[;;;;;;;;;;+';;;;;;;;;;~*;;..            ",
+"            .^;;;;;;;'%;;;;;;;;;;{&}#;;;;;;;;[+|;-..            ",
+"            .&3$1$))))%))))1]))))]+&}$))))))@&./)@.             ",
+"            ..(;_<'{;;(-;;[2;;;;;;-@3;;;;;;;_}};;~.             ",
+"             .=;;;;:~<-(;-[;;;;;;;;:.=;;;;;;>.!;;,.             ",
+"             ./:;;;;;!!!;=-;;;;;;;;>.+$;;;;[.&_;=..             ",
+"             ..&|)))))$,|%)))))))))]1&.|]]@&.|]]}.              ",
+"              .&;;;;;;;:@=;;;;;;;;;;;-/....3:;;;}.              ",
+"              ..!;;;;;;;([;;;;_2;;;;;;;>)){;;;;^..              ",
+"               ..=2_:-;;;(;;;2<;;;;;;;;;;;;;;-)..               ",
+"                ...%$#@%#)#))|))))))))))))))|}&.                ",
+"                 ..!;;;2!]{_-[;;;;;;;;;;;;;;;&..                ",
+"                  ..^-;;;;^)(:;;;;;;;;;;;;;;'..                 ",
+"                   ..*'-;;;:]-;;;;;;;;;;;;-$..                  ",
+"                    ....}./1))))))))))))]/...                   ",
+"                     ........}3||1#$$$]1...                     ",
+"                       ...................                      ",
+"                                                                "};
diff --git a/src/sdl/Srb2SDL.ico b/src/sdl/Srb2SDL.ico
index f9caf642c..4e3f81336 100644
Binary files a/src/sdl/Srb2SDL.ico and b/src/sdl/Srb2SDL.ico differ
diff --git a/src/sdl/i_system.c b/src/sdl/i_system.c
index 390ffa23f..36c11b2f7 100644
--- a/src/sdl/i_system.c
+++ b/src/sdl/i_system.c
@@ -144,10 +144,10 @@ typedef LPVOID (WINAPI *p_MapViewOfFile) (HANDLE, DWORD, DWORD, DWORD, SIZE_T);
 
 // Locations for searching for main.pk3
 #if defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON)
-#define DEFAULTWADLOCATION1 "/usr/local/share/games/RingRacers"
-#define DEFAULTWADLOCATION2 "/usr/local/games/RingRacers"
-#define DEFAULTWADLOCATION3 "/usr/share/games/RingRacers"
-#define DEFAULTWADLOCATION4 "/usr/games/RingRacers"
+#define DEFAULTWADLOCATION1 "/usr/local/share/games/SRB2Kart-V2"
+#define DEFAULTWADLOCATION2 "/usr/local/games/SRB2Kart-V2"
+#define DEFAULTWADLOCATION3 "/usr/share/games/SRB2Kart-V2"
+#define DEFAULTWADLOCATION4 "/usr/games/SRB2Kart-V2"
 #define DEFAULTSEARCHPATH1 "/usr/local/games"
 #define DEFAULTSEARCHPATH2 "/usr/games"
 #define DEFAULTSEARCHPATH3 "/usr/local"
diff --git a/src/sdl/srb2icon.png b/src/sdl/srb2icon.png
index 17de4468e..2aca4b204 100644
Binary files a/src/sdl/srb2icon.png and b/src/sdl/srb2icon.png differ
diff --git a/src/sdl12/i_system.c b/src/sdl12/i_system.c
index 487a56dfb..2c41df3ec 100644
--- a/src/sdl12/i_system.c
+++ b/src/sdl12/i_system.c
@@ -155,9 +155,9 @@ void __set_fpscr(long); // in libgcc / kernel's startup.s?
 //#define DEFAULTSEARCHPATH3 "/pc/home/alam/srb2code/data"
 #elif defined (GP2X)
 #define DEFAULTWADLOCATION1 "/mnt/sd"
-#define DEFAULTWADLOCATION2 "/mnt/sd/RingRacers"
+#define DEFAULTWADLOCATION2 "/mnt/sd/SRB2Kart-V2"
 #define DEFAULTWADLOCATION3 "/tmp/mnt/sd"
-#define DEFAULTWADLOCATION4 "/tmp/mnt/sd/RingRacers"
+#define DEFAULTWADLOCATION4 "/tmp/mnt/sd/SRB2Kart-V2"
 #define DEFAULTSEARCHPATH1 "/mnt/sd"
 #define DEFAULTSEARCHPATH2 "/tmp/mnt/sd"
 #elif defined (_WII)
@@ -184,10 +184,10 @@ void __set_fpscr(long); // in libgcc / kernel's startup.s?
 #define DEFAULTSEARCHPATH1 "host0:/"
 #define DEFAULTSEARCHPATH2 "ms0:/PSP/GAME/SRB2PSP"
 #elif defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON)
-#define DEFAULTWADLOCATION1 "/usr/local/share/games/RingRacers"
-#define DEFAULTWADLOCATION2 "/usr/local/games/RingRacers"
-#define DEFAULTWADLOCATION3 "/usr/share/games/RingRacers"
-#define DEFAULTWADLOCATION4 "/usr/games/RingRacers"
+#define DEFAULTWADLOCATION1 "/usr/local/share/games/SRB2Kart-V2"
+#define DEFAULTWADLOCATION2 "/usr/local/games/SRB2Kart-V2"
+#define DEFAULTWADLOCATION3 "/usr/share/games/SRB2Kart-V2"
+#define DEFAULTWADLOCATION4 "/usr/games/SRB2Kart-V2"
 #define DEFAULTSEARCHPATH1 "/usr/local/games"
 #define DEFAULTSEARCHPATH2 "/usr/games"
 #define DEFAULTSEARCHPATH3 "/usr/local"
@@ -196,21 +196,21 @@ void __set_fpscr(long); // in libgcc / kernel's startup.s?
 #ifdef __GNUC__
 #include <openxdk/debug.h>
 #endif
-#define DEFAULTWADLOCATION1 "c:\\ringracers"
-#define DEFAULTWADLOCATION2 "d:\\ringracers"
-#define DEFAULTWADLOCATION3 "e:\\ringracers"
-#define DEFAULTWADLOCATION4 "f:\\ringracers"
-#define DEFAULTWADLOCATION5 "g:\\ringracers"
-#define DEFAULTWADLOCATION6 "h:\\ringracers"
-#define DEFAULTWADLOCATION7 "i:\\ringracers"
+#define DEFAULTWADLOCATION1 "c:\\srb2kart-v2"
+#define DEFAULTWADLOCATION2 "d:\\srb2kart-v2"
+#define DEFAULTWADLOCATION3 "e:\\srb2kart-v2"
+#define DEFAULTWADLOCATION4 "f:\\srb2kart-v2"
+#define DEFAULTWADLOCATION5 "g:\\srb2kart-v2"
+#define DEFAULTWADLOCATION6 "h:\\srb2kart-v2"
+#define DEFAULTWADLOCATION7 "i:\\srb2kart-v2"
 #elif defined (_WIN32_WCE)
 #define NOCWD
 #define NOHOME
-#define DEFAULTWADLOCATION1 "\\Storage Card\\RingRacers"
+#define DEFAULTWADLOCATION1 "\\Storage Card\\SRB2Kart-V2"
 #define DEFAULTSEARCHPATH1 "\\Storage Card"
 #elif defined (_WIN32)
-#define DEFAULTWADLOCATION1 "c:\\games\\ringracers"
-#define DEFAULTWADLOCATION2 "\\games\\ringracers"
+#define DEFAULTWADLOCATION1 "c:\\games\\SRB2Kart-V2"
+#define DEFAULTWADLOCATION2 "\\games\\SRB2Kart-V2"
 #define DEFAULTSEARCHPATH1 "c:\\games"
 #define DEFAULTSEARCHPATH2 "\\games"
 #endif
diff --git a/src/sdl12/sdl_sound.c b/src/sdl12/sdl_sound.c
index cc16eb0f1..3f2484a9d 100644
--- a/src/sdl12/sdl_sound.c
+++ b/src/sdl12/sdl_sound.c
@@ -154,16 +154,16 @@ static SDL_mutex *Msc_Mutex = NULL;
 #ifdef _arch_dreamcast
 #define MIDI_PATH     "/ram"
 #elif defined(GP2X)
-#define MIDI_PATH     "/mnt/sd/ringracers"
-#define MIDI_PATH2    "/tmp/mnt/sd/ringracers"
+#define MIDI_PATH     "/mnt/sd/srb2kart-v2"
+#define MIDI_PATH2    "/tmp/mnt/sd/srb2kart-v2"
 #else
 #define MIDI_PATH     srb2home
 #if defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON)
 #define MIDI_PATH2    "/tmp"
 #endif
 #endif
-#define MIDI_TMPFILE  "ringracersmusic"
-#define MIDI_TMPFILE2 "ringracerswav"
+#define MIDI_TMPFILE  "srb2kart-v2music"
+#define MIDI_TMPFILE2 "srb2kart-v2wav"
 static INT32 musicvol = 62;
 
 #if SDL_MIXER_VERSION_ATLEAST(1,2,2)