diff --git a/chainmail-tests/src/main/resources/fabric.mod.json b/chainmail-tests/src/main/resources/fabric.mod.json
index 615616b6..a24c8d53 100644
--- a/chainmail-tests/src/main/resources/fabric.mod.json
+++ b/chainmail-tests/src/main/resources/fabric.mod.json
@@ -3,10 +3,5 @@
   "id": "chainmail-tests",
   "version": "${mod_version}",
   "name": "Chainmail Test Mod",
-  "environment": "*",
-  "entrypoints": {
-    "main": [
-      "ninjaphenix.tests.chainmail.Main::INSTANCE"
-    ]
-  }
+  "entrypoints": { "main": [ "ninjaphenix.tests.chainmail.Main::INSTANCE" ] }
 }
\ No newline at end of file
diff --git a/chainmail/src/main/resources/fabric.mod.json b/chainmail/src/main/resources/fabric.mod.json
index d2d68f80..bbe79c8d 100644
--- a/chainmail/src/main/resources/fabric.mod.json
+++ b/chainmail/src/main/resources/fabric.mod.json
@@ -4,20 +4,16 @@
   "version": "${mod_version}",
   "name": "Chainmail",
   "description": "Provides an expanded api for mod developers.",
-  "authors": [
-    "NinjaPhenix"
-  ],
+  "authors": [ "NinjaPhenix" ],
   "contact": {
     "sources": "https://github.com/NinjaPhenix/FabricMods/tree/${minecraft_version}",
     "issues": "https://github.com/NinjaPhenix/FabricMods/issues"
   },
   "license": "MIT-0",
-  "environment": "*",
-  "mixins": [
-    "chainmail.common.mixins.json"
-  ],
+  "mixins": [ "chainmail.common.mixins.json" ],
   "depends": {
-    "fabric": ">=${dep_fabric_version}"
+    "fabric": ">=${dep_fabric_version}",
+    "minecraft": "~${dep_minecraft_version}"
   },
   "custom": {
     "modmenu:api": true
diff --git a/expandedstorage/src/main/resources/fabric.mod.json b/expandedstorage/src/main/resources/fabric.mod.json
index 2cadf1c1..965d0cb0 100644
--- a/expandedstorage/src/main/resources/fabric.mod.json
+++ b/expandedstorage/src/main/resources/fabric.mod.json
@@ -12,21 +12,16 @@
   },
   "license": "MIT-0",
   "icon": "assets/expandedstorage/icon.png",
-  "environment": "*",
   "entrypoints": {
     "main": [ "ninjaphenix.expandedstorage.common.ExpandedStorage::INSTANCE" ],
     "client": [ "ninjaphenix.expandedstorage.client.ExpandedStorageClient::INSTANCE" ],
     "rei_plugins": [ "ninjaphenix.expandedstorage.client.ExpandedStorageReiPlugin" ]
   },
   "accessWidener": "expandedstorage.accesswidener",
-  "mixins": [
-    {
-      "config": "expandedstorage.mixins.common.json",
-      "environment": "*"
-    }
-  ],
+  "mixins": [ "expandedstorage.mixins.common.json" ],
   "depends": {
+    "chainmail": ">=${dep_chainmail_version}",
     "fabric": ">=${dep_fabric_version}",
-    "chainmail": ">=${dep_chainmail_version}"
+    "minecraft": "~${dep_minecraft_version}"
   }
 }
\ No newline at end of file
diff --git a/fatexperienceorbs/src/main/resources/fabric.mod.json b/fatexperienceorbs/src/main/resources/fabric.mod.json
index d9474f2a..af40aae2 100644
--- a/fatexperienceorbs/src/main/resources/fabric.mod.json
+++ b/fatexperienceorbs/src/main/resources/fabric.mod.json
@@ -4,21 +4,13 @@
   "version": "${mod_version}",
   "name": "Fat Experience Orbs",
   "description": "Makes Experience orbs combine together.",
-  "authors": [
-    "NinjaPhenix"
-  ],
+  "authors": [ "NinjaPhenix" ],
   "contact": {
     "homepage": "https://www.curseforge.com/minecraft/mc-mods/fat-experience-orbs",
     "sources": "https://github.com/NinjaPhenix/FabricMods/tree/${minecraft_version}",
     "issues": "https://github.com/NinjaPhenix/FabricMods/issues"
   },
   "license": "MIT-0",
