diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0252a500..22bc32b9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,21 @@ Notes for all 1.17.1 releases:
 * Curseforge Launcher: if you're upgrading from MC 1.16.x, please ☑️ Update to new Profile
 * MultiMC: Minecraft 1.17.1 requires Java 16: https://www.oracle.com/java/technologies/javase-jdk16-downloads.html
 
+### 2.3.0
+
+New mods
+
+* **Animatica** - Optifine's animated textures!
+* **ToolTipFix** - makes sure all tooltips fit to screen
+* **No Potion Offset** - removes the potion offset on Creative inventory (similar to 1.18)
+
+Other stuff
+
+* Game will attempt to reduce RAM usage when unfocused (enabled Dynamic FPS's GC on unfocus)
+* Optimized the Mod Menu Helper resource pack and MultiMC/MultiMC (auto-update) icon
+* Updated Fabric Loader
+* Updated Architectury API, CIT Resewn, CompleteConfig, Fabric API, Not Enough Crashes
+
 ### 2.2.1
 
 2.2.0 had a bit of a rocky launch but we're back with mod updates!
diff --git a/Curseforge/manifest.json b/Curseforge/manifest.json
index 7a7972a7..0c9c2129 100644
--- a/Curseforge/manifest.json
+++ b/Curseforge/manifest.json
@@ -11,7 +11,7 @@
   "manifestType": "minecraftModpack",
   "manifestVersion": 1,
   "name": "Fabulously Optimized",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "author": "robotkoer",
   "files": [
     {
@@ -26,7 +26,7 @@
     },
     {
       "projectID": 306612,
-      "fileID": 3454922,
+      "fileID": 3483909,
       "required": true
     },
     {
@@ -36,12 +36,12 @@
     },
     {
       "projectID": 353890,
-      "fileID": 3475869,
+      "fileID": 3478207,
       "required": true
     },
     {
       "projectID": 527334,
-      "fileID": 3460200,
+      "fileID": 3477612,
       "required": true
     },
     {
@@ -61,7 +61,7 @@
     },
     {
       "projectID": 308702,
-      "fileID": 3472548,
+      "fileID": 3479750,
       "required": true
     },
     {
@@ -91,7 +91,7 @@
     },
     {
       "projectID": 419697,
-      "fileID": 3468516,
+      "fileID": 3477576,
       "required": true
     },
     {
@@ -121,7 +121,7 @@
     },
     {
       "projectID": 447673,
-      "fileID": 3442217,
+      "fileID": 3480453,
       "required": true
     },
     {
@@ -151,7 +151,7 @@
     },
     {
       "projectID": 308769,
-      "fileID": 3439050,
+      "fileID": 3477154,
       "required": true
     },
     {
@@ -161,7 +161,7 @@
     },
     {
       "projectID": 527975,
-      "fileID": 3461755,
+      "fileID": 3478188,
       "required": true
     },
     {
@@ -175,13 +175,13 @@
       "required": true
     },
     {
-      "projectID": 452768,
-      "fileID": 3355800,
+      "projectID": 455508,
+      "fileID": 3451773,
       "required": true
     },
     {
-      "projectID": 455508,
-      "fileID": 3451773,
+      "projectID": 452768,
+      "fileID": 3355800,
       "required": true
     },
     {
@@ -199,14 +199,19 @@
       "fileID": 2934596,
       "required": true
     },
+    {
+      "projectID": 325092,
+      "fileID": 3475133,
+      "required": true
+    },
     {
       "projectID": 360438,
       "fileID": 3438799,
       "required": true
     },
     {
-      "projectID": 325092,
-      "fileID": 3475133,
+      "projectID": 459496,
+      "fileID": 3484852,
       "required": true
     }
   ],
diff --git a/Curseforge/modlist.html b/Curseforge/modlist.html
index 9908249a..f5518f62 100644
--- a/Curseforge/modlist.html
+++ b/Curseforge/modlist.html
@@ -31,11 +31,12 @@
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/littletweaks">LittleTweaks (by ImUrX)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/lambdynamiclights">LambDynamicLights (by LambdAurora)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/dynamic-fps">Dynamic FPS (by juliand665)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/no-fade">No Fade (by UltimateBoomer)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/irisshaders">Iris Shaders (by coderbot)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/no-fade">No Fade (by UltimateBoomer)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/cloth-config">Cloth Config API (Fabric) (by shedaniel)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/completeconfig">CompleteConfig (by Lortseam_)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/yosbr">Your Options Shall Be Respected (YOSBR) (by shedaniel)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/lithium">Lithium (Fabric) (by jellysquid3)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/colormatic">Colormatic (by kwertiTheCats)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/lithium">Lithium (Fabric) (by jellysquid3)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/indium">Indium (by comp500)</a></li>
 </ul>
diff --git a/Modrinth/index.json b/Modrinth/index.json
index 4e44c27a..5a7568bf 100644
--- a/Modrinth/index.json
+++ b/Modrinth/index.json
@@ -1,7 +1,7 @@
 {
     "formatVersion": 1,
     "game": "minecraft",
-    "versionId": "2.2.1",
+    "versionId": "2.3.0",
     "name": "Fabulously Optimized",
     "summary": "A Fabric-based modpack for Minecraft that focuses on performance and graphics optimizations",
     "files": [
@@ -14,6 +14,15 @@
                 "https://edge.forgecdn.net/files/3379/960/advancementinfo-1.17.1-fabric0.36.1-1.2.1.jar"
             ]
         },
+        {
+            "path": "mods/animatica-0.1+1.17.jar",
+            "hashes": {
+                "murmur2": "624985466"
+            },
+            "downloads": [
+                "https://edge.forgecdn.net/files/3478/564/animatica-0.1+1.17.jar"
+            ]
+        },
         {
             "path": "mods/antighost-1.17.1-fabric0.36.1-1.1.4.jar",
             "hashes": {
@@ -24,12 +33,12 @@
             ]
         },
         {
-            "path": "mods/architectury-2.5.30-fabric.jar",
+            "path": "mods/architectury-2.5.32.jar",
             "hashes": {
-                "murmur2": "1511557361"
+                "murmur2": "1497275255"
             },
             "downloads": [
-                "https://edge.forgecdn.net/files/3477/576/architectury-2.5.30-fabric.jar"
+                "https://edge.forgecdn.net/files/3489/954/architectury-2.5.32.jar"
             ]
         },
         {
@@ -51,12 +60,12 @@
             ]
         },
         {
-            "path": "mods/CITResewn-0.7.1.jar",
+            "path": "mods/CITResewn-0.8.0.jar",
             "hashes": {
-                "murmur2": "3666274114"
+                "murmur2": "841446064"
             },
             "downloads": [
-                "https://edge.forgecdn.net/files/3471/105/CITResewn-0.7.1.jar"
+                "https://edge.forgecdn.net/files/3492/848/CITResewn-0.8.0.jar"
             ]
         },
         {
@@ -87,21 +96,21 @@
             ]
         },
         {
-            "path": "mods/completeconfig-lib-1.1.0.jar",
+            "path": "mods/completeconfig-lib-1.2.0.jar",
             "hashes": {
-                "murmur2": "1262874284"
+                "murmur2": "2957550967"
             },
             "downloads": [
-                "https://edge.forgecdn.net/files/3395/949/completeconfig-lib-1.1.0.jar"
+                "https://edge.forgecdn.net/files/3492/921/completeconfig-lib-1.2.0.jar"
             ]
         },
         {
-            "path": "mods/continuity-1.0.0+1.17.jar",
+            "path": "mods/continuity-1.0.1+1.17.jar",
             "hashes": {
-                "murmur2": "2802689940"
+                "murmur2": "3396429412"
             },
             "downloads": [
-                "https://edge.forgecdn.net/files/3472/479/continuity-1.0.0+1.17.jar"
+                "https://edge.forgecdn.net/files/3495/893/continuity-1.0.1+1.17.jar"
             ]
         },
         {
@@ -159,12 +168,12 @@
             ]
         },
         {
-            "path": "mods/fabric-api-0.40.6+1.17.jar",
+            "path": "mods/fabric-api-0.41.0+1.17.jar",
             "hashes": {
-                "murmur2": "2808126018"
+                "murmur2": "2846834524"
             },
             "downloads": [
-                "https://edge.forgecdn.net/files/3483/909/fabric-api-0.40.6+1.17.jar"
+                "https://edge.forgecdn.net/files/3494/349/fabric-api-0.41.0+1.17.jar"
             ]
         },
         {
@@ -312,12 +321,21 @@
             ]
         },
         {
-            "path": "mods/notenoughcrashes-3.6.5+1.17.1-fabric.jar",
+            "path": "mods/no-potion-offset-1.0.2.jar",
             "hashes": {
-                "murmur2": "3935023578"
+                "murmur2": "2073280837"
             },
             "downloads": [
-                "https://edge.forgecdn.net/files/3478/207/notenoughcrashes-3.6.5+1.17.1-fabric.jar"
+                "https://edge.forgecdn.net/files/3119/667/no-potion-offset-1.0.2.jar"
+            ]
+        },
+        {
+            "path": "mods/notenoughcrashes-3.7.0+1.17.1-fabric.jar",
+            "hashes": {
+                "murmur2": "93411339"
+            },
+            "downloads": [
+                "https://edge.forgecdn.net/files/3491/766/notenoughcrashes-3.7.0+1.17.1-fabric.jar"
             ]
         },
         {
@@ -356,6 +374,15 @@
                 "https://edge.forgecdn.net/files/3480/453/sodium-extra-mc1.17.1-0.3.5.jar"
             ]
         },
