diff --git a/config/menus_multiplayer.cfg b/config/menus_multiplayer.cfg
index f6dd2a1d..1fe5665e 100644
--- a/config/menus_multiplayer.cfg
+++ b/config/menus_multiplayer.cfg
@@ -305,8 +305,8 @@ menuinit [
     resetcurmenu
     menuitem "      This server is using a different version of this map..." -1
     menuitem "" -1
-    menuitem $__getmaprevisions"
-    menuitem " -1
+    menuitem $__getmaprevisions
+    menuitem "" -1
     menuitem "\f2    [ Download the servers map version and join the game ]"     [ getmap ]
     menuitem "\f3 [ Keep the local map version and disconnect from the server ]" [ showmenu ""; disconnect ]
     menuinitselection 4
diff --git a/packages/models/pickups/flags/CLA/md3.cfg b/packages/models/pickups/flags/CLA/md3.cfg
index f2b76e4e..dbb11970 100644
--- a/packages/models/pickups/flags/CLA/md3.cfg
+++ b/packages/models/pickups/flags/CLA/md3.cfg
@@ -1,3 +1,4 @@
 md3load tris.md3
 md3skin mesh CLA.jpg
-md3anim flag 0 7
\ No newline at end of file
+md3anim flag 0 7
+
diff --git a/packages/models/pickups/flags/CLA_htf/CLA_htf.jpg b/packages/models/pickups/flags/CLA_htf/CLA_htf.jpg
new file mode 100755
index 00000000..8a30c502
Binary files /dev/null and b/packages/models/pickups/flags/CLA_htf/CLA_htf.jpg differ
diff --git a/packages/models/pickups/flags/CLA_htf/md3.cfg b/packages/models/pickups/flags/CLA_htf/md3.cfg
index 2bea9c75..412f43d2 100644
--- a/packages/models/pickups/flags/CLA_htf/md3.cfg
+++ b/packages/models/pickups/flags/CLA_htf/md3.cfg
@@ -1,3 +1,4 @@
-md3load tris.md3
-md3skin mesh ../CLA/CLA.jpg
-md3anim flag 0 7
\ No newline at end of file
+md3load ../CLA/tris.md3
+md3skin mesh CLA_htf.jpg
+md3anim flag 0 7
+
diff --git a/packages/models/pickups/flags/CLA_htf/tris.md3 b/packages/models/pickups/flags/CLA_htf/tris.md3
deleted file mode 100644
index b4849f30..00000000
Binary files a/packages/models/pickups/flags/CLA_htf/tris.md3 and /dev/null differ
diff --git a/packages/models/pickups/flags/RVSF/md3.cfg b/packages/models/pickups/flags/RVSF/md3.cfg
index 2edaccc0..d4e906c6 100644
--- a/packages/models/pickups/flags/RVSF/md3.cfg
+++ b/packages/models/pickups/flags/RVSF/md3.cfg
@@ -1,3 +1,4 @@
 md3load tris.md3
 md3skin mesh RVSF.jpg
-md3anim flag 0 7
\ No newline at end of file
+md3anim flag 0 7
+
diff --git a/packages/models/pickups/flags/RVSF_htf/RVSF_htf.jpg b/packages/models/pickups/flags/RVSF_htf/RVSF_htf.jpg
new file mode 100755
index 00000000..3006bece
Binary files /dev/null and b/packages/models/pickups/flags/RVSF_htf/RVSF_htf.jpg differ
diff --git a/packages/models/pickups/flags/RVSF_htf/md3.cfg b/packages/models/pickups/flags/RVSF_htf/md3.cfg
index 47611940..dc02c64d 100644
--- a/packages/models/pickups/flags/RVSF_htf/md3.cfg
+++ b/packages/models/pickups/flags/RVSF_htf/md3.cfg
@@ -1,3 +1,4 @@
-md3load tris.md3
-md3skin mesh ../RVSF/RVSF.jpg
-md3anim flag 0 7
\ No newline at end of file
+md3load ../RVSF/tris.md3
+md3skin mesh RVSF_htf.jpg
+md3anim flag 0 7
+
diff --git a/packages/models/pickups/flags/RVSF_htf/tris.md3 b/packages/models/pickups/flags/RVSF_htf/tris.md3
deleted file mode 100644
index 69aa1f12..00000000
Binary files a/packages/models/pickups/flags/RVSF_htf/tris.md3 and /dev/null differ
diff --git a/packages/models/pickups/flags/ktf/skin.jpg b/packages/models/pickups/flags/ktf/ktf.jpg
similarity index 100%
rename from packages/models/pickups/flags/ktf/skin.jpg
rename to packages/models/pickups/flags/ktf/ktf.jpg
diff --git a/packages/models/pickups/flags/ktf/md3.cfg b/packages/models/pickups/flags/ktf/md3.cfg
index 27f36645..2435096e 100644
--- a/packages/models/pickups/flags/ktf/md3.cfg
+++ b/packages/models/pickups/flags/ktf/md3.cfg
@@ -1,3 +1,4 @@
-md3load tris.md3
-md3skin mesh skin.jpg
-md3anim flag 0 7
\ No newline at end of file
+md3load ../RVSF/tris.md3
+md3skin mesh ktf.jpg
+md3anim flag 0 7
+
diff --git a/packages/models/pickups/flags/ktf/tris.md3 b/packages/models/pickups/flags/ktf/tris.md3
deleted file mode 100644
index 69aa1f12..00000000
Binary files a/packages/models/pickups/flags/ktf/tris.md3 and /dev/null differ
diff --git a/packages/models/pickups/flags/small_CLA/md3.cfg b/packages/models/pickups/flags/small_CLA/md3.cfg
index df11401b..14204665 100644
--- a/packages/models/pickups/flags/small_CLA/md3.cfg
+++ b/packages/models/pickups/flags/small_CLA/md3.cfg
@@ -1,4 +1,4 @@
-md3load tris.md3
+md3load ../small_RVSF/tris.md3
 md3skin tris small_CLA.jpg
 mdlscale 60
 
diff --git a/packages/models/pickups/flags/small_CLA/small_CLA.jpg b/packages/models/pickups/flags/small_CLA/small_CLA.jpg
index 329762d8..916aa408 100644
Binary files a/packages/models/pickups/flags/small_CLA/small_CLA.jpg and b/packages/models/pickups/flags/small_CLA/small_CLA.jpg differ
diff --git a/packages/models/pickups/flags/small_CLA/tris.md3 b/packages/models/pickups/flags/small_CLA/tris.md3
deleted file mode 100644
index a77fc0ae..00000000
Binary files a/packages/models/pickups/flags/small_CLA/tris.md3 and /dev/null differ
diff --git a/packages/models/pickups/flags/small_CLA_htf/md3.cfg b/packages/models/pickups/flags/small_CLA_htf/md3.cfg
index 77fd8d13..0f6b1c5b 100644
--- a/packages/models/pickups/flags/small_CLA_htf/md3.cfg
+++ b/packages/models/pickups/flags/small_CLA_htf/md3.cfg
@@ -1,4 +1,4 @@
-md3load tris.md3
-md3skin tris ../small_CLA/small_CLA.jpg
+md3load ../small_RVSF/tris.md3
+md3skin tris small_CLA_htf.jpg
 mdlscale 60
 
diff --git a/packages/models/pickups/flags/small_CLA_htf/small_CLA_htf.jpg b/packages/models/pickups/flags/small_CLA_htf/small_CLA_htf.jpg
new file mode 100755
index 00000000..329762d8
Binary files /dev/null and b/packages/models/pickups/flags/small_CLA_htf/small_CLA_htf.jpg differ
diff --git a/packages/models/pickups/flags/small_CLA_htf/tris.md3 b/packages/models/pickups/flags/small_CLA_htf/tris.md3
deleted file mode 100644
index a77fc0ae..00000000
Binary files a/packages/models/pickups/flags/small_CLA_htf/tris.md3 and /dev/null differ
diff --git a/packages/models/pickups/flags/small_RVSF/md3.cfg b/packages/models/pickups/flags/small_RVSF/md3.cfg
index 4fdfb621..65fa0e0c 100644
--- a/packages/models/pickups/flags/small_RVSF/md3.cfg
+++ b/packages/models/pickups/flags/small_RVSF/md3.cfg
@@ -1,3 +1,4 @@
 md3load tris.md3
 md3skin tris small_RVSF.jpg
 mdlscale 60
+
diff --git a/packages/models/pickups/flags/small_RVSF_htf/md3.cfg b/packages/models/pickups/flags/small_RVSF_htf/md3.cfg
index b811dbfa..734187f2 100644
--- a/packages/models/pickups/flags/small_RVSF_htf/md3.cfg
+++ b/packages/models/pickups/flags/small_RVSF_htf/md3.cfg
@@ -1,3 +1,4 @@
-md3load tris.md3
-md3skin tris ../small_RVSF/small_RVSF.jpg
+md3load ../small_RVSF/tris.md3
+md3skin tris small_RVSF_htf.jpg
 mdlscale 60
+
diff --git a/packages/models/pickups/flags/small_RVSF_htf/small_RVSF_htf.jpg b/packages/models/pickups/flags/small_RVSF_htf/small_RVSF_htf.jpg
new file mode 100755
index 00000000..a3944dc9
Binary files /dev/null and b/packages/models/pickups/flags/small_RVSF_htf/small_RVSF_htf.jpg differ
diff --git a/packages/models/pickups/flags/small_RVSF_htf/tris.md3 b/packages/models/pickups/flags/small_RVSF_htf/tris.md3
deleted file mode 100644
index a77fc0ae..00000000
Binary files a/packages/models/pickups/flags/small_RVSF_htf/tris.md3 and /dev/null differ
diff --git a/packages/models/pickups/flags/small_ktf/md2.cfg b/packages/models/pickups/flags/small_ktf/md2.cfg
deleted file mode 100644
index 8d01cf63..00000000
--- a/packages/models/pickups/flags/small_ktf/md2.cfg
+++ /dev/null
@@ -1 +0,0 @@
-mdlscale 60
diff --git a/packages/models/pickups/flags/small_ktf/md3.cfg b/packages/models/pickups/flags/small_ktf/md3.cfg
new file mode 100644
index 00000000..b4fab67b
--- /dev/null
+++ b/packages/models/pickups/flags/small_ktf/md3.cfg
@@ -0,0 +1,4 @@
+md3load ../small_RVSF/tris.md3
+md3skin tris small_ktf.jpg
+mdlscale 60
+
diff --git a/packages/models/pickups/flags/small_ktf/skin.jpg b/packages/models/pickups/flags/small_ktf/small_ktf.jpg
similarity index 100%
rename from packages/models/pickups/flags/small_ktf/skin.jpg
rename to packages/models/pickups/flags/small_ktf/small_ktf.jpg
diff --git a/packages/models/pickups/flags/small_ktf/tris.md2 b/packages/models/pickups/flags/small_ktf/tris.md2
deleted file mode 100644
index 06256f47..00000000
Binary files a/packages/models/pickups/flags/small_ktf/tris.md2 and /dev/null differ