-  "mixins": [
-    {
-      "config": "fatxporbs.mixins.json"
-    }
-  ],
-  "depends": {
-    "fabricloader": ">=${dep_loader_version}"
-  }
+  "mixins": [ "fatxporbs.mixins.json" ],
+  "depends": { "fabricloader": ">=${dep_loader_version}" }
 }
\ No newline at end of file
diff --git a/fatexperienceorbs/src/main/resources/fatxporbs.mixins.json b/fatexperienceorbs/src/main/resources/fatxporbs.mixins.json
index 09cc5fa9..14dbaedc 100644
--- a/fatexperienceorbs/src/main/resources/fatxporbs.mixins.json
+++ b/fatexperienceorbs/src/main/resources/fatxporbs.mixins.json
@@ -2,11 +2,7 @@
   "required": true,
   "package": "ninjaphenix.fatxporbs.mixins",
   "compatibilityLevel": "JAVA_8",
-  "mixins": [
-    "ExperienceOrbEntityMixin"
-  ],
-  "injectors": {
-    "defaultRequire": 1
-  },
+  "mixins": [ "ExperienceOrbEntityMixin" ],
+  "injectors": { "defaultRequire": 1 },
   "minVersion": "0.7.11"
 }
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 112a726a..1034f94c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -14,7 +14,7 @@ mod_version = 999.999.999
 # Mod Json Dependency Version Data
 dep_minecraft_version = 1.16.2
 dep_loader_version = 0.9.1
-dep_fabric_version = 0.17.1
+dep_fabric_version = 0.20.1
 # Curseforge Task Data
 curseforge_game_version = 1.16.2
 curseforge_url_template = https://www.curseforge.com/minecraft/mc-mods/%s/files/%s
diff --git a/ninjatips/src/main/resources/fabric.mod.json b/ninjatips/src/main/resources/fabric.mod.json
index 1a3aa763..4cdeae76 100644
--- a/ninjatips/src/main/resources/fabric.mod.json
+++ b/ninjatips/src/main/resources/fabric.mod.json
@@ -4,37 +4,21 @@
   "version": "${mod_version}",
   "name": "NinjaTips",
   "description": "Add nbt and data tags to tooltips and more.",
-  "authors": [
-    "NinjaPhenix"
-  ],
+  "authors": [ "NinjaPhenix" ],
   "contact": {
     "sources": "https://github.com/NinjaPhenix/FabricMods/tree/${minecraft_version}",
     "issues": "https://github.com/NinjaPhenix/FabricMods/issues"
   },
   "license": "MIT",
   "icon": "assets/ninjatips/icon.png",
-  "environment": "*",
   "entrypoints": {
-    "main": [
-      "ninjaphenix.ninjatips.NinjaTips"
-    ],
-    "client": [
-      "ninjaphenix.ninjatips.client.NinjaTipsClient"
-    ]
+    "main": [ "ninjaphenix.ninjatips.NinjaTips" ],
+    "client": [ "ninjaphenix.ninjatips.client.NinjaTipsClient" ]
   },
-  "mixins": [
-    {
-      "config": "ninjatips.mixins.common.json",
-      "environment": "*"
-    },
-    {
-      "config": "ninjatips.mixins.client.json",
-      "environment": "client"
-    }
-  ],
+  "mixins": [ "ninjatips.mixins.common.json" ],
   "depends": {
-    "fabricloader": ">=${dep_loader_version}",
     "fabric": ">=${dep_fabric_version}",
-    "minecraft": ">=${dep_minecraft_version}"
+    "fabricloader": ">=${dep_loader_version}",
+    "minecraft": "~${dep_minecraft_version}"
   }
 }
\ No newline at end of file
diff --git a/ninjatips/src/main/resources/ninjatips.mixins.client.json b/ninjatips/src/main/resources/ninjatips.mixins.client.json
deleted file mode 100644
index 60c63c30..00000000
--- a/ninjatips/src/main/resources/ninjatips.mixins.client.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "required": true,
-  "package": "ninjaphenix.ninjatips.mixins",
-  "compatibilityLevel": "JAVA_8",
-  "mixins": [
-    "ItemLinkingMixin"
-  ],
-  "injectors": {
-    "defaultRequire": 1
-  },
-  "minVersion": "0.7.11"
-}
\ No newline at end of file
diff --git a/ninjatips/src/main/resources/ninjatips.mixins.common.json b/ninjatips/src/main/resources/ninjatips.mixins.common.json
index 4c842252..5b4a889a 100644
--- a/ninjatips/src/main/resources/ninjatips.mixins.common.json
+++ b/ninjatips/src/main/resources/ninjatips.mixins.common.json
@@ -2,10 +2,8 @@
   "required": true,
   "package": "ninjaphenix.ninjatips.mixins",
   "compatibilityLevel": "JAVA_8",