+        {
+            "path": "mods/tooltipfix-1.0.4-1.17.1.jar",
+            "hashes": {
+                "murmur2": "2352865992"
+            },
+            "downloads": [
+                "https://edge.forgecdn.net/files/3487/571/tooltipfix-1.0.4-1.17.1.jar"
+            ]
+        },
         {
             "path": "mods/WI-Zoom-1.3-MC1.17.1.jar",
             "hashes": {
diff --git a/MultiMC-Packwiz/Fabulously Optimized (auto-update)/instance.cfg b/MultiMC-Packwiz/Fabulously Optimized (auto-update)/instance.cfg
index c0db563a..a510a138 100644
--- a/MultiMC-Packwiz/Fabulously Optimized (auto-update)/instance.cfg	
+++ b/MultiMC-Packwiz/Fabulously Optimized (auto-update)/instance.cfg	
@@ -24,5 +24,5 @@ iconKey=pack
 lastLaunchTime=1632412009561
 lastTimePlayed=125
 name=Fabulously Optimized (MC 1.17.1 auto-update)
-notes=https://github.com/Madis0/fabulously-optimized
+notes=https://github.com/Fabulously-Optimized/fabulously-optimized
 totalTimePlayed=100
diff --git a/MultiMC/Fabulously Optimized x.y.z/instance.cfg b/MultiMC/Fabulously Optimized x.y.z/instance.cfg
index 00381c8e..54c2179a 100644
--- a/MultiMC/Fabulously Optimized x.y.z/instance.cfg	
+++ b/MultiMC/Fabulously Optimized x.y.z/instance.cfg	
@@ -1,24 +1,17 @@
-AutoCloseConsole=false
 ForgeVersion=
 InstanceType=OneSix
 IntendedVersion=
-JavaPath=javaw
 JoinServerOnLaunch=false
-JoinServerOnLaunchAddress=
 JvmArgs=-XX:+UnlockExperimentalVMOptions -XX:+UseG1GC -XX:G1NewSizePercent=20 -XX:G1ReservePercent=20 -XX:MaxGCPauseMillis=50 -XX:G1HeapRegionSize=32M
 LWJGLVersion=
-LaunchMaximized=false
 LiteloaderVersion=
 LogPrePostOutput=true
 MCLaunchMethod=LauncherPart
 MaxMemAlloc=2048
 MinMemAlloc=512
-MinecraftWinHeight=480
-MinecraftWinWidth=854
 OverrideCommands=false
 OverrideConsole=false
 OverrideGameTime=false
-OverrideJava=false
 OverrideJavaArgs=true
 OverrideJavaLocation=false
 OverrideMCLaunchMethod=false
@@ -26,18 +19,9 @@ OverrideMemory=true
 OverrideNativeWorkarounds=false
 OverrideWindow=false
 PermGen=128
-PostExitCommand=
-PreLaunchCommand=
-RecordGameTime=true
-ShowConsole=false
-ShowConsoleOnError=true
-ShowGameTime=true
-UseNativeGLFW=false
-UseNativeOpenAL=false
-WrapperCommand=
 iconKey=pack
-lastLaunchTime=1633705873000
-lastTimePlayed=70
-name=Fabulously Optimized 2.2.1
+lastLaunchTime=1634574367356
+lastTimePlayed=2985
+name=Fabulously Optimized 2.3.0
 notes=https://www.curseforge.com/minecraft/modpacks/fabulously-optimized
-totalTimePlayed=3559
+totalTimePlayed=9583
diff --git a/MultiMC/Fabulously Optimized x.y.z/mmc-pack.json b/MultiMC/Fabulously Optimized x.y.z/mmc-pack.json
index a8888cd7..dd03dc1e 100644
--- a/MultiMC/Fabulously Optimized x.y.z/mmc-pack.json	
+++ b/MultiMC/Fabulously Optimized x.y.z/mmc-pack.json	
@@ -43,9 +43,9 @@
                     "uid": "net.fabricmc.intermediary"
                 }
             ],
