diff --git a/source/blood/src/blood.cpp b/source/blood/src/blood.cpp
index 81e9c2f80..77f47ee3e 100644
--- a/source/blood/src/blood.cpp
+++ b/source/blood/src/blood.cpp
@@ -1850,7 +1850,7 @@ RESTART:
         {
             gGameMenuMgr.Process();
             G_HandleAsync();
-            if (viewFPSLimit())
+            if (G_FPSLimit())
             {
                 videoClearScreen(0);
                 gGameMenuMgr.Draw();
diff --git a/source/blood/src/config.h b/source/blood/src/config.h
index 764afb982..85ec3e1be 100644
--- a/source/blood/src/config.h
+++ b/source/blood/src/config.h
@@ -69,7 +69,6 @@ extern int32_t gMessageFont;
 extern int32_t gbAdultContent;
 extern char gzAdultPassword[9];
 extern int32_t gMouseSensitivity;
-extern int32_t in_mouseflip;
 extern bool gNoClip;
 extern bool gInfiniteAmmo;
 extern bool gFullMap;
diff --git a/source/blood/src/menu.cpp b/source/blood/src/menu.cpp
index dc86e523e..57ea6757b 100644
--- a/source/blood/src/menu.cpp
+++ b/source/blood/src/menu.cpp
@@ -1184,8 +1184,6 @@ void SetupOptionsMenu(void)
 #endif
     menuOptionsDisplayMode.Add(&itemOptionsDisplayModeFullscreen, false);
     menuOptionsDisplayMode.Add(&itemOptionsDisplayModeVSync, false);
-    menuOptionsDisplayMode.Add(&itemOptionsDisplayModeFrameLimit, false);
-    menuOptionsDisplayMode.Add(&itemOptionsDisplayModeFPSOffset, false);
     menuOptionsDisplayMode.Add(&itemOptionsDisplayModeApply, false);
     menuOptionsDisplayMode.Add(&itemBloodQAV, false);
 
@@ -1193,7 +1191,6 @@ void SetupOptionsMenu(void)
     itemOptionsDisplayModeRenderer.pPreDrawCallback = PreDrawVideoModeMenu;
 #endif
     itemOptionsDisplayModeFullscreen.pPreDrawCallback = PreDrawVideoModeMenu;
-    itemOptionsDisplayModeFPSOffset.pPreDrawCallback = PreDrawVideoModeMenu;
 
     menuOptionsDisplayColor.Add(&itemOptionsDisplayColorTitle, false);
     menuOptionsDisplayColor.Add(&itemOptionsDisplayColorGamma, true);
diff --git a/source/blood/src/startwin.game.cpp b/source/blood/src/startwin.game.cpp
index 679b9fae6..31b259d08 100644
--- a/source/blood/src/startwin.game.cpp
+++ b/source/blood/src/startwin.game.cpp
@@ -183,41 +183,6 @@ static void PopulateForm(int32_t pgs)
         }
     }
 