-  "mixins": [
-  ],
-  "injectors": {
-    "defaultRequire": 1
-  },
+  "mixins": [ ],
+  "client": [ "ItemLinkingMixin" ],
+  "injectors": { "defaultRequire": 1 },
   "minVersion": "0.7.11"
 }
\ No newline at end of file
diff --git a/renderingtests/src/main/resources/fabric.mod.json b/renderingtests/src/main/resources/fabric.mod.json
index 1303e178..ec1d51e6 100644
--- a/renderingtests/src/main/resources/fabric.mod.json
+++ b/renderingtests/src/main/resources/fabric.mod.json
@@ -4,12 +4,9 @@
   "version": "${mod_version}",
   "name": "Rendering Tests",
   "description": "THIS IS NOT A MOD.",
-  "authors": ["NinjaPhenix"],
+  "authors": [ "NinjaPhenix" ],
   "license": "MIT-0",
-  "environment": "*",
   "entrypoints": {
-    "main": [
-      "ninjaphenix.renderingtests.Main::INSTANCE"
-    ]
+    "main": [ "ninjaphenix.renderingtests.Main::INSTANCE" ]
   }
 }
\ No newline at end of file
diff --git a/torcherino/src/main/resources/fabric.mod.json b/torcherino/src/main/resources/fabric.mod.json
index 21d5a0f7..0453a4a5 100644
--- a/torcherino/src/main/resources/fabric.mod.json
+++ b/torcherino/src/main/resources/fabric.mod.json
@@ -4,9 +4,7 @@
   "version": "${mod_version}",
   "name": "Torcherino",
   "description": "Adds torches which speeds up block entities around them.",
-  "authors": [
-    "NinjaPhenix"
-  ],
+  "authors": [ "NinjaPhenix" ],
   "contact": {
     "homepage": "https://minecraft.curseforge.com/projects/torcherino",
     "sources": "https://github.com/NinjaPhenix/FabricMods/tree/${minecraft_version}",
@@ -14,27 +12,15 @@
   },
   "license": "LGPL-3.0",
   "icon": "assets/torcherino/icon.png",
-  "environment": "*",
   "entrypoints": {
-    "main": [
-      "torcherino.Torcherino"
-    ],
-    "client": [
-      "torcherino.TorcherinoClient"
-    ],
-    "torcherinoInitializer": [
-      "torcherino.Torcherino"
-    ]
+    "main": [ "torcherino.Torcherino" ],
+    "client": [ "torcherino.TorcherinoClient" ],
+    "torcherinoInitializer": [ "torcherino.Torcherino" ]
   },
-  "mixins": [
-    {
-      "config": "torcherino.mixins.json",
-      "environment": "*"
-    }
-  ],
+  "mixins": [ "torcherino.mixins.json" ],
   "accessWidener": "torcherino.accesswidener",
   "depends": {
-    "fabric": ">=${dep_fabric_version}",
-    "chainmail": ">=${dep_chainmail_version}"
+    "chainmail": ">=${dep_chainmail_version}",
+    "fabric": "~${dep_fabric_version}"
   }
 }
\ No newline at end of file
diff --git a/torcherino/src/main/resources/torcherino.mixins.json b/torcherino/src/main/resources/torcherino.mixins.json
index 8e7b74c8..22b0a6af 100644
--- a/torcherino/src/main/resources/torcherino.mixins.json
+++ b/torcherino/src/main/resources/torcherino.mixins.json
@@ -2,13 +2,8 @@
   "required": true,
   "package": "torcherino.mixin",
   "compatibilityLevel": "JAVA_8",
-  "mixins": [
-  ],
-  "client": [
-    "ParticleMixin"
-  ],
-  "injectors": {
-    "defaultRequire": 1
-  },
+  "mixins": [ ],
+  "client": [ "ParticleMixin" ],
+  "injectors": { "defaultRequire": 1 },
   "minVersion": "0.8"
 }
\ No newline at end of file