-            "cachedVersion": "0.11.6",
+            "cachedVersion": "0.11.7",
             "uid": "net.fabricmc.fabric-loader",
-            "version": "0.11.6"
+            "version": "0.11.7"
         }
     ],
     "formatVersion": 1
diff --git a/MultiMC/Fabulously Optimized x.y.z/pack.png b/MultiMC/Fabulously Optimized x.y.z/pack.png
index 831b8308..6d305738 100644
Binary files a/MultiMC/Fabulously Optimized x.y.z/pack.png and b/MultiMC/Fabulously Optimized x.y.z/pack.png differ
diff --git a/Packwiz/1.17.1/config/slightguimodifications/cts.groovy b/Packwiz/1.17.1/config/slightguimodifications/cts.groovy
index a435641d..8a52bcf2 100644
--- a/Packwiz/1.17.1/config/slightguimodifications/cts.groovy
+++ b/Packwiz/1.17.1/config/slightguimodifications/cts.groovy
@@ -5,7 +5,7 @@ mainMenu {
             x { it - 2 }
             y { it - 20 }
         }
-        text = literal("Fabulously Optimized 2.2.1")
+        text = literal("Fabulously Optimized 2.3.0")
         align = "right"
         color = 0xFFFFFF
         hoveredColor = 0x55FFFF
diff --git a/Packwiz/1.17.1/config/yosbr/config/dynamicfps.toml b/Packwiz/1.17.1/config/yosbr/config/dynamicfps.toml
new file mode 100644
index 00000000..fffd8afc
--- /dev/null
+++ b/Packwiz/1.17.1/config/yosbr/config/dynamicfps.toml
@@ -0,0 +1,4 @@
+reduceFPSWhenUnfocused = true
+unfocusedFPS = 1
+restoreFPSWhenHovered = true
+runGCOnUnfocus = true
diff --git a/Packwiz/1.17.1/config/yosbr/options.txt b/Packwiz/1.17.1/config/yosbr/options.txt
index 72b1cc14..25b3b25e 100644
--- a/Packwiz/1.17.1/config/yosbr/options.txt
+++ b/Packwiz/1.17.1/config/yosbr/options.txt
@@ -4,7 +4,7 @@ snooperEnabled:false
 darkMojangStudiosBackground:true
 gamma:0.5
 guiScale:3
-resourcePacks:["vanilla","Fabric Mods","lambdabettergrass/default","continuity/default","continuity/glass_pane_culling_fix","cullleaves/smartleaves","file/Mod Menu Helper"]
+resourcePacks:["vanilla","Fabric Mods","lambdabettergrass/default","continuity/default","continuity/glass_pane_culling_fix","cullleaves/smartleaves","file/Mod Menu Helper.zip"]
 tutorialStep:none
 skipMultiplayerWarning:true
 joinedFirstServer:true
diff --git a/Packwiz/1.17.1/index.toml b/Packwiz/1.17.1/index.toml
index 92c701ad..61d9f59e 100644
--- a/Packwiz/1.17.1/index.toml
+++ b/Packwiz/1.17.1/index.toml
@@ -10,7 +10,7 @@ hash = "84b82b6a4610dcf0f2992d3b86a3abfb8748c54ada513020bae4154581f012ea"
 
 [[files]]
 file = "config/slightguimodifications/cts.groovy"
-hash = "5809aa8071db8bd4433dfdc3d2e336fc26f6f4c3a311339d454a2e4dcc99728b"
+hash = "c9c37ef7b65a22f9a382c971c1adfe0c74f421b362ce791f7838c75d578b1a4a"
 
 [[files]]
 file = "config/sodium-mixins.properties"
@@ -32,6 +32,10 @@ hash = "e0dfdbd6f39f1fc0a92b3fd18c981d20953e681f56eec736038f8940afa20d72"
 file = "config/yosbr/config/cullleaves.json"
 hash = "6ba25b17d218c13aecd7773fb0dd9f01783997854cc7123891e526e82490662e"
 
