22 files changed, 6 insertions, 5 deletions
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screenbuilder/ScreenMaster.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screenbuilder/ScreenMaster.java
index 997bd5a9..114aa0cb 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screenbuilder/ScreenMaster.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screenbuilder/ScreenMaster.java
@@ -42,11 +42,12 @@ public class ScreenMaster {
 
             if (screenType.equals("standard")) {
                 standardMap.put(location, new ScreenBuilder(ident));
-            } else if (screenType.equals("screenA")) {
+            } else if (screenType.equals("screen_a")) {
                 screenAMap.put(location, new ScreenBuilder(ident));
-            } else if (screenType.equals("screenB")) {
+            } else if (screenType.equals("screen_b")) {
                 screenBMap.put(location, new ScreenBuilder(ident));
             }
+
         } catch (IOException ioex) {
             LOGGER.error("Can't load screen definition from {}", path);
         }
diff --git a/src/main/resources/assets/skyblocker/tabhud/readme.md b/src/main/resources/assets/skyblocker/tabhud/readme.md
index 2d3dcf67..1f294cb4 100644
--- a/src/main/resources/assets/skyblocker/tabhud/readme.md
+++ b/src/main/resources/assets/skyblocker/tabhud/readme.md
@@ -6,11 +6,11 @@ my_pack
 └───assets
     └───skyblocker
         └───tabhud
