diff --git a/gui.pnproj b/gui.pnproj
index 7d63842a..c3d79b47 100644
--- a/gui.pnproj
+++ b/gui.pnproj
@@ -1 +1 @@
-<Project name="gui"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="source" path="source\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="fonts" path="fonts\"><File path="clock.ttf"></File><File path="font.ttf"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="images" path="images\"><File path="arrow_next.png"></File><File path="arrow_previous.png"></File><File path="background.png"></File><File path="battery.png"></File><File path="battery_bar.png"></File><File path="battery_red.png"></File><File path="bg_options.png"></File><File path="bg_options_entry.png"></File><File path="bg_options_settings.png"></File><File path="button_dialogue_box.png"></File><File path="button_install.png"></File><File path="button_install_over.png"></File><File path="credits_bg.png"></File><File path="credits_button.png"></File><File path="credits_button_over.png"></File><File path="dialogue_box.png"></File><File path="dialogue_box_install.png"></File><File path="dialogue_box_startgame.png"></File><File path="keyboard_key.png"></File><File path="keyboard_key_over.png"></File><File path="keyboard_largekey.png"></File><File path="keyboard_largekey_over.png"></File><File path="keyboard_mediumkey.png"></File><File path="keyboard_mediumkey_over.png"></File><File path="keyboard_textbox.png"></File><File path="little_star.png"></File><File path="menu_button.png"></File><File path="menu_button_over.png"></File><File path="mp3_pause.png"></File><File path="mp3_stop.png"></File><File path="nocover.png"></File><File path="nodisc.png"></File><File path="page1.png"></File><File path="page1d.png"></File><File path="page2.png"></File><File path="page2d.png"></File><File path="player1_grab.png"></File><File path="player1_point.png"></File><File path="player2_grab.png"></File><File path="player2_point.png"></File><File path="player3_grab.png"></File><File path="player3_point.png"></File><File path="player4_grab.png"></File><File path="player4_point.png"></File><File path="progressbar.png"></File><File path="progressbar_empty.png"></File><File path="progressbar_outline.png"></File><File path="scrollbar.png"></File><File path="scrollbar_arrowdown.png"></File><File path="scrollbar_arrowup.png"></File><File path="scrollbar_box.png"></File><File path="sdcard.png"></File><File path="settings_background.png"></File><File path="settings_button.png"></File><File path="settings_button_over.png"></File><File path="settings_menu_button.png"></File><File path="startgame_arrow_left.png"></File><File path="startgame_arrow_right.png"></File><File path="tab_bg1.png"></File><File path="tab_bg2.png"></File><File path="tab_bg3.png"></File><File path="tooltip_left.png"></File><File path="tooltip_right.png"></File><File path="tooltip_tile.png"></File><File path="wbackground.png"></File><File path="wdialogue_box_startgame.png"></File><File path="wiimote_poweroff.png"></File><File path="wiimote_poweroff_over.png"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="libwbfs" path="libwbfs\"><File path="libwbfs.c"></File><File path="libwbfs.h"></File><File path="libwbfs_os.h"></File><File path="rijndael.c"></File><File path="wiidisc.c"></File><File path="wiidisc.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="libwiigui" path="libwiigui\"><File path="gui.h"></File><File path="gui_button.cpp"></File><File path="gui_customoptionbrowser.cpp"></File><File path="gui_customoptionbrowser.h"></File><File path="gui_element.cpp"></File><File path="gui_gamebrowser.cpp"></File><File path="gui_gamebrowser.h"></File><File path="gui_image.cpp"></File><File path="gui_imagedata.cpp"></File><File path="gui_keyboard.cpp"></File><File path="gui_optionbrowser.cpp"></File><File path="gui_sound.cpp"></File><File path="gui_text.cpp"></File><File path="gui_tooltip.cpp"></File><File path="gui_trigger.cpp"></File><File path="gui_window.cpp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="sounds" path="sounds\"><File path="bg_music.ogg"></File><File path="button_click.pcm"></File><File path="button_click2.pcm"></File><File path="button_over.pcm"></File><File path="credits_music.ogg"></File></MagicFolder><File path="apploader.c"></File><File path="apploader.h"></File><File path="audio.cpp"></File><File path="audio.h"></File><File path="cfg.c"></File><File path="cfg.h"></File><File path="data1"></File><File path="disc.c"></File><File path="disc.h"></File><File path="dns.c"></File><File path="dns.h"></File><File path="dvd_broadway.c"></File><File path="dvd_broadway.h"></File><File path="fatmounter.c"></File><File path="fatmounter.h"></File><File path="filelist.h"></File><File path="FreeTypeGX.cpp"></File><File path="FreeTypeGX.h"></File><File path="fst.c"></File><File path="fst.h"></File><File path="fwrite_patch.h"></File><File path="geckomenu.h"></File><File path="http.c"></File><File path="http.h"></File><File path="input.cpp"></File><File path="input.h"></File><File path="kenobiwii.h"></File><File path="language.c"></File><File path="language.h"></File><File path="main.cpp"></File><File path="main.h"></File><File path="menu.cpp"></File><File path="menu.h"></File><File path="mp3s.c"></File><File path="mp3s.h"></File><File path="oggplayer.c"></File><File path="oggplayer.h"></File><File path="partition.c"></File><File path="partition.h"></File><File path="patchcode.c"></File><File path="patchcode.h"></File><File path="patchhook.S"></File><File path="ppc.h"></File><File path="sdhc.c"></File><File path="sdhc.h"></File><File path="stub.S"></File><File path="sys.c"></File><File path="sys.h"></File><File path="usbstorage.c"></File><File path="usbstorage.h"></File><File path="utils.c"></File><File path="utils.h"></File><File path="video.cpp"></File><File path="video.h"></File><File path="video2.c"></File><File path="video2.h"></File><File path="wbfs.c"></File><File path="wbfs.h"></File><File path="wdvd.c"></File><File path="wdvd.h"></File><File path="wpad.c"></File><File path="wpad.h"></File></MagicFolder></Project>
\ No newline at end of file
+<Project name="gui"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="source" path="source\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="fonts" path="fonts\"><File path="clock.ttf"></File><File path="font.ttf"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="images" path="images\"><File path="arrow_next.png"></File><File path="arrow_previous.png"></File><File path="background.png"></File><File path="battery.png"></File><File path="battery_bar.png"></File><File path="battery_red.png"></File><File path="bg_options.png"></File><File path="bg_options_entry.png"></File><File path="bg_options_settings.png"></File><File path="button_dialogue_box.png"></File><File path="button_install.png"></File><File path="button_install_over.png"></File><File path="credits_bg.png"></File><File path="credits_button.png"></File><File path="credits_button_over.png"></File><File path="dialogue_box.png"></File><File path="dialogue_box_install.png"></File><File path="dialogue_box_startgame.png"></File><File path="keyboard_key.png"></File><File path="keyboard_key_over.png"></File><File path="keyboard_largekey.png"></File><File path="keyboard_largekey_over.png"></File><File path="keyboard_mediumkey.png"></File><File path="keyboard_mediumkey_over.png"></File><File path="keyboard_textbox.png"></File><File path="little_star.png"></File><File path="menu_button.png"></File><File path="menu_button_over.png"></File><File path="mp3_pause.png"></File><File path="mp3_stop.png"></File><File path="nocover.png"></File><File path="nodisc.png"></File><File path="page1.png"></File><File path="page1d.png"></File><File path="page2.png"></File><File path="page2d.png"></File><File path="player1_grab.png"></File><File path="player1_point.png"></File><File path="player2_grab.png"></File><File path="player2_point.png"></File><File path="player3_grab.png"></File><File path="player3_point.png"></File><File path="player4_grab.png"></File><File path="player4_point.png"></File><File path="progressbar.png"></File><File path="progressbar_empty.png"></File><File path="progressbar_outline.png"></File><File path="scrollbar.png"></File><File path="scrollbar_arrowdown.png"></File><File path="scrollbar_arrowup.png"></File><File path="scrollbar_box.png"></File><File path="sdcard.png"></File><File path="settings_background.png"></File><File path="settings_button.png"></File><File path="settings_button_over.png"></File><File path="settings_menu_button.png"></File><File path="startgame_arrow_left.png"></File><File path="startgame_arrow_right.png"></File><File path="tab_bg1.png"></File><File path="tab_bg2.png"></File><File path="tab_bg3.png"></File><File path="tooltip_left.png"></File><File path="tooltip_right.png"></File><File path="tooltip_tile.png"></File><File path="wbackground.png"></File><File path="wdialogue_box_startgame.png"></File><File path="wiimote_poweroff.png"></File><File path="wiimote_poweroff_over.png"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="libwbfs" path="libwbfs\"><File path="libwbfs.c"></File><File path="libwbfs.h"></File><File path="libwbfs_os.h"></File><File path="rijndael.c"></File><File path="wiidisc.c"></File><File path="wiidisc.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="libwiigui" path="libwiigui\"><File path="gui.h"></File><File path="gui_button.cpp"></File><File path="gui_customoptionbrowser.cpp"></File><File path="gui_customoptionbrowser.h"></File><File path="gui_element.cpp"></File><File path="gui_gamebrowser.cpp"></File><File path="gui_gamebrowser.h"></File><File path="gui_image.cpp"></File><File path="gui_imagedata.cpp"></File><File path="gui_keyboard.cpp"></File><File path="gui_optionbrowser.cpp"></File><File path="gui_sound.cpp"></File><File path="gui_text.cpp"></File><File path="gui_tooltip.cpp"></File><File path="gui_trigger.cpp"></File><File path="gui_window.cpp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="sounds" path="sounds\"><File path="bg_music.ogg"></File><File path="button_click.pcm"></File><File path="button_click2.pcm"></File><File path="button_over.pcm"></File><File path="credits_music.ogg"></File></MagicFolder><File path="apploader.c"></File><File path="apploader.h"></File><File path="audio.cpp"></File><File path="audio.h"></File><File path="cfg.c"></File><File path="cfg.h"></File><File path="CH2Unicode.c"></File><File path="CH2Unicode.h"></File><File path="data1"></File><File path="disc.c"></File><File path="disc.h"></File><File path="dns.c"></File><File path="dns.h"></File><File path="dvd_broadway.c"></File><File path="dvd_broadway.h"></File><File path="fatmounter.c"></File><File path="fatmounter.h"></File><File path="filelist.h"></File><File path="FreeTypeGX.cpp"></File><File path="FreeTypeGX.h"></File><File path="fst.c"></File><File path="fst.h"></File><File path="fwrite_patch.h"></File><File path="geckomenu.h"></File><File path="http.c"></File><File path="http.h"></File><File path="input.cpp"></File><File path="input.h"></File><File path="kenobiwii.h"></File><File path="language.c"></File><File path="language.h"></File><File path="main.cpp"></File><File path="main.h"></File><File path="menu.cpp"></File><File path="menu.h"></File><File path="mp3s.c"></File><File path="mp3s.h"></File><File path="oggplayer.c"></File><File path="oggplayer.h"></File><File path="partition.c"></File><File path="partition.h"></File><File path="patchcode.c"></File><File path="patchcode.h"></File><File path="patchhook.S"></File><File path="ppc.h"></File><File path="sdhc.c"></File><File path="sdhc.h"></File><File path="stub.S"></File><File path="sys.c"></File><File path="sys.h"></File><File path="usbstorage.c"></File><File path="usbstorage.h"></File><File path="utils.c"></File><File path="utils.h"></File><File path="video.cpp"></File><File path="video.h"></File><File path="video2.c"></File><File path="video2.h"></File><File path="wbfs.c"></File><File path="wbfs.h"></File><File path="wdvd.c"></File><File path="wdvd.h"></File><File path="wpad.c"></File><File path="wpad.h"></File></MagicFolder></Project>
\ No newline at end of file
diff --git a/source/cfg.c b/source/cfg.c
index 3336e6d9..dd20e546 100644
--- a/source/cfg.c
+++ b/source/cfg.c
@@ -285,6 +285,9 @@ void CFG_Default(int widescreen) // -1 = non forced Mode
 	THEME.info_r = 63;
 	THEME.info_g = 154;
 	THEME.info_b = 192;