-    if (pgs & POPULATE_CONFIG)
-    {
-        Button_SetCheck(GetDlgItem(pages[TAB_CONFIG], IDCALWAYSSHOW), (settings.shared.forcesetup ? BST_CHECKED : BST_UNCHECKED));
-        Button_SetCheck(GetDlgItem(pages[TAB_CONFIG], IDCAUTOLOAD), (!(settings.shared.noautoload) ? BST_CHECKED : BST_UNCHECKED));
-
-        HWND hwnd = GetDlgItem(pages[TAB_CONFIG], IDCINPUT);
-
-        (void)ComboBox_ResetContent(hwnd);
-        (void)ComboBox_SetCurSel(hwnd, 0);
-
-        int j = 4;
-
-#ifdef RENDERTYPEWIN
-        if (di_disabled) j = 2;
-#endif
-
-        for (int i=0; i<j; i++)
-        {
-            (void)ComboBox_InsertString(hwnd, i, controlstrings[i]);
-            (void)ComboBox_SetItemData(hwnd, i, i);
-
-            switch (i)
-            {
-            case INPUT_MOUSE:
-                if (settings.shared.usemouse && !settings.shared.usejoystick)(void)ComboBox_SetCurSel(hwnd, i);
-                break;
-            case INPUT_JOYSTICK:
-                if (!settings.shared.usemouse && settings.shared.usejoystick)(void)ComboBox_SetCurSel(hwnd, i);
-                break;
-            case INPUT_ALL:
-                if (settings.shared.usemouse && settings.shared.usejoystick)(void)ComboBox_SetCurSel(hwnd, i);
-                break;
-            }
-        }
-    }
 
     if (pgs & POPULATE_GAME)
     {
@@ -272,33 +237,6 @@ static INT_PTR CALLBACK ConfigPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, L
         case IDCAUTOLOAD:
             settings.shared.noautoload = (IsDlgButtonChecked(hwndDlg, IDCAUTOLOAD) != BST_CHECKED);
             return TRUE;
-        case IDCINPUT:
-            if (HIWORD(wParam) == CBN_SELCHANGE)
-            {
-                int i = ComboBox_GetCurSel((HWND)lParam);
-                if (i != CB_ERR) i = ComboBox_GetItemData((HWND)lParam, i);
-                if (i != CB_ERR)
-                {
-                    switch (i)
-                    {
-                    case INPUT_KB:
-                        settings.shared.usemouse = settings.shared.usejoystick = 0;
-                        break;
-                    case INPUT_MOUSE:
-                        settings.shared.usemouse = 1;
-                        settings.shared.usejoystick = 0;
-                        break;
-                    case INPUT_JOYSTICK:
-                        settings.shared.usemouse = 0;
-                        settings.shared.usejoystick = 1;
-                        break;
-                    case INPUT_ALL:
-                        settings.shared.usemouse = settings.shared.usejoystick = 1;
-                        break;
-                    }
-                }
-            }
-            return TRUE;
 
         case IDCGAMEDIR:
             if (HIWORD(wParam) == CBN_SELCHANGE)
diff --git a/source/build/src/engine.cpp b/source/build/src/engine.cpp
index c50b93b83..8740e75da 100644
--- a/source/build/src/engine.cpp
+++ b/source/build/src/engine.cpp
@@ -23,6 +23,7 @@
 #include "pragmas.h"
 #include "scriptfile.h"
 #include "softsurface.h"
+#include "gamecvars.h"
 
 #ifdef USE_OPENGL
 # include "glsurface.h"
diff --git a/source/common/gamecvars.cpp b/source/common/gamecvars.cpp
index 51fa5790d..b59a7879e 100644
--- a/source/common/gamecvars.cpp
+++ b/source/common/gamecvars.cpp
@@ -3,6 +3,7 @@
 #include "fx_man.h"
 #include "baselayer.h"
 #include "gameconfigfile.h"
+#include "keyboard.h"
 #include "control.h"
 #include "_control.h"
 
@@ -332,10 +333,10 @@ int G_FPSLimit(void)
     return 0;
 }
 