-            ├───screenA
-            ├───screenB
+            ├───screen_a
+            ├───screen_b
             └───standard
 ```
-The three dirs `screenA`, `screenB` and `standard` contain the screen definition JSON files as described below. `standard` describes the screens shown when just the TAB key is pressed, while `screenA/B` describe the screens shown when using the modifier keys A and B (default binds: N and B).
+The three dirs `screen_a`, `screen_b` and `standard` contain the screen definition JSON files as described below. `standard` describes the screens shown when just the TAB key is pressed, while `screen_a/b` describe the screens shown when using the modifier keys A and B (default binds: N and B).
 The file names are used to describe where a screen is shown. They are case sensitive. For a full list of possible names see Appendix A. While this scheme necessitates duplicate file contents and results in similar file names in different directories, it also allows for much control both when creating a complete layout or when only overriding specific screens.
 
 # Screen definition JSONs
diff --git a/src/main/resources/assets/skyblocker/tabhud/screenA/default.json b/src/main/resources/assets/skyblocker/tabhud/screen_a/default.json
index dcfa5138..dcfa5138 100644
--- a/src/main/resources/assets/skyblocker/tabhud/screenA/default.json
+++ b/src/main/resources/assets/skyblocker/tabhud/screen_a/default.json
diff --git a/src/main/resources/assets/skyblocker/tabhud/screenA/garden.json b/src/main/resources/assets/skyblocker/tabhud/screen_a/garden.json
index 3e1556ef..3e1556ef 100644
--- a/src/main/resources/assets/skyblocker/tabhud/screenA/garden.json
+++ b/src/main/resources/assets/skyblocker/tabhud/screen_a/garden.json
diff --git a/src/main/resources/assets/skyblocker/tabhud/screenA/rift.json b/src/main/resources/assets/skyblocker/tabhud/screen_a/rift.json
index 8d1d4c5f..8d1d4c5f 100644
--- a/src/main/resources/assets/skyblocker/tabhud/screenA/rift.json
+++ b/src/main/resources/assets/skyblocker/tabhud/screen_a/rift.json
diff --git a/src/main/resources/assets/skyblocker/tabhud/screenA/unknown.json b/src/main/resources/assets/skyblocker/tabhud/screen_a/unknown.json
index 0252940a..0252940a 100644
--- a/src/main/resources/assets/skyblocker/tabhud/screenA/unknown.json
+++ b/src/main/resources/assets/skyblocker/tabhud/screen_a/unknown.json
diff --git a/src/main/resources/assets/skyblocker/tabhud/screenB/default.json b/src/main/resources/assets/skyblocker/tabhud/screen_b/default.json
index a1f52ad5..a1f52ad5 100644
--- a/src/main/resources/assets/skyblocker/tabhud/screenB/default.json
+++ b/src/main/resources/assets/skyblocker/tabhud/screen_b/default.json
diff --git a/src/main/resources/assets/skyblocker/tabhud/screenB/dungeon.json b/src/main/resources/assets/skyblocker/tabhud/screen_b/dungeon.json
index 075e3d4c..075e3d4c 100644
--- a/src/main/resources/assets/skyblocker/tabhud/screenB/dungeon.json
+++ b/src/main/resources/assets/skyblocker/tabhud/screen_b/dungeon.json
diff --git a/src/main/resources/assets/skyblocker/tabhud/screenB/garden.json b/src/main/resources/assets/skyblocker/tabhud/screen_b/garden.json
index 772e0594..772e0594 100644
--- a/src/main/resources/assets/skyblocker/tabhud/screenB/garden.json
+++ b/src/main/resources/assets/skyblocker/tabhud/screen_b/garden.json
diff --git a/src/main/resources/assets/skyblocker/tabhud/screenB/guest_island.json b/src/main/resources/assets/skyblocker/tabhud/screen_b/guest_island.json
index 54a4039d..54a4039d 100644
--- a/src/main/resources/assets/skyblocker/tabhud/screenB/guest_island.json
+++ b/src/main/resources/assets/skyblocker/tabhud/screen_b/guest_island.json
diff --git a/src/main/resources/assets/skyblocker/tabhud/screenB/home_island.json b/src/main/resources/assets/skyblocker/tabhud/screen_b/home_island.json
index 772e0594..772e0594 100644
--- a/src/main/resources/assets/skyblocker/tabhud/screenB/home_island.json
+++ b/src/main/resources/assets/skyblocker/tabhud/screen_b/home_island.json
diff --git a/src/main/resources/assets/skyblocker/tabhud/screenB/unknown.json b/src/main/resources/assets/skyblocker/tabhud/screen_b/unknown.json
index 0252940a..0252940a 100644
--- a/src/main/resources/assets/skyblocker/tabhud/screenB/unknown.json
+++ b/src/main/resources/assets/skyblocker/tabhud/screen_b/unknown.json
diff --git a/src/main/resources/resourcepacks/default_top/assets/skyblocker/tabhud/screenA/default.json b/src/main/resources/resourcepacks/default_top/assets/skyblocker/tabhud/screen_a/default.json
index 2002591f..2002591f 100644
--- a/src/main/resources/resourcepacks/default_top/assets/skyblocker/tabhud/screenA/default.json
+++ b/src/main/resources/resourcepacks/default_top/assets/skyblocker/tabhud/screen_a/default.json
diff --git a/src/main/resources/resourcepacks/default_top/assets/skyblocker/tabhud/screenA/garden.json b/src/main/resources/resourcepacks/default_top/assets/skyblocker/tabhud/screen_a/garden.json
index 39ee5b98..39ee5b98 100644
--- a/src/main/resources/resourcepacks/default_top/assets/skyblocker/tabhud/screenA/garden.json
+++ b/src/main/resources/resourcepacks/default_top/assets/skyblocker/tabhud/screen_a/garden.json
diff --git a/src/main/resources/resourcepacks/default_top/assets/skyblocker/tabhud/screenA/rift.json b/src/main/resources/resourcepacks/default_top/assets/skyblocker/tabhud/screen_a/rift.json
index d18efca8..d18efca8 100644
--- a/src/main/resources/resourcepacks/default_top/assets/skyblocker/tabhud/screenA/rift.json
+++ b/src/main/resources/resourcepacks/default_top/assets/skyblocker/tabhud/screen_a/rift.json
diff --git a/src/main/resources/resourcepacks/default_top/assets/skyblocker/tabhud/screenA/unknown.json b/src/main/resources/resourcepacks/default_top/assets/skyblocker/tabhud/screen_a/unknown.json
index 1b204adf..1b204adf 100644
--- a/src/main/resources/resourcepacks/default_top/assets/skyblocker/tabhud/screenA/unknown.json
+++ b/src/main/resources/resourcepacks/default_top/assets/skyblocker/tabhud/screen_a/unknown.json
diff --git a/src/main/resources/resourcepacks/default_top/assets/skyblocker/tabhud/screenB/default.json b/src/main/resources/resourcepacks/default_top/assets/skyblocker/tabhud/screen_b/default.json
index e857ee6f..e857ee6f 100644
--- a/src/main/resources/resourcepacks/default_top/assets/skyblocker/tabhud/screenB/default.json
+++ b/src/main/resources/resourcepacks/default_top/assets/skyblocker/tabhud/screen_b/default.json
diff --git a/src/main/resources/resourcepacks/default_top/assets/skyblocker/tabhud/screenB/dungeon.json b/src/main/resources/resourcepacks/default_top/assets/skyblocker/tabhud/screen_b/dungeon.json
index 8bb6181b..8bb6181b 100644
--- a/src/main/resources/resourcepacks/default_top/assets/skyblocker/tabhud/screenB/dungeon.json
+++ b/src/main/resources/resourcepacks/default_top/assets/skyblocker/tabhud/screen_b/dungeon.json
diff --git a/src/main/resources/resourcepacks/default_top/assets/skyblocker/tabhud/screenB/garden.json b/src/main/resources/resourcepacks/default_top/assets/skyblocker/tabhud/screen_b/garden.json
index 64fe8de4..64fe8de4 100644
--- a/src/main/resources/resourcepacks/default_top/assets/skyblocker/tabhud/screenB/garden.json
+++ b/src/main/resources/resourcepacks/default_top/assets/skyblocker/tabhud/screen_b/garden.json
diff --git a/src/main/resources/resourcepacks/default_top/assets/skyblocker/tabhud/screenB/guest_island.json b/src/main/resources/resourcepacks/default_top/assets/skyblocker/tabhud/screen_b/guest_island.json
index 98d9bd9e..98d9bd9e 100644
--- a/src/main/resources/resourcepacks/default_top/assets/skyblocker/tabhud/screenB/guest_island.json
+++ b/src/main/resources/resourcepacks/default_top/assets/skyblocker/tabhud/screen_b/guest_island.json
diff --git a/src/main/resources/resourcepacks/default_top/assets/skyblocker/tabhud/screenB/home_island.json b/src/main/resources/resourcepacks/default_top/assets/skyblocker/tabhud/screen_b/home_island.json
index 64fe8de4..64fe8de4 100644
--- a/src/main/resources/resourcepacks/default_top/assets/skyblocker/tabhud/screenB/home_island.json
+++ b/src/main/resources/resourcepacks/default_top/assets/skyblocker/tabhud/screen_b/home_island.json
diff --git a/src/main/resources/resourcepacks/default_top/assets/skyblocker/tabhud/screenB/unknown.json b/src/main/resources/resourcepacks/default_top/assets/skyblocker/tabhud/screen_b/unknown.json
index 1b204adf..1b204adf 100644
--- a/src/main/resources/resourcepacks/default_top/assets/skyblocker/tabhud/screenB/unknown.json
+++ b/src/main/resources/resourcepacks/default_top/assets/skyblocker/tabhud/screen_b/unknown.json