+[[files]]
+file = "config/yosbr/config/dynamicfps.toml"
+hash = "d755fffa95330f9083560f4a9f197c01bd18acccf5f262e506b4d80a4809e6bf"
+
 [[files]]
 file = "config/yosbr/config/iris.properties"
 hash = "67a031c7e7c187bf7b93db9d7419e0c9b01fefecaf1e54f408b16fb9d7fc57c0"
@@ -62,13 +66,18 @@ hash = "7e597a01436a7da6f68b3456848ad6b6a000c0efad3e5c04d75249b1df170b18"
 
 [[files]]
 file = "config/yosbr/options.txt"
-hash = "d64a0f9fd54a9921ec10e574b6b161af6145d775b831e0f5f3ae8a47f29fe551"
+hash = "ef7dc96d24f915a87d55e51748a4c06a34bf7a65114e7e7d67f6e1ed2a2a4d7e"
 
 [[files]]
 file = "mods/advancementinfo.toml"
 hash = "4bdd914cc09497cbfa0122dab0f888f4bfd8d144a394db1746a592c95667fba7"
 metafile = true
 
+[[files]]
+file = "mods/animatica.toml"
+hash = "b9924f833272e1afc0d7214f0a4b2301b3391ae98d4da4a94a315a15de9ecd3a"
+metafile = true
+
 [[files]]
 file = "mods/antighost.toml"
 hash = "5db5823578bbc8f2d1389439e42d13fe2254b2833f5784d07d833b806df2fc4c"
@@ -76,7 +85,7 @@ metafile = true
 
 [[files]]
 file = "mods/architectury-fabric.toml"
-hash = "7d83e8f4291e9804e555fe8319f55159f6072472845975f19a94d1fc8ebb35f7"
+hash = "2f084a168e35bc5a46a9b4d60401ffcb4ab228a61bfc8f7a651dc5724a285b76"
 metafile = true
 
 [[files]]
@@ -91,7 +100,7 @@ metafile = true
 
 [[files]]
 file = "mods/cit-resewn.toml"
-hash = "8da96bd69dc1bef4b69eed84dd3b761becbb2035860a5b20a8e97d3223364319"
+hash = "8fe663f39df5542c3777669c1f19f128298a520bce6c41d90bbca0d4eff2e015"
 metafile = true
 
 [[files]]
@@ -111,12 +120,12 @@ metafile = true
 
 [[files]]
 file = "mods/completeconfig.toml"
-hash = "a450488178229b6499551890f991c99b1042d17baeaa3aad33890a1077ac14cc"
+hash = "dac12eae85ffde6cd4efc4bba7da0c9059e0d6cc52c5a9ae8ce6c5a312c275d0"
 metafile = true
 
 [[files]]
 file = "mods/continuity.toml"
-hash = "692d1cbb5e28320e8f3c1f774d8eab4b150b28bfb7146da952d7f637d333fe02"
+hash = "d24baa89c8049503e02ab41c7318af6367789dbd9b64128483dada9a7161a3ad"
 metafile = true
 
 [[files]]
@@ -151,7 +160,7 @@ metafile = true
 
 [[files]]
 file = "mods/fabric-api.toml"
-hash = "3c5176c6c36c4fb8d97283dc07f91c400cc1ccd81836e298b7687dcd352282cb"
+hash = "b021631b3c9eb2df67a922cf29afbfc01616cd86b1eb2a1f489930d8a478c6b1"
 metafile = true
 
 [[files]]
@@ -234,9 +243,14 @@ file = "mods/no-fade.toml"
 hash = "00e39f0a666b5418c9e149ec75bc1b6fff68a720efc2669908cec788103dff33"
 metafile = true
 
+[[files]]
+file = "mods/no-potion-offset.toml"
+hash = "3864b5de7c1ea8afaccb95ee351a27e7f5b2dba30b47f385b07b4ff72c1cded4"
+metafile = true
+
 [[files]]
 file = "mods/not-enough-crashes.toml"
-hash = "aee4049eb818ffbdbf60de121cf9a4f1b2b5747e3ea8f1d3c678ee0d1f4613e2"
+hash = "3755504caf9a9d519bcc358be8208816e6aad2cfd8384ac8cfc249de592582e3"
 metafile = true
 
 [[files]]
@@ -259,6 +273,11 @@ file = "mods/sodium-extra.toml"
 hash = "0a037711955c1f0108d195683e2d8018f9193270e86a61d2e5cd2d874cae7000"
 metafile = true
 
+[[files]]
+file = "mods/tooltipfix.toml"
+hash = "3ef460e68b01f02bfddc1d3b4c5edf6aec9470a3c7ebdf577ad4e26668c3485e"
+metafile = true
+
 [[files]]
 file = "mods/wi-zoom.toml"
 hash = "acc7a3d78125c57ebef774099e7dadae8b9249032b030c598569377f10fe4384"
@@ -270,15 +289,15 @@ hash = "218b2b38862091f96e1db0ee7580c6f9cd5e8f008f88e4fe00016c6dea1065b3"
 metafile = true
 
 [[files]]
-file = "resourcepacks/Mod Menu Helper/assets/minecraft/lang/en_us.json"
-hash = "0f3c2f5826bd4b892976e152e04112f5fd0efc7e105f4f2b434085265a0dcca1"
+file = "resourcepacks/Mod Menu Helper/assets/modmenu/lang/en_us.json"
+hash = "7ed9a94bc8017478ebd954f6369c2c05442a4490b3b90c1837c799fb7272d7e6"
 
 [[files]]
-file = "resourcepacks/Mod Menu Helper/assets/minecraft/lang/et_ee.json"
-hash = "e4fbceec568f3f25413ecafd9095fe03fe762a61fdf9b8f4b8cd4c923978b373"
+file = "resourcepacks/Mod Menu Helper/assets/modmenu/lang/et_ee.json"
+hash = "4992d15d02322485a306f68955f3af3ebb67f301cd3478e4846a2ee66bfcbb38"
 
 [[files]]
