Revert "Merge pull request #16240 from ShadowLarkens/revert"

This reverts commit 885171f985, reversing
changes made to 3e314f8064.

interface/interface.dm

@@ -223,7 +223,7 @@ Any-Mode: (hotkey doesn't need to be on)
 /client/proc/set_hotkeys_macro(macro_name = "macro", hotkey_macro_name = "hotkeymode", hotkeys_enabled = null)
 	// If hotkeys mode was not specified, fall back to choice of default in client preferences.
 	if(isnull(hotkeys_enabled))
-		hotkeys_enabled = is_preference_enabled(/datum/client_preference/hotkeys_default)
+		hotkeys_enabled = prefs?.read_preference(/datum/preference/toggle/hotkeys_default)
 
 	if(hotkeys_enabled)
 		winset(src, null, "mainwindow.macro=[hotkey_macro_name] hotkey_toggle.is-checked=true mapwindow.map.focus=true")

interface/skin.dmf

@@ -1149,6 +1149,20 @@ menu "menu"
 		command = "hotkeys-help"
 		category = "&Help"
 		saved-params = "is-checked"
+	elem
+		name = "&Preferences"
+		command = ""
+		saved-params = "is-checked"
+	elem
+		name = "&Character Setup"
+		command = "character-setup"
+		category = "&Preferences"
+		saved-params = "is-checked"
+	elem
+		name = "&Game Options"
+		command = "game-options"
+		category = "&Preferences"
+		saved-params = "is-checked"
 
 window "mainwindow"
 	elem "mainwindow"