Updated forms

svn-id: r13874

3 files changed, 7 insertions, 12 deletions

diff --git a/backends/PalmOS/Src/forms/formSystem.cpp b/backends/PalmOS/Src/forms/formSystem.cpp
index 1e94a311b8..20703c7408 100644
--- a/backends/PalmOS/Src/forms/formSystem.cpp
+++ b/backends/PalmOS/Src/forms/formSystem.cpp
@@ -82,7 +82,7 @@ static void SystemInfoFormInit() {
 	frmP = FrmGetActiveForm();
 	FrmDrawForm(frmP);
 
-	WinSetTextColor(255);
+	WinSetTextColor(UIColorGetTableEntryIndex(UIObjectForeground));
 	FntSetFont(stdFont);
 	
 	StrIToA(num, dm);
diff --git a/backends/PalmOS/Src/forms/formmain.cpp b/backends/PalmOS/Src/forms/formmain.cpp
index bfcd1cd368..1adf489985 100644
--- a/backends/PalmOS/Src/forms/formmain.cpp
+++ b/backends/PalmOS/Src/forms/formmain.cpp
@@ -5,6 +5,7 @@
 #include "skin.h"
 #include "games.h"
 #include "scumm_globals.h"
+#include "globals.h"
 
 #include "stdafx.h"
 #include "version.h"
@@ -106,13 +107,8 @@ static Boolean MainFormDoCommand(UInt16 command)
  			handled = true;
 			break;
 		
-		case MainOptionsVolumeControl:
-			FrmPopupForm(VolumeForm);
-			handled = true;
-			break;
-
-		case MainOptionsMusic:
-			FrmPopupForm(SoundForm);
+		case MainOptionsMusicSound:
+			FrmPopupForm(MusicForm);
 			handled = true;
 			break;
 
@@ -122,7 +118,7 @@ static Boolean MainFormDoCommand(UInt16 command)
 			break;
 
 		case MainOptionsMisc:
-			FrmPopupForm(MiscOptionsForm);
+			FrmPopupForm(MiscForm);
 			handled = true;
 			break;
 		}
diff --git a/backends/PalmOS/Src/forms/forms.h b/backends/PalmOS/Src/forms/forms.h
index edc54e76b0..e0d0f8ec25 100644
--- a/backends/PalmOS/Src/forms/forms.h
+++ b/backends/PalmOS/Src/forms/forms.h
@@ -12,11 +12,10 @@
 
 HANDLER(Main)
 HANDLER(EditGame)
-HANDLER(Volume)
 HANDLER(SystemInfo)
-HANDLER(Sound)
-HANDLER(MiscOptions)
+HANDLER(Misc)
 HANDLER(CardSlot)
 HANDLER(Skins)
+HANDLER(Music)
 
 #endif