38 files changed, 5 insertions, 5 deletions
diff --git a/keyboards/diverge3/config.h b/keyboards/unikeyboard/diverge3/config.h
index 45dedfe621..45dedfe621 100644
--- a/keyboards/diverge3/config.h
+++ b/keyboards/unikeyboard/diverge3/config.h
diff --git a/keyboards/diverge3/diverge3.c b/keyboards/unikeyboard/diverge3/diverge3.c
index 4143b14275..4143b14275 100644
--- a/keyboards/diverge3/diverge3.c
+++ b/keyboards/unikeyboard/diverge3/diverge3.c
diff --git a/keyboards/diverge3/diverge3.h b/keyboards/unikeyboard/diverge3/diverge3.h
index c668bb29ef..c668bb29ef 100644
--- a/keyboards/diverge3/diverge3.h
+++ b/keyboards/unikeyboard/diverge3/diverge3.h
diff --git a/keyboards/diverge3/info.json b/keyboards/unikeyboard/diverge3/info.json
index fc678b40bc..fc678b40bc 100644
--- a/keyboards/diverge3/info.json
+++ b/keyboards/unikeyboard/diverge3/info.json
diff --git a/keyboards/diverge3/keymaps/default/config.h b/keyboards/unikeyboard/diverge3/keymaps/default/config.h
index fc375f0812..fc375f0812 100644
--- a/keyboards/diverge3/keymaps/default/config.h
+++ b/keyboards/unikeyboard/diverge3/keymaps/default/config.h
diff --git a/keyboards/diverge3/keymaps/default/keymap.c b/keyboards/unikeyboard/diverge3/keymaps/default/keymap.c
index acf262696b..acf262696b 100644
--- a/keyboards/diverge3/keymaps/default/keymap.c
+++ b/keyboards/unikeyboard/diverge3/keymaps/default/keymap.c
diff --git a/keyboards/diverge3/keymaps/default/readme.md b/keyboards/unikeyboard/diverge3/keymaps/default/readme.md
index c2e698b3ce..c2e698b3ce 100644
--- a/keyboards/diverge3/keymaps/default/readme.md
+++ b/keyboards/unikeyboard/diverge3/keymaps/default/readme.md
diff --git a/keyboards/diverge3/keymaps/default/rules.mk b/keyboards/unikeyboard/diverge3/keymaps/default/rules.mk
index e5ddcae8d9..e5ddcae8d9 100644
--- a/keyboards/diverge3/keymaps/default/rules.mk
+++ b/keyboards/unikeyboard/diverge3/keymaps/default/rules.mk
diff --git a/keyboards/diverge3/keymaps/iso_uk/config.h b/keyboards/unikeyboard/diverge3/keymaps/iso_uk/config.h
index 83f65979c7..83f65979c7 100755
--- a/keyboards/diverge3/keymaps/iso_uk/config.h
+++ b/keyboards/unikeyboard/diverge3/keymaps/iso_uk/config.h
diff --git a/keyboards/diverge3/keymaps/iso_uk/keymap.c b/keyboards/unikeyboard/diverge3/keymaps/iso_uk/keymap.c
index 2564640293..2564640293 100644
--- a/keyboards/diverge3/keymaps/iso_uk/keymap.c
+++ b/keyboards/unikeyboard/diverge3/keymaps/iso_uk/keymap.c
diff --git a/keyboards/diverge3/keymaps/iso_uk/readme.md b/keyboards/unikeyboard/diverge3/keymaps/iso_uk/readme.md
index ff4971754a..ff4971754a 100755
--- a/keyboards/diverge3/keymaps/iso_uk/readme.md
+++ b/keyboards/unikeyboard/diverge3/keymaps/iso_uk/readme.md
diff --git a/keyboards/diverge3/keymaps/iso_uk/rules.mk b/keyboards/unikeyboard/diverge3/keymaps/iso_uk/rules.mk
index c9383ab8db..c9383ab8db 100755
--- a/keyboards/diverge3/keymaps/iso_uk/rules.mk
+++ b/keyboards/unikeyboard/diverge3/keymaps/iso_uk/rules.mk
diff --git a/keyboards/diverge3/keymaps/workman/config.h b/keyboards/unikeyboard/diverge3/keymaps/workman/config.h
index 9829a604f1..9829a604f1 100644
--- a/keyboards/diverge3/keymaps/workman/config.h
+++ b/keyboards/unikeyboard/diverge3/keymaps/workman/config.h
diff --git a/keyboards/diverge3/keymaps/workman/keymap.c b/keyboards/unikeyboard/diverge3/keymaps/workman/keymap.c
index 415df2eead..415df2eead 100644
--- a/keyboards/diverge3/keymaps/workman/keymap.c
+++ b/keyboards/unikeyboard/diverge3/keymaps/workman/keymap.c
diff --git a/keyboards/diverge3/keymaps/workman/readme.md b/keyboards/unikeyboard/diverge3/keymaps/workman/readme.md
index 48ba482fe6..48ba482fe6 100644
--- a/keyboards/diverge3/keymaps/workman/readme.md
+++ b/keyboards/unikeyboard/diverge3/keymaps/workman/readme.md
diff --git a/keyboards/diverge3/keymaps/workman/rules.mk b/keyboards/unikeyboard/diverge3/keymaps/workman/rules.mk
index 8b13789179..8b13789179 100644
--- a/keyboards/diverge3/keymaps/workman/rules.mk
+++ b/keyboards/unikeyboard/diverge3/keymaps/workman/rules.mk
diff --git a/keyboards/diverge3/readme.md b/keyboards/unikeyboard/diverge3/readme.md
index 45ddaa64cf..6e4cf3d781 100644
--- a/keyboards/diverge3/readme.md
+++ b/keyboards/unikeyboard/diverge3/readme.md
@@ -8,13 +8,13 @@ Hardware Availability: [Diverge 3](https://unikeyboard.io/product/diverge/)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make diverge3:default
+    make unikeyboard/diverge3:default
 
 Or for the [Workman](https://github.com/ojbucao/workman) layout:
 
-    make diverge3:workman
+    make unikeyboard/diverge3:workman
 
 See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
 
 # Reflashing Animus
-Reflashing the stock firmware is pretty easy. Just follow the same steps in the [original guide](https://imgur.com/a/8UapN). You will have to manually reset the Pro Micro (by shorting the GND and RST pins) during the upload step. Then reapply your keymap through Arbites.
-\ No newline at end of file
+Reflashing the stock firmware is pretty easy. Just follow the same steps in the [original guide](https://imgur.com/a/8UapN). You will have to manually reset the Pro Micro (by shorting the GND and RST pins) during the upload step. Then reapply your keymap through Arbites.
diff --git a/keyboards/diverge3/rules.mk b/keyboards/unikeyboard/diverge3/rules.mk
index 7fc9fd2291..7fc9fd2291 100644
--- a/keyboards/diverge3/rules.mk
+++ b/keyboards/unikeyboard/diverge3/rules.mk
diff --git a/keyboards/divergetm2/config.h b/keyboards/unikeyboard/divergetm2/config.h
index ee8372aa7e..ee8372aa7e 100644
--- a/keyboards/divergetm2/config.h
+++ b/keyboards/unikeyboard/divergetm2/config.h
diff --git a/keyboards/divergetm2/divergetm2.c b/keyboards/unikeyboard/divergetm2/divergetm2.c
index 61ea45416c..61ea45416c 100644
--- a/keyboards/divergetm2/divergetm2.c
+++ b/keyboards/unikeyboard/divergetm2/divergetm2.c
diff --git a/keyboards/divergetm2/divergetm2.h b/keyboards/unikeyboard/divergetm2/divergetm2.h
index 6de48e41c7..6de48e41c7 100644
--- a/keyboards/divergetm2/divergetm2.h
+++ b/keyboards/unikeyboard/divergetm2/divergetm2.h
diff --git a/keyboards/divergetm2/info.json b/keyboards/unikeyboard/divergetm2/info.json
index fc64e57906..fc64e57906 100644
--- a/keyboards/divergetm2/info.json
+++ b/keyboards/unikeyboard/divergetm2/info.json
diff --git a/keyboards/divergetm2/keymaps/default/config.h b/keyboards/unikeyboard/divergetm2/keymaps/default/config.h
index ccd00621fd..ccd00621fd 100644
--- a/keyboards/divergetm2/keymaps/default/config.h
+++ b/keyboards/unikeyboard/divergetm2/keymaps/default/config.h
diff --git a/keyboards/divergetm2/keymaps/default/keymap.c b/keyboards/unikeyboard/divergetm2/keymaps/default/keymap.c
index fb5957ccae..fb5957ccae 100644
--- a/keyboards/divergetm2/keymaps/default/keymap.c
+++ b/keyboards/unikeyboard/divergetm2/keymaps/default/keymap.c
diff --git a/keyboards/divergetm2/keymaps/default/readme.md b/keyboards/unikeyboard/divergetm2/keymaps/default/readme.md
index dceb4f8a95..dceb4f8a95 100644
--- a/keyboards/divergetm2/keymaps/default/readme.md
+++ b/keyboards/unikeyboard/divergetm2/keymaps/default/readme.md
diff --git a/keyboards/divergetm2/keymaps/xtonhasvim/config.h b/keyboards/unikeyboard/divergetm2/keymaps/xtonhasvim/config.h
index 4ba4a57165..4ba4a57165 100644
--- a/keyboards/divergetm2/keymaps/xtonhasvim/config.h
+++ b/keyboards/unikeyboard/divergetm2/keymaps/xtonhasvim/config.h
diff --git a/keyboards/divergetm2/keymaps/xtonhasvim/keymap.c b/keyboards/unikeyboard/divergetm2/keymaps/xtonhasvim/keymap.c
index 5f478c1df1..5f478c1df1 100644
--- a/keyboards/divergetm2/keymaps/xtonhasvim/keymap.c
+++ b/keyboards/unikeyboard/divergetm2/keymaps/xtonhasvim/keymap.c
diff --git a/keyboards/divergetm2/keymaps/xtonhasvim/readme.md b/keyboards/unikeyboard/divergetm2/keymaps/xtonhasvim/readme.md
index 9ff4ce1f19..9ff4ce1f19 100644
--- a/keyboards/divergetm2/keymaps/xtonhasvim/readme.md
+++ b/keyboards/unikeyboard/divergetm2/keymaps/xtonhasvim/readme.md
diff --git a/keyboards/divergetm2/keymaps/xtonhasvim/rules.mk b/keyboards/unikeyboard/divergetm2/keymaps/xtonhasvim/rules.mk
index ede4e02b64..ede4e02b64 100644
--- a/keyboards/divergetm2/keymaps/xtonhasvim/rules.mk
+++ b/keyboards/unikeyboard/divergetm2/keymaps/xtonhasvim/rules.mk
diff --git a/keyboards/divergetm2/readme.md b/keyboards/unikeyboard/divergetm2/readme.md
index 893b82cb5c..5bff74389f 100644
--- a/keyboards/divergetm2/readme.md
+++ b/keyboards/unikeyboard/divergetm2/readme.md
@@ -8,7 +8,7 @@ Hardware Availability: [Diverge TM2](https://unikeyboard.io/product/diverge-tm/)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make divergetm2:default
+    make unikeyboard/divergetm2: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/divergetm2/rules.mk b/keyboards/unikeyboard/divergetm2/rules.mk
index bd53948797..bd53948797 100644
--- a/keyboards/divergetm2/rules.mk
+++ b/keyboards/unikeyboard/divergetm2/rules.mk
diff --git a/keyboards/felix/config.h b/keyboards/unikeyboard/felix/config.h
index 73f9d1fa86..73f9d1fa86 100644
--- a/keyboards/felix/config.h
+++ b/keyboards/unikeyboard/felix/config.h
diff --git a/keyboards/felix/felix.c b/keyboards/unikeyboard/felix/felix.c
index 013360d043..013360d043 100644
--- a/keyboards/felix/felix.c
+++ b/keyboards/unikeyboard/felix/felix.c
diff --git a/keyboards/felix/felix.h b/keyboards/unikeyboard/felix/felix.h
index f43a586c8e..f43a586c8e 100644
--- a/keyboards/felix/felix.h
+++ b/keyboards/unikeyboard/felix/felix.h
diff --git a/keyboards/felix/info.json b/keyboards/unikeyboard/felix/info.json
index f81d56f340..f81d56f340 100644
--- a/keyboards/felix/info.json
+++ b/keyboards/unikeyboard/felix/info.json
diff --git a/keyboards/felix/keymaps/default/keymap.c b/keyboards/unikeyboard/felix/keymaps/default/keymap.c
index 630a46c086..630a46c086 100644
--- a/keyboards/felix/keymaps/default/keymap.c
+++ b/keyboards/unikeyboard/felix/keymaps/default/keymap.c
diff --git a/keyboards/felix/readme.md b/keyboards/unikeyboard/felix/readme.md
index 0a3fe10a6e..2ea41d382f 100644
--- a/keyboards/felix/readme.md
+++ b/keyboards/unikeyboard/felix/readme.md
@@ -8,6 +8,6 @@ Hardware Availability: [Unikeyboard](https://unikeyboard.io/product/felix/)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make felix:default
+    make unikeyboard/felix: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/felix/rules.mk b/keyboards/unikeyboard/felix/rules.mk
index 9fbe5d4dad..9fbe5d4dad 100644
--- a/keyboards/felix/rules.mk
+++ b/keyboards/unikeyboard/felix/rules.mk