diff --git a/interface/skin.dmf b/interface/skin.dmf
index 42d766fe9b2d9..0bb631dee4e89 100644
--- a/interface/skin.dmf
+++ b/interface/skin.dmf
@@ -1,4 +1,663 @@
+<<<<<<< ours
 macro "default"
+=======
+macro "borghotkeymode"
+	elem
+		name = "Tab"
+		command = ".winset \"mainwindow.macro=borgmacro hotkey_toggle.is-checked=false input.focus=true input.background-color=#d3b5b5\""
+	elem
+		name = "Center+REP"
+		command = ".center"
+	elem
+		name = "ALT+Return"
+		command = "Toggle-Fullscreen"
+	elem
+		name = "Northeast"
+		command = ".northeast"
+	elem
+		name = "Southeast"
+		command = ".southeast"
+	elem
+		name = "Southwest"
+		command = ".southwest"
+	elem
+		name = "Northwest"
+		command = ".northwest"
+	elem
+		name = "ALT+West"
+		command = "westfaceperm"
+	elem
+		name = "CTRL+West"
+		command = "westface"
+	elem
+		name = "West+REP"
+		command = ".moveleft"
+	elem
+		name = "ALT+North"
+		command = "northfaceperm"
+	elem
+		name = "CTRL+North"
+		command = "northface"
+	elem
+		name = "North+REP"
+		command = ".moveup"
+	elem
+		name = "ALT+East"
+		command = "eastfaceperm"
+	elem
+		name = "CTRL+East"
+		command = "eastface"
+	elem
+		name = "East+REP"
+		command = ".moveright"
+	elem
+		name = "ALT+South"
+		command = "southfaceperm"
+	elem
+		name = "CTRL+South"
+		command = "southface"
+	elem
+		name = "South+REP"
+		command = ".movedown"
+	elem
+		name = "Insert"
+		command = "a-intent right"
+	elem
+		name = "Delete"
+		command = "delete-key-pressed"
+	elem
+		name = "1"
+		command = "toggle-module 1"
+	elem
+		name = "CTRL+1"
+		command = "toggle-module 1"
+	elem
+		name = "2"
+		command = "toggle-module 2"
+	elem
+		name = "CTRL+2"
+		command = "toggle-module 2"
+	elem
+		name = "3"
+		command = "toggle-module 3"
+	elem
+		name = "CTRL+3"
+		command = "toggle-module 3"
+	elem
+		name = "4"
+		command = "a-intent left"
+	elem
+		name = "CTRL+4"
+		command = "a-intent left"
+	elem
+		name = "5"
+		command = ".me"
+	elem
+		name = "A+REP"
+		command = ".moveleft"
+	elem
+		name = "CTRL+A+REP"
+		command = ".moveleft"
+	elem
+		name = "D+REP"
+		command = ".moveright"
+	elem
+		name = "CTRL+D+REP"
+		command = ".moveright"
+	elem
+		name = "F"
+		command = "a-intent left"
+	elem
+		name = "CTRL+F"
+		command = "a-intent left"
+	elem
+		name = "G"
+		command = "a-intent right"
+	elem
+		name = "CTRL+G"
+		command = "a-intent right"
+	elem
+		name = "J"
+		command = "toggle-gun-mode"
+	elem
+		name = "CTRL+J"
+		command = "toggle-gun-mode"
+	elem
+		name = "Q"
+		command = "unequip-module"
+	elem
+		name = "CTRL+Q"
+		command = "unequip-module"
+	elem
+		name = "R"
+		command = ".southwest"
+	elem
+		name = "CTRL+R"
+		command = ".southwest"
+	elem "s_key"
+		name = "S+REP"
+		command = ".movedown"
+	elem
+		name = "CTRL+S+REP"
+		command = ".movedown"
+	elem
+		name = "T"
+		command = ".say"
+	elem "w_key"
+		name = "W+REP"
+		command = ".moveup"
+	elem
+		name = "CTRL+W+REP"
+		command = ".moveup"
+	elem
+		name = "X"
+		command = ".northeast"
+	elem
+		name = "CTRL+X"
+		command = ".northeast"
+	elem
+		name = "Y"
+		command = "Activate-Held-Object"
+	elem
+		name = "CTRL+Y"
+		command = "Activate-Held-Object"
+	elem
+		name = "Z"
+		command = "Activate-Held-Object"
+	elem
+		name = "CTRL+Z"
+		command = "Activate-Held-Object"
+	elem
+		name = "Numpad1"
+		command = "body-r-leg"
+	elem
+		name = "Numpad2"
+		command = "body-groin"
+	elem
+		name = "Numpad3"
+		command = "body-l-leg"
+	elem
+		name = "Numpad4"
+		command = "body-r-arm"
+	elem
+		name = "Numpad5"
+		command = "body-chest"
+	elem
+		name = "Numpad6"
+		command = "body-l-arm"
+	elem
+		name = "Numpad8"
+		command = "body-toggle-head"
+	elem
+		name = "F1"
+		command = "adminhelp"
+	elem
+		name = "CTRL+SHIFT+F1+REP"
+		command = ".options"
+	elem
+		name = "F2"
+		command = "ooc"
+	elem
+		name = "F2+REP"
+		command = ".screenshot auto"
+	elem
+		name = "SHIFT+F2+REP"
+		command = ".screenshot"
+	elem
+		name = "F3"
+		command = ".say"
+	elem
+		name = "F4"
+		command = ".me"
+	elem
+		name = "F5"
+		command = "msay"
+	elem
+		name = "F6"
+		command = "Player-List"
+	elem
+		name = "F7"
+		command = "Admin-PM"
+	elem
+		name = "F8"
+		command = "Invisimin"
+	elem
+		name = "F12"
+		command = "F12"
+	elem
+		name = ","
+		command = "move-upwards"
+	elem
+		name = "."
+		command = "move-down"
+
+macro "macro"
+	elem
+		name = "Tab"
+		command = ".winset \"mainwindow.macro=hotkeymode hotkey_toggle.is-checked=true mapwindow.map.focus=true input.background-color=#f0f0f0\""
+	elem
+		name = "Center+REP"
+		command = ".center"
+	elem
+		name = "ALT+Return"
+		command = "Toggle-Fullscreen"
+	elem
+		name = "Northeast"
+		command = ".northeast"
+	elem
+		name = "Southeast"
+		command = ".southeast"
+	elem
+		name = "Southwest"
+		command = ".southwest"
+	elem
+		name = "Northwest"
+		command = ".northwest"
+	elem
+		name = "ALT+West"
+		command = "westfaceperm"
+	elem
+		name = "CTRL+West"
+		command = "westface"
+	elem
+		name = "West+REP"
+		command = ".moveleft"
+	elem
+		name = "ALT+North"
+		command = "northfaceperm"
+	elem
+		name = "CTRL+North"
+		command = "northface"
+	elem
+		name = "North+REP"
+		command = ".moveup"
+	elem
+		name = "ALT+East"
+		command = "eastfaceperm"
+	elem
+		name = "CTRL+East"
+		command = "eastface"
+	elem
+		name = "East+REP"
+		command = ".moveright"
+	elem
+		name = "ALT+South"
+		command = "southfaceperm"
+	elem
+		name = "CTRL+South"
+		command = "southface"
+	elem
+		name = "South+REP"
+		command = ".movedown"
+	elem
+		name = "Insert"
+		command = "a-intent right"
+	elem
+		name = "Delete"
+		command = "delete-key-pressed"
+	elem
+		name = "CTRL+1"
+		command = "a-intent help"
+	elem
+		name = "CTRL+2"
+		command = "a-intent disarm"
+	elem
+		name = "CTRL+3"
+		command = "a-intent grab"
+	elem
+		name = "CTRL+4"
+		command = "a-intent harm"
+	elem
+		name = "CTRL+A+REP"
+		command = ".moveleft"
+	elem
+		name = "CTRL+D+REP"
+		command = ".moveright"
+	elem
+		name = "CTRL+E"
+		command = "quick-equip"
+	elem
+		name = "CTRL+F"
+		command = "a-intent left"
+	elem
+		name = "CTRL+G"
+		command = "a-intent right"
+	elem
+		name = "CTRL+SHIFT+G"
+		command = ".configure graphics-hwmode on"
+	elem
+		name = "CTRL+Q"
+		command = ".northwest"
+	elem
+		name = "CTRL+R"
+		command = ".southwest"
+	elem
+		name = "CTRL+S+REP"
+		command = ".movedown"
+	elem
+		name = "CTRL+W+REP"
+		command = ".moveup"
+	elem
+		name = "CTRL+X"
+		command = ".northeast"
+	elem
+		name = "CTRL+Y"
+		command = "Activate-Held-Object"
+	elem
+		name = "CTRL+Z"
+		command = "Activate-Held-Object"
+	elem
+		name = "CTRL+Numpad1"
+		command = "body-r-leg"
+	elem
+		name = "CTRL+Numpad2"
+		command = "body-groin"
+	elem
+		name = "CTRL+Numpad3"
+		command = "body-l-leg"
+	elem
+		name = "CTRL+Numpad4"
+		command = "body-r-arm"
+	elem
+		name = "CTRL+Numpad5"
+		command = "body-chest"
+	elem
+		name = "CTRL+Numpad6"
+		command = "body-l-arm"
+	elem
+		name = "CTRL+Numpad8"
+		command = "body-toggle-head"
+	elem
+		name = "CTRL+Add"
+		command = "move-upwards"
+	elem
+		name = "CTRL+Subtract"
+		command = "move-down"
+	elem
+		name = "F1"
+		command = "adminhelp"
+	elem
+		name = "CTRL+SHIFT+F1+REP"
+		command = ".options"
+	elem
+		name = "F2"
+		command = "ooc"
+	elem
+		name = "F2+REP"
+		command = ".screenshot auto"
+	elem
+		name = "SHIFT+F2+REP"
+		command = ".screenshot"
+	elem
+		name = "F3"
+		command = ".say"
+	elem
+		name = "F4"
+		command = ".me"
+	elem
+		name = "F5"
+		command = "msay"
+	elem
+		name = "F6"
+		command = "Player-List"
+	elem
+		name = "F7"
+		command = "Admin-PM"
+	elem
+		name = "F8"
+		command = "Invisimin"
+	elem
+		name = "F12"
+		command = "F12"
+
+macro "hotkeymode"
+	elem
+		name = "Tab"
+		command = ".winset \"mainwindow.macro=macro hotkey_toggle.is-checked=false input.focus=true input.background-color=#d3b5b5\""
+	elem
+		name = "Center+REP"
+		command = ".center"
+	elem
+		name = "ALT+Return"
+		command = "Toggle-Fullscreen"
+	elem
+		name = "Northeast"
+		command = ".northeast"
+	elem
+		name = "Southeast"
+		command = ".southeast"
+	elem
+		name = "Southwest"
+		command = ".southwest"
+	elem
+		name = "Northwest"
+		command = ".northwest"
+	elem
+		name = "ALT+West"
+		command = "westfaceperm"
+	elem
+		name = "CTRL+West"
+		command = "westface"
+	elem
+		name = "West+REP"
+		command = ".moveleft"
+	elem
+		name = "ALT+North"
+		command = "northfaceperm"
+	elem
+		name = "CTRL+North"
+		command = "northface"
+	elem
+		name = "North+REP"
+		command = ".moveup"
+	elem
+		name = "ALT+East"
+		command = "eastfaceperm"
+	elem
+		name = "CTRL+East"
+		command = "eastface"
+	elem
+		name = "East+REP"
+		command = ".moveright"
+	elem
+		name = "ALT+South"
+		command = "southfaceperm"
+	elem
+		name = "CTRL+South"
+		command = "southface"
+	elem
+		name = "South+REP"
+		command = ".movedown"
+	elem
+		name = "Insert"
+		command = "a-intent right"
+	elem
+		name = "Delete"
+		command = "delete-key-pressed"
+	elem
+		name = "1"
+		command = "a-intent help"
+	elem
+		name = "CTRL+1"
+		command = "a-intent help"
+	elem
+		name = "2"
+		command = "a-intent disarm"
+	elem
+		name = "CTRL+2"
+		command = "a-intent disarm"
+	elem
+		name = "3"
+		command = "a-intent grab"
+	elem
+		name = "CTRL+3"
+		command = "a-intent grab"
+	elem
+		name = "4"
+		command = "a-intent harm"
+	elem
+		name = "CTRL+4"
+		command = "a-intent harm"
+	elem
+		name = "5"
+		command = ".me"
+	elem
+		name = "A+REP"
+		command = ".moveleft"
+	elem
+		name = "CTRL+A+REP"
+		command = ".moveleft"
+	elem
+		name = "D+REP"
+		command = ".moveright"
+	elem
+		name = "CTRL+D+REP"
+		command = ".moveright"
+	elem
+		name = "E"
+		command = "quick-equip"
+	elem
+		name = "CTRL+E"
+		command = "quick-equip"
+	elem
+		name = "F"
+		command = "a-intent left"
+	elem
+		name = "CTRL+F"
+		command = "a-intent left"
+	elem
+		name = "G"
+		command = "a-intent right"
+	elem
+		name = "CTRL+G"
+		command = "a-intent right"
+	elem
+		name = "H"
+		command = "holster"
+	elem
+		name = "CTRL+H"
+		command = "holster"
+	elem
+		name = "J"
+		command = "toggle-gun-mode"
+	elem
+		name = "CTRL+J"
+		command = "toggle-gun-mode"
+	elem
+		name = "Q"
+		command = ".northwest"
+	elem
+		name = "CTRL+Q"
+		command = ".northwest"
+	elem
+		name = "R"
+		command = ".southwest"
+	elem
+		name = "CTRL+R"
+		command = ".southwest"
+	elem "s_key"
+		name = "S+REP"
+		command = ".movedown"
+	elem
+		name = "CTRL+S+REP"
+		command = ".movedown"
+	elem
+		name = "T"
+		command = ".say"
+	elem "w_key"
+		name = "W+REP"
+		command = ".moveup"
+	elem
+		name = "CTRL+W+REP"
+		command = ".moveup"
+	elem
+		name = "X"
+		command = ".northeast"
+	elem
+		name = "CTRL+X"
+		command = ".northeast"
+	elem
+		name = "Y"
+		command = "Activate-Held-Object"
+	elem
+		name = "CTRL+Y"
+		command = "Activate-Held-Object"
+	elem
+		name = "Z"
+		command = "Activate-Held-Object"
+	elem
+		name = "CTRL+Z"
+		command = "Activate-Held-Object"
+	elem
+		name = "Numpad1"
+		command = "body-r-leg"
+	elem
+		name = "Numpad2"
+		command = "body-groin"
+	elem
+		name = "Numpad3"
+		command = "body-l-leg"
+	elem
+		name = "Numpad4"
+		command = "body-r-arm"
+	elem
+		name = "Numpad5"
+		command = "body-chest"
+	elem
+		name = "Numpad6"
+		command = "body-l-arm"
+	elem
+		name = "Numpad8"
+		command = "body-toggle-head"
+	elem
+		name = "F1"
+		command = "adminhelp"
+	elem
+		name = "CTRL+SHIFT+F1+REP"
+		command = ".options"
+	elem
+		name = "F2"
+		command = "ooc"
+	elem
+		name = "F2+REP"
+		command = ".screenshot auto"
+	elem
+		name = "SHIFT+F2+REP"
+		command = ".screenshot"
+	elem
+		name = "F3"
+		command = ".say"
+	elem
+		name = "F4"
+		command = ".me"
+	elem
+		name = "F5"
+		command = "msay"
+	elem
+		name = "F6"
+		command = "Player-List"
+	elem
+		name = "F7"
+		command = "Admin-PM"
+	elem
+		name = "F8"
+		command = "Invisimin"
+	elem
+		name = "F12"
+		command = "F12"
+	elem
+		name = ","
+		command = "move-upwards"
+	elem
+		name = "."
+		command = "move-down"
+	elem
+		name = "SHIFT"
+		command = "setmovingquickly"
+	elem
+		name = "SHIFT+UP"
+		command = "setmovingslowly"
+>>>>>>> theirs
 
 macro "macro"
 	elem
@@ -168,7 +827,7 @@ macro "macro"
 		command = "msay"
 	elem
 		name = "F6"
-		command = "Player-Panel"
+		command = "Player-List"
 	elem
 		name = "F7"
 		command = "Admin-PM"