diff --git a/keyboards/zmk-config/config/boards/shields/tg4x/keymap/tg4x - layer default.json b/keyboards/tg4x/layer - default.json
similarity index 88%
rename from keyboards/zmk-config/config/boards/shields/tg4x/keymap/tg4x - layer default.json
rename to keyboards/tg4x/layer - default.json
index 8aac587a..2f0d4ee2 100644
--- a/keyboards/zmk-config/config/boards/shields/tg4x/keymap/tg4x - layer default.json	
+++ b/keyboards/tg4x/layer - default.json	
@@ -18,14 +18,20 @@
     "I",
     "O",
     "P",
-    "'",
-    "Bksp"
+    {
+      "w": 2
+    },
+    "Backspace"
   ],
   [
     {
+      "a": 5,
       "w": 1.5
     },
-    "Tab",
+    "Caps\n\n\n\n\n\nTab",
+    {
+      "a": 7
+    },
     "A",
     "S",
     "D",
@@ -74,21 +80,19 @@
     },
     "Alt",
     {
-      "a": 5,
       "w": 2.25
     },
-    "MO(1)\n\n\n\n\n\nSpace",
+    "MO(2)",
     {
-      "a": 7,
       "w": 2.75
     },
     "Space",
     {
       "w": 1.25
     },
+    "MO(1)",
     "Alt",
     "Gui",
-    "MO(2)",
     "Ctrl"
   ]
 ]
\ No newline at end of file
diff --git a/keyboards/tg4x/layer - default.png b/keyboards/tg4x/layer - default.png
new file mode 100644
index 00000000..42c7fd1c
Binary files /dev/null and b/keyboards/tg4x/layer - default.png differ
diff --git a/keyboards/zmk-config/config/boards/shields/tg4x/keymap/tg4x - layer 1.json b/keyboards/tg4x/layer - function.json
similarity index 90%
rename from keyboards/zmk-config/config/boards/shields/tg4x/keymap/tg4x - layer 1.json
rename to keyboards/tg4x/layer - function.json
index 52d133ca..542a34be 100644
--- a/keyboards/zmk-config/config/boards/shields/tg4x/keymap/tg4x - layer 1.json	
+++ b/keyboards/tg4x/layer - function.json	
@@ -1,7 +1,7 @@
 [
   {
     "name": "TG4X",
-    "author": "Layer 1"
+    "author": "Layer - Function"
   },
   [
     {
@@ -18,7 +18,9 @@
     "8",
     "9",
     "0",
-    "-",
+    {
+      "w": 2
+    },
     "Del"
   ],
   [
@@ -28,18 +30,18 @@
     "",
     "Home",
     "Pg Up",
-    "",
-    "",
-    "",
-    "",
     "[",
     "]",
+    "",
+    "",
+    "-",
     "=",
     "\\",
+    "/",
     {
       "w": 1.5
     },
-    "Enter"
+    "'"
   ],
   [
     {
@@ -58,7 +60,7 @@
     {
       "w": 2.25
     },
-    "Shift"
+    ""
   ],
   [
     {
diff --git a/keyboards/tg4x/layer - function.png b/keyboards/tg4x/layer - function.png
new file mode 100644
index 00000000..8e0251dc
Binary files /dev/null and b/keyboards/tg4x/layer - function.png differ
diff --git a/keyboards/zmk-config/config/boards/shields/tg4x/keymap/tg4x - layer 2.json b/keyboards/tg4x/layer - other.json
similarity index 82%
rename from keyboards/zmk-config/config/boards/shields/tg4x/keymap/tg4x - layer 2.json
rename to keyboards/tg4x/layer - other.json
index 69e6b7be..98be3b15 100644
--- a/keyboards/zmk-config/config/boards/shields/tg4x/keymap/tg4x - layer 2.json	
+++ b/keyboards/tg4x/layer - other.json	
@@ -1,13 +1,12 @@
 [
   {
     "name": "TG4X",
-    "author": "Layer 2"
+    "author": "Layer - Other"
   },
   [
     {
       "a": 7
     },
-    "`",
     "F1",
     "F2",
     "F3",
@@ -19,6 +18,9 @@
     "F9",
     "F10",
     "F11",
+    {
+      "w": 2
+    },
     "F12"
   ],
   [
@@ -33,23 +35,22 @@
     "",
     "",
     "",
+    "",
+    "",
+    "",
     {
-      "a": 5
-    },
-    "Vol\n\n\n\n\n\nUp",
-    "Vol\n\n\n\n\n\nDown",
-    "Play\n\n\n\n\n\nPause",
-    {
-      "a": 7,
       "w": 1.5
     },
-    ""
+    "Insert"
   ],
   [
     {
-      "a": 5,
       "w": 1.75
     },
+    "",
+    {
+      "a": 5
+    },
     "BT\n\n\n\n\n\nClear",
     "BT\n\n\n\n\n\nPrev",
     "BT\n\n\n\n\n\nNext",
@@ -60,13 +61,12 @@
     "",
     "",
     "",
-    "",
     "Boot",
     "Reset",
     {
       "w": 2.25
     },
-    ""
+    "Print Screen"
   ],
   [
     {
@@ -93,8 +93,11 @@
       "w": 1.25
     },
     "",
-    "",
-    "",
-    ""
+    {
+      "a": 5
+    },
+    "Vol\n\n\n\n\n\nUp",
+    "Vol\n\n\n\n\n\nDn",
+    "Play\n\n\n\n\n\nPause"
   ]
 ]
\ No newline at end of file
diff --git a/keyboards/tg4x/layer - other.png b/keyboards/tg4x/layer - other.png
new file mode 100644
index 00000000..71c384e0
Binary files /dev/null and b/keyboards/tg4x/layer - other.png differ
diff --git a/keyboards/zmk-config/config/boards/shields/tg4x/keymap/tg4x - layer 1.png b/keyboards/zmk-config/config/boards/shields/tg4x/keymap/tg4x - layer 1.png
deleted file mode 100644
index 62ae860f..00000000
Binary files a/keyboards/zmk-config/config/boards/shields/tg4x/keymap/tg4x - layer 1.png and /dev/null differ
diff --git a/keyboards/zmk-config/config/boards/shields/tg4x/keymap/tg4x - layer 2.png b/keyboards/zmk-config/config/boards/shields/tg4x/keymap/tg4x - layer 2.png
deleted file mode 100644
index d59cd408..00000000
Binary files a/keyboards/zmk-config/config/boards/shields/tg4x/keymap/tg4x - layer 2.png and /dev/null differ
diff --git a/keyboards/zmk-config/config/boards/shields/tg4x/keymap/tg4x - layer default.png b/keyboards/zmk-config/config/boards/shields/tg4x/keymap/tg4x - layer default.png
deleted file mode 100644
index e2ac06c3..00000000
Binary files a/keyboards/zmk-config/config/boards/shields/tg4x/keymap/tg4x - layer default.png and /dev/null differ