diff --git a/src/components/popover/tab/keypress/scancodes.json b/src/components/popover/tab/keypress/scancodes.json
index 526fc6a1..0f060c1c 100644
--- a/src/components/popover/tab/keypress/scancodes.json
+++ b/src/components/popover/tab/keypress/scancodes.json
@@ -334,10 +334,6 @@
     {
         "text": "Navigation",
         "children": [
-            {
-                "id": "73",
-                "text": "Insert"
-            },
             {
                 "id": "74",
                 "text": "Home"
@@ -349,13 +345,6 @@
                 },
                 "text": "Page Up"
             },
-            {
-                "id": "76",
-                "additional": {
-                    "explanation": "Delete Forward"
-                },
-                "text": "Delete"
-            },
             {
                 "id": "77",
                 "text": "End"
@@ -511,7 +500,7 @@
                 "additional": {
                     "explanation": "Period"
                 },
-                "text": ","
+                "text": "."
             },
             {
                 "id": "176",
@@ -533,13 +522,28 @@
         "text": "Misc",
         "children": [
             {
-                "id": "70",
-                "text": "PrintScreen"
+                "id": "118",
+                "text": "Menu"
+            },
+            {
+                "id": "73",
+                "text": "Insert"
+            },
+            {
+                "id": "76",
+                "additional": {
+                    "explanation": "Delete Forward"
+                },
+                "text": "Delete"
             },
             {
                 "id": "57",
                 "text": "CapsLock"
             },
+            {
+                "id": "70",
+                "text": "PrintScreen"
+            },
             {
                 "id": "71",
                 "text": "ScrollLock"
diff --git a/src/services/mapper.service.ts b/src/services/mapper.service.ts
index 611db1ab..34d86ed2 100644
--- a/src/services/mapper.service.ts
+++ b/src/services/mapper.service.ts
@@ -117,6 +117,22 @@ export class MapperService {
         this.scanCodeTextMap.set(81, ['Down Arrow']);
         this.scanCodeTextMap.set(82, ['Up Arrow']);
         this.scanCodeTextMap.set(83, ['Num Lock']);
+        this.scanCodeTextMap.set(84, ['/']);
+        this.scanCodeTextMap.set(85, ['*']);
+        this.scanCodeTextMap.set(86, ['-']);
+        this.scanCodeTextMap.set(87, ['+']);
+        this.scanCodeTextMap.set(88, ['Enter']);
+        this.scanCodeTextMap.set(89, ['end', '1']);
+        this.scanCodeTextMap.set(90, ['2']);
+        this.scanCodeTextMap.set(91, ['pgdn', '3']);
+        this.scanCodeTextMap.set(92, ['4']);
+        this.scanCodeTextMap.set(93, ['5']);
+        this.scanCodeTextMap.set(94, ['6']);
+        this.scanCodeTextMap.set(95, ['home', '7']);
+        this.scanCodeTextMap.set(96, ['8']);
+        this.scanCodeTextMap.set(97, ['pgup', '9']);
+        this.scanCodeTextMap.set(98, ['Insert', '0']);
+        this.scanCodeTextMap.set(99, ['Del', '.']);
         this.scanCodeTextMap.set(104, ['F13']);
         this.scanCodeTextMap.set(105, ['F14']);
         this.scanCodeTextMap.set(106, ['F15']);
@@ -130,6 +146,8 @@ export class MapperService {
         this.scanCodeTextMap.set(114, ['F23']);
         this.scanCodeTextMap.set(115, ['F24']);
         this.scanCodeTextMap.set(118, ['Menu']);
+        this.scanCodeTextMap.set(176, ['00']);
+        this.scanCodeTextMap.set(177, ['000']);
         this.scanCodeTextMap.set(232, ['Play']);
         this.scanCodeTextMap.set(233, ['Stop']);
         this.scanCodeTextMap.set(234, ['Prev']);