+	THEME.prompttxt_r = 0;
+	THEME.prompttxt_g = 0;
+	THEME.prompttxt_b = 0;
 	THEME.clock_x = 0;
 	THEME.clock_y = 330;
 	THEME.clockAlign = CFG_ALIGN_CENTRE;
@@ -653,6 +656,15 @@ void theme_set(char *name, char *val)
 		}
 	}
 
+	else if (strcmp(cfg_name, "prompttext_color") == 0) {
+		short x,y,z;
+		if (sscanf(val, "%hd,%hd, %hd", &x, &y, &z) == 3) {
+			THEME.prompttxt_r = x;
+			THEME.prompttxt_g = y;
+			THEME.prompttxt_b = z;
+		}
+	}
+
 	else if (strcmp(cfg_name, "pagesize") == 0) {
 		short x;
 		if (sscanf(val, "%hd", &x) == 1) {
diff --git a/source/cfg.h b/source/cfg.h
index 4276ab99..93a91314 100644
--- a/source/cfg.h
+++ b/source/cfg.h
@@ -122,6 +122,9 @@ struct THEME
 	short info_r;
 	short info_g;
 	short info_b;
+	short prompttxt_r;
+	short prompttxt_g;
+	short prompttxt_b;
 	short clock_x;
 	short clock_y;
 	short clockAlign;
diff --git a/source/menu.cpp b/source/menu.cpp
index 9b47de97..cb19716e 100644
--- a/source/menu.cpp
+++ b/source/menu.cpp
@@ -57,9 +57,9 @@ static GuiImageData * background = NULL;
 static char prozent[10] = "0%";
 static char timet[50] = " ";
 static char sizeshow[20] = " ";
-static GuiText prTxt(prozent, 26, (GXColor){0, 0, 0, 255});
-static GuiText timeTxt(prozent, 26, (GXColor){0, 0, 0, 255});
-static GuiText sizeTxt(sizeshow, 26, (GXColor){0, 0, 0, 255});
+static GuiText prTxt(prozent, 26, (GXColor){THEME.prompttxt_r, THEME.prompttxt_g, THEME.prompttxt_b, 255}); //{0, 0, 0, 255});
+static GuiText timeTxt(prozent, 26, (GXColor){THEME.prompttxt_r, THEME.prompttxt_g, THEME.prompttxt_b, 255}); //{0, 0, 0, 255});
+static GuiText sizeTxt(sizeshow, 26, (GXColor){THEME.prompttxt_r, THEME.prompttxt_g, THEME.prompttxt_b, 255}); //{0, 0, 0, 255});
 static GuiText *GameIDTxt = NULL;
 static GuiText *GameRegionTxt = NULL;
 static GuiSound * bgMusic = NULL;
@@ -400,7 +400,11 @@ WindowPrompt(const char *title, const char *msg, const char *btn1Label,
 	promptWindow.SetPosition(0, -10);
 	GuiSound btnSoundOver(button_over_pcm, button_over_pcm_size, SOUND_PCM, vol);
 	GuiSound btnClick(button_click2_pcm, button_click2_pcm_size, SOUND_PCM, vol);
-	GuiImageData btnOutline(button_dialogue_box_png);
+	char imgPath[50];
+	snprintf(imgPath, sizeof(imgPath), "%sbutton_dialogue_box.png", CFG.theme_path);
+	GuiImageData btnOutline(imgPath, button_dialogue_box_png);
+	snprintf(imgPath, sizeof(imgPath), "%sdialogue_box.png", CFG.theme_path);
+	GuiImageData dialogBox(imgPath, dialogue_box_png);
 
 
 	GuiTrigger trigA;
@@ -408,20 +412,20 @@ WindowPrompt(const char *title, const char *msg, const char *btn1Label,
 	GuiTrigger trigB;
 	trigB.SetButtonOnlyTrigger(-1, WPAD_BUTTON_B | WPAD_CLASSIC_BUTTON_B, PAD_BUTTON_B);
 
-	GuiImageData dialogBox(dialogue_box_png);
+	//GuiImageData dialogBox(dialogue_box_png);
 	GuiImage dialogBoxImg(&dialogBox);
 	if (Settings.wsprompt == yes){
 	dialogBoxImg.SetWidescreen(CFG.widescreen);}///////////
 
-	GuiText titleTxt(title, 26, (GXColor){0, 0, 0, 255});
+	GuiText titleTxt(title, 26, (GXColor){THEME.prompttxt_r, THEME.prompttxt_g, THEME.prompttxt_b, 255}); //{0, 0, 0, 255});
 	titleTxt.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
 	titleTxt.SetPosition(0,55);
-	GuiText msgTxt(msg, 22, (GXColor){0, 0, 0, 255});
+	GuiText msgTxt(msg, 22, (GXColor){THEME.prompttxt_r, THEME.prompttxt_g, THEME.prompttxt_b, 255}); //{0, 0, 0, 255});
 	msgTxt.SetAlignment(ALIGN_CENTRE, ALIGN_MIDDLE);
 	msgTxt.SetPosition(0,-40);
 	msgTxt.SetMaxWidth(430);
 
-	GuiText btn1Txt(btn1Label, 22, (GXColor){0, 0, 0, 255});
+	GuiText btn1Txt(btn1Label, 22, (GXColor){THEME.prompttxt_r, THEME.prompttxt_g, THEME.prompttxt_b, 255}); //{0, 0, 0, 255});
 	GuiImage btn1Img(&btnOutline);
 	if (Settings.wsprompt == yes){
 	btn1Img.SetWidescreen(CFG.widescreen);}///////////
@@ -434,7 +438,7 @@ WindowPrompt(const char *title, const char *msg, const char *btn1Label,
 	btn1.SetState(STATE_SELECTED);
 	btn1.SetEffectGrow();
 
-	GuiText btn2Txt(btn2Label, 22, (GXColor){0, 0, 0, 255});
+	GuiText btn2Txt(btn2Label, 22, (GXColor){THEME.prompttxt_r, THEME.prompttxt_g, THEME.prompttxt_b, 255}); //{0, 0, 0, 255});
 	GuiImage btn2Img(&btnOutline);
 	if (Settings.wsprompt == yes){
 	btn2Img.SetWidescreen(CFG.widescreen);}///////////
@@ -448,7 +452,7 @@ WindowPrompt(const char *title, const char *msg, const char *btn1Label,
 	btn2.SetTrigger(&trigA);
 	btn2.SetEffectGrow();
 
-    GuiText btn3Txt(btn3Label, 22, (GXColor){0, 0, 0, 255});
+    GuiText btn3Txt(btn3Label, 22, (GXColor){THEME.prompttxt_r, THEME.prompttxt_g, THEME.prompttxt_b, 255}); //{0, 0, 0, 255});
 	GuiImage btn3Img(&btnOutline);
 	if (Settings.wsprompt == yes){
 	btn3Img.SetWidescreen(CFG.widescreen);}///////////
@@ -462,7 +466,7 @@ WindowPrompt(const char *title, const char *msg, const char *btn1Label,
 	btn3.SetTrigger(&trigA);
 	btn3.SetEffectGrow();
 
-    GuiText btn4Txt(btn4Label, 22, (GXColor){0, 0, 0, 255});
+    GuiText btn4Txt(btn4Label, 22, (GXColor){THEME.prompttxt_r, THEME.prompttxt_g, THEME.prompttxt_b, 255}); //{0, 0, 0, 255});
 	GuiImage btn4Img(&btnOutline);
 	if (Settings.wsprompt == yes){
 	btn4Img.SetWidescreen(CFG.widescreen);}///////////
@@ -660,7 +664,12 @@ int GameWindowPrompt()
 	promptWindow.SetPosition(0, -10);
 	GuiSound btnSoundOver(button_over_pcm, button_over_pcm_size, SOUND_PCM, vol);
 	GuiSound btnClick(button_click2_pcm, button_click2_pcm_size, SOUND_PCM, vol);
-	GuiImageData btnOutline(button_dialogue_box_png);
+	
+	char imgPath[100];
+	snprintf(imgPath, sizeof(imgPath), "%sbutton_dialogue_box.png", CFG.theme_path);
+	GuiImageData btnOutline(imgPath, button_dialogue_box_png);
+	
+	
 	GuiImageData imgLeft(startgame_arrow_left_png);
 	GuiImageData imgRight(startgame_arrow_right_png);
 
@@ -678,8 +687,6 @@ int GameWindowPrompt()
 	GuiTrigger trigMinus;
 	trigMinus.SetButtonOnlyTrigger(-1, WPAD_BUTTON_MINUS | WPAD_CLASSIC_BUTTON_MINUS, 0);
 
-	char imgPath[100];
-
 	if (CFG.widescreen)
 		snprintf(imgPath, sizeof(imgPath), "%swdialogue_box_startgame.png", CFG.theme_path);
 	else
@@ -691,7 +698,7 @@ int GameWindowPrompt()
 	GuiTooltip nameBtnTT(LANGUAGE.RenameGameonWBFS);
 	if (Settings.wsprompt == yes)
 		nameBtnTT.SetWidescreen(CFG.widescreen);
-	GuiText msgTxt("", 22, (GXColor){50, 50, 50, 255});
+	GuiText msgTxt("", 22, (GXColor){THEME.prompttxt_r, THEME.prompttxt_g, THEME.prompttxt_b, 255}); //{50, 50, 50, 255});
 	GuiButton nameBtn(120,50);
 	nameBtn.SetLabel(&msgTxt);
 	nameBtn.SetLabelOver(&msgTxt);
@@ -706,7 +713,7 @@ int GameWindowPrompt()
 		nameBtn.SetEffectGrow();
 	}
 
-    GuiText sizeTxt("", 22, (GXColor){50, 50, 50, 255}); //TODO: get the size here
+    GuiText sizeTxt("", 22, (GXColor){THEME.prompttxt_r, THEME.prompttxt_g, THEME.prompttxt_b, 255}); //{50, 50, 50, 255}); //TODO: get the size here
 	sizeTxt.SetAlignment(ALIGN_RIGHT, ALIGN_TOP);
 	sizeTxt.SetPosition(-60,70);
 
@@ -726,7 +733,7 @@ int GameWindowPrompt()
 	btn1.SetState(STATE_SELECTED);
 	//btn1.SetEffectGrow(); just commented it out if anybody wants to use it again.
 
-	GuiText btn2Txt(LANGUAGE.Back, 22, (GXColor){0, 0, 0, 255});
+	GuiText btn2Txt(LANGUAGE.Back, 22, (GXColor){THEME.prompttxt_r, THEME.prompttxt_g, THEME.prompttxt_b, 255}); //{0, 0, 0, 255});
 	GuiImage btn2Img(&btnOutline);
 	if (Settings.wsprompt == yes){
 	btn2Img.SetWidescreen(CFG.widescreen);}///////////
@@ -751,7 +758,7 @@ int GameWindowPrompt()
 	btn2.SetTrigger(&trigA);
 	btn2.SetEffectGrow();
 
-	GuiText btn3Txt(LANGUAGE.settings, 22, (GXColor){0, 0, 0, 255});
+	GuiText btn3Txt(LANGUAGE.settings, 22, (GXColor){THEME.prompttxt_r, THEME.prompttxt_g, THEME.prompttxt_b, 255}); //{0, 0, 0, 255});
 	GuiImage btn3Img(&btnOutline);
 	if (Settings.wsprompt == yes){
 	btn3Img.SetWidescreen(CFG.widescreen);}///////////
@@ -1026,26 +1033,30 @@ DiscWait(const char *title, const char *msg, const char *btn1Label, const char *
 	promptWindow.SetPosition(0, -10);
 	GuiSound btnSoundOver(button_over_pcm, button_over_pcm_size, SOUND_PCM, vol);
 	GuiSound btnClick(button_click2_pcm, button_click2_pcm_size, SOUND_PCM, vol);
-	GuiImageData btnOutline(button_dialogue_box_png);
+	
+	char imgPath[100];
+	snprintf(imgPath, sizeof(imgPath), "%sbutton_dialogue_box.png", CFG.theme_path);
+	GuiImageData btnOutline(imgPath, button_dialogue_box_png);
+	snprintf(imgPath, sizeof(imgPath), "%sdialogue_box.png", CFG.theme_path);
+	GuiImageData dialogBox(imgPath, dialogue_box_png);
 	GuiTrigger trigA;
 	trigA.SetSimpleTrigger(-1, WPAD_BUTTON_A | WPAD_CLASSIC_BUTTON_A, PAD_BUTTON_A);
 	GuiTrigger trigB;
 	trigB.SetButtonOnlyTrigger(-1, WPAD_BUTTON_B | WPAD_CLASSIC_BUTTON_B, PAD_BUTTON_B);
 
-	GuiImageData dialogBox(dialogue_box_png);
 	GuiImage dialogBoxImg(&dialogBox);
 	if (Settings.wsprompt == yes){
 	dialogBoxImg.SetWidescreen(CFG.widescreen);}///////////
 
-	GuiText titleTxt(title, 26, (GXColor){0, 0, 0, 255});
+	GuiText titleTxt(title, 26, (GXColor){THEME.prompttxt_r, THEME.prompttxt_g, THEME.prompttxt_b, 255}); //{0, 0, 0, 255});
 	titleTxt.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
 	titleTxt.SetPosition(0,60);
-	GuiText msgTxt(msg, 22, (GXColor){0, 0, 0, 255});
+	GuiText msgTxt(msg, 22, (GXColor){THEME.prompttxt_r, THEME.prompttxt_g, THEME.prompttxt_b, 255}); //{0, 0, 0, 255});
 	msgTxt.SetAlignment(ALIGN_CENTRE, ALIGN_MIDDLE);
 	msgTxt.SetPosition(0,-40);
 	msgTxt.SetMaxWidth(430);
 
-	GuiText btn1Txt(btn1Label, 22, (GXColor){0, 0, 0, 255});
+	GuiText btn1Txt(btn1Label, 22, (GXColor){THEME.prompttxt_r, THEME.prompttxt_g, THEME.prompttxt_b, 255}); //{0, 0, 0, 255});
 	GuiImage btn1Img(&btnOutline);
 	if (Settings.wsprompt == yes){
 	btn1Img.SetWidescreen(CFG.widescreen);}///////////
@@ -1071,7 +1082,7 @@ DiscWait(const char *title, const char *msg, const char *btn1Label, const char *
 	btn1.SetState(STATE_SELECTED);
 	btn1.SetEffectGrow();
 
-	GuiText btn2Txt(btn2Label, 22, (GXColor){0, 0, 0, 255});
+	GuiText btn2Txt(btn2Label, 22, (GXColor){THEME.prompttxt_r, THEME.prompttxt_g, THEME.prompttxt_b, 255}); //{0, 0, 0, 255});
 	GuiImage btn2Img(&btnOutline);
 	if (Settings.wsprompt == yes){
 	btn2Img.SetWidescreen(CFG.widescreen);}///////////
@@ -1101,7 +1112,7 @@ DiscWait(const char *title, const char *msg, const char *btn1Label, const char *
 	}
 
     char timer[20];
-	GuiText timerTxt(timer, 26, (GXColor){0, 0, 0, 255});
+	GuiText timerTxt(timer, 26, (GXColor){THEME.prompttxt_r, THEME.prompttxt_g, THEME.prompttxt_b, 255}); //{0, 0, 0, 255});
 	timerTxt.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
 	timerTxt.SetPosition(0,160);
 
@@ -1174,17 +1185,22 @@ FormatingPartition(const char *title, partitionEntry *entry)
 	GuiWindow promptWindow(472,320);
 	promptWindow.SetAlignment(ALIGN_CENTRE, ALIGN_MIDDLE);
 	promptWindow.SetPosition(0, -10);
+	
+	char imgPath[100];
+	snprintf(imgPath, sizeof(imgPath), "%sbutton_dialogue_box.png", CFG.theme_path);
+	GuiImageData btnOutline(imgPath, button_dialogue_box_png);
+	snprintf(imgPath, sizeof(imgPath), "%sdialogue_box.png", CFG.theme_path);
+	GuiImageData dialogBox(imgPath, dialogue_box_png);
 
-	GuiImageData btnOutline(button_dialogue_box_png);
+	
 	GuiTrigger trigA;
 	trigA.SetSimpleTrigger(-1, WPAD_BUTTON_A | WPAD_CLASSIC_BUTTON_A, PAD_BUTTON_A);
 
-	GuiImageData dialogBox(dialogue_box_png);
 	GuiImage dialogBoxImg(&dialogBox);
 	if (Settings.wsprompt == yes){
 	dialogBoxImg.SetWidescreen(CFG.widescreen);}///////////
 
-	GuiText titleTxt(title, 26, (GXColor){0, 0, 0, 255});
+	GuiText titleTxt(title, 26, (GXColor){THEME.prompttxt_r, THEME.prompttxt_g, THEME.prompttxt_b, 255}); //{0, 0, 0, 255});
 	titleTxt.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
 	titleTxt.SetPosition(0,60);
 
@@ -1229,25 +1245,28 @@ int NetworkInitPromp(int choice2)
     GuiSound btnSoundOver(button_over_pcm, button_over_pcm_size, SOUND_PCM, vol);
 	GuiSound btnClick(button_click2_pcm, button_click2_pcm_size, SOUND_PCM, vol);
 
-	GuiImageData btnOutline(button_dialogue_box_png);
+	char imgPath[100];
+	snprintf(imgPath, sizeof(imgPath), "%sbutton_dialogue_box.png", CFG.theme_path);
+	GuiImageData btnOutline(imgPath, button_dialogue_box_png);
+	snprintf(imgPath, sizeof(imgPath), "%sdialogue_box.png", CFG.theme_path);
+	GuiImageData dialogBox(imgPath, dialogue_box_png);
 	GuiTrigger trigA;
 	trigA.SetSimpleTrigger(-1, WPAD_BUTTON_A | WPAD_CLASSIC_BUTTON_A, PAD_BUTTON_A);
 
-	GuiImageData dialogBox(dialogue_box_png);
 	GuiImage dialogBoxImg(&dialogBox);
 	if (Settings.wsprompt == yes){
 	dialogBoxImg.SetWidescreen(CFG.widescreen);}///////////
 
-	GuiText titleTxt(LANGUAGE.InitializingNetwork, 26, (GXColor){0, 0, 0, 255});
+	GuiText titleTxt(LANGUAGE.InitializingNetwork, 26, (GXColor){THEME.prompttxt_r, THEME.prompttxt_g, THEME.prompttxt_b, 255}); //{0, 0, 0, 255});
 	titleTxt.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
 	titleTxt.SetPosition(0,60);
 
 	char msg[20] = " ";
-	GuiText msgTxt(msg, 22, (GXColor){0, 0, 0, 255});
+	GuiText msgTxt(msg, 22, (GXColor){THEME.prompttxt_r, THEME.prompttxt_g, THEME.prompttxt_b, 255}); //{0, 0, 0, 255});
 	msgTxt.SetAlignment(ALIGN_CENTRE, ALIGN_MIDDLE);
 	msgTxt.SetPosition(0,-40);
 
-    GuiText btn1Txt(LANGUAGE.Cancel, 22, (GXColor){0, 0, 0, 255});
+    GuiText btn1Txt(LANGUAGE.Cancel, 22, (GXColor){THEME.prompttxt_r, THEME.prompttxt_g, THEME.prompttxt_b, 255}); //{0, 0, 0, 255});
 	GuiImage btn1Img(&btnOutline);
 	if (Settings.wsprompt == yes){
 	btn1Img.SetWidescreen(CFG.widescreen);}///////////
@@ -1448,11 +1467,14 @@ ProgressWindow(const char *title, const char *msg)
 	GuiWindow promptWindow(472,320);
 	promptWindow.SetAlignment(ALIGN_CENTRE, ALIGN_MIDDLE);
 	promptWindow.SetPosition(0, -10);
-	GuiImageData btnOutline(button_dialogue_box_png);
+	char imgPath[100];
+	snprintf(imgPath, sizeof(imgPath), "%sbutton_dialogue_box.png", CFG.theme_path);
+	GuiImageData btnOutline(imgPath, button_dialogue_box_png);
+	snprintf(imgPath, sizeof(imgPath), "%sdialogue_box.png", CFG.theme_path);
+	GuiImageData dialogBox(imgPath, dialogue_box_png);
 	GuiTrigger trigA;
 	trigA.SetSimpleTrigger(-1, WPAD_BUTTON_A | WPAD_CLASSIC_BUTTON_A, PAD_BUTTON_A);
 
-	GuiImageData dialogBox(dialogue_box_png);
 	GuiImage dialogBoxImg(&dialogBox);
 	if (Settings.wsprompt == yes){
 	dialogBoxImg.SetWidescreen(CFG.widescreen);}
@@ -1475,14 +1497,14 @@ ProgressWindow(const char *title, const char *msg)
 	progressbarImg.SetAlignment(ALIGN_LEFT, ALIGN_MIDDLE);
 	progressbarImg.SetPosition(25, 40);
 
-	GuiText titleTxt(title, 26, (GXColor){0, 0, 0, 255});
+	GuiText titleTxt(title, 26, (GXColor){THEME.prompttxt_r, THEME.prompttxt_g, THEME.prompttxt_b, 255}); //{0, 0, 0, 255});
 	titleTxt.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
 	titleTxt.SetPosition(0,60);
-	GuiText msgTxt(msg, 26, (GXColor){0, 0, 0, 255});
+	GuiText msgTxt(msg, 26, (GXColor){THEME.prompttxt_r, THEME.prompttxt_g, THEME.prompttxt_b, 255}); //{0, 0, 0, 255});
 	msgTxt.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
 	msgTxt.SetPosition(0,120);
 
-	GuiText prsTxt("%", 26, (GXColor){0, 0, 0, 255});
+	GuiText prsTxt("%", 26, (GXColor){THEME.prompttxt_r, THEME.prompttxt_g, THEME.prompttxt_b, 255}); //{0, 0, 0, 255});
 	prsTxt.SetAlignment(ALIGN_RIGHT, ALIGN_MIDDLE);
 	prsTxt.SetPosition(-188,40);
 
@@ -1564,11 +1586,14 @@ ProgressDownloadWindow(int choice2)
     GuiSound btnSoundOver(button_over_pcm, button_over_pcm_size, SOUND_PCM, vol);
 	GuiSound btnClick(button_click2_pcm, button_click2_pcm_size, SOUND_PCM, vol);
 
-	GuiImageData btnOutline(button_dialogue_box_png);
+	char imgPath[100];
+	snprintf(imgPath, sizeof(imgPath), "%sbutton_dialogue_box.png", CFG.theme_path);
+	GuiImageData btnOutline(imgPath, button_dialogue_box_png);
+	snprintf(imgPath, sizeof(imgPath), "%sdialogue_box.png", CFG.theme_path);
+	GuiImageData dialogBox(imgPath, dialogue_box_png);
 	GuiTrigger trigA;
 	trigA.SetSimpleTrigger(-1, WPAD_BUTTON_A | WPAD_CLASSIC_BUTTON_A, PAD_BUTTON_A);
 
-	GuiImageData dialogBox(dialogue_box_png);
 	GuiImage dialogBoxImg(&dialogBox);
 	if (Settings.wsprompt == yes){
 	dialogBoxImg.SetWidescreen(CFG.widescreen);}
@@ -1590,22 +1615,22 @@ ProgressDownloadWindow(int choice2)
 	progressbarImg.SetAlignment(ALIGN_LEFT, ALIGN_MIDDLE);
 	progressbarImg.SetPosition(25, 40);
 
-	GuiText titleTxt(LANGUAGE.Downloadingfile, 26, (GXColor){0, 0, 0, 255});
+	GuiText titleTxt(LANGUAGE.Downloadingfile, 26, (GXColor){THEME.prompttxt_r, THEME.prompttxt_g, THEME.prompttxt_b, 255}); //{0, 0, 0, 255});
 	titleTxt.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
 	titleTxt.SetPosition(0,60);
     char msg[25] = " ";
-	GuiText msgTxt(msg, 26, (GXColor){0, 0, 0, 255});
+	GuiText msgTxt(msg, 26, (GXColor){THEME.prompttxt_r, THEME.prompttxt_g, THEME.prompttxt_b, 255}); //{0, 0, 0, 255});
 	msgTxt.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
 	msgTxt.SetPosition(0,130);
 	char msg2[15] = " ";
-	GuiText msg2Txt(msg2, 26, (GXColor){0, 0, 0, 255});
+	GuiText msg2Txt(msg2, 26, (GXColor){THEME.prompttxt_r, THEME.prompttxt_g, THEME.prompttxt_b, 255}); //{0, 0, 0, 255});
 	msg2Txt.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
 	msg2Txt.SetPosition(0,100);
 
 	prTxt.SetAlignment(ALIGN_CENTRE, ALIGN_MIDDLE);
 	prTxt.SetPosition(0, 40);
 
-    GuiText btn1Txt(LANGUAGE.Cancel, 22, (GXColor){0, 0, 0, 255});
+    GuiText btn1Txt(LANGUAGE.Cancel, 22, (GXColor){THEME.prompttxt_r, THEME.prompttxt_g, THEME.prompttxt_b, 255}); //{0, 0, 0, 255});
 	GuiImage btn1Img(&btnOutline);
 	if (Settings.wsprompt == yes){
 	btn1Img.SetWidescreen(CFG.widescreen);}
@@ -1927,13 +1952,16 @@ static int OnScreenKeyboard(char * var, u32 maxlen, int min)
 	GuiSound btnSoundOver(button_over_pcm, button_over_pcm_size, SOUND_PCM, vol);
 	GuiSound btnClick(button_click2_pcm, button_click2_pcm_size, SOUND_PCM, vol);
 
-	GuiImageData btnOutline(button_dialogue_box_png);
+	char imgPath[50];
+	snprintf(imgPath, sizeof(imgPath), "%sbutton_dialogue_box.png", CFG.theme_path);
+	GuiImageData btnOutline(imgPath, button_dialogue_box_png);
+	
 	GuiTrigger trigA;
 	trigA.SetSimpleTrigger(-1, WPAD_BUTTON_A | WPAD_CLASSIC_BUTTON_A, PAD_BUTTON_A);
 	GuiTrigger trigB;
 	trigB.SetSimpleTrigger(-1, WPAD_BUTTON_B | WPAD_CLASSIC_BUTTON_B, PAD_BUTTON_B);
 
-	GuiText okBtnTxt(LANGUAGE.ok, 22, (GXColor){0, 0, 0, 255});
+	GuiText okBtnTxt(LANGUAGE.ok, 22, (GXColor){THEME.prompttxt_r, THEME.prompttxt_g, THEME.prompttxt_b, 255}); //{0, 0, 0, 255});
 	GuiImage okBtnImg(&btnOutline);
 	if (Settings.wsprompt == yes){
 	okBtnImg.SetWidescreen(CFG.widescreen);}///////////
@@ -1949,7 +1977,7 @@ static int OnScreenKeyboard(char * var, u32 maxlen, int min)
 	okBtn.SetTrigger(&trigA);
 	okBtn.SetEffectGrow();
 
-	GuiText cancelBtnTxt(LANGUAGE.Cancel, 22, (GXColor){0, 0, 0, 255});
+	GuiText cancelBtnTxt(LANGUAGE.Cancel, 22, (GXColor){THEME.prompttxt_r, THEME.prompttxt_g, THEME.prompttxt_b, 255}); //{0, 0, 0, 255});
 	GuiImage cancelBtnImg(&btnOutline);
 	if (Settings.wsprompt == yes){
 	cancelBtnImg.SetWidescreen(CFG.widescreen);}///////////
@@ -3382,7 +3410,9 @@ static int MenuSettings()
 
 	char imgPath[100];
 
-	GuiImageData btnOutline(settings_menu_button_png);
+	
+	snprintf(imgPath, sizeof(imgPath), "%sbutton_dialogue_box.png", CFG.theme_path);
+	GuiImageData btnOutline(imgPath, button_dialogue_box_png);
 	snprintf(imgPath, sizeof(imgPath), "%ssettings_background.png", CFG.theme_path);
 	GuiImageData settingsbg(imgPath, settings_background_png);
 	snprintf(imgPath, sizeof(imgPath), "%stab_bg1.png", CFG.theme_path);
@@ -3417,7 +3447,7 @@ static int MenuSettings()
 	settingsbackgroundbtn.SetPosition(0, 0);
 	settingsbackgroundbtn.SetImage(&settingsbackground);
 
-    GuiText backBtnTxt(LANGUAGE.Back , 22, (GXColor){0, 0, 0, 255});
+    GuiText backBtnTxt(LANGUAGE.Back , 22, (GXColor){THEME.prompttxt_r, THEME.prompttxt_g, THEME.prompttxt_b, 255}); //{0, 0, 0, 255});
 	backBtnTxt.SetMaxWidth(btnOutline.GetWidth()-30);
 	GuiImage backBtnImg(&btnOutline);
 	if (Settings.wsprompt == yes){
@@ -3493,7 +3523,7 @@ static int MenuSettings()
 	const char * text = LANGUAGE.Unlock;
 	if (CFG.godmode == 1)
 			text = LANGUAGE.Lock;
-	GuiText lockBtnTxt(text, 22, (GXColor){0, 0, 0, 255});
+	GuiText lockBtnTxt(text, 22, (GXColor){THEME.prompttxt_r, THEME.prompttxt_g, THEME.prompttxt_b, 255}); //{0, 0, 0, 255});
 	lockBtnTxt.SetMaxWidth(btnOutline.GetWidth()-30);
 	GuiImage lockBtnImg(&btnOutline);
 	lockBtnImg.SetWidescreen(CFG.widescreen);//////
@@ -4325,7 +4355,8 @@ int GameSettings(struct discHdr * header)
 
 	char imgPath[100];
 
-	GuiImageData btnOutline(settings_menu_button_png);
+	snprintf(imgPath, sizeof(imgPath), "%sbutton_dialogue_box.png", CFG.theme_path);
+	GuiImageData btnOutline(imgPath, button_dialogue_box_png);
 	snprintf(imgPath, sizeof(imgPath), "%sgamesettings_background.png", CFG.theme_path);
 	GuiImageData settingsbg(imgPath, settings_background_png);
 
@@ -4346,7 +4377,7 @@ int GameSettings(struct discHdr * header)
 	settingsbackgroundbtn.SetPosition(0, 0);
 	settingsbackgroundbtn.SetImage(&settingsbackground);
 
-    GuiText saveBtnTxt(LANGUAGE.Save, 22, (GXColor){0, 0, 0, 255});
+    GuiText saveBtnTxt(LANGUAGE.Save, 22, (GXColor){THEME.prompttxt_r, THEME.prompttxt_g, THEME.prompttxt_b, 255}); //{0, 0, 0, 255});
 	saveBtnTxt.SetMaxWidth(btnOutline.GetWidth()-30);
 	GuiImage saveBtnImg(&btnOutline);
 	if (Settings.wsprompt == yes){
@@ -4361,7 +4392,7 @@ int GameSettings(struct discHdr * header)
 	saveBtn.SetTrigger(&trigA);
 	saveBtn.SetEffectGrow();
 
-    GuiText cancelBtnTxt(LANGUAGE.Back, 22, (GXColor){0, 0, 0, 255});
+    GuiText cancelBtnTxt(LANGUAGE.Back, 22, (GXColor){THEME.prompttxt_r, THEME.prompttxt_g, THEME.prompttxt_b, 255}); //{0, 0, 0, 255});
 	cancelBtnTxt.SetMaxWidth(btnOutline.GetWidth()-30);
 	GuiImage cancelBtnImg(&btnOutline);
 	if (Settings.wsprompt == yes){
@@ -4377,7 +4408,7 @@ int GameSettings(struct discHdr * header)
 	cancelBtn.SetTrigger(&trigB);
 	cancelBtn.SetEffectGrow();
 
-	GuiText deleteBtnTxt(LANGUAGE.Uninstall, 22, (GXColor){0, 0, 0, 255});
+	GuiText deleteBtnTxt(LANGUAGE.Uninstall, 22, (GXColor){THEME.prompttxt_r, THEME.prompttxt_g, THEME.prompttxt_b, 255}); //{0, 0, 0, 255});
 	deleteBtnTxt.SetMaxWidth(btnOutline.GetWidth()-30);
 	GuiImage deleteBtnImg(&btnOutline);
 	if (Settings.wsprompt == yes){
@@ -4691,8 +4722,9 @@ int MenuMp3()
     }
     options2.length = cnt;
 
-    GuiImageData btnOutline(settings_menu_button_png);
-    if(cnt < 9) {
+    snprintf(imgPath, sizeof(imgPath), "%sbutton_dialogue_box.png", CFG.theme_path);
+	GuiImageData btnOutline(imgPath, button_dialogue_box_png);
+	if(cnt < 9) {
     scrollon = 0;
     } else {
     scrollon = 1;
@@ -4702,7 +4734,7 @@ int MenuMp3()
 	optionBrowser4.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
 	optionBrowser4.SetCol2Position(65);
 
-    GuiText cancelBtnTxt(LANGUAGE.Back, 22, (GXColor){0, 0, 0, 255});
+    GuiText cancelBtnTxt(LANGUAGE.Back, 22, (GXColor){THEME.prompttxt_r, THEME.prompttxt_g, THEME.prompttxt_b, 255}); //{0, 0, 0, 255});
 	cancelBtnTxt.SetMaxWidth(btnOutline.GetWidth()-30);
 	GuiImage cancelBtnImg(&btnOutline);
 	if (Settings.wsprompt == yes){