-CUSTOM_CVARD(String, wchoice, "3457860291", CVAR_ARCHIVE|CVAR_NOINITCALL|CVAR_FRONTEND_DUKELIKE, "sets weapon autoselection order")
+CUSTOM_CVARD(String, wchoice, "3457860291", CVAR_ARCHIVE | CVAR_NOINITCALL | CVAR_FRONTEND_DUKELIKE, "sets weapon autoselection order")
 {
 	char dest[11];
-	char const *c = self;
+	char const* c = self;
 	if (*c)
 	{
 		int j = 0;
@@ -363,7 +364,7 @@ CUSTOM_CVARD(String, wchoice, "3457860291", CVAR_ARCHIVE|CVAR_NOINITCALL|CVAR_FR
 		OSD_Printf("Using default weapon orders.\n");
 		self = "3457860291";
 	}
-
+}
 
 
 #if 0
diff --git a/source/common/gamecvars.h b/source/common/gamecvars.h
index 1ceb59e42..e1d4f9f9d 100644
--- a/source/common/gamecvars.h
+++ b/source/common/gamecvars.h
@@ -60,8 +60,8 @@ EXTERN_CVAR(Bool, r_horizcenter)
 EXTERN_CVAR(Int, r_drawweapon)
 EXTERN_CVAR(Int, r_showfps)
 EXTERN_CVAR(Int, r_showfpsperiod)
-EXTERN_CVAR(Int, r_ambientlight)
-EXTERN_CVAR(Int, r_shadows)
+EXTERN_CVAR(Float, r_ambientlight)
+EXTERN_CVAR(Bool, r_shadows)
 EXTERN_CVAR(Bool, r_rotatespritenowidescreen)
 EXTERN_CVAR(Bool, r_precache)
 
diff --git a/source/duke3d/src/cheats.cpp b/source/duke3d/src/cheats.cpp
index b8691c39f..2aeb855a5 100644
--- a/source/duke3d/src/cheats.cpp
+++ b/source/duke3d/src/cheats.cpp
@@ -667,7 +667,7 @@ void G_DoCheats(void)
 
                 case CHEAT_RATE:
 					r_showfps = r_showfps+1;
-                    if (ud.showfps > 3)
+                    if (r_showfps > 3)
                         r_showfps = 0;
 
                     end_cheat(pPlayer);
diff --git a/source/duke3d/src/player.h b/source/duke3d/src/player.h
index fce4174a9..f73bef081 100644
--- a/source/duke3d/src/player.h
+++ b/source/duke3d/src/player.h
@@ -319,7 +319,6 @@ extern playerdata_t     *const g_player;
 extern int16_t          WeaponPickupSprites[MAX_WEAPONS];
 extern hudweapon_t      hudweap;
 extern int32_t          g_levelTextTime;
-extern int32_t          g_MyAimMode;
 extern int32_t          g_numObituaries;
 extern int32_t          g_numSelfObituaries;
 extern int32_t          mouseyaxismode;
diff --git a/source/duke3d/src/startwin.game.cpp b/source/duke3d/src/startwin.game.cpp
index bd8e73088..12be45711 100644
--- a/source/duke3d/src/startwin.game.cpp
+++ b/source/duke3d/src/startwin.game.cpp
@@ -179,41 +179,6 @@ static void PopulateForm(int32_t pgs)
         }
     }
 
