diff --git a/.minecraft/index.toml b/.minecraft/index.toml
index 005d083..30050fc 100644
--- a/.minecraft/index.toml
+++ b/.minecraft/index.toml
@@ -331,7 +331,7 @@ metafile = true
 
 [[files]]
 file = "mods/viabackwards.pw.toml"
-hash = "08ca0a9e48d656ba452636a884e4e70b58d8c0981b3377f1473f0522c83bb1bf"
+hash = "fef06296df89aebf2f26078dc98bb3dd34998aa4304206377d3db8518fa50eb0"
 metafile = true
 
 [[files]]
diff --git a/.minecraft/mods/viabackwards.pw.toml b/.minecraft/mods/viabackwards.pw.toml
index 26e3c37..4b87e79 100644
--- a/.minecraft/mods/viabackwards.pw.toml
+++ b/.minecraft/mods/viabackwards.pw.toml
@@ -1,7 +1,13 @@
-name = "viabackwards"
+name = "ViaBackwards"
 filename = "ViaBackwards-4.6.1.jar"
+side = "both"
 
 [download]
-url = "https://github.com/ViaVersion/ViaBackwards/releases/download/4.6.1/ViaBackwards-4.6.1.jar"
 hash-format = "sha1"
 hash = "b2e34bcb808dc9badaf46080718d693d1332b7cd"
+mode = "metadata:curseforge"
+
+[update]
+[update.curseforge]
+file-id = 4445533
+project-id = 412928
diff --git a/.minecraft/pack.toml b/.minecraft/pack.toml
index 2dc0059..0956114 100644
--- a/.minecraft/pack.toml
+++ b/.minecraft/pack.toml
@@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0"
 [index]
 file = "index.toml"
 hash-format = "sha256"
-hash = "53ff186957cf40b9dba1ddf6cac9dff662715a81571626d363c130c41c9b683a"
+hash = "5b4ab13a1157bebcf2efc9232fddffcc9bb2bb0481fb204b866ba358f93dc194"
 
 [versions]
 fabric = "0.14.19"
diff --git a/Makefile b/Makefile
index 129a997..f55be11 100644
--- a/Makefile
+++ b/Makefile
@@ -17,19 +17,19 @@ default:
 
 PACKNAME := $(notdir $(CURDIR))
 
-curseforge:
+curseforge: refresh
 	-mkdir .build
 	@echo "Making Curseforge pack"
 	packwiz curseforge export --pack-file .minecraft/pack.toml
-	mv ./*.zip ./.build/
+	mv ./*.zip ./.build/${PACKNAME}-curseforge.zip
 
-modrinth:
+modrinth: refresh
 	-mkdir .build
 	@echo "Making Modrinth pack"
 	packwiz modrinth export --pack-file .minecraft/pack.toml
-	mv ./*.mrpack ./.build/
+	mv ./*.mrpack ./.build/${PACKNAME}-modrinth.zip
 
-multimc:
+multimc: refresh
 	-mkdir .build
 	@echo "Making MultiMC pack"
 	7z d .build/${PACKNAME}-multimc.zip ./* -r
@@ -38,7 +38,7 @@ multimc:
 	7z a .build/${PACKNAME}-multimc.zip ./.minecraft -r
 	7z d .build/${PACKNAME}-multimc.zip ./.build ./.minecraft/mods ./.minecraft/pack.toml ./.minecraft/index.toml -r
 
-technic:
+technic: refresh
 	-mkdir .build
 	@echo "Making Technic pack"
 	-rm -rf .technic
@@ -49,25 +49,22 @@ technic:
 	7z d .build/${PACKNAME}-technic.zip ./* ./.* -r
 	7z a .build/${PACKNAME}-technic.zip ./.technic/* -r
 
-server:
-	-mkdir .build
-	@echo "Making Server pack"
-	-rm -rf .server
-	-mkdir .server
-	cd .server && java -jar ../.minecraft/packwiz-installer-bootstrap.jar ../.minecraft/pack.toml -s server && cd ..
-	7z d .build/${PACKNAME}-server.zip ./* ./.* -r
-	7z a .build/${PACKNAME}-server.zip ./.server/* -r
-
-preClean:
+preClean: refresh
 	-rm -rf .build
-postClean:
+postClean: refresh
 	-rm -rf .technic
 	-git gc --aggressive --prune
 
 all: preClean curseforge modrinth multimc technic postClean
 
+refresh:
+	cd .minecraft && packwiz refresh
+
 update-packwiz:
 	go install github.com/packwiz/packwiz@latest
+	go install github.com/Merith-TK/packwiz-wrapper/cmd/pw@main
+	go install github.com/Merith-TK/packwiz-wrapper/cmd/pw-modlist@main
+	go install github.com/Merith-TK/packwiz-wrapper/cmd/pw-reinstall@main
 	clear
 	@echo "Packwiz has been Updated"
 
diff --git a/README.md b/README.md
index e7697ce..fdcd0a9 100644
--- a/README.md
+++ b/README.md
@@ -64,3 +64,16 @@ I am not responsible for server bans, please check with server admins if you hav
   - Integrates with LuckPerms
 - [Universal Shops](https://modrinth.com/mod/universal-shops)
   - Allows players to create shops on servers
+
+# Non-Modrinth Mods
+
+The Following mods are not on Modrinth, but are still included in the pack
+- [Controlling](https://www.curseforge.com/minecraft/mc-mods/controlling)
+  - Allows viewing and changing keybinds in-game with ease
+	- Dependant: [Searchables](https://www.curseforge.com/minecraft/mc-mods/searchables)
+- [ViaRewind](https://www.curseforge.com/minecraft/mc-mods/viarewind)
+- [ViaBackwards](https://www.curseforge.com/minecraft/mc-mods/viabackwards)
+- [Yosbr](https://www.curseforge.com/minecraft/mc-mods/yosbr)
+  - Allows me to ship default configs
+  - Modrinth release is not updated to latest yet (for some reason)
+	  
\ No newline at end of file