diff --git a/src/ckb-daemon/keymap.c b/src/ckb-daemon/keymap.c
index 01b0618..92efdda 100644
--- a/src/ckb-daemon/keymap.c
+++ b/src/ckb-daemon/keymap.c
@@ -124,30 +124,30 @@ const key keymap[N_KEYS_EXTENDED] = {
     { "num3",       0x75, KEY_KP3 },
     { "num0",       0x81, KEY_KP0 },
     { "numdot",     0x8d, KEY_KPDOT },
-    { "g1",         0x0a, KEY_CORSAIR },
-    { "g2",         0x16, KEY_CORSAIR },
-    { "g3",         0x22, KEY_CORSAIR },
-    { "g4",         0x2e, KEY_CORSAIR },
-    { "g5",         0x3a, KEY_CORSAIR },
-    { "g6",         0x46, KEY_CORSAIR },
-    { "g7",         0x52, KEY_CORSAIR },
-    { "g8",         0x5e, KEY_CORSAIR },
-    { "g9",         0x6a, KEY_CORSAIR },
-    { "g10",        0x76, KEY_CORSAIR },
+    { "g1",         0x0a, KEY_STOP },
+    { "g2",         0x16, KEY_AGAIN },
+    { "g3",         0x22, KEY_F13 },
+    { "g4",         0x2e, KEY_PROPS },
+    { "g5",         0x3a, KEY_UNDO },
+    { "g6",         0x46, KEY_F14 },
+    { "g7",         0x52, KEY_FRONT },
+    { "g8",         0x5e, KEY_COPY },
+    { "g9",         0x6a, KEY_F15 },
+    { "g10",        0x76, KEY_OPEN },
     { "volup",      0x20, KEY_VOLUMEUP },
     { "voldn",      0x2c, KEY_VOLUMEDOWN },
-    { "mr",         0x0b, KEY_CORSAIR },
+    { "mr",         0x0b, KEY_CORSAIR }, 
     { "m1",         0x17, KEY_CORSAIR },
     { "m2",         0x23, KEY_CORSAIR },
     { "m3",         0x2f, KEY_CORSAIR },
-    { "g11",        0x3b, KEY_CORSAIR },
-    { "g12",        0x47, KEY_CORSAIR },
-    { "g13",        0x53, KEY_CORSAIR },
-    { "g14",        0x5f, KEY_CORSAIR },
-    { "g15",        0x6b, KEY_CORSAIR },
-    { "g16",        0x77, KEY_CORSAIR },
-    { "g17",        0x83, KEY_CORSAIR },
-    { "g18",        0x8f, KEY_CORSAIR },
+    { "g11",        0x3b, KEY_PASTE },
+    { "g12",        0x47, KEY_F16 }, 
+    { "g13",        0x53, KEY_FIND },
+    { "g14",        0x5f, KEY_CUT },
+    { "g15",        0x6b, KEY_F17 },
+    { "g16",        0x77, KEY_F18 },
+    { "g17",        0x83, KEY_F19 },
+    { "g18",        0x8f, KEY_F20 },
     { 0,            -1,   KEY_NONE },
     { 0,            -1,   KEY_NONE },
     { "fn",         0x65, KEY_FN },         // STRAFE Fn - rwin on other keyboards
diff --git a/src/ckb/keymap.cpp b/src/ckb/keymap.cpp
index c82deff..f4cd058 100644
--- a/src/ckb/keymap.cpp
+++ b/src/ckb/keymap.cpp
@@ -622,7 +622,7 @@ QString KeyMap::friendlyName(const QString& key, Layout layout){
         return map[key].friendlyName();
 
     // Additionally, there are a handful of keys not present on any physical keyboard, but we need names for them
-    if(key == "f13" || key == "f14" || key == "f15" || key == "f16" || key == "f17" || key == "f18" || key == "f19" || key == "f20")
+    if(key == "f13" || key == "f14" || key == "f15" || key == "f16" || key == "f17" || key == "f18" || key == "f19" || key == "f20" || key == "SunProps" || key == "SunFront" || key == "SunCut" || key == "SunOpen" || key == "SunPaste" || key == "SunCopy" || key == "Undo" || key == "SunStop" || key == "SunAgain" || key == "SunFind" || key == "G3" || key == "G6" || key == "G9" || key == "G12" || key == "G15" || key == "G16" || key == "G17"|| key == "G18")
         return key.toUpper();
     else if(key == "lightup")
         return "Screen Brightness Up";
diff --git a/src/ckb/rebindwidget.cpp b/src/ckb/rebindwidget.cpp
index e9c12bc..c1182bd 100644
--- a/src/ckb/rebindwidget.cpp
+++ b/src/ckb/rebindwidget.cpp
@@ -18,7 +18,7 @@ RebindWidget::RebindWidget(QWidget *parent) :
 
     // Populate key lists
     modKeys << "caps" << "lshift" << "rshift" << "lctrl" << "rctrl" << "lwin" << "rwin" << "lalt" << "ralt" << "rmenu" << "fn";
-    fnKeys << "esc" << "f1" << "f2" << "f3" << "f4" << "f5" << "f6" << "f7" << "f8" << "f9" << "f10" << "f11" << "f12" << "prtscn" << "scroll" << "pause" << "f13" << "f14" << "f15" << "f16" << "f17" << "f18" << "f19" << "f20" << "ins" << "del" << "home" << "end" << "pgup" << "pgdn" << "power" << "lightup" << "lightdn" << "up" << "down" << "left" << "right";
+    fnKeys << "esc" << "f1" << "f2" << "f3" << "f4" << "f5" << "f6" << "f7" << "f8" << "f9" << "f10" << "f11" << "f12" << "prtscn" << "scroll" << "pause" << "f13" << "f14" << "f15" << "f16" << "f17" << "f18" << "f19" << "f20" << "ins" << "del" << "home" << "end" << "pgup" << "pgdn" << "power" << "lightup" << "lightdn" << "up" << "down" << "left" << "right" << "SunProps" << "SunFront" << "SunCut" << "SunOpen" << "SunPaste" << "SunCopy" << "SunStop" << "SunAgain" << "SunFind" << "Undo"  << "G3" << "G6" << "G9" << "G12" << "G15" << "G18" << "G16"<< "G17";
     numKeys << "numlock" << "num0" << "num1" << "num2" << "num3" << "num4" << "num5" << "num6" << "num7" << "num8" << "num9" << "numslash" << "numstar" << "numminus" << "numplus" << "numdot" << "numenter";
     mediaKeys << "stop" << "prev" << "play" << "next" << "volup" << "voldn" << "mute" << "eject";
     mouseKeys << "mouse1" << "mouse2" << "mouse3";