171 files changed, 629 insertions, 521 deletions
diff --git a/data/mappings/keyboard_aliases.hjson b/data/mappings/keyboard_aliases.hjson
index 78a85ef6e7..4295d0700c 100644
--- a/data/mappings/keyboard_aliases.hjson
+++ b/data/mappings/keyboard_aliases.hjson
@@ -1060,6 +1060,48 @@
     "rabbit_capture_plan": {
         "target": "kakunpc/rabbit_capture_plan"
     },
+    "ramonimbao/aelith": {
+        "target": "rmi_kb/aelith"
+    },
+    "ramonimbao/chevron": {
+        "target": "rmi_kb/chevron"
+    },
+    "ramonimbao/herringbone/pro": {
+        "target": "rmi_kb/herringbone/pro"
+    },
+    "ramonimbao/herringbone/v1": {
+        "target": "rmi_kb/herringbone/v1"
+    },
+    "ramonimbao/mona/v1": {
+        "target": "rmi_kb/mona/v1"
+    },
+    "ramonimbao/mona/v1_1": {
+        "target": "rmi_kb/mona/v1_1"
+    },
+    "ramonimbao/mona/v32a": {
+        "target": "rmi_kb/mona/v32a"
+    },
+    "ramonimbao/squishy65": {
+        "target": "rmi_kb/squishy65"
+    },
+    "ramonimbao/squishyfrl": {
+        "target": "rmi_kb/squishyfrl"
+    },
+    "ramonimbao/squishytkl": {
+        "target": "rmi_kb/squishytkl"
+    },
+    "ramonimbao/tkl_ff/v1": {
+        "target": "rmi_kb/tkl_ff/v1"
+    },
+    "ramonimbao/tkl_ff/v2": {
+        "target": "rmi_kb/tkl_ff/v2"
+    },
+    "ramonimbao/wete/v1": {
+        "target": "rmi_kb/wete/v1"
+    },
+    "ramonimbao/wete/v2": {
+        "target": "rmi_kb/wete/v2"
+    },
     "rainkeeb": {
         "target": "rainkeebs/rainkeeb"
     },