-    if (pgs & POPULATE_CONFIG)
-    {
-        Button_SetCheck(GetDlgItem(pages[TAB_CONFIG], IDCALWAYSSHOW), (settings.shared.forcesetup ? BST_CHECKED : BST_UNCHECKED));
-        Button_SetCheck(GetDlgItem(pages[TAB_CONFIG], IDCAUTOLOAD), (!(settings.shared.noautoload) ? BST_CHECKED : BST_UNCHECKED));
-
-        HWND hwnd = GetDlgItem(pages[TAB_CONFIG], IDCINPUT);
-
-        (void)ComboBox_ResetContent(hwnd);
-        (void)ComboBox_SetCurSel(hwnd, 0);
-
-        int j = 4;
-
-#ifdef RENDERTYPEWIN
-        if (di_disabled) j = 2;
-#endif
-
-        for (int i=0; i<j; i++)
-        {
-            (void)ComboBox_InsertString(hwnd, i, controlstrings[i]);
-            (void)ComboBox_SetItemData(hwnd, i, i);
-
-            switch (i)
-            {
-            case INPUT_MOUSE:
-                if (settings.shared.usemouse && !settings.shared.usejoystick)(void)ComboBox_SetCurSel(hwnd, i);
-                break;
-            case INPUT_JOYSTICK:
-                if (!settings.shared.usemouse && settings.shared.usejoystick)(void)ComboBox_SetCurSel(hwnd, i);
-                break;
-            case INPUT_ALL:
-                if (settings.shared.usemouse && settings.shared.usejoystick)(void)ComboBox_SetCurSel(hwnd, i);
-                break;
-            }
-        }
-    }
 
     if (pgs & POPULATE_GAME)
     {
@@ -265,34 +230,6 @@ static INT_PTR CALLBACK ConfigPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, L
         case IDCAUTOLOAD:
             settings.shared.noautoload = (IsDlgButtonChecked(hwndDlg, IDCAUTOLOAD) != BST_CHECKED);
             return TRUE;
-        case IDCINPUT:
-            if (HIWORD(wParam) == CBN_SELCHANGE)
-            {
-                int i = ComboBox_GetCurSel((HWND)lParam);
-                if (i != CB_ERR) i = ComboBox_GetItemData((HWND)lParam, i);
-                if (i != CB_ERR)
-                {
-                    switch (i)
-                    {
-                    case INPUT_KB:
-                        settings.shared.usemouse = settings.shared.usejoystick = 0;
-                        break;
-                    case INPUT_MOUSE:
-                        settings.shared.usemouse = 1;
-                        settings.shared.usejoystick = 0;
-                        break;
-                    case INPUT_JOYSTICK:
-                        settings.shared.usemouse = 0;
-                        settings.shared.usejoystick = 1;
-                        break;
-                    case INPUT_ALL:
-                        settings.shared.usemouse = settings.shared.usejoystick = 1;
-                        break;
-                    }
-                }
-            }
-            return TRUE;
-
         case IDCGAMEDIR:
             if (HIWORD(wParam) == CBN_SELCHANGE)
             {
diff --git a/source/platform/win32/gameres.rc b/source/platform/win32/gameres.rc
index 7bd024a6a..a6b893658 100644
--- a/source/platform/win32/gameres.rc
+++ b/source/platform/win32/gameres.rc
@@ -28,8 +28,6 @@ BEGIN
 //#if defined POLYMER && POLYMER != 0
 //    CONTROL "&Polymer",       IDCPOLYMER, "BUTTON", BS_CHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 203, 6, 40, 10
 //#endif
-    CONTROL "Input devices:", -1, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE, 5, 20, 50, 8
-    CONTROL "",               IDCINPUT, "COMBOBOX", CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 60, 19, 86, 56
     CONTROL "&Game:", 	  -1, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE, 5, 35, 100, 8
     CONTROL "",               IDCDATA, "LISTBOX", LBS_NOINTEGRALHEIGHT | LBS_USETABSTOPS | LBS_STANDARD | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 45, 226, 43
 
diff --git a/source/rr/src/menus.cpp b/source/rr/src/menus.cpp
index e402000cb..a2226d5c6 100644
--- a/source/rr/src/menus.cpp
+++ b/source/rr/src/menus.cpp
@@ -830,7 +830,7 @@ static char const *MEOSN_MOUSESETUP_AIM_TYPE [] = { "Toggle", "Hold" };
 static MenuOptionSet_t MEOS_MOUSESETUP_AIM_TYPE = MAKE_MENUOPTIONSET(MEOSN_MOUSESETUP_AIM_TYPE, NULL, 0x2);
 static MenuOption_t MEO_MOUSESETUP_MOUSEAIMINGTYPE = MAKE_MENUOPTION(&MF_Redfont, &MEOS_MOUSESETUP_AIM_TYPE, &in_aimmode.Value);
 static MenuEntry_t ME_MOUSESETUP_MOUSEAIMINGTYPE = MAKE_MENUENTRY("Aiming type:", &MF_Redfont, &MEF_BigOptionsRt, &MEO_MOUSESETUP_MOUSEAIMINGTYPE, Option);
-static MenuOption_t MEO_MOUSESETUP_MOUSEAIMING = MAKE_MENUOPTION( &MF_Redfont, &MEOS_NoYes, &n_mousemode.Value );
+static MenuOption_t MEO_MOUSESETUP_MOUSEAIMING = MAKE_MENUOPTION( &MF_Redfont, &MEOS_NoYes, &in_mousemode.Value );
 static MenuEntry_t ME_MOUSESETUP_MOUSEAIMING = MAKE_MENUENTRY( "Vertical aiming:", &MF_Redfont, &MEF_BigOptionsRt, &MEO_MOUSESETUP_MOUSEAIMING, Option );
 #endif
 static MenuOption_t MEO_MOUSESETUP_INVERT = MAKE_MENUOPTION( &MF_Redfont, &MEOS_YesNo, &in_mouseflip.Value );
@@ -1042,7 +1042,7 @@ static MenuEntry_t ME_COLCORR_RESET = MAKE_MENUENTRY( "Reset To Defaults", &MF_R
 #define MINVIS 0.125f
 #endif
 #ifndef EDUKE32_SIMPLE_MENU
-static MenuRangeFloat_t MEO_COLCORR_AMBIENT = MAKE_MENURANGE( &r_ambientlight, &MF_Bluefont, MINVIS, 4.f, 0.f, 32, 1 );
+static MenuRangeFloat_t MEO_COLCORR_AMBIENT = MAKE_MENURANGE( &r_ambientlight.Value, &MF_Bluefont, MINVIS, 4.f, 0.f, 32, 1 );
 static MenuEntry_t ME_COLCORR_AMBIENT = MAKE_MENUENTRY( "Visibility:", &MF_Redfont, &MEF_ColorCorrect, &MEO_COLCORR_AMBIENT, RangeFloat );
 #endif
 static MenuEntry_t *MEL_COLCORR[] = {
diff --git a/source/rr/src/startwin.game.cpp b/source/rr/src/startwin.game.cpp
index 2ab549047..156f2d9e3 100644
--- a/source/rr/src/startwin.game.cpp
+++ b/source/rr/src/startwin.game.cpp
@@ -45,6 +45,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "grpscan.h"
 #include "inv.h"
 #include "keyboard.h"
+#include "gamecvars.h"
 #include "startwin.game.h"
 #include "windows_inc.h"
 
@@ -177,42 +178,6 @@ static void PopulateForm(int32_t pgs)
         }
     }
 
-    if (pgs & POPULATE_CONFIG)
-    {
-        Button_SetCheck(GetDlgItem(pages[TAB_CONFIG], IDCALWAYSSHOW), (settings.shared.forcesetup ? BST_CHECKED : BST_UNCHECKED));
-        Button_SetCheck(GetDlgItem(pages[TAB_CONFIG], IDCAUTOLOAD), (!(settings.shared.noautoload) ? BST_CHECKED : BST_UNCHECKED));
-
-        HWND hwnd = GetDlgItem(pages[TAB_CONFIG], IDCINPUT);
-
-        (void)ComboBox_ResetContent(hwnd);
-        (void)ComboBox_SetCurSel(hwnd, 0);
-
-        int j = 4;
-
-#ifdef RENDERTYPEWIN
-        if (di_disabled) j = 2;
-#endif
-
-        for (int i=0; i<j; i++)
-        {
-            (void)ComboBox_InsertString(hwnd, i, controlstrings[i]);
-            (void)ComboBox_SetItemData(hwnd, i, i);
-
-            switch (i)
-            {
-            case INPUT_MOUSE:
-                if (settings.shared.usemouse && !settings.shared.usejoystick)(void)ComboBox_SetCurSel(hwnd, i);
-                break;
-            case INPUT_JOYSTICK:
-                if (!settings.shared.usemouse && settings.shared.usejoystick)(void)ComboBox_SetCurSel(hwnd, i);
-                break;
-            case INPUT_ALL:
-                if (settings.shared.usemouse && settings.shared.usejoystick)(void)ComboBox_SetCurSel(hwnd, i);
-                break;
-            }
-        }
-    }
-
     if (pgs & POPULATE_GAME)
     {
         HWND hwnd = GetDlgItem(pages[TAB_CONFIG], IDCDATA);
@@ -264,31 +229,6 @@ static INT_PTR CALLBACK ConfigPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, L
             settings.shared.noautoload = (IsDlgButtonChecked(hwndDlg, IDCAUTOLOAD) != BST_CHECKED);
             return TRUE;
         case IDCINPUT:
-            if (HIWORD(wParam) == CBN_SELCHANGE)
-            {
-                int i = ComboBox_GetCurSel((HWND)lParam);
-                if (i != CB_ERR) i = ComboBox_GetItemData((HWND)lParam, i);
-                if (i != CB_ERR)
-                {
-                    switch (i)
-                    {
-                    case INPUT_KB:
-                        settings.shared.usemouse = settings.shared.usejoystick = 0;
-                        break;
-                    case INPUT_MOUSE:
-                        settings.shared.usemouse = 1;
-                        settings.shared.usejoystick = 0;
-                        break;
-                    case INPUT_JOYSTICK:
-                        settings.shared.usemouse = 0;
-                        settings.shared.usejoystick = 1;
-                        break;
-                    case INPUT_ALL:
-                        settings.shared.usemouse = settings.shared.usejoystick = 1;
-                        break;
-                    }
-                }
-            }
             return TRUE;
 
         case IDCGAMEDIR:
diff --git a/source/sw/src/config.cpp b/source/sw/src/config.cpp
index 206ff444e..fd4a0c83b 100644
--- a/source/sw/src/config.cpp
+++ b/source/sw/src/config.cpp
@@ -28,6 +28,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #include "build.h"
 #include "baselayer.h"
 #include "osd.h"
+#include "gamecvars.h"
 
 #include "settings.h"
 #include "mytypes.h"