-file = "resourcepacks/Mod Menu Helper/assets/minecraft/lang/ru_ru.json"
+file = "resourcepacks/Mod Menu Helper/assets/modmenu/lang/ru_ru.json"
 hash = "edf03a9e11bf44ffaa9a649c71f3f4133344df773f09f716ec50122c01cd882f"
 
 [[files]]
@@ -287,4 +306,4 @@ hash = "030fa0ef52d316d65df081035cfa61b57021df4a2302ee0755f6bfdb06d715e1"
 
 [[files]]
 file = "resourcepacks/Mod Menu Helper/pack.png"
-hash = "ac168b033a18ef0a1c8a97126a6554d7455cb878a1c8f40b4bef8c4f4a37fe45"
+hash = "2cc1f8c9bd888865ba3789e226092cc7ef9d095e5d930390db74dfb62023949f"
diff --git a/Packwiz/1.17.1/mods/animatica.toml b/Packwiz/1.17.1/mods/animatica.toml
new file mode 100644
index 00000000..c0333f8f
--- /dev/null
+++ b/Packwiz/1.17.1/mods/animatica.toml
@@ -0,0 +1,14 @@
+name = "Animatica"
+filename = "animatica-0.1+1.17.jar"
+side = "both"
+
+[download]
+url = "https://edge.forgecdn.net/files/3478/564/animatica-0.1+1.17.jar"
+hash-format = "murmur2"
+hash = "624985466"
+
+[update]
+[update.curseforge]
+file-id = 3478564
+project-id = 533006
+release-channel = "beta"
diff --git a/Packwiz/1.17.1/mods/architectury-fabric.toml b/Packwiz/1.17.1/mods/architectury-fabric.toml
index 55536126..8b40429d 100644
--- a/Packwiz/1.17.1/mods/architectury-fabric.toml
+++ b/Packwiz/1.17.1/mods/architectury-fabric.toml
@@ -1,14 +1,14 @@
 name = "Architectury API (Fabric)"
-filename = "architectury-2.5.30-fabric.jar"
+filename = "architectury-2.5.32.jar"
 side = "both"
 
 [download]
-url = "https://edge.forgecdn.net/files/3477/576/architectury-2.5.30-fabric.jar"
+url = "https://edge.forgecdn.net/files/3489/954/architectury-2.5.32.jar"
 hash-format = "murmur2"
-hash = "1511557361"
+hash = "1497275255"
 
 [update]
 [update.curseforge]
-file-id = 3477576
+file-id = 3489954
 project-id = 419697
 release-channel = "beta"
diff --git a/Packwiz/1.17.1/mods/cit-resewn.toml b/Packwiz/1.17.1/mods/cit-resewn.toml
index f915e25d..fab72dc9 100644
--- a/Packwiz/1.17.1/mods/cit-resewn.toml
+++ b/Packwiz/1.17.1/mods/cit-resewn.toml
@@ -1,14 +1,14 @@
 name = "CIT Resewn"
-filename = "CITResewn-0.7.1.jar"
+filename = "CITResewn-0.8.0.jar"
 side = "both"
 
 [download]
-url = "https://edge.forgecdn.net/files/3471/105/CITResewn-0.7.1.jar"
+url = "https://edge.forgecdn.net/files/3492/848/CITResewn-0.8.0.jar"
 hash-format = "murmur2"
-hash = "3666274114"
+hash = "841446064"
 
 [update]
 [update.curseforge]
-file-id = 3471105
+file-id = 3492848
 project-id = 521427
 release-channel = "beta"
diff --git a/Packwiz/1.17.1/mods/completeconfig.toml b/Packwiz/1.17.1/mods/completeconfig.toml
index db31c089..be75a614 100644
--- a/Packwiz/1.17.1/mods/completeconfig.toml
+++ b/Packwiz/1.17.1/mods/completeconfig.toml
@@ -1,14 +1,14 @@
 name = "CompleteConfig"
-filename = "completeconfig-lib-1.1.0.jar"
+filename = "completeconfig-lib-1.2.0.jar"
 side = "both"
 
 [download]
-url = "https://edge.forgecdn.net/files/3395/949/completeconfig-lib-1.1.0.jar"
+url = "https://edge.forgecdn.net/files/3492/921/completeconfig-lib-1.2.0.jar"
 hash-format = "murmur2"
-hash = "1262874284"
+hash = "2957550967"
 
 [update]
 [update.curseforge]
-file-id = 3395949
+file-id = 3492921
 project-id = 381257
 release-channel = "beta"
diff --git a/Packwiz/1.17.1/mods/continuity.toml b/Packwiz/1.17.1/mods/continuity.toml
index ac47e8fe..03e0d83e 100644
--- a/Packwiz/1.17.1/mods/continuity.toml
+++ b/Packwiz/1.17.1/mods/continuity.toml
@@ -1,14 +1,14 @@
 name = "Continuity"
-filename = "continuity-1.0.0+1.17.jar"
+filename = "continuity-1.0.1+1.17.jar"
 side = "both"
 
 [download]
-url = "https://edge.forgecdn.net/files/3472/479/continuity-1.0.0+1.17.jar"
+url = "https://edge.forgecdn.net/files/3495/893/continuity-1.0.1+1.17.jar"
 hash-format = "murmur2"
-hash = "2802689940"
+hash = "3396429412"
 
 [update]
 [update.curseforge]
-file-id = 3472479
+file-id = 3495893
 project-id = 531351
 release-channel = "beta"
diff --git a/Packwiz/1.17.1/mods/fabric-api.toml b/Packwiz/1.17.1/mods/fabric-api.toml
index f025a7a5..18360d8a 100644
--- a/Packwiz/1.17.1/mods/fabric-api.toml
+++ b/Packwiz/1.17.1/mods/fabric-api.toml
@@ -1,14 +1,14 @@
 name = "Fabric API"
-filename = "fabric-api-0.40.6+1.17.jar"
+filename = "fabric-api-0.41.0+1.17.jar"
 side = "both"
 
 [download]
-url = "https://edge.forgecdn.net/files/3483/909/fabric-api-0.40.6+1.17.jar"
+url = "https://edge.forgecdn.net/files/3494/349/fabric-api-0.41.0+1.17.jar"
 hash-format = "murmur2"
-hash = "2808126018"
+hash = "2846834524"
 
 [update]
 [update.curseforge]
-file-id = 3483909
+file-id = 3494349
 project-id = 306612
 release-channel = "beta"
diff --git a/Packwiz/1.17.1/mods/no-potion-offset.toml b/Packwiz/1.17.1/mods/no-potion-offset.toml
new file mode 100644
index 00000000..ea658f70
--- /dev/null
+++ b/Packwiz/1.17.1/mods/no-potion-offset.toml
@@ -0,0 +1,14 @@
+name = "No Potion Offset (Fabric/Forge)"
+filename = "no-potion-offset-1.0.2.jar"
+side = "both"
+
+[download]
+url = "https://edge.forgecdn.net/files/3119/667/no-potion-offset-1.0.2.jar"
+hash-format = "murmur2"
+hash = "2073280837"
+
+[update]
+[update.curseforge]
+file-id = 3119667
+project-id = 361550
+release-channel = "beta"
diff --git a/Packwiz/1.17.1/mods/not-enough-crashes.toml b/Packwiz/1.17.1/mods/not-enough-crashes.toml
index a806cc69..1f298990 100644
--- a/Packwiz/1.17.1/mods/not-enough-crashes.toml
+++ b/Packwiz/1.17.1/mods/not-enough-crashes.toml
@@ -1,14 +1,14 @@
 name = "Not Enough Crashes (Fabric)"
-filename = "notenoughcrashes-3.6.5+1.17.1-fabric.jar"
+filename = "notenoughcrashes-3.7.0+1.17.1-fabric.jar"
 side = "both"
 
 [download]
-url = "https://edge.forgecdn.net/files/3478/207/notenoughcrashes-3.6.5+1.17.1-fabric.jar"
+url = "https://edge.forgecdn.net/files/3491/766/notenoughcrashes-3.7.0+1.17.1-fabric.jar"
 hash-format = "murmur2"
-hash = "3935023578"
+hash = "93411339"
 
 [update]
 [update.curseforge]
-file-id = 3478207
+file-id = 3491766
 project-id = 353890
 release-channel = "beta"
diff --git a/Packwiz/1.17.1/mods/tooltipfix.toml b/Packwiz/1.17.1/mods/tooltipfix.toml
new file mode 100644
index 00000000..e5d4c574
--- /dev/null
+++ b/Packwiz/1.17.1/mods/tooltipfix.toml
@@ -0,0 +1,14 @@
+name = "ToolTipFix"
+filename = "tooltipfix-1.0.4-1.17.1.jar"
+side = "both"
+
+[download]
+url = "https://edge.forgecdn.net/files/3487/571/tooltipfix-1.0.4-1.17.1.jar"
+hash-format = "murmur2"
+hash = "2352865992"
+
+[update]
+[update.curseforge]
+file-id = 3487571
+project-id = 411557
+release-channel = "beta"
diff --git a/Packwiz/1.17.1/pack.toml b/Packwiz/1.17.1/pack.toml
index 1a5c0676..0ee700ae 100644
--- a/Packwiz/1.17.1/pack.toml
+++ b/Packwiz/1.17.1/pack.toml
@@ -3,7 +3,7 @@ name = "Fabulously Optimized"
 [index]
 file = "index.toml"
 hash-format = "sha256"
-hash = "4b74656ed2e45e2d4126a73f6aa9dd373f18636abfe01fa2910bda4157d0c270"
+hash = "757a5871fd2f3881eda98164f93f375f411f22ee5254f1e7ad0143482b7f80b0"
 
 [versions]
 fabric = "0.11.6"
