diff --git a/config/craftpresence.json b/config/craftpresence.json
index be57b9311..509bed496 100644
--- a/config/craftpresence.json
+++ b/config/craftpresence.json
@@ -172,7 +172,8 @@
       }
     },
     "dynamicIcons": {
-      "default": "https://via.placeholder.com/256.png"
+      "default": "https://via.placeholder.com/256.png",
+      "Xikaro": "https://mc-heads.net/avatar/57b3dfb5f8a649e28b544e4ffc63256f"
     },
     "dynamicVariables": {
       "default": "Example Text",
diff --git a/config/gtceu.yaml b/config/gtceu.yaml
index 0aa7d7c23..4ab8022fe 100644
--- a/config/gtceu.yaml
+++ b/config/gtceu.yaml
@@ -211,6 +211,11 @@ client:
   # #D2DCFF is the classic blue from GT5.
   defaultPaintingColor: #FFFFFF
 
+  # Use VBO cache for multiblock preview.
+  # Disable it if you have issues with rendering multiblocks.
+  # Default: true
+  useVBO: true
+
 # Config options for Mod Compatibility
 compat:
   # Config options regarding GTEU compatibility with other energy systems
diff --git a/config/tfcambiental-client.toml b/config/tfcambiental-client.toml
index ad3071a55..a93f447e2 100644
--- a/config/tfcambiental-client.toml
+++ b/config/tfcambiental-client.toml
@@ -4,7 +4,7 @@
 noiseDarkness = 0.18
 #How many darkness levels should there be?
 #Range: 5 ~ 30
-noiseLevels = 1
+noiseLevels = 5
 #How big should noise areas be?
 #Range: 3 ~ 50
 noiseArea = 10
diff --git a/config/waterflasks-common.toml b/config/waterflasks-common.toml
new file mode 100644
index 000000000..3c7af8798
--- /dev/null
+++ b/config/waterflasks-common.toml
@@ -0,0 +1,4 @@
+#Settings for Water Flasks
+#Allow drinking when not thirsty? Could be useful or wasteful if that's not water in there... Default False
+thirstyDrinking = false
+
diff --git a/config/xaerominimap_entities.json b/config/xaerominimap_entities.json
index 93efd9076..485d87e8f 100644
--- a/config/xaerominimap_entities.json
+++ b/config/xaerominimap_entities.json
@@ -10,20 +10,20 @@
   "name": "gui.xaero_entity_category_root",
   "protection": true,
   "settingOverrides": {
-    "displayHeight": 0.0,
     "displayed": true,
+    "displayHeight": 0.0,
     "heightBasedFade": true,
     "renderOrder": 0.0,
     "color": 13.0,
     "displayNameWhenIconFails": true,
     "entityNumber": 1000.0,
     "alwaysDisplayNametags": false,
-    "startFadingAt": 0.0,
     "dotSize": 2.0,
+    "startFadingAt": 0.0,
     "renderOverMinimapFrame": 1.0,
     "icons": 1.0,
-    "heightLimit": 20.0,
     "names": 0.0,
+    "heightLimit": 20.0,
     "iconScale": 1.0
   },
   "subCategories": [
diff --git a/mods/AmbientSounds_FORGE_v5.3.4_mc1.20.1.jar b/mods/AmbientSounds_FORGE_v5.3.5_mc1.20.1.jar
similarity index 99%
rename from mods/AmbientSounds_FORGE_v5.3.4_mc1.20.1.jar
rename to mods/AmbientSounds_FORGE_v5.3.5_mc1.20.1.jar
index 31c9dac61..a203bd4a1 100644
Binary files a/mods/AmbientSounds_FORGE_v5.3.4_mc1.20.1.jar and b/mods/AmbientSounds_FORGE_v5.3.5_mc1.20.1.jar differ
diff --git a/mods/TFCAstikorCarts-1.20.1-1.1.7.1.jar.disabled b/mods/TFCAstikorCarts-1.20.1-1.1.7.2.jar
similarity index 71%
rename from mods/TFCAstikorCarts-1.20.1-1.1.7.1.jar.disabled
rename to mods/TFCAstikorCarts-1.20.1-1.1.7.2.jar
index 8cc868c71..e241e0517 100644
Binary files a/mods/TFCAstikorCarts-1.20.1-1.1.7.1.jar.disabled and b/mods/TFCAstikorCarts-1.20.1-1.1.7.2.jar differ
diff --git a/mods/gtceu-forge-1.20.1-1.0.15.a.jar b/mods/gtceu-forge-1.20.1-1.0.16.jar
similarity index 82%
rename from mods/gtceu-forge-1.20.1-1.0.15.a.jar
rename to mods/gtceu-forge-1.20.1-1.0.16.jar
index 59dc73d1f..d039a55a0 100644
Binary files a/mods/gtceu-forge-1.20.1-1.0.15.a.jar and b/mods/gtceu-forge-1.20.1-1.0.16.jar differ
diff --git a/mods/waterflasks-3.0.1.jar b/mods/waterflasks-3.0.2.jar
similarity index 97%
rename from mods/waterflasks-3.0.1.jar
rename to mods/waterflasks-3.0.2.jar
index b0e781180..361615046 100644
Binary files a/mods/waterflasks-3.0.1.jar and b/mods/waterflasks-3.0.2.jar differ