diff --git a/keyboards/ramonimbao/chevron/info.json b/keyboards/ramonimbao/chevron/info.json
deleted file mode 100644
index 8e2c26563a..0000000000
--- a/keyboards/ramonimbao/chevron/info.json
+++ /dev/null
@@ -1,191 +0,0 @@
-{
-    "keyboard_name": "Chevron",
-    "manufacturer": "Ramon Imbao",
-    "url": "",
-    "maintainer": "ramonimbao",
-    "usb": {
-        "vid": "0xB16B",
-        "pid": "0xC4EE",
-        "device_version": "0.1.2"
-    },
-    "processor": "atmega32a",
-    "bootloader": "usbasploader",
-    "layouts": {
-        "LAYOUT_ansi": {
-            "layout": [
-                {"x":13.5, "y":0}, 
-                
-                {"x":0, "y":1}, 
-                {"x":1, "y":1}, 
-                {"x":2, "y":1}, 
-                {"x":3, "y":1}, 
-                {"x":4, "y":1}, 
-                {"x":5, "y":1}, 
-                {"x":6, "y":1}, 
-                {"x":7, "y":1}, 
-                {"x":8, "y":1}, 
-                {"x":9, "y":1}, 
-                {"x":10, "y":1}, 
-                {"x":11, "y":1}, 
-                {"x":12, "y":1}, 
-                {"x":13, "y":1, "w":1.5}, 
-                
-                {"x":0, "y":2, "w":1.25}, 
-                {"x":1.25, "y":2}, 
-                {"x":2.25, "y":2}, 
-                {"x":3.25, "y":2}, 
-                {"x":4.25, "y":2}, 
-                {"x":5.25, "y":2}, 
-                {"x":6.25, "y":2}, 
-                {"x":7.25, "y":2}, 
-                {"x":8.25, "y":2}, 
-                {"x":9.25, "y":2}, 
-                {"x":10.25, "y":2}, 
-                {"x":11.25, "y":2}, 
-                {"x":12.25, "y":2, "w":2.25}, 
-
-                {"x":0, "y":3, "w":1.75}, 
-                {"x":1.75, "y":3}, 
-                {"x":2.75, "y":3}, 
-                {"x":3.75, "y":3}, 
-                {"x":4.75, "y":3}, 
-                {"x":5.75, "y":3}, 
-                {"x":6.75, "y":3}, 
-                {"x":7.75, "y":3}, 
-                {"x":8.75, "y":3}, 
-                {"x":9.75, "y":3}, 
-                {"x":10.75, "y":3}, 
-                {"x":11.75, "y":3, "w":1.75}, 
-                {"x":13.5, "y":3}, 
-                
-                {"x":0, "y":4, "w":1.25}, 
-                {"x":1.25, "y":4, "w":1.25}, 
-                {"x":2.5, "y":4, "w":1.25}, 
-                {"x":3.75, "y":4, "w":3}, 
-                {"x":6.75, "y":4}, 
-                {"x":7.75, "y":4, "w":3}, 
-                {"x":10.75, "y":4, "w":1.25}, 
-                {"x":12, "y":4, "w":1.25}, 
-                {"x":13.25, "y":4, "w":1.25}
-            ]
-        },
-        "LAYOUT_iso": {
-            "layout": [
-                {"x":13.5, "y":0}, 
-                
-                {"x":0, "y":1}, 
-                {"x":1, "y":1}, 
-                {"x":2, "y":1}, 
-                {"x":3, "y":1}, 
-                {"x":4, "y":1}, 
-                {"x":5, "y":1}, 
-                {"x":6, "y":1}, 
-                {"x":7, "y":1}, 
-                {"x":8, "y":1}, 
-                {"x":9, "y":1}, 
-                {"x":10, "y":1}, 
-                {"x":11, "y":1}, 
-                {"x":12, "y":1}, 
-                
-                {"x":0, "y":2, "w":1.25}, 
-                {"x":1.25, "y":2}, 
-                {"x":2.25, "y":2}, 
-                {"x":3.25, "y":2}, 
-                {"x":4.25, "y":2}, 
-                {"x":5.25, "y":2}, 
-                {"x":6.25, "y":2}, 
-                {"x":7.25, "y":2}, 
-                {"x":8.25, "y":2}, 
-                {"x":9.25, "y":2}, 
-                {"x":10.25, "y":2}, 
-                {"x":11.25, "y":2}, 
-                {"x":12.25, "y":2}, 
-                {"x":13.25, "y":1, "w":1.25, "h":2}, 
-                
-                {"x":0, "y":3, "w":1.75}, 
-                {"x":1.75, "y":3}, 
-                {"x":2.75, "y":3}, 
-                {"x":3.75, "y":3}, 
-                {"x":4.75, "y":3}, 
-                {"x":5.75, "y":3}, 
-                {"x":6.75, "y":3}, 
-                {"x":7.75, "y":3}, 
-                {"x":8.75, "y":3}, 
-                {"x":9.75, "y":3}, 
-                {"x":10.75, "y":3}, 
-                {"x":11.75, "y":3, "w":1.75}, 
-                {"x":13.5, "y":3}, 
-                
-                {"x":0, "y":4, "w":1.25}, 
-                {"x":1.25, "y":4, "w":1.25}, 
-                {"x":2.5, "y":4, "w":1.25}, 
-                {"x":3.75, "y":4, "w":3}, 
-                {"x":6.75, "y":4}, 
-                {"x":7.75, "y":4, "w":3}, 
-                {"x":10.75, "y":4, "w":1.25}, 
-                {"x":12, "y":4, "w":1.25}, 
-                {"x":13.25, "y":4, "w":1.25}
-            ]
-        },
-        "LAYOUT_all": {
-            "layout": [
-                {"x":11.5, "y":0}, 
-                {"x":12.5, "y":0}, 
-                {"x":13.5, "y":0}, 
-                
-                {"x":0, "y":1}, 
-                {"x":1, "y":1}, 
-                {"x":2, "y":1}, 
-                {"x":3, "y":1}, 
-                {"x":4, "y":1}, 
-                {"x":5, "y":1}, 
-                {"x":6, "y":1}, 
-                {"x":7, "y":1}, 
-                {"x":8, "y":1}, 
-                {"x":9, "y":1}, 
-                {"x":10, "y":1}, 
-                {"x":11, "y":1}, 
-                {"x":12, "y":1}, 
-                {"x":13, "y":1, "w":1.5}, 
-                
-                {"x":0, "y":2, "w":1.25}, 
-                {"x":1.25, "y":2}, 
-                {"x":2.25, "y":2}, 
-                {"x":3.25, "y":2}, 
-                {"x":4.25, "y":2}, 
-                {"x":5.25, "y":2}, 
-                {"x":6.25, "y":2}, 
-                {"x":7.25, "y":2}, 
-                {"x":8.25, "y":2}, 
-                {"x":9.25, "y":2}, 
-                {"x":10.25, "y":2}, 
-                {"x":11.25, "y":2}, 
-                {"x":12.25, "y":2, "w":2.25}, 
-                
-                {"x":0, "y":3, "w":1.75}, 
-                {"x":1.75, "y":3}, 
-                {"x":2.75, "y":3}, 
-                {"x":3.75, "y":3}, 
-                {"x":4.75, "y":3}, 
-                {"x":5.75, "y":3}, 
-                {"x":6.75, "y":3}, 
-                {"x":7.75, "y":3}, 
-                {"x":8.75, "y":3}, 
-                {"x":9.75, "y":3}, 
-                {"x":10.75, "y":3}, 
-                {"x":11.75, "y":3, "w":1.75}, 
-                {"x":13.5, "y":3}, 
-                
-                {"x":0, "y":4, "w":1.25}, 
-                {"x":1.25, "y":4, "w":1.25}, 
-                {"x":2.5, "y":4, "w":1.25}, 
-                {"x":3.75, "y":4, "w":3}, 
-                {"x":6.75, "y":4}, 
-                {"x":7.75, "y":4, "w":3}, 
-                {"x":10.75, "y":4, "w":1.25}, 
-                {"x":12, "y":4, "w":1.25}, 
-                {"x":13.25, "y":4, "w":1.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/ramonimbao/herringbone/rules.mk b/keyboards/ramonimbao/herringbone/rules.mk
deleted file mode 100644
index cd0dc7b855..0000000000
--- a/keyboards/ramonimbao/herringbone/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = ramonimbao/herringbone/v1
diff --git a/keyboards/ramonimbao/mona/rules.mk b/keyboards/ramonimbao/mona/rules.mk
deleted file mode 100644
index ba6b059569..0000000000
--- a/keyboards/ramonimbao/mona/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = ramonimbao/mona/v1_1
diff --git a/keyboards/ramonimbao/squishy65/keymaps/via/config.h b/keyboards/ramonimbao/squishy65/keymaps/via/config.h
deleted file mode 100644
index 4dadf6a169..0000000000
--- a/keyboards/ramonimbao/squishy65/keymaps/via/config.h
+++ /dev/null
@@ -1 +0,0 @@
-#define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 2047
diff --git a/keyboards/ramonimbao/squishyfrl/info.json b/keyboards/ramonimbao/squishyfrl/info.json
deleted file mode 100644
index b64dbe1c46..0000000000
--- a/keyboards/ramonimbao/squishyfrl/info.json
+++ /dev/null
@@ -1,260 +0,0 @@
-{
-    "keyboard_name": "SquishyFRL",
-    "manufacturer": "Ramon Imbao",
-    "url": "",
-    "maintainer": "Ramon Imbao",
-    "usb": {
-        "vid": "0xB16B",
-        "pid": "0x4BE5",
-        "device_version": "0.0.1"
-    },
-    "processor": "STM32F103",
-    "bootloader": "stm32duino",
-    "layouts": {
-        "LAYOUT_ansi": {
-            "layout": [
-                {"x":0, "y":0}, 
-                {"x":1, "y":0}, 
-                {"x":2, "y":0}, 
-                {"x":3, "y":0}, 
-                {"x":4, "y":0}, 
-                {"x":5, "y":0}, 
-                {"x":6, "y":0}, 
-                {"x":7, "y":0}, 
-                {"x":8, "y":0}, 
-                {"x":9, "y":0}, 
-                {"x":10, "y":0}, 
-                {"x":11, "y":0}, 
-                {"x":12, "y":0}, 
-                {"x":13, "y":0, "w":2}, 
-                {"x":15.25, "y":0}, 
-                {"x":16.25, "y":0}, 
-                {"x":17.25, "y":0}, 
-                
-                {"x":0, "y":1, "w":1.5}, 
-                {"x":1.5, "y":1}, 
-                {"x":2.5, "y":1}, 
-                {"x":3.5, "y":1}, 
-                {"x":4.5, "y":1}, 
-                {"x":5.5, "y":1}, 
-                {"x":6.5, "y":1}, 
-                {"x":7.5, "y":1}, 
-                {"x":8.5, "y":1}, 
-                {"x":9.5, "y":1}, 
-                {"x":10.5, "y":1}, 
-                {"x":11.5, "y":1}, 
-                {"x":12.5, "y":1}, 
-                {"x":13.5, "y":1, "w":1.5}, 
-                {"x":15.25, "y":1}, 
-                {"x":16.25, "y":1}, 
-                {"x":17.25, "y":1}, 
-                
-                {"x":0, "y":2, "w":1.75}, 
-                {"x":1.75, "y":2}, 
-                {"x":2.75, "y":2}, 
-                {"x":3.75, "y":2}, 
-                {"x":4.75, "y":2}, 
-                {"x":5.75, "y":2}, 
-                {"x":6.75, "y":2}, 
-                {"x":7.75, "y":2}, 
-                {"x":8.75, "y":2}, 
-                {"x":9.75, "y":2}, 
-                {"x":10.75, "y":2}, 
-                {"x":11.75, "y":2}, 
-                {"x":12.75, "y":2, "w":2.25}, 
-                
-                {"x":0, "y":3, "w":2.25}, 
-                {"x":2.25, "y":3}, 
-                {"x":3.25, "y":3}, 
-                {"x":4.25, "y":3}, 
-                {"x":5.25, "y":3}, 
-                {"x":6.25, "y":3}, 
-                {"x":7.25, "y":3}, 
-                {"x":8.25, "y":3}, 
-                {"x":9.25, "y":3}, 
-                {"x":10.25, "y":3}, 
-                {"x":11.25, "y":3}, 
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3}, 
-                {"x":16.25, "y":3}, 
-                
-                {"x":0, "y":4, "w":1.25}, 
-                {"x":1.25, "y":4, "w":1.25}, 
-                {"x":2.5, "y":4, "w":1.25}, 
-                {"x":3.75, "y":4, "w":6.25}, 
-                {"x":10, "y":4, "w":1.25}, 
-                {"x":11.25, "y":4, "w":1.25}, 
-                {"x":12.5, "y":4, "w":1.25}, 
-                {"x":13.75, "y":4, "w":1.25}, 
-                {"x":15.25, "y":4}, 
-                {"x":16.25, "y":4}, 
-                {"x":17.25, "y":4}
-            ]
-        },
-        "LAYOUT_iso": {
-            "layout": [
-                {"x":0, "y":0}, 
-                {"x":1, "y":0}, 
-                {"x":2, "y":0}, 
-                {"x":3, "y":0}, 
-                {"x":4, "y":0}, 
-                {"x":5, "y":0}, 
-                {"x":6, "y":0}, 
-                {"x":7, "y":0}, 
-                {"x":8, "y":0}, 
-                {"x":9, "y":0}, 
-                {"x":10, "y":0}, 
-                {"x":11, "y":0}, 
-                {"x":12, "y":0}, 
-                {"x":13, "y":0, "w":2}, 
-                {"x":15.25, "y":0}, 
-                {"x":16.25, "y":0}, 
-                {"x":17.25, "y":0}, 
-
-                {"x":0, "y":1, "w":1.5}, 
-                {"x":1.5, "y":1}, 
-                {"x":2.5, "y":1}, 
-                {"x":3.5, "y":1}, 
-                {"x":4.5, "y":1}, 
-                {"x":5.5, "y":1}, 
-                {"x":6.5, "y":1}, 
-                {"x":7.5, "y":1}, 
-                {"x":8.5, "y":1}, 
-                {"x":9.5, "y":1}, 
-                {"x":10.5, "y":1}, 
-                {"x":11.5, "y":1}, 
-                {"x":12.5, "y":1}, 
-                {"x":15.25, "y":1}, 
-                {"x":16.25, "y":1}, 
-                {"x":17.25, "y":1}, 
-
-                {"x":0, "y":2, "w":1.75}, 
-                {"x":1.75, "y":2}, 
-                {"x":2.75, "y":2}, 
-                {"x":3.75, "y":2}, 
-                {"x":4.75, "y":2}, 
-                {"x":5.75, "y":2}, 
-                {"x":6.75, "y":2}, 
-                {"x":7.75, "y":2}, 
-                {"x":8.75, "y":2}, 
-                {"x":9.75, "y":2}, 
-                {"x":10.75, "y":2}, 
-                {"x":11.75, "y":2}, 
-                {"x":12.75, "y":2}, 
-                {"x":13.75, "y":1, "w":1.25, "h":2}, 
-                
-                {"x":0, "y":3, "w":1.25}, 
-                {"x":1.25, "y":3}, 
-                {"x":2.25, "y":3}, 
-                {"x":3.25, "y":3}, 
-                {"x":4.25, "y":3}, 
-                {"x":5.25, "y":3}, 
-                {"x":6.25, "y":3}, 
-                {"x":7.25, "y":3}, 
-                {"x":8.25, "y":3}, 
-                {"x":9.25, "y":3}, 
-                {"x":10.25, "y":3}, 
-                {"x":11.25, "y":3}, 
-                {"x":12.25, "y":3, "w":1.75}, 
-                {"x":14, "y":3}, 
-                {"x":16.25, "y":3}, 
-                
-                {"x":0, "y":4, "w":1.25}, 
-                {"x":1.25, "y":4, "w":1.25}, 
-                {"x":2.5, "y":4, "w":1.25}, 
-                {"x":3.75, "y":4, "w":6.25}, 
-                {"x":10, "y":4, "w":1.25}, 
-                {"x":11.25, "y":4, "w":1.25}, 
-                {"x":12.5, "y":4, "w":1.25}, 
-                {"x":13.75, "y":4, "w":1.25}, 
-                {"x":15.25, "y":4}, 
-                {"x":16.25, "y":4}, 
-                {"x":17.25, "y":4}
-            ]
-        },
-        "LAYOUT_all": {
-            "layout": [
-                {"x":0, "y":0}, 
-                {"x":1, "y":0}, 
-                {"x":2, "y":0}, 
-                {"x":3, "y":0}, 
-                {"x":4, "y":0}, 
-                {"x":5, "y":0}, 
-                {"x":6, "y":0}, 
-                {"x":7, "y":0}, 
-                {"x":8, "y":0}, 
-                {"x":9, "y":0}, 
-                {"x":10, "y":0}, 
-                {"x":11, "y":0}, 
-                {"x":12, "y":0}, 
-                {"x":13, "y":0}, 
-                {"x":14, "y":0}, 
-                {"x":15.25, "y":0}, 
-                {"x":16.25, "y":0}, 
-                {"x":17.25, "y":0}, 
-                
-                {"x":0, "y":1, "w":1.5}, 
-                {"x":1.5, "y":1}, 
-                {"x":2.5, "y":1}, 
-                {"x":3.5, "y":1}, 
-                {"x":4.5, "y":1}, 
-                {"x":5.5, "y":1}, 
-                {"x":6.5, "y":1}, 
-                {"x":7.5, "y":1}, 
-                {"x":8.5, "y":1}, 
-                {"x":9.5, "y":1}, 
-                {"x":10.5, "y":1}, 
-                {"x":11.5, "y":1}, 
-                {"x":12.5, "y":1}, 
-                {"x":13.5, "y":1, "w":1.5}, 
-                {"x":15.25, "y":1}, 
-                {"x":16.25, "y":1}, 
-                {"x":17.25, "y":1}, 
-                
-                {"x":0, "y":2, "w":1.75}, 
-                {"x":1.75, "y":2}, 
-                {"x":2.75, "y":2}, 
-                {"x":3.75, "y":2}, 
-                {"x":4.75, "y":2}, 
-                {"x":5.75, "y":2}, 
-                {"x":6.75, "y":2}, 
-                {"x":7.75, "y":2}, 
-                {"x":8.75, "y":2}, 
-                {"x":9.75, "y":2}, 
-                {"x":10.75, "y":2}, 
-                {"x":11.75, "y":2}, 
-                {"x":12.75, "y":2, "w":2.25}, 
-                
-                {"x":0, "y":3, "w":1.25}, 
-                {"x":1.25, "y":3}, 
-                {"x":2.25, "y":3}, 
-                {"x":3.25, "y":3}, 
-                {"x":4.25, "y":3}, 
-                {"x":5.25, "y":3}, 
-                {"x":6.25, "y":3}, 
-                {"x":7.25, "y":3}, 
-                {"x":8.25, "y":3}, 
-                {"x":9.25, "y":3}, 
-                {"x":10.25, "y":3}, 
-                {"x":11.25, "y":3}, 
-                {"x":12.25, "y":3, "w":1.75}, 
-                {"x":14, "y":3}, 
-                {"x":16.25, "y":3}, 
-
-                {"x":0, "y":4, "w":1.25}, 
-                {"x":1.25, "y":4, "w":1.25}, 
-                {"x":2.5, "y":4, "w":1.25}, 
-                {"x":3.75, "y":4, "w":3}, 
-                {"x":6.75, "y":4}, 
-                {"x":7.75, "y":4, "w":2.25}, 
-                {"x":10, "y":4, "w":1.25}, 
-                {"x":11.25, "y":4, "w":1.25}, 
-                {"x":12.5, "y":4, "w":1.25}, 
-                {"x":13.75, "y":4, "w":1.25}, 
-                {"x":15.25, "y":4}, 
-                {"x":16.25, "y":4}, 
-                {"x":17.25, "y":4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/ramonimbao/wete/rules.mk b/keyboards/ramonimbao/wete/rules.mk
deleted file mode 100644
index f4a04ab47f..0000000000
--- a/keyboards/ramonimbao/wete/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = ramonimbao/wete/v2
diff --git a/keyboards/ramonimbao/wete/v1/keymaps/via/config.h b/keyboards/ramonimbao/wete/v1/keymaps/via/config.h
deleted file mode 100644
index 4dadf6a169..0000000000
--- a/keyboards/ramonimbao/wete/v1/keymaps/via/config.h
+++ /dev/null
@@ -1 +0,0 @@
-#define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 2047
diff --git a/keyboards/ramonimbao/wete/v1/v1.c b/keyboards/ramonimbao/wete/v1/v1.c
deleted file mode 100644
index b14a7dc738..0000000000
--- a/keyboards/ramonimbao/wete/v1/v1.c
+++ /dev/null
@@ -1,19 +0,0 @@
-#include "v1.h"
-
-void keyboard_pre_init_user(void) {
-    // Initialize indicator LED pins
-    setPinOutput(A14); // Num Lock
-    setPinOutput(A15); // Scroll Lock
-    setPinOutput(B3); // Caps Lock
-}
-
-bool led_update_kb(led_t led_state) {
-    bool res = led_update_user(led_state);
-    if (res) {
-        writePin(A14, !led_state.num_lock);
-        writePin(A15, !led_state.scroll_lock);
-        writePin(B3, !led_state.caps_lock);
-    }
-
-    return res;
-}
diff --git a/keyboards/ramonimbao/aelith/aelith.c b/keyboards/rmi_kb/aelith/aelith.c
index e2153f7645..e2153f7645 100644
--- a/keyboards/ramonimbao/aelith/aelith.c
+++ b/keyboards/rmi_kb/aelith/aelith.c
diff --git a/keyboards/ramonimbao/aelith/aelith.h b/keyboards/rmi_kb/aelith/aelith.h
index 47fe9a90ed..47fe9a90ed 100644
--- a/keyboards/ramonimbao/aelith/aelith.h
+++ b/keyboards/rmi_kb/aelith/aelith.h
diff --git a/keyboards/ramonimbao/aelith/config.h b/keyboards/rmi_kb/aelith/config.h
index 99bc99049f..99bc99049f 100644
--- a/keyboards/ramonimbao/aelith/config.h
+++ b/keyboards/rmi_kb/aelith/config.h
diff --git a/keyboards/ramonimbao/aelith/info.json b/keyboards/rmi_kb/aelith/info.json
index cef0556993..87c491a7bd 100644
--- a/keyboards/ramonimbao/aelith/info.json
+++ b/keyboards/rmi_kb/aelith/info.json
@@ -1,8 +1,8 @@
 {
     "keyboard_name": "AELITH",
-    "manufacturer": "Ramon Imbao",
+    "manufacturer": "RMI-KB",
     "url": "",
-    "maintainer": "Ramon Imbao",
+    "maintainer": "ramonimbao",
     "usb": {
         "vid": "0xB16B",
         "pid": "0xE460",
diff --git a/keyboards/ramonimbao/aelith/keymaps/default/keymap.c b/keyboards/rmi_kb/aelith/keymaps/default/keymap.c
index 64e74607e1..64e74607e1 100644
--- a/keyboards/ramonimbao/aelith/keymaps/default/keymap.c
+++ b/keyboards/rmi_kb/aelith/keymaps/default/keymap.c
diff --git a/keyboards/ramonimbao/aelith/keymaps/via/keymap.c b/keyboards/rmi_kb/aelith/keymaps/via/keymap.c
index e916d6e6c1..e916d6e6c1 100644
--- a/keyboards/ramonimbao/aelith/keymaps/via/keymap.c
+++ b/keyboards/rmi_kb/aelith/keymaps/via/keymap.c
diff --git a/keyboards/ramonimbao/aelith/keymaps/via/rules.mk b/keyboards/rmi_kb/aelith/keymaps/via/rules.mk
index 1e5b99807c..1e5b99807c 100644
--- a/keyboards/ramonimbao/aelith/keymaps/via/rules.mk
+++ b/keyboards/rmi_kb/aelith/keymaps/via/rules.mk
diff --git a/keyboards/ramonimbao/aelith/readme.md b/keyboards/rmi_kb/aelith/readme.md
index 243d58e292..23d24cb5f9 100644
--- a/keyboards/ramonimbao/aelith/readme.md
+++ b/keyboards/rmi_kb/aelith/readme.md
@@ -9,6 +9,6 @@ A through-hole Alice-layout keyboard.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make ramonimbao/aelith:default
+    make rmi_kb/aelith:default
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/ramonimbao/aelith/rules.mk b/keyboards/rmi_kb/aelith/rules.mk
index 1e9f925544..1e9f925544 100644
--- a/keyboards/ramonimbao/aelith/rules.mk
+++ b/keyboards/rmi_kb/aelith/rules.mk
diff --git a/keyboards/ramonimbao/chevron/chevron.c b/keyboards/rmi_kb/chevron/chevron.c
index 5b15d3324c..5b15d3324c 100644
--- a/keyboards/ramonimbao/chevron/chevron.c
+++ b/keyboards/rmi_kb/chevron/chevron.c
diff --git a/keyboards/ramonimbao/chevron/chevron.h b/keyboards/rmi_kb/chevron/chevron.h
index 0f95555c55..0f95555c55 100644
--- a/keyboards/ramonimbao/chevron/chevron.h
+++ b/keyboards/rmi_kb/chevron/chevron.h
diff --git a/keyboards/ramonimbao/chevron/config.h b/keyboards/rmi_kb/chevron/config.h
index 624162cff1..624162cff1 100644
--- a/keyboards/ramonimbao/chevron/config.h
+++ b/keyboards/rmi_kb/chevron/config.h
diff --git a/keyboards/rmi_kb/chevron/info.json b/keyboards/rmi_kb/chevron/info.json
new file mode 100644
index 0000000000..654da4ace8
--- /dev/null
+++ b/keyboards/rmi_kb/chevron/info.json
@@ -0,0 +1,191 @@
+{
+    "keyboard_name": "Chevron",
+    "manufacturer": "RMI-KB",
+    "url": "",
+    "maintainer": "ramonimbao",
+    "usb": {
+        "vid": "0xB16B",
+        "pid": "0xC4EE",
+        "device_version": "0.1.2"
+    },
+    "processor": "atmega32a",
+    "bootloader": "usbasploader",
+    "layouts": {
+        "LAYOUT_ansi": {
+            "layout": [
+                {"x":13.5, "y":0},
+
+                {"x":0, "y":1},
+                {"x":1, "y":1},
+                {"x":2, "y":1},
+                {"x":3, "y":1},
+                {"x":4, "y":1},
+                {"x":5, "y":1},
+                {"x":6, "y":1},
+                {"x":7, "y":1},
+                {"x":8, "y":1},
+                {"x":9, "y":1},
+                {"x":10, "y":1},
+                {"x":11, "y":1},
+                {"x":12, "y":1},
+                {"x":13, "y":1, "w":1.5},
+
+                {"x":0, "y":2, "w":1.25},
+                {"x":1.25, "y":2},
+                {"x":2.25, "y":2},
+                {"x":3.25, "y":2},
+                {"x":4.25, "y":2},
+                {"x":5.25, "y":2},
+                {"x":6.25, "y":2},
+                {"x":7.25, "y":2},
+                {"x":8.25, "y":2},
+                {"x":9.25, "y":2},
+                {"x":10.25, "y":2},
+                {"x":11.25, "y":2},
+                {"x":12.25, "y":2, "w":2.25},
+
+                {"x":0, "y":3, "w":1.75},
+                {"x":1.75, "y":3},
+                {"x":2.75, "y":3},
+                {"x":3.75, "y":3},
+                {"x":4.75, "y":3},
+                {"x":5.75, "y":3},
+                {"x":6.75, "y":3},
+                {"x":7.75, "y":3},
+                {"x":8.75, "y":3},
+                {"x":9.75, "y":3},
+                {"x":10.75, "y":3},
+                {"x":11.75, "y":3, "w":1.75},
+                {"x":13.5, "y":3},
+
+                {"x":0, "y":4, "w":1.25},
+                {"x":1.25, "y":4, "w":1.25},
+                {"x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":3},
+                {"x":6.75, "y":4},
+                {"x":7.75, "y":4, "w":3},
+                {"x":10.75, "y":4, "w":1.25},
+                {"x":12, "y":4, "w":1.25},
+                {"x":13.25, "y":4, "w":1.25}
+            ]
+        },
+        "LAYOUT_iso": {
+            "layout": [
+                {"x":13.5, "y":0},
+
+                {"x":0, "y":1},
+                {"x":1, "y":1},
+                {"x":2, "y":1},
+                {"x":3, "y":1},
+                {"x":4, "y":1},
+                {"x":5, "y":1},
+                {"x":6, "y":1},
+                {"x":7, "y":1},
+                {"x":8, "y":1},
+                {"x":9, "y":1},
+                {"x":10, "y":1},
+                {"x":11, "y":1},
+                {"x":12, "y":1},
+
+                {"x":0, "y":2, "w":1.25},
+                {"x":1.25, "y":2},
+                {"x":2.25, "y":2},
+                {"x":3.25, "y":2},
+                {"x":4.25, "y":2},
+                {"x":5.25, "y":2},
+                {"x":6.25, "y":2},
+                {"x":7.25, "y":2},
+                {"x":8.25, "y":2},
+                {"x":9.25, "y":2},
+                {"x":10.25, "y":2},
+                {"x":11.25, "y":2},
+                {"x":12.25, "y":2},
+                {"x":13.25, "y":1, "w":1.25, "h":2},
+
+                {"x":0, "y":3, "w":1.75},
+                {"x":1.75, "y":3},
+                {"x":2.75, "y":3},
+                {"x":3.75, "y":3},
+                {"x":4.75, "y":3},
+                {"x":5.75, "y":3},
+                {"x":6.75, "y":3},
+                {"x":7.75, "y":3},
+                {"x":8.75, "y":3},
+                {"x":9.75, "y":3},
+                {"x":10.75, "y":3},
+                {"x":11.75, "y":3, "w":1.75},
+                {"x":13.5, "y":3},
+
+                {"x":0, "y":4, "w":1.25},
+                {"x":1.25, "y":4, "w":1.25},
+                {"x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":3},
+                {"x":6.75, "y":4},
+                {"x":7.75, "y":4, "w":3},
+                {"x":10.75, "y":4, "w":1.25},
+                {"x":12, "y":4, "w":1.25},
+                {"x":13.25, "y":4, "w":1.25}
+            ]
+        },
+        "LAYOUT_all": {
+            "layout": [
+                {"x":11.5, "y":0},
+                {"x":12.5, "y":0},
+                {"x":13.5, "y":0},
+
+                {"x":0, "y":1},
+                {"x":1, "y":1},
+                {"x":2, "y":1},
+                {"x":3, "y":1},
+                {"x":4, "y":1},
+                {"x":5, "y":1},
+                {"x":6, "y":1},
+                {"x":7, "y":1},
+                {"x":8, "y":1},
+                {"x":9, "y":1},
+                {"x":10, "y":1},
+                {"x":11, "y":1},
+                {"x":12, "y":1},
+                {"x":13, "y":1, "w":1.5},
+
+                {"x":0, "y":2, "w":1.25},
+                {"x":1.25, "y":2},
+                {"x":2.25, "y":2},
+                {"x":3.25, "y":2},
+                {"x":4.25, "y":2},
+                {"x":5.25, "y":2},
+                {"x":6.25, "y":2},
+                {"x":7.25, "y":2},
+                {"x":8.25, "y":2},
+                {"x":9.25, "y":2},
+                {"x":10.25, "y":2},
+                {"x":11.25, "y":2},
+                {"x":12.25, "y":2, "w":2.25},
+
+                {"x":0, "y":3, "w":1.75},
+                {"x":1.75, "y":3},
+                {"x":2.75, "y":3},
+                {"x":3.75, "y":3},
+                {"x":4.75, "y":3},
+                {"x":5.75, "y":3},
+                {"x":6.75, "y":3},
+                {"x":7.75, "y":3},
+                {"x":8.75, "y":3},
+                {"x":9.75, "y":3},
+                {"x":10.75, "y":3},
+                {"x":11.75, "y":3, "w":1.75},
+                {"x":13.5, "y":3},
+
+                {"x":0, "y":4, "w":1.25},
+                {"x":1.25, "y":4, "w":1.25},
+                {"x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":3},
+                {"x":6.75, "y":4},
+                {"x":7.75, "y":4, "w":3},
+                {"x":10.75, "y":4, "w":1.25},
+                {"x":12, "y":4, "w":1.25},
+                {"x":13.25, "y":4, "w":1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/ramonimbao/chevron/keymaps/default/keymap.c b/keyboards/rmi_kb/chevron/keymaps/default/keymap.c
index 45c7494f8b..45c7494f8b 100644
--- a/keyboards/ramonimbao/chevron/keymaps/default/keymap.c
+++ b/keyboards/rmi_kb/chevron/keymaps/default/keymap.c
diff --git a/keyboards/ramonimbao/chevron/keymaps/iso/keymap.c b/keyboards/rmi_kb/chevron/keymaps/iso/keymap.c
index ed18fc0e54..ed18fc0e54 100644
--- a/keyboards/ramonimbao/chevron/keymaps/iso/keymap.c
+++ b/keyboards/rmi_kb/chevron/keymaps/iso/keymap.c
diff --git a/keyboards/ramonimbao/chevron/keymaps/via/keymap.c b/keyboards/rmi_kb/chevron/keymaps/via/keymap.c
index 190a39e257..190a39e257 100644
--- a/keyboards/ramonimbao/chevron/keymaps/via/keymap.c
+++ b/keyboards/rmi_kb/chevron/keymaps/via/keymap.c
diff --git a/keyboards/ramonimbao/chevron/keymaps/via/rules.mk b/keyboards/rmi_kb/chevron/keymaps/via/rules.mk
index 1e5b99807c..1e5b99807c 100644
--- a/keyboards/ramonimbao/chevron/keymaps/via/rules.mk
+++ b/keyboards/rmi_kb/chevron/keymaps/via/rules.mk
diff --git a/keyboards/ramonimbao/chevron/readme.md b/keyboards/rmi_kb/chevron/readme.md
index 9c2b990ef2..456ad9db43 100644
--- a/keyboards/ramonimbao/chevron/readme.md
+++ b/keyboards/rmi_kb/chevron/readme.md
@@ -15,6 +15,6 @@ To get to the bootloader,
 
 Make example for this keyboard (after setting up your build environment):
 
-    make ramonimbao/chevron:default
+    make rmi_kb/chevron:default
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/ramonimbao/chevron/rules.mk b/keyboards/rmi_kb/chevron/rules.mk
index 36c6a2d050..36c6a2d050 100644
--- a/keyboards/ramonimbao/chevron/rules.mk
+++ b/keyboards/rmi_kb/chevron/rules.mk
diff --git a/keyboards/ramonimbao/herringbone/pro/config.h b/keyboards/rmi_kb/herringbone/pro/config.h
index 60b1a3f64b..60b1a3f64b 100644
--- a/keyboards/ramonimbao/herringbone/pro/config.h
+++ b/keyboards/rmi_kb/herringbone/pro/config.h
diff --git a/keyboards/ramonimbao/herringbone/pro/info.json b/keyboards/rmi_kb/herringbone/pro/info.json
index 3c7e7bead1..6a365b17c1 100644
--- a/keyboards/ramonimbao/herringbone/pro/info.json
+++ b/keyboards/rmi_kb/herringbone/pro/info.json
@@ -1,8 +1,8 @@
 {
     "keyboard_name": "Herringbone Pro",
-    "manufacturer": "Ramon Imbao",
+    "manufacturer": "RMI-KB",
     "url": "",
-    "maintainer": "Ramon Imbao",
+    "maintainer": "ramonimbao",
     "usb": {
         "vid": "0xB16B",
         "pid": "0x440B",
diff --git a/keyboards/ramonimbao/herringbone/pro/keymaps/default/keymap.c b/keyboards/rmi_kb/herringbone/pro/keymaps/default/keymap.c
index a04192a3e4..a04192a3e4 100644
--- a/keyboards/ramonimbao/herringbone/pro/keymaps/default/keymap.c
+++ b/keyboards/rmi_kb/herringbone/pro/keymaps/default/keymap.c
diff --git a/keyboards/ramonimbao/herringbone/pro/keymaps/iso/keymap.c b/keyboards/rmi_kb/herringbone/pro/keymaps/iso/keymap.c
index 6d280905dc..6d280905dc 100644
--- a/keyboards/ramonimbao/herringbone/pro/keymaps/iso/keymap.c
+++ b/keyboards/rmi_kb/herringbone/pro/keymaps/iso/keymap.c
diff --git a/keyboards/ramonimbao/herringbone/pro/keymaps/via/keymap.c b/keyboards/rmi_kb/herringbone/pro/keymaps/via/keymap.c
index 71622cddcf..71622cddcf 100644
--- a/keyboards/ramonimbao/herringbone/pro/keymaps/via/keymap.c
+++ b/keyboards/rmi_kb/herringbone/pro/keymaps/via/keymap.c
diff --git a/keyboards/ramonimbao/herringbone/pro/keymaps/via/rules.mk b/keyboards/rmi_kb/herringbone/pro/keymaps/via/rules.mk
index 1e5b99807c..1e5b99807c 100644
--- a/keyboards/ramonimbao/herringbone/pro/keymaps/via/rules.mk
+++ b/keyboards/rmi_kb/herringbone/pro/keymaps/via/rules.mk
diff --git a/keyboards/ramonimbao/herringbone/pro/pattern.c b/keyboards/rmi_kb/herringbone/pro/pattern.c
index 135c067b68..135c067b68 100644
--- a/keyboards/ramonimbao/herringbone/pro/pattern.c
+++ b/keyboards/rmi_kb/herringbone/pro/pattern.c
diff --git a/keyboards/ramonimbao/herringbone/pro/pattern.h b/keyboards/rmi_kb/herringbone/pro/pattern.h
index a564e4abb4..a564e4abb4 100644
--- a/keyboards/ramonimbao/herringbone/pro/pattern.h
+++ b/keyboards/rmi_kb/herringbone/pro/pattern.h
diff --git a/keyboards/ramonimbao/herringbone/pro/pro.c b/keyboards/rmi_kb/herringbone/pro/pro.c
index 4c11baefcc..4c11baefcc 100644
--- a/keyboards/ramonimbao/herringbone/pro/pro.c
+++ b/keyboards/rmi_kb/herringbone/pro/pro.c
diff --git a/keyboards/ramonimbao/herringbone/pro/pro.h b/keyboards/rmi_kb/herringbone/pro/pro.h
index 28494e0ddc..28494e0ddc 100644
--- a/keyboards/ramonimbao/herringbone/pro/pro.h
+++ b/keyboards/rmi_kb/herringbone/pro/pro.h
diff --git a/keyboards/ramonimbao/herringbone/pro/readme.md b/keyboards/rmi_kb/herringbone/pro/readme.md
index abf5fc851c..4e3eef39f6 100644
--- a/keyboards/ramonimbao/herringbone/pro/readme.md
+++ b/keyboards/rmi_kb/herringbone/pro/readme.md
@@ -18,6 +18,6 @@ To get to the bootloader,
 
 Make example for this keyboard (after setting up your build environment):
 
-    make ramonimbao/herringbone/pro:default
+    make rmi_kb/herringbone/pro:default
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/ramonimbao/herringbone/pro/rules.mk b/keyboards/rmi_kb/herringbone/pro/rules.mk
index db45e4f61c..db45e4f61c 100644
--- a/keyboards/ramonimbao/herringbone/pro/rules.mk
+++ b/keyboards/rmi_kb/herringbone/pro/rules.mk
diff --git a/keyboards/ramonimbao/herringbone/readme.md b/keyboards/rmi_kb/herringbone/readme.md
index b1f745c719..b1f745c719 100644
--- a/keyboards/ramonimbao/herringbone/readme.md
+++ b/keyboards/rmi_kb/herringbone/readme.md
diff --git a/keyboards/rmi_kb/herringbone/rules.mk b/keyboards/rmi_kb/herringbone/rules.mk
new file mode 100644
index 0000000000..1efe9fa4f5
--- /dev/null
+++ b/keyboards/rmi_kb/herringbone/rules.mk
@@ -0,0 +1 @@
+DEFAULT_FOLDER = rmi_kb/herringbone/v1
diff --git a/keyboards/ramonimbao/herringbone/v1/config.h b/keyboards/rmi_kb/herringbone/v1/config.h
index 89fbf781d5..89fbf781d5 100644
--- a/keyboards/ramonimbao/herringbone/v1/config.h
+++ b/keyboards/rmi_kb/herringbone/v1/config.h
diff --git a/keyboards/ramonimbao/herringbone/v1/info.json b/keyboards/rmi_kb/herringbone/v1/info.json
index 35bdd08af2..2e12362994 100644
--- a/keyboards/ramonimbao/herringbone/v1/info.json
+++ b/keyboards/rmi_kb/herringbone/v1/info.json
@@ -1,8 +1,8 @@
 {
     "keyboard_name": "Herringbone",
-    "manufacturer": "Ramon Imbao",
+    "manufacturer": "RMI-KB",
     "url": "",
-    "maintainer": "Ramon Imbao",
+    "maintainer": "ramonimbao",
     "usb": {
         "vid": "0xB16B",
         "pid": "0x04E5",
diff --git a/keyboards/ramonimbao/herringbone/v1/keymaps/default/keymap.c b/keyboards/rmi_kb/herringbone/v1/keymaps/default/keymap.c
index b9cf45351f..b9cf45351f 100644
--- a/keyboards/ramonimbao/herringbone/v1/keymaps/default/keymap.c
+++ b/keyboards/rmi_kb/herringbone/v1/keymaps/default/keymap.c
diff --git a/keyboards/ramonimbao/herringbone/v1/keymaps/iso/keymap.c b/keyboards/rmi_kb/herringbone/v1/keymaps/iso/keymap.c
index d6d2b15f19..d6d2b15f19 100644
--- a/keyboards/ramonimbao/herringbone/v1/keymaps/iso/keymap.c
+++ b/keyboards/rmi_kb/herringbone/v1/keymaps/iso/keymap.c
diff --git a/keyboards/ramonimbao/herringbone/v1/keymaps/via/keymap.c b/keyboards/rmi_kb/herringbone/v1/keymaps/via/keymap.c
index 6438021f3a..6438021f3a 100644
--- a/keyboards/ramonimbao/herringbone/v1/keymaps/via/keymap.c
+++ b/keyboards/rmi_kb/herringbone/v1/keymaps/via/keymap.c
diff --git a/keyboards/ramonimbao/herringbone/v1/keymaps/via/rules.mk b/keyboards/rmi_kb/herringbone/v1/keymaps/via/rules.mk
index 1e5b99807c..1e5b99807c 100644
--- a/keyboards/ramonimbao/herringbone/v1/keymaps/via/rules.mk
+++ b/keyboards/rmi_kb/herringbone/v1/keymaps/via/rules.mk
diff --git a/keyboards/ramonimbao/herringbone/v1/readme.md b/keyboards/rmi_kb/herringbone/v1/readme.md
index eb5546cb70..0ba9d34cd6 100644
--- a/keyboards/ramonimbao/herringbone/v1/readme.md
+++ b/keyboards/rmi_kb/herringbone/v1/readme.md
@@ -18,6 +18,6 @@ To get to the bootloader,
 
 Make example for this keyboard (after setting up your build environment):
 
-    make ramonimbao/herringbone/v1:default
+    make rmi_kb/herringbone/v1:default
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/ramonimbao/herringbone/v1/rules.mk b/keyboards/rmi_kb/herringbone/v1/rules.mk
index 18550f0a64..18550f0a64 100644
--- a/keyboards/ramonimbao/herringbone/v1/rules.mk
+++ b/keyboards/rmi_kb/herringbone/v1/rules.mk
diff --git a/keyboards/ramonimbao/herringbone/v1/v1.c b/keyboards/rmi_kb/herringbone/v1/v1.c
index 4bdb5fad38..4bdb5fad38 100644
--- a/keyboards/ramonimbao/herringbone/v1/v1.c
+++ b/keyboards/rmi_kb/herringbone/v1/v1.c
diff --git a/keyboards/ramonimbao/herringbone/v1/v1.h b/keyboards/rmi_kb/herringbone/v1/v1.h
index 80c411690e..80c411690e 100644
--- a/keyboards/ramonimbao/herringbone/v1/v1.h
+++ b/keyboards/rmi_kb/herringbone/v1/v1.h
diff --git a/keyboards/rmi_kb/mona/rules.mk b/keyboards/rmi_kb/mona/rules.mk
new file mode 100644
index 0000000000..54aa705d96
--- /dev/null
+++ b/keyboards/rmi_kb/mona/rules.mk
@@ -0,0 +1 @@
+DEFAULT_FOLDER = rmi_kb/mona/v1_1
diff --git a/keyboards/ramonimbao/mona/v1/config.h b/keyboards/rmi_kb/mona/v1/config.h
index 15029cfc37..15029cfc37 100644
--- a/keyboards/ramonimbao/mona/v1/config.h
+++ b/keyboards/rmi_kb/mona/v1/config.h
diff --git a/keyboards/ramonimbao/mona/v1/info.json b/keyboards/rmi_kb/mona/v1/info.json
index 6a6f8ccc0e..84ed48762d 100644
--- a/keyboards/ramonimbao/mona/v1/info.json
+++ b/keyboards/rmi_kb/mona/v1/info.json
@@ -1,8 +1,8 @@
 {
     "keyboard_name": "Mona",
-    "manufacturer": "Ramon Imbao",
+    "manufacturer": "RMI-KB",
     "url": "",
-    "maintainer": "Ramon Imbao",
+    "maintainer": "ramonimbao",
     "usb": {
         "vid": "0xB16B",
         "pid": "0x404A",
diff --git a/keyboards/ramonimbao/mona/v1/keymaps/default/keymap.c b/keyboards/rmi_kb/mona/v1/keymaps/default/keymap.c
index 430c77b289..430c77b289 100644
--- a/keyboards/ramonimbao/mona/v1/keymaps/default/keymap.c
+++ b/keyboards/rmi_kb/mona/v1/keymaps/default/keymap.c
diff --git a/keyboards/ramonimbao/mona/v1/keymaps/iso/keymap.c b/keyboards/rmi_kb/mona/v1/keymaps/iso/keymap.c
index 966f0b6efe..966f0b6efe 100644
--- a/keyboards/ramonimbao/mona/v1/keymaps/iso/keymap.c
+++ b/keyboards/rmi_kb/mona/v1/keymaps/iso/keymap.c
diff --git a/keyboards/ramonimbao/mona/v1/keymaps/via/keymap.c b/keyboards/rmi_kb/mona/v1/keymaps/via/keymap.c
index 14ba2a4339..14ba2a4339 100644
--- a/keyboards/ramonimbao/mona/v1/keymaps/via/keymap.c
+++ b/keyboards/rmi_kb/mona/v1/keymaps/via/keymap.c
diff --git a/keyboards/ramonimbao/mona/v1/keymaps/via/rules.mk b/keyboards/rmi_kb/mona/v1/keymaps/via/rules.mk
index 1e5b99807c..1e5b99807c 100644
--- a/keyboards/ramonimbao/mona/v1/keymaps/via/rules.mk
+++ b/keyboards/rmi_kb/mona/v1/keymaps/via/rules.mk
diff --git a/keyboards/ramonimbao/mona/v1/readme.md b/keyboards/rmi_kb/mona/v1/readme.md
index 8b6af0526e..192d452a5a 100644
--- a/keyboards/ramonimbao/mona/v1/readme.md
+++ b/keyboards/rmi_kb/mona/v1/readme.md
@@ -10,10 +10,10 @@ A gummy-worm o-ring mount 60% marble keyboard.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make ramonimbao/mona/v1:default
+    make rmi_kb/mona/v1:default
 
 Flashing example for this keyboard:
 
-    make ramonimbao/mona/v1:default:flash
+    make rmi_kb/mona/v1:default:flash
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/ramonimbao/mona/v1/rules.mk b/keyboards/rmi_kb/mona/v1/rules.mk
index ab2c49da70..ab2c49da70 100644
--- a/keyboards/ramonimbao/mona/v1/rules.mk
+++ b/keyboards/rmi_kb/mona/v1/rules.mk
diff --git a/keyboards/ramonimbao/mona/v1/v1.c b/keyboards/rmi_kb/mona/v1/v1.c
index d55373272d..d55373272d 100644
--- a/keyboards/ramonimbao/mona/v1/v1.c
+++ b/keyboards/rmi_kb/mona/v1/v1.c
diff --git a/keyboards/ramonimbao/mona/v1/v1.h b/keyboards/rmi_kb/mona/v1/v1.h
index 1bb416daed..1bb416daed 100644
--- a/keyboards/ramonimbao/mona/v1/v1.h
+++ b/keyboards/rmi_kb/mona/v1/v1.h
diff --git a/keyboards/ramonimbao/mona/v1_1/config.h b/keyboards/rmi_kb/mona/v1_1/config.h
index 2d7b5e33e4..2d7b5e33e4 100644
--- a/keyboards/ramonimbao/mona/v1_1/config.h
+++ b/keyboards/rmi_kb/mona/v1_1/config.h
diff --git a/keyboards/ramonimbao/mona/v1_1/info.json b/keyboards/rmi_kb/mona/v1_1/info.json
index dd1909b39d..77488da230 100644
--- a/keyboards/ramonimbao/mona/v1_1/info.json
+++ b/keyboards/rmi_kb/mona/v1_1/info.json
@@ -1,8 +1,8 @@
 {
     "keyboard_name": "Mona",
-    "manufacturer": "Ramon Imbao",
+    "manufacturer": "RMI-KB",
     "url": "",
-    "maintainer": "Ramon Imbao",
+    "maintainer": "ramonimbao",
     "usb": {
         "vid": "0xB16B",
         "pid": "0x404B",
diff --git a/keyboards/ramonimbao/mona/v1_1/keymaps/default/keymap.c b/keyboards/rmi_kb/mona/v1_1/keymaps/default/keymap.c
index 430c77b289..430c77b289 100644
--- a/keyboards/ramonimbao/mona/v1_1/keymaps/default/keymap.c
+++ b/keyboards/rmi_kb/mona/v1_1/keymaps/default/keymap.c
diff --git a/keyboards/ramonimbao/mona/v1_1/keymaps/iso/keymap.c b/keyboards/rmi_kb/mona/v1_1/keymaps/iso/keymap.c
index 966f0b6efe..966f0b6efe 100644
--- a/keyboards/ramonimbao/mona/v1_1/keymaps/iso/keymap.c
+++ b/keyboards/rmi_kb/mona/v1_1/keymaps/iso/keymap.c
diff --git a/keyboards/ramonimbao/mona/v1_1/keymaps/via/keymap.c b/keyboards/rmi_kb/mona/v1_1/keymaps/via/keymap.c
index f7e88610f0..f7e88610f0 100644
--- a/keyboards/ramonimbao/mona/v1_1/keymaps/via/keymap.c
+++ b/keyboards/rmi_kb/mona/v1_1/keymaps/via/keymap.c
diff --git a/keyboards/ramonimbao/mona/v1_1/keymaps/via/rules.mk b/keyboards/rmi_kb/mona/v1_1/keymaps/via/rules.mk
index 1e5b99807c..1e5b99807c 100644
--- a/keyboards/ramonimbao/mona/v1_1/keymaps/via/rules.mk
+++ b/keyboards/rmi_kb/mona/v1_1/keymaps/via/rules.mk
diff --git a/keyboards/ramonimbao/mona/v1_1/readme.md b/keyboards/rmi_kb/mona/v1_1/readme.md
index b28fedd76c..2df9019fcf 100644
--- a/keyboards/ramonimbao/mona/v1_1/readme.md
+++ b/keyboards/rmi_kb/mona/v1_1/readme.md
@@ -11,10 +11,10 @@ To get to the bootloader, with the USB cable plugged in, press the `RESET` butto
 
 Make example for this keyboard (after setting up your build environment):
 
-    make ramonimbao/mona:default
+    make rmi_kb/mona:default
 
 Flashing example for this keyboard:
 
-    make ramonimbao/mona:default:flash
+    make rmi_kb/mona:default:flash
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/ramonimbao/mona/v1_1/rules.mk b/keyboards/rmi_kb/mona/v1_1/rules.mk
index ab2c49da70..ab2c49da70 100644
--- a/keyboards/ramonimbao/mona/v1_1/rules.mk
+++ b/keyboards/rmi_kb/mona/v1_1/rules.mk
diff --git a/keyboards/ramonimbao/mona/v1_1/v1_1.c b/keyboards/rmi_kb/mona/v1_1/v1_1.c
index d6ebf98053..d6ebf98053 100644
--- a/keyboards/ramonimbao/mona/v1_1/v1_1.c
+++ b/keyboards/rmi_kb/mona/v1_1/v1_1.c
diff --git a/keyboards/ramonimbao/mona/v1_1/v1_1.h b/keyboards/rmi_kb/mona/v1_1/v1_1.h
index a7327c3b80..a7327c3b80 100644
--- a/keyboards/ramonimbao/mona/v1_1/v1_1.h
+++ b/keyboards/rmi_kb/mona/v1_1/v1_1.h
diff --git a/keyboards/ramonimbao/mona/v32a/config.h b/keyboards/rmi_kb/mona/v32a/config.h
index 1363c8635a..1363c8635a 100644
--- a/keyboards/ramonimbao/mona/v32a/config.h
+++ b/keyboards/rmi_kb/mona/v32a/config.h
diff --git a/keyboards/ramonimbao/mona/v32a/info.json b/keyboards/rmi_kb/mona/v32a/info.json
index 00d8641440..3e802d1a4e 100644
--- a/keyboards/ramonimbao/mona/v32a/info.json
+++ b/keyboards/rmi_kb/mona/v32a/info.json
@@ -1,8 +1,8 @@
 {
     "keyboard_name": "Mona",
-    "manufacturer": "Ramon Imbao",
+    "manufacturer": "RMI-KB",
     "url": "",
-    "maintainer": "Ramon Imbao",
+    "maintainer": "ramonimbao",
     "usb": {
         "vid": "0xB16B",
         "pid": "0x4032",
diff --git a/keyboards/ramonimbao/mona/v32a/keymaps/default/keymap.c b/keyboards/rmi_kb/mona/v32a/keymaps/default/keymap.c
index 430c77b289..430c77b289 100644
--- a/keyboards/ramonimbao/mona/v32a/keymaps/default/keymap.c
+++ b/keyboards/rmi_kb/mona/v32a/keymaps/default/keymap.c
diff --git a/keyboards/ramonimbao/mona/v32a/keymaps/iso/keymap.c b/keyboards/rmi_kb/mona/v32a/keymaps/iso/keymap.c
index 966f0b6efe..966f0b6efe 100644
--- a/keyboards/ramonimbao/mona/v32a/keymaps/iso/keymap.c
+++ b/keyboards/rmi_kb/mona/v32a/keymaps/iso/keymap.c
diff --git a/keyboards/ramonimbao/mona/v32a/keymaps/via/keymap.c b/keyboards/rmi_kb/mona/v32a/keymaps/via/keymap.c
index f7e88610f0..f7e88610f0 100644
--- a/keyboards/ramonimbao/mona/v32a/keymaps/via/keymap.c
+++ b/keyboards/rmi_kb/mona/v32a/keymaps/via/keymap.c
diff --git a/keyboards/ramonimbao/mona/v32a/keymaps/via/rules.mk b/keyboards/rmi_kb/mona/v32a/keymaps/via/rules.mk
index 1e5b99807c..1e5b99807c 100644
--- a/keyboards/ramonimbao/mona/v32a/keymaps/via/rules.mk
+++ b/keyboards/rmi_kb/mona/v32a/keymaps/via/rules.mk
diff --git a/keyboards/ramonimbao/mona/v32a/readme.md b/keyboards/rmi_kb/mona/v32a/readme.md
index 61a3deefaa..0666f95fec 100644
--- a/keyboards/ramonimbao/mona/v32a/readme.md
+++ b/keyboards/rmi_kb/mona/v32a/readme.md
@@ -11,10 +11,10 @@ To get to the bootloader, with the USB cable plugged in, press the `RESET` butto
 
 Make example for this keyboard (after setting up your build environment):
 
-    make ramonimbao/mona/v32a:default
+    make rmi_kb/mona/v32a:default
 
 Flashing example for this keyboard:
 
-    make ramonimbao/mona/v32a:default:flash
+    make rmi_kb/mona/v32a:default:flash
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/ramonimbao/mona/v32a/rules.mk b/keyboards/rmi_kb/mona/v32a/rules.mk
index 1e9f925544..1e9f925544 100644
--- a/keyboards/ramonimbao/mona/v32a/rules.mk
+++ b/keyboards/rmi_kb/mona/v32a/rules.mk
diff --git a/keyboards/ramonimbao/mona/v32a/v32a.c b/keyboards/rmi_kb/mona/v32a/v32a.c
index cc35f4d5ff..cc35f4d5ff 100644
--- a/keyboards/ramonimbao/mona/v32a/v32a.c
+++ b/keyboards/rmi_kb/mona/v32a/v32a.c
diff --git a/keyboards/ramonimbao/mona/v32a/v32a.h b/keyboards/rmi_kb/mona/v32a/v32a.h
index ac58b851a6..ac58b851a6 100644
--- a/keyboards/ramonimbao/mona/v32a/v32a.h
+++ b/keyboards/rmi_kb/mona/v32a/v32a.h
diff --git a/keyboards/ramonimbao/squishy65/chconf.h b/keyboards/rmi_kb/squishy65/chconf.h
index 144f324bc5..144f324bc5 100644
--- a/keyboards/ramonimbao/squishy65/chconf.h
+++ b/keyboards/rmi_kb/squishy65/chconf.h
diff --git a/keyboards/ramonimbao/squishy65/config.h b/keyboards/rmi_kb/squishy65/config.h
index b31d8d2ebd..b31d8d2ebd 100644
--- a/keyboards/ramonimbao/squishy65/config.h
+++ b/keyboards/rmi_kb/squishy65/config.h
diff --git a/keyboards/ramonimbao/squishy65/halconf.h b/keyboards/rmi_kb/squishy65/halconf.h
index 4ebba2e53b..4ebba2e53b 100644
--- a/keyboards/ramonimbao/squishy65/halconf.h
+++ b/keyboards/rmi_kb/squishy65/halconf.h
diff --git a/keyboards/ramonimbao/squishy65/info.json b/keyboards/rmi_kb/squishy65/info.json
index 58c4199590..6e374d5f2b 100644
--- a/keyboards/ramonimbao/squishy65/info.json
+++ b/keyboards/rmi_kb/squishy65/info.json
@@ -1,8 +1,8 @@
 {
     "keyboard_name": "Squishy65",
-    "manufacturer": "Ramon Imbao",
+    "manufacturer": "RMI-KB",
     "url": "",
-    "maintainer": "Ramon Imbao",
+    "maintainer": "ramonimbao",
     "usb": {
         "vid": "0xB16B",
         "pid": "0x10B5",
diff --git a/keyboards/ramonimbao/squishy65/keymaps/default/keymap.c b/keyboards/rmi_kb/squishy65/keymaps/default/keymap.c
index f22daf1760..f22daf1760 100644
--- a/keyboards/ramonimbao/squishy65/keymaps/default/keymap.c
+++ b/keyboards/rmi_kb/squishy65/keymaps/default/keymap.c
diff --git a/keyboards/ramonimbao/squishy65/keymaps/iso/keymap.c b/keyboards/rmi_kb/squishy65/keymaps/iso/keymap.c
index dedb48f333..dedb48f333 100644
--- a/keyboards/ramonimbao/squishy65/keymaps/iso/keymap.c
+++ b/keyboards/rmi_kb/squishy65/keymaps/iso/keymap.c
diff --git a/keyboards/rmi_kb/squishy65/keymaps/via/config.h b/keyboards/rmi_kb/squishy65/keymaps/via/config.h
new file mode 100644
index 0000000000..8b3f3ebf97
--- /dev/null
+++ b/keyboards/rmi_kb/squishy65/keymaps/via/config.h
@@ -0,0 +1,18 @@
+/* Copyright 2020 Ramon Imbao
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 2047
diff --git a/keyboards/ramonimbao/squishy65/keymaps/via/keymap.c b/keyboards/rmi_kb/squishy65/keymaps/via/keymap.c
index c1abb8cff6..c1abb8cff6 100644
--- a/keyboards/ramonimbao/squishy65/keymaps/via/keymap.c
+++ b/keyboards/rmi_kb/squishy65/keymaps/via/keymap.c
diff --git a/keyboards/ramonimbao/squishy65/keymaps/via/rules.mk b/keyboards/rmi_kb/squishy65/keymaps/via/rules.mk
index 1e5b99807c..1e5b99807c 100644
--- a/keyboards/ramonimbao/squishy65/keymaps/via/rules.mk
+++ b/keyboards/rmi_kb/squishy65/keymaps/via/rules.mk
diff --git a/keyboards/ramonimbao/squishy65/mcuconf.h b/keyboards/rmi_kb/squishy65/mcuconf.h
index f7ce173262..f7ce173262 100644
--- a/keyboards/ramonimbao/squishy65/mcuconf.h
+++ b/keyboards/rmi_kb/squishy65/mcuconf.h
diff --git a/keyboards/ramonimbao/squishy65/readme.md b/keyboards/rmi_kb/squishy65/readme.md
index 95dd1edfaf..7fbf0f6b85 100644
--- a/keyboards/ramonimbao/squishy65/readme.md
+++ b/keyboards/rmi_kb/squishy65/readme.md
@@ -9,6 +9,6 @@ A gasket mount stacked acrylic 65% keyboard.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make ramonimbao/squishy65:default
+    make rmi_kb/squishy65:default
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/ramonimbao/squishy65/rules.mk b/keyboards/rmi_kb/squishy65/rules.mk
index 4eaa5819ac..4eaa5819ac 100644
--- a/keyboards/ramonimbao/squishy65/rules.mk
+++ b/keyboards/rmi_kb/squishy65/rules.mk
diff --git a/keyboards/ramonimbao/squishy65/squishy65.c b/keyboards/rmi_kb/squishy65/squishy65.c
index 6d9fb24196..6d9fb24196 100644
--- a/keyboards/ramonimbao/squishy65/squishy65.c
+++ b/keyboards/rmi_kb/squishy65/squishy65.c
diff --git a/keyboards/ramonimbao/squishy65/squishy65.h b/keyboards/rmi_kb/squishy65/squishy65.h
index 25480c8748..25480c8748 100644
--- a/keyboards/ramonimbao/squishy65/squishy65.h
+++ b/keyboards/rmi_kb/squishy65/squishy65.h
diff --git a/keyboards/ramonimbao/squishyfrl/config.h b/keyboards/rmi_kb/squishyfrl/config.h
index 041407aed3..041407aed3 100644
--- a/keyboards/ramonimbao/squishyfrl/config.h
+++ b/keyboards/rmi_kb/squishyfrl/config.h
diff --git a/keyboards/ramonimbao/squishyfrl/halconf.h b/keyboards/rmi_kb/squishyfrl/halconf.h
index 344e66379f..344e66379f 100644
--- a/keyboards/ramonimbao/squishyfrl/halconf.h
+++ b/keyboards/rmi_kb/squishyfrl/halconf.h
diff --git a/keyboards/rmi_kb/squishyfrl/info.json b/keyboards/rmi_kb/squishyfrl/info.json
new file mode 100644
index 0000000000..f2dc2ebd24
--- /dev/null
+++ b/keyboards/rmi_kb/squishyfrl/info.json
@@ -0,0 +1,260 @@
+{
+    "keyboard_name": "SquishyFRL",
+    "manufacturer": "RMI-KB",
+    "url": "",
+    "maintainer": "ramonimbao",
+    "usb": {
+        "vid": "0xB16B",
+        "pid": "0x4BE5",
+        "device_version": "0.0.1"
+    },
+    "processor": "STM32F103",
+    "bootloader": "stm32duino",
+    "layouts": {
+        "LAYOUT_ansi": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0, "w":2},
+                {"x":15.25, "y":0},
+                {"x":16.25, "y":0},
+                {"x":17.25, "y":0},
+
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":13.5, "y":1, "w":1.5},
+                {"x":15.25, "y":1},
+                {"x":16.25, "y":1},
+                {"x":17.25, "y":1},
+
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2, "w":2.25},
+
+                {"x":0, "y":3, "w":2.25},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3, "w":1.75},
+                {"x":14, "y":3},
+                {"x":16.25, "y":3},
+
+                {"x":0, "y":4, "w":1.25},
+                {"x":1.25, "y":4, "w":1.25},
+                {"x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":6.25},
+                {"x":10, "y":4, "w":1.25},
+                {"x":11.25, "y":4, "w":1.25},
+                {"x":12.5, "y":4, "w":1.25},
+                {"x":13.75, "y":4, "w":1.25},
+                {"x":15.25, "y":4},
+                {"x":16.25, "y":4},
+                {"x":17.25, "y":4}
+            ]
+        },
+        "LAYOUT_iso": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0, "w":2},
+                {"x":15.25, "y":0},
+                {"x":16.25, "y":0},
+                {"x":17.25, "y":0},
+
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":15.25, "y":1},
+                {"x":16.25, "y":1},
+                {"x":17.25, "y":1},
+
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2},
+                {"x":13.75, "y":1, "w":1.25, "h":2},
+
+                {"x":0, "y":3, "w":1.25},
+                {"x":1.25, "y":3},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3, "w":1.75},
+                {"x":14, "y":3},
+                {"x":16.25, "y":3},
+
+                {"x":0, "y":4, "w":1.25},
+                {"x":1.25, "y":4, "w":1.25},
+                {"x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":6.25},
+                {"x":10, "y":4, "w":1.25},
+                {"x":11.25, "y":4, "w":1.25},
+                {"x":12.5, "y":4, "w":1.25},
+                {"x":13.75, "y":4, "w":1.25},
+                {"x":15.25, "y":4},
+                {"x":16.25, "y":4},
+                {"x":17.25, "y":4}
+            ]
+        },
+        "LAYOUT_all": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14, "y":0},
+                {"x":15.25, "y":0},
+                {"x":16.25, "y":0},
+                {"x":17.25, "y":0},
+
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":13.5, "y":1, "w":1.5},
+                {"x":15.25, "y":1},
+                {"x":16.25, "y":1},
+                {"x":17.25, "y":1},
+
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2, "w":2.25},
+
+                {"x":0, "y":3, "w":1.25},
+                {"x":1.25, "y":3},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3, "w":1.75},
+                {"x":14, "y":3},
+                {"x":16.25, "y":3},
+
+                {"x":0, "y":4, "w":1.25},
+                {"x":1.25, "y":4, "w":1.25},
+                {"x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":3},
+                {"x":6.75, "y":4},
+                {"x":7.75, "y":4, "w":2.25},
+                {"x":10, "y":4, "w":1.25},
+                {"x":11.25, "y":4, "w":1.25},
+                {"x":12.5, "y":4, "w":1.25},
+                {"x":13.75, "y":4, "w":1.25},
+                {"x":15.25, "y":4},
+                {"x":16.25, "y":4},
+                {"x":17.25, "y":4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/ramonimbao/squishyfrl/keymaps/default/keymap.c b/keyboards/rmi_kb/squishyfrl/keymaps/default/keymap.c
index c29df874c5..c29df874c5 100644
--- a/keyboards/ramonimbao/squishyfrl/keymaps/default/keymap.c
+++ b/keyboards/rmi_kb/squishyfrl/keymaps/default/keymap.c
diff --git a/keyboards/ramonimbao/squishyfrl/keymaps/default/readme.md b/keyboards/rmi_kb/squishyfrl/keymaps/default/readme.md
index b20cf74361..b20cf74361 100644
--- a/keyboards/ramonimbao/squishyfrl/keymaps/default/readme.md
+++ b/keyboards/rmi_kb/squishyfrl/keymaps/default/readme.md
diff --git a/keyboards/ramonimbao/squishyfrl/keymaps/iso/keymap.c b/keyboards/rmi_kb/squishyfrl/keymaps/iso/keymap.c
index e6dc1c974e..e6dc1c974e 100644
--- a/keyboards/ramonimbao/squishyfrl/keymaps/iso/keymap.c
+++ b/keyboards/rmi_kb/squishyfrl/keymaps/iso/keymap.c
diff --git a/keyboards/ramonimbao/squishyfrl/keymaps/via/config.h b/keyboards/rmi_kb/squishyfrl/keymaps/via/config.h
index c7cec8a9d7..c7cec8a9d7 100644
--- a/keyboards/ramonimbao/squishyfrl/keymaps/via/config.h
+++ b/keyboards/rmi_kb/squishyfrl/keymaps/via/config.h
diff --git a/keyboards/ramonimbao/squishyfrl/keymaps/via/keymap.c b/keyboards/rmi_kb/squishyfrl/keymaps/via/keymap.c
index 06e14e016e..06e14e016e 100644
--- a/keyboards/ramonimbao/squishyfrl/keymaps/via/keymap.c
+++ b/keyboards/rmi_kb/squishyfrl/keymaps/via/keymap.c
diff --git a/keyboards/ramonimbao/squishyfrl/keymaps/via/rules.mk b/keyboards/rmi_kb/squishyfrl/keymaps/via/rules.mk
index 1e5b99807c..1e5b99807c 100644
--- a/keyboards/ramonimbao/squishyfrl/keymaps/via/rules.mk
+++ b/keyboards/rmi_kb/squishyfrl/keymaps/via/rules.mk
diff --git a/keyboards/ramonimbao/squishyfrl/mcuconf.h b/keyboards/rmi_kb/squishyfrl/mcuconf.h
index b14bd32f80..b14bd32f80 100644
--- a/keyboards/ramonimbao/squishyfrl/mcuconf.h
+++ b/keyboards/rmi_kb/squishyfrl/mcuconf.h
diff --git a/keyboards/ramonimbao/squishyfrl/readme.md b/keyboards/rmi_kb/squishyfrl/readme.md
index e1039d560c..98bbec27e9 100644
--- a/keyboards/ramonimbao/squishyfrl/readme.md
+++ b/keyboards/rmi_kb/squishyfrl/readme.md
@@ -9,10 +9,10 @@ A stacked acrylic o-ring gasket mounted F-row-less TKL keyboard with a twist!
 
 Make example for this keyboard (after setting up your build environment):
 
-    make ramonimbao/squishyfrl:via
+    make rmi_kb/squishyfrl:via
 
 Flashing example for this keyboard:
 
-    dfu-util -d 1eaf:0003 -a 2 -D path/to/ramonimbao_squishyfrl_via.bin
+    dfu-util -d 1eaf:0003 -a 2 -D path/to/rmi_kb_squishyfrl_via.bin
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/ramonimbao/squishyfrl/rules.mk b/keyboards/rmi_kb/squishyfrl/rules.mk
index 5c31520ab4..5c31520ab4 100644
--- a/keyboards/ramonimbao/squishyfrl/rules.mk
+++ b/keyboards/rmi_kb/squishyfrl/rules.mk
diff --git a/keyboards/ramonimbao/squishyfrl/squishyfrl.c b/keyboards/rmi_kb/squishyfrl/squishyfrl.c
index db2a2ae933..db2a2ae933 100644
--- a/keyboards/ramonimbao/squishyfrl/squishyfrl.c
+++ b/keyboards/rmi_kb/squishyfrl/squishyfrl.c
diff --git a/keyboards/ramonimbao/squishyfrl/squishyfrl.h b/keyboards/rmi_kb/squishyfrl/squishyfrl.h
index e98139da16..e98139da16 100644
--- a/keyboards/ramonimbao/squishyfrl/squishyfrl.h
+++ b/keyboards/rmi_kb/squishyfrl/squishyfrl.h
diff --git a/keyboards/ramonimbao/squishytkl/config.h b/keyboards/rmi_kb/squishytkl/config.h
index e46aeea45a..e46aeea45a 100644
--- a/keyboards/ramonimbao/squishytkl/config.h
+++ b/keyboards/rmi_kb/squishytkl/config.h
diff --git a/keyboards/ramonimbao/squishytkl/halconf.h b/keyboards/rmi_kb/squishytkl/halconf.h
index 344e66379f..344e66379f 100644
--- a/keyboards/ramonimbao/squishytkl/halconf.h
+++ b/keyboards/rmi_kb/squishytkl/halconf.h
diff --git a/keyboards/ramonimbao/squishytkl/info.json b/keyboards/rmi_kb/squishytkl/info.json
index b5baf900a1..febd39bdf5 100644
--- a/keyboards/ramonimbao/squishytkl/info.json
+++ b/keyboards/rmi_kb/squishytkl/info.json
@@ -1,8 +1,8 @@
 {
     "keyboard_name": "SquishyTKL",
-    "manufacturer": "Ramon Imbao",
+    "manufacturer": "RMI-KB",
     "url": "",
-    "maintainer": "Ramon Imbao",
+    "maintainer": "ramonimbao",
     "usb": {
         "vid": "0xB16B",
         "pid": "0x00B1",
diff --git a/keyboards/ramonimbao/squishytkl/keymaps/default/keymap.c b/keyboards/rmi_kb/squishytkl/keymaps/default/keymap.c
index 2a6754c4af..2a6754c4af 100644
--- a/keyboards/ramonimbao/squishytkl/keymaps/default/keymap.c
+++ b/keyboards/rmi_kb/squishytkl/keymaps/default/keymap.c
diff --git a/keyboards/ramonimbao/squishytkl/keymaps/default/readme.md b/keyboards/rmi_kb/squishytkl/keymaps/default/readme.md
index b20cf74361..b20cf74361 100644
--- a/keyboards/ramonimbao/squishytkl/keymaps/default/readme.md
+++ b/keyboards/rmi_kb/squishytkl/keymaps/default/readme.md
diff --git a/keyboards/ramonimbao/squishytkl/keymaps/iso/keymap.c b/keyboards/rmi_kb/squishytkl/keymaps/iso/keymap.c
index 0f2502dc3d..0f2502dc3d 100644
--- a/keyboards/ramonimbao/squishytkl/keymaps/iso/keymap.c
+++ b/keyboards/rmi_kb/squishytkl/keymaps/iso/keymap.c
diff --git a/keyboards/ramonimbao/squishytkl/keymaps/jis/keymap.c b/keyboards/rmi_kb/squishytkl/keymaps/jis/keymap.c
index 280de324a6..8e56ec5f30 100644
--- a/keyboards/ramonimbao/squishytkl/keymaps/jis/keymap.c
+++ b/keyboards/rmi_kb/squishytkl/keymaps/jis/keymap.c
@@ -20,7 +20,7 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_jis(
         KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_MUTE,          KC_PSCR, KC_SCRL, KC_PAUS,
-        JP_ZHTG, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    JP_MINS, JP_CIRC, JP_YEN,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
+        JP_ZKHK, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    JP_MINS, JP_CIRC, JP_YEN,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    JP_AT,   JP_LBRC,                   KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    JP_SCLN, JP_COLN, JP_RBRC, KC_ENT,
         KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    JP_COMM, JP_DOT,  JP_SLSH, JP_BSLS, KC_RSFT,                            KC_UP,
diff --git a/keyboards/ramonimbao/squishytkl/keymaps/via/config.h b/keyboards/rmi_kb/squishytkl/keymaps/via/config.h
index 884fbd4871..884fbd4871 100644
--- a/keyboards/ramonimbao/squishytkl/keymaps/via/config.h
+++ b/keyboards/rmi_kb/squishytkl/keymaps/via/config.h
diff --git a/keyboards/ramonimbao/squishytkl/keymaps/via/keymap.c b/keyboards/rmi_kb/squishytkl/keymaps/via/keymap.c
index 7bd524f9d9..7bd524f9d9 100644
--- a/keyboards/ramonimbao/squishytkl/keymaps/via/keymap.c
+++ b/keyboards/rmi_kb/squishytkl/keymaps/via/keymap.c
diff --git a/keyboards/ramonimbao/squishytkl/keymaps/via/rules.mk b/keyboards/rmi_kb/squishytkl/keymaps/via/rules.mk
index 1e5b99807c..1e5b99807c 100644
--- a/keyboards/ramonimbao/squishytkl/keymaps/via/rules.mk
+++ b/keyboards/rmi_kb/squishytkl/keymaps/via/rules.mk
diff --git a/keyboards/ramonimbao/squishytkl/mcuconf.h b/keyboards/rmi_kb/squishytkl/mcuconf.h
index b14bd32f80..b14bd32f80 100644
--- a/keyboards/ramonimbao/squishytkl/mcuconf.h
+++ b/keyboards/rmi_kb/squishytkl/mcuconf.h
diff --git a/keyboards/ramonimbao/squishytkl/readme.md b/keyboards/rmi_kb/squishytkl/readme.md
index 29655d29d6..b8311ca5a4 100644
--- a/keyboards/ramonimbao/squishytkl/readme.md
+++ b/keyboards/rmi_kb/squishytkl/readme.md
@@ -9,10 +9,10 @@ A stacked acrylic o-ring gasket mounted TKL-sized keyboard with a twist!
 
 Make example for this keyboard (after setting up your build environment):
 
-    make ramonimbao/squishytkl:via
+    make rmi_kb/squishytkl:via
 
 Flashing example for this keyboard:
 
-    dfu-util -d 1eaf:0003 -a 2 -D path/to/ramonimbao_squishytkl_via.bin
+    dfu-util -d 1eaf:0003 -a 2 -D path/to/rmi_kb_squishytkl_via.bin
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/ramonimbao/squishytkl/rules.mk b/keyboards/rmi_kb/squishytkl/rules.mk
index ae292c0a5a..ae292c0a5a 100644
--- a/keyboards/ramonimbao/squishytkl/rules.mk
+++ b/keyboards/rmi_kb/squishytkl/rules.mk
diff --git a/keyboards/ramonimbao/squishytkl/squishytkl.c b/keyboards/rmi_kb/squishytkl/squishytkl.c
index 9a63c81364..9a63c81364 100644
--- a/keyboards/ramonimbao/squishytkl/squishytkl.c
+++ b/keyboards/rmi_kb/squishytkl/squishytkl.c
diff --git a/keyboards/ramonimbao/squishytkl/squishytkl.h b/keyboards/rmi_kb/squishytkl/squishytkl.h
index 204d497a57..204d497a57 100644
--- a/keyboards/ramonimbao/squishytkl/squishytkl.h
+++ b/keyboards/rmi_kb/squishytkl/squishytkl.h
diff --git a/keyboards/ramonimbao/tkl_ff/config.h b/keyboards/rmi_kb/tkl_ff/config.h
index 4dd0322d70..4dd0322d70 100644
--- a/keyboards/ramonimbao/tkl_ff/config.h
+++ b/keyboards/rmi_kb/tkl_ff/config.h
diff --git a/keyboards/ramonimbao/tkl_ff/info.json b/keyboards/rmi_kb/tkl_ff/info.json
index 9ad88092a3..5f263352ac 100644
--- a/keyboards/ramonimbao/tkl_ff/info.json
+++ b/keyboards/rmi_kb/tkl_ff/info.json
@@ -1,8 +1,8 @@
 {
     "keyboard_name": "TKL FF",
-    "manufacturer": "Ramon Imbao",
+    "manufacturer": "RMI-KB",
     "url": "",
-    "maintainer": "Ramon Imbao",
+    "maintainer": "ramonimbao",
     "usb": {
         "vid": "0xB16B",
         "device_version": "0.0.1"
diff --git a/keyboards/ramonimbao/tkl_ff/keymaps/default/keymap.c b/keyboards/rmi_kb/tkl_ff/keymaps/default/keymap.c
index d49d9d0b77..d49d9d0b77 100644
--- a/keyboards/ramonimbao/tkl_ff/keymaps/default/keymap.c
+++ b/keyboards/rmi_kb/tkl_ff/keymaps/default/keymap.c
diff --git a/keyboards/ramonimbao/tkl_ff/keymaps/iso/keymap.c b/keyboards/rmi_kb/tkl_ff/keymaps/iso/keymap.c
index 90319d52e6..90319d52e6 100644
--- a/keyboards/ramonimbao/tkl_ff/keymaps/iso/keymap.c
+++ b/keyboards/rmi_kb/tkl_ff/keymaps/iso/keymap.c
diff --git a/keyboards/ramonimbao/tkl_ff/keymaps/via/keymap.c b/keyboards/rmi_kb/tkl_ff/keymaps/via/keymap.c
index c7e5cd786a..c7e5cd786a 100644
--- a/keyboards/ramonimbao/tkl_ff/keymaps/via/keymap.c
+++ b/keyboards/rmi_kb/tkl_ff/keymaps/via/keymap.c
diff --git a/keyboards/ramonimbao/tkl_ff/keymaps/via/rules.mk b/keyboards/rmi_kb/tkl_ff/keymaps/via/rules.mk
index 1e5b99807c..1e5b99807c 100644
--- a/keyboards/ramonimbao/tkl_ff/keymaps/via/rules.mk
+++ b/keyboards/rmi_kb/tkl_ff/keymaps/via/rules.mk
diff --git a/keyboards/ramonimbao/tkl_ff/readme.md b/keyboards/rmi_kb/tkl_ff/readme.md
index ffc11f585e..3debe619a3 100644
--- a/keyboards/ramonimbao/tkl_ff/readme.md
+++ b/keyboards/rmi_kb/tkl_ff/readme.md
@@ -9,12 +9,12 @@ A TKL PCB made for the Geonworks Frog keyboard that supports both F12 and F13. V
 
 Make example for this keyboard (after setting up your build environment):
 
-    make ramonimbao/tkl_ff:default
+    make rmi_kb/tkl_ff:default
     
 To get to the bootloader, simply press the reset button located at the back of the PCB. You can then flash new firmware onto it.
 
 Flashing example for this keyboard:
 
-    make ramonimbao/tkl_ff:default:flash
+    make rmi_kb/tkl_ff:default:flash
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/ramonimbao/tkl_ff/rules.mk b/keyboards/rmi_kb/tkl_ff/rules.mk
index abeb993a67..6e2fbcde2e 100644
--- a/keyboards/ramonimbao/tkl_ff/rules.mk
+++ b/keyboards/rmi_kb/tkl_ff/rules.mk
@@ -11,4 +11,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
-DEFAULT_FOLDER = ramonimbao/tkl_ff/v1
+DEFAULT_FOLDER = rmi_kb/tkl_ff/v1
diff --git a/keyboards/ramonimbao/tkl_ff/tkl_ff.c b/keyboards/rmi_kb/tkl_ff/tkl_ff.c
index 4a4b7c204a..4a4b7c204a 100644
--- a/keyboards/ramonimbao/tkl_ff/tkl_ff.c
+++ b/keyboards/rmi_kb/tkl_ff/tkl_ff.c
diff --git a/keyboards/ramonimbao/tkl_ff/tkl_ff.h b/keyboards/rmi_kb/tkl_ff/tkl_ff.h
index cdc4ab60cb..cdc4ab60cb 100644
--- a/keyboards/ramonimbao/tkl_ff/tkl_ff.h
+++ b/keyboards/rmi_kb/tkl_ff/tkl_ff.h
diff --git a/keyboards/ramonimbao/tkl_ff/v1/info.json b/keyboards/rmi_kb/tkl_ff/v1/info.json
index 3370446f2d..3370446f2d 100644
--- a/keyboards/ramonimbao/tkl_ff/v1/info.json
+++ b/keyboards/rmi_kb/tkl_ff/v1/info.json
diff --git a/keyboards/ramonimbao/tkl_ff/v1/rules.mk b/keyboards/rmi_kb/tkl_ff/v1/rules.mk
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/ramonimbao/tkl_ff/v1/rules.mk
+++ b/keyboards/rmi_kb/tkl_ff/v1/rules.mk
diff --git a/keyboards/ramonimbao/tkl_ff/v2/config.h b/keyboards/rmi_kb/tkl_ff/v2/config.h
index eb60e5c311..eb60e5c311 100644
--- a/keyboards/ramonimbao/tkl_ff/v2/config.h
+++ b/keyboards/rmi_kb/tkl_ff/v2/config.h
diff --git a/keyboards/ramonimbao/tkl_ff/v2/info.json b/keyboards/rmi_kb/tkl_ff/v2/info.json
index ed70ec408c..ed70ec408c 100644
--- a/keyboards/ramonimbao/tkl_ff/v2/info.json
+++ b/keyboards/rmi_kb/tkl_ff/v2/info.json
diff --git a/keyboards/ramonimbao/tkl_ff/v2/rules.mk b/keyboards/rmi_kb/tkl_ff/v2/rules.mk
index 84ef473c02..84ef473c02 100644
--- a/keyboards/ramonimbao/tkl_ff/v2/rules.mk
+++ b/keyboards/rmi_kb/tkl_ff/v2/rules.mk
diff --git a/keyboards/ramonimbao/tkl_ff/v2/v2.c b/keyboards/rmi_kb/tkl_ff/v2/v2.c
index de5f32e3ca..de5f32e3ca 100644
--- a/keyboards/ramonimbao/tkl_ff/v2/v2.c
+++ b/keyboards/rmi_kb/tkl_ff/v2/v2.c
diff --git a/keyboards/ramonimbao/tkl_ff/v2/v2.h b/keyboards/rmi_kb/tkl_ff/v2/v2.h
index 7c4566defb..7c4566defb 100644
--- a/keyboards/ramonimbao/tkl_ff/v2/v2.h
+++ b/keyboards/rmi_kb/tkl_ff/v2/v2.h
diff --git a/keyboards/ramonimbao/wete/readme.md b/keyboards/rmi_kb/wete/readme.md
index 575b342b46..5a117c4875 100644
--- a/keyboards/ramonimbao/wete/readme.md
+++ b/keyboards/rmi_kb/wete/readme.md
@@ -7,8 +7,8 @@ Southpaw numpad 75% boards.
 
 Make example for these keyboards (after setting up your build environment):
 
-    make ramonimbao/wete/v1:default
+    make rmi_kb/wete/v1:default
     
-    make ramonimbao/wete/v2:default
+    make rmi_kb/wete/v2:default
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/rmi_kb/wete/rules.mk b/keyboards/rmi_kb/wete/rules.mk
new file mode 100644
index 0000000000..cda6fbfbe4
--- /dev/null
+++ b/keyboards/rmi_kb/wete/rules.mk
@@ -0,0 +1 @@
+DEFAULT_FOLDER = rmi_kb/wete/v2
diff --git a/keyboards/ramonimbao/wete/v1/chconf.h b/keyboards/rmi_kb/wete/v1/chconf.h
index 18befdb8e1..18befdb8e1 100644
--- a/keyboards/ramonimbao/wete/v1/chconf.h
+++ b/keyboards/rmi_kb/wete/v1/chconf.h
diff --git a/keyboards/ramonimbao/wete/v1/config.h b/keyboards/rmi_kb/wete/v1/config.h
index 732848465e..732848465e 100644
--- a/keyboards/ramonimbao/wete/v1/config.h
+++ b/keyboards/rmi_kb/wete/v1/config.h
diff --git a/keyboards/ramonimbao/wete/v1/halconf.h b/keyboards/rmi_kb/wete/v1/halconf.h
index b3de873be1..b3de873be1 100644
--- a/keyboards/ramonimbao/wete/v1/halconf.h
+++ b/keyboards/rmi_kb/wete/v1/halconf.h
diff --git a/keyboards/ramonimbao/wete/v1/info.json b/keyboards/rmi_kb/wete/v1/info.json
index a8446b1db9..f36f7cefa7 100644
--- a/keyboards/ramonimbao/wete/v1/info.json
+++ b/keyboards/rmi_kb/wete/v1/info.json
@@ -1,8 +1,8 @@
 {
     "keyboard_name": "Wete",
-    "manufacturer": "Ramon Imbao",
+    "manufacturer": "RMI-KB",
     "url": "",
-    "maintainer": "Ramon Imbao",
+    "maintainer": "ramonimbao",
     "usb": {
         "vid": "0xB16B",
         "pid": "0x00B5",
diff --git a/keyboards/ramonimbao/wete/v1/keymaps/default/keymap.c b/keyboards/rmi_kb/wete/v1/keymaps/default/keymap.c
index 73f3811e76..73f3811e76 100644
--- a/keyboards/ramonimbao/wete/v1/keymaps/default/keymap.c
+++ b/keyboards/rmi_kb/wete/v1/keymaps/default/keymap.c
diff --git a/keyboards/ramonimbao/wete/v1/keymaps/iso/keymap.c b/keyboards/rmi_kb/wete/v1/keymaps/iso/keymap.c
index afaf6bfe9e..afaf6bfe9e 100644
--- a/keyboards/ramonimbao/wete/v1/keymaps/iso/keymap.c
+++ b/keyboards/rmi_kb/wete/v1/keymaps/iso/keymap.c
diff --git a/keyboards/ramonimbao/wete/v1/keymaps/jis/keymap.c b/keyboards/rmi_kb/wete/v1/keymaps/jis/keymap.c
index 11db8e7da9..11db8e7da9 100644
--- a/keyboards/ramonimbao/wete/v1/keymaps/jis/keymap.c
+++ b/keyboards/rmi_kb/wete/v1/keymaps/jis/keymap.c
diff --git a/keyboards/rmi_kb/wete/v1/keymaps/via/config.h b/keyboards/rmi_kb/wete/v1/keymaps/via/config.h
new file mode 100644
index 0000000000..c74a6d2923
--- /dev/null
+++ b/keyboards/rmi_kb/wete/v1/keymaps/via/config.h
@@ -0,0 +1,18 @@
+/* Copyright 2020 Ramon Imbao
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once 
+
+#define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 2047
diff --git a/keyboards/ramonimbao/wete/v1/keymaps/via/keymap.c b/keyboards/rmi_kb/wete/v1/keymaps/via/keymap.c
index b9acb6cace..b9acb6cace 100644
--- a/keyboards/ramonimbao/wete/v1/keymaps/via/keymap.c
+++ b/keyboards/rmi_kb/wete/v1/keymaps/via/keymap.c
diff --git a/keyboards/ramonimbao/wete/v1/keymaps/via/rules.mk b/keyboards/rmi_kb/wete/v1/keymaps/via/rules.mk
index 666e72557b..666e72557b 100644
--- a/keyboards/ramonimbao/wete/v1/keymaps/via/rules.mk
+++ b/keyboards/rmi_kb/wete/v1/keymaps/via/rules.mk
diff --git a/keyboards/ramonimbao/wete/v1/mcuconf.h b/keyboards/rmi_kb/wete/v1/mcuconf.h
index 7a2e877763..7a2e877763 100644
--- a/keyboards/ramonimbao/wete/v1/mcuconf.h
+++ b/keyboards/rmi_kb/wete/v1/mcuconf.h
diff --git a/keyboards/ramonimbao/wete/v1/readme.md b/keyboards/rmi_kb/wete/v1/readme.md
index f0f26b78bd..f1835894ac 100644
--- a/keyboards/ramonimbao/wete/v1/readme.md
+++ b/keyboards/rmi_kb/wete/v1/readme.md
@@ -9,6 +9,6 @@ A southpaw full-sized keyboard.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make ramonimbao/wete:default
+    make rmi_kb/wete/v1:default
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/ramonimbao/wete/v1/rules.mk b/keyboards/rmi_kb/wete/v1/rules.mk
index e81a5dd98e..e81a5dd98e 100644
--- a/keyboards/ramonimbao/wete/v1/rules.mk
+++ b/keyboards/rmi_kb/wete/v1/rules.mk
diff --git a/keyboards/rmi_kb/wete/v1/v1.c b/keyboards/rmi_kb/wete/v1/v1.c
new file mode 100644
index 0000000000..71002461a1
--- /dev/null
+++ b/keyboards/rmi_kb/wete/v1/v1.c
@@ -0,0 +1,35 @@
+/* Copyright 2020 Ramon Imbao
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "v1.h"
+
+void keyboard_pre_init_user(void) {
+    // Initialize indicator LED pins
+    setPinOutput(A14); // Num Lock
+    setPinOutput(A15); // Scroll Lock
+    setPinOutput(B3); // Caps Lock
+}
+
+bool led_update_kb(led_t led_state) {
+    bool res = led_update_user(led_state);
+    if (res) {
+        writePin(A14, !led_state.num_lock);
+        writePin(A15, !led_state.scroll_lock);
+        writePin(B3, !led_state.caps_lock);
+    }
+
+    return res;
+}
diff --git a/keyboards/ramonimbao/wete/v1/v1.h b/keyboards/rmi_kb/wete/v1/v1.h
index 46daf6d6f1..55bb035b8b 100644
--- a/keyboards/ramonimbao/wete/v1/v1.h
+++ b/keyboards/rmi_kb/wete/v1/v1.h
@@ -1,3 +1,19 @@
+/* Copyright 2020 Ramon Imbao
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #pragma once
 
 #include "quantum.h"
diff --git a/keyboards/ramonimbao/wete/v2/config.h b/keyboards/rmi_kb/wete/v2/config.h
index e719e4f835..e719e4f835 100644
--- a/keyboards/ramonimbao/wete/v2/config.h
+++ b/keyboards/rmi_kb/wete/v2/config.h
diff --git a/keyboards/ramonimbao/wete/v2/info.json b/keyboards/rmi_kb/wete/v2/info.json
index eccd2815be..d1aa783336 100644
--- a/keyboards/ramonimbao/wete/v2/info.json
+++ b/keyboards/rmi_kb/wete/v2/info.json
@@ -1,8 +1,8 @@
 {
     "keyboard_name": "Wete R2",
-    "manufacturer": "Ramon Imbao",
+    "manufacturer": "RMI-KB",
     "url": "",
-    "maintainer": "Ramon Imbao",
+    "maintainer": "ramonimbao",
     "usb": {
         "vid": "0xB16B",
         "pid": "0x00B3",
diff --git a/keyboards/ramonimbao/wete/v2/keymaps/default/keymap.c b/keyboards/rmi_kb/wete/v2/keymaps/default/keymap.c
index 3916d18366..3916d18366 100644
--- a/keyboards/ramonimbao/wete/v2/keymaps/default/keymap.c
+++ b/keyboards/rmi_kb/wete/v2/keymaps/default/keymap.c
diff --git a/keyboards/ramonimbao/wete/v2/keymaps/iso/keymap.c b/keyboards/rmi_kb/wete/v2/keymaps/iso/keymap.c
index 12933c4b57..12933c4b57 100644
--- a/keyboards/ramonimbao/wete/v2/keymaps/iso/keymap.c
+++ b/keyboards/rmi_kb/wete/v2/keymaps/iso/keymap.c
diff --git a/keyboards/ramonimbao/wete/v2/keymaps/via/config.h b/keyboards/rmi_kb/wete/v2/keymaps/via/config.h
index c7cec8a9d7..c7cec8a9d7 100644
--- a/keyboards/ramonimbao/wete/v2/keymaps/via/config.h
+++ b/keyboards/rmi_kb/wete/v2/keymaps/via/config.h
diff --git a/keyboards/ramonimbao/wete/v2/keymaps/via/keymap.c b/keyboards/rmi_kb/wete/v2/keymaps/via/keymap.c
index 8afc6f9c25..8afc6f9c25 100644
--- a/keyboards/ramonimbao/wete/v2/keymaps/via/keymap.c
+++ b/keyboards/rmi_kb/wete/v2/keymaps/via/keymap.c
diff --git a/keyboards/ramonimbao/wete/v2/keymaps/via/rules.mk b/keyboards/rmi_kb/wete/v2/keymaps/via/rules.mk
index 1e5b99807c..1e5b99807c 100644
--- a/keyboards/ramonimbao/wete/v2/keymaps/via/rules.mk
+++ b/keyboards/rmi_kb/wete/v2/keymaps/via/rules.mk
diff --git a/keyboards/ramonimbao/wete/v2/readme.md b/keyboards/rmi_kb/wete/v2/readme.md
index d99c611560..5867c5ea7e 100644
--- a/keyboards/ramonimbao/wete/v2/readme.md
+++ b/keyboards/rmi_kb/wete/v2/readme.md
@@ -9,11 +9,11 @@ Round two of the Wete keyboard. Now uses the ATmega32u4, adds an encoder, and sw
 
 Make example for this keyboard (after setting up your build environment):
 
-    make ramonimbao/wete/v2:default
+    make rmi_kb/wete/v2:default
 
 Flashing example for this keyboard:
 
-    make ramonimbao/wete/v2:default:flash
+    make rmi_kb/wete/v2:default:flash
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
 
diff --git a/keyboards/ramonimbao/wete/v2/rules.mk b/keyboards/rmi_kb/wete/v2/rules.mk
index 7386bf6999..7386bf6999 100644
--- a/keyboards/ramonimbao/wete/v2/rules.mk
+++ b/keyboards/rmi_kb/wete/v2/rules.mk
diff --git a/keyboards/ramonimbao/wete/v2/v2.c b/keyboards/rmi_kb/wete/v2/v2.c
index de5f32e3ca..de5f32e3ca 100644
--- a/keyboards/ramonimbao/wete/v2/v2.c
+++ b/keyboards/rmi_kb/wete/v2/v2.c
diff --git a/keyboards/ramonimbao/wete/v2/v2.h b/keyboards/rmi_kb/wete/v2/v2.h
index 75c9430c02..75c9430c02 100644
--- a/keyboards/ramonimbao/wete/v2/v2.h
+++ b/keyboards/rmi_kb/wete/v2/v2.h