diff --git a/Packwiz/1.17.1/resourcepacks/Mod Menu Helper/assets/minecraft/lang/en_us.json b/Packwiz/1.17.1/resourcepacks/Mod Menu Helper/assets/modmenu/lang/en_us.json
similarity index 91%
rename from Packwiz/1.17.1/resourcepacks/Mod Menu Helper/assets/minecraft/lang/en_us.json
rename to Packwiz/1.17.1/resourcepacks/Mod Menu Helper/assets/modmenu/lang/en_us.json
index b2c2f09c..dbb7d18c 100644
--- a/Packwiz/1.17.1/resourcepacks/Mod Menu Helper/assets/minecraft/lang/en_us.json	
+++ b/Packwiz/1.17.1/resourcepacks/Mod Menu Helper/assets/modmenu/lang/en_us.json	
@@ -1,6 +1,7 @@
 {
   "modmenu.summaryTranslation.slight-gui-modifications": "Animations, modpack version in menu\n§9✎§8 Animations, colors, FPS indicator, ...",
   "modmenu.summaryTranslation.advancementinfo": "Bigger, smarter advancement screen\n§8✎ (no options)",
+  "modmenu.summaryTranslation.animatica": "Optifine's animated textures\n§8✎ (only advanced options)",
   "modmenu.summaryTranslation.antighost": "Fix ghost blocks with /ghost\n§9✎§8 Keybind",
   "modmenu.summaryTranslation.bettermounthud": "Show food and XP while on a horse\n§8✎ (no options)",
   "modmenu.summaryTranslation.capes": "Optifine's and other capes\n§9✎§8 Types, preferred type, elytra, ...",
@@ -20,18 +21,20 @@
   "modmenu.summaryTranslation.itemmodelfix": "Fix transparent lines in held items\n§9✎§8 Method",
   "modmenu.summaryTranslation.lambdabettergrass": "Optifine's \"better grass\"\n§9✎§8 Quality, snow, resource pack",
   "modmenu.summaryTranslation.lambdynlights": "Optifine's \"dynamic lights\"\n§9✎§8 Quality, entity options, ...",
-  "modmenu.summaryTranslation.languagereload": "Instant language switching\n§9✎§8 F3+J to reload languages",
+  "modmenu.summaryTranslation.languagereload": "Instant language switching, searchbar\n§9✎§8 F3+J to reload languages",
   "modmenu.summaryTranslation.lazydfu": "Faster game startup\n§8✎ (no options)",
   "modmenu.summaryTranslation.lithium": "Optimize physics and chunks\n§8✎ (only advanced options)",
   "modmenu.summaryTranslation.littletweaks": "Audio output option\n§9✎§8 In Music & Sounds: Device",
   "modmenu.summaryTranslation.modmenu": "This mod menu\n§9✎§8 Button placement, filtering, sorting, ...",
   "modmenu.summaryTranslation.morechathistory": "Increase chat history limit\n§8✎ (no options)",
   "modmenu.summaryTranslation.nofade": "Remove loading fade animation\n§8✎ (no options)",
+  "modmenu.summaryTranslation.no-potion-offset": "Keep the effects in place on inventory\n§8✎ (no options)",
   "modmenu.summaryTranslation.notenoughcrashes": "Report and play after crash\n§8✎ (only advanced options)",
   "modmenu.summaryTranslation.smoothboot": "Reduce game freezing\n§8✎ (only advanced options)",
   "modmenu.summaryTranslation.sodium": "Optimize rendering, better FPS\n§9✎§8 In Video Settings: optimizations",
   "modmenu.summaryTranslation.reeses-sodium-options": "Vertical video settings\n§8✎ (no options)",
   "modmenu.summaryTranslation.sodium-extra": "Optifine's graphics options\n§9✎§8 In Video Settings: animations, particles, ...",
+  "modmenu.summaryTranslation.tooltipfix": "Prevents tooltip overflow\n§8✎ (no options)",
   "modmenu.summaryTranslation.wi_zoom": "Zoom by holding C\n§9✎§8 Scroll to adjust, keybind",
   "modmenu.summaryTranslation.yosbr": "Modpack's default options\n§9✎§8 To reset, delete options.txt and config folder"
 }
diff --git a/Packwiz/1.17.1/resourcepacks/Mod Menu Helper/assets/minecraft/lang/et_ee.json b/Packwiz/1.17.1/resourcepacks/Mod Menu Helper/assets/modmenu/lang/et_ee.json
similarity index 91%
rename from Packwiz/1.17.1/resourcepacks/Mod Menu Helper/assets/minecraft/lang/et_ee.json
rename to Packwiz/1.17.1/resourcepacks/Mod Menu Helper/assets/modmenu/lang/et_ee.json
index db4bbbe5..49dd88ad 100644
--- a/Packwiz/1.17.1/resourcepacks/Mod Menu Helper/assets/minecraft/lang/et_ee.json	
+++ b/Packwiz/1.17.1/resourcepacks/Mod Menu Helper/assets/modmenu/lang/et_ee.json	
@@ -1,6 +1,7 @@
 {
   "modmenu.summaryTranslation.slight-gui-modifications": "Animatsioonid, modipaki versioon menüüs\n§9✎§8 Animatsioonid, värvid, ks indikaator, ...",
   "modmenu.summaryTranslation.advancementinfo": "Suurem, targem edasijõudmiste kuva\n§8✎ (valikud puuduvad)",
+  "modmenu.summaryTranslation.animatica": "Optifine'i animeeritud tekstuurid\n§8✎ (vaid edasijõudnute valikud)",
   "modmenu.summaryTranslation.antighost": "Paranda kummitusplokid käsuga /ghost\n§9✎§8 Kiirklahv",
   "modmenu.summaryTranslation.bettermounthud": "Kuva hobusel olles toit ja kogemusp.\n§8✎ (valikud puuduvad)",
   "modmenu.summaryTranslation.capes": "Optifine'i ja teised keebid\n§9✎§8 Tüübid, eelistatud tüüp, kattetiivad, ...",
@@ -20,18 +21,20 @@
   "modmenu.summaryTranslation.itemmodelfix": "Paranda käeshoitud esemetel läbipaistvad jooned\n§9✎§8 Meetod",
   "modmenu.summaryTranslation.lambdabettergrass": "Optifine'i \"parem muru\"\n§9✎§8 Kvaliteet, lumi, ressursipakk",
   "modmenu.summaryTranslation.lambdynlights": "Optifine'i \"dünaamiline valgus\"\n§9✎§8 Kvaliteet, olemivalikud, ...",
-  "modmenu.summaryTranslation.languagereload": "Kohene keelevahetus\n§9✎§8 F3+J keelte taaslaadimiseks",
+  "modmenu.summaryTranslation.languagereload": "Kohene keelevahetus, otsinguriba\n§9✎§8 F3+J keelte taaslaadimiseks",
   "modmenu.summaryTranslation.lazydfu": "Kiirem mängu käivitus\n§8✎ (valikud puuduvad)",
   "modmenu.summaryTranslation.lithium": "Optimeeri füüsikat ja kamakaid\n§8✎ (vaid edasijõudnute valikud)",
   "modmenu.summaryTranslation.littletweaks": "Heliväljundi valik\n§9✎§8 Muusika ja helides: Device",
   "modmenu.summaryTranslation.modmenu": "See modimenüü\n§9✎§8 Nupuasetus, filtreerimine, sorteerimine, ...",
   "modmenu.summaryTranslation.morechathistory": "Suurenda vestlusajaloo limiiti\n§8✎ (valikud puuduvad)",
   "modmenu.summaryTranslation.nofade": "Eemalda laadimise hääbumisanimatsioon\n§8✎ (valikud puuduvad)",
+  "modmenu.summaryTranslation.no-potion-offset": "Säilita efektide asukoht seljakotis\n§8✎ (valikud puuduvad)",
   "modmenu.summaryTranslation.notenoughcrashes": "Teata ja mängi pärast krahhi edasi\n§8✎ (vaid edasijõudnute valikud)",
   "modmenu.summaryTranslation.smoothboot": "Vähenda mängu \"külmumist\"\n§8✎ (vaid edasijõudnute valikud)",
   "modmenu.summaryTranslation.sodium": "Optimeeri renderdamist, parem ks\n§9✎§8 Graafikaseadetes: optimeeringud",
   "modmenu.summaryTranslation.reeses-sodium-options": "Vertikaalsed graafikasätted\n§8✎ (valikud puuduvad)",
   "modmenu.summaryTranslation.sodium-extra": "Optifine'i graafikavalikud\n§9✎§8 Graafikaseadetes: animatsioonid, osakesed, ...",
+  "modmenu.summaryTranslation.tooltipfix": "Väldib hüpiktekstide ülevoolavust\n§8✎ (valikud puuduvad)",
   "modmenu.summaryTranslation.wi_zoom": "Suumi klahvi C all hoides\n§9✎§8 Reguleerimiseks keri, kiirklahv",
   "modmenu.summaryTranslation.yosbr": "Modipaki vaikesätted\n§9✎§8 Lähtest. kustuta options.txt ja config kaust"
 }
diff --git a/Packwiz/1.17.1/resourcepacks/Mod Menu Helper/assets/minecraft/lang/ru_ru.json b/Packwiz/1.17.1/resourcepacks/Mod Menu Helper/assets/modmenu/lang/ru_ru.json
similarity index 100%
rename from Packwiz/1.17.1/resourcepacks/Mod Menu Helper/assets/minecraft/lang/ru_ru.json
rename to Packwiz/1.17.1/resourcepacks/Mod Menu Helper/assets/modmenu/lang/ru_ru.json
diff --git a/Packwiz/1.17.1/resourcepacks/Mod Menu Helper/pack.png b/Packwiz/1.17.1/resourcepacks/Mod Menu Helper/pack.png
index fabf61f8..21e621bc 100644
Binary files a/Packwiz/1.17.1/resourcepacks/Mod Menu Helper/pack.png and b/Packwiz/1.17.1/resourcepacks/Mod Menu Helper/pack.png differ
diff --git a/README.md b/README.md
index e401998d..78ded2be 100644
--- a/README.md
+++ b/README.md
@@ -44,7 +44,7 @@ Not sure which edition is right for you? Check this handy table!
 
 The selected mods are inspired, but not limited by the [list of Optifine alternatives](https://gist.github.com/LambdAurora/1f6a4a99af374ce500f250c6b42e8754). The modpack also [improves the default settings](https://github.com/Madis0/fabulously-optimized/wiki/Changed-options).
 
-List of mods as of 2.2.0 are below.
+List of mods as of 2.3.0 are below.
 
 ### Smooth
 * [Sodium](https://www.curseforge.com/minecraft/mc-mods/sodium) by CaffeineMC - optimizes general rendering to improve FPS, adds some graphics options
@@ -69,12 +69,15 @@ List of mods as of 2.2.0 are below.
 * [Continuity](https://www.curseforge.com/minecraft/mc-mods/continuity) by Pepper_Bell - adds Optifine's connected textures support
 * [CIT Resewn](https://www.curseforge.com/minecraft/mc-mods/cit-resewn) by SHsuperCM - adds Optifine's custom item textures support
 * [Colormatic](https://www.curseforge.com/minecraft/mc-mods/colormatic) by kwertiTheCats - adds Optifine's custom colors support, clear skies and clear void options
+* [Animatica](https://www.curseforge.com/minecraft/mc-mods/animatica) by FoundationGames - adds Optifine's animated textures support
 * [Custom Entity Models](https://www.curseforge.com/minecraft/mc-mods/custom-entity-models-cem) by dorianpb - adds Optifine's custom entity models [partial support](https://www.curseforge.com/minecraft/mc-mods/custom-entity-models-cem)
 * [Cull Leaves](https://www.curseforge.com/minecraft/mc-mods/cull-leaves) by Motschen - adds Optifine's "better trees" - fancy leaves are more see-through for better FPS
 * [AdvancementInfo](https://www.curseforge.com/minecraft/mc-mods/advancementinfo) by Giserbaer - makes the advancement screen bigger, adds a requirement list and search bar
 * [Better Mount Hud](https://www.curseforge.com/minecraft/mc-mods/better-mount-hud) by Lortseam_ - horse health and your food are displayed at the same time, jump bar appears when jumping
 * ['Slight' Gui Modifications](https://www.curseforge.com/minecraft/mc-mods/slight-gui-modifications) by shedaniel - adds toast animations and FO text in main menu, plus several opt-in features
 * [Item Model Fix](https://www.curseforge.com/minecraft/mc-mods/item-model-fix) by Pepper_Bell - fixes transparent gaps in held items
+* [ToolTipFix](https://www.curseforge.com/minecraft/mc-mods/tooltipfix) by Kyrptonaught - makes sure all tooltips fit to screen
+* [No Potion Offset](https://www.curseforge.com/minecraft/mc-mods/no-potion-offset) by shedaniel - removes the potion offset on Creative inventory (similar to 1.18)
 * [Fabrishot](https://www.curseforge.com/minecraft/mc-mods/fabrishot) by ramidzkh - lets you take a high-res screenshot with F9
 
 ### Functional