diff --git a/README.md b/README.md
index f5429296..df2f455a 100644
--- a/README.md
+++ b/README.md
@@ -126,7 +126,7 @@ GCC 4.9 / Clang 3.2 or later is recommended because OpenSpades relies on C++11 f
 9. To get audio working, download a [Windows release of OpenSpades](https://github.com/yvt/openspades/releases), extract it, and copy the following dlls to the build output directory:
  * For OpenAL audio: `openal32.dll` 
  * For YSR audio: `YSRSpades.dll`, `libgcc_s_dw2-1.dll`, `libstdc++-6.dll`, `pthreadGC2.dll`
-10. Download the [Non-free pak](https://github.com/yvt/openspades-paks/releases/download/r30/OpenSpadesDevPackage-r30.zip) and copy it to the `Resources` folder inside your build output directory, which is probably `E:/Projects/openspades/openspades.msvc/bin/BUILD_TYPE/Resources`. You can also copy the paks contained in `Official Mods/` folder of OpenSpades 0.0.12b to add more fonts and improve localization support of your build.
+10. Download the [Non-free pak](https://github.com/yvt/openspades-paks/releases/download/r30/OpenSpadesDevPackage-r31.zip) and copy it to the `Resources` folder inside your build output directory, which is probably `E:/Projects/openspades/openspades.msvc/bin/BUILD_TYPE/Resources`. You can also copy the paks contained in `Official Mods/` folder of OpenSpades 0.0.12b to add more fonts and improve localization support of your build.
 
 ### On Mac OS X (with Xcode)
 1. Get the latest version of Xcode and OpenSpades source.
diff --git a/Resources/Models/Weapons/Rifle/Sight1.kv6 b/Resources/Models/Weapons/Rifle/Sight1.kv6
new file mode 100644
index 00000000..dda05e2a
Binary files /dev/null and b/Resources/Models/Weapons/Rifle/Sight1.kv6 differ
diff --git a/Resources/Models/Weapons/Rifle/Sight1.kv6.weak b/Resources/Models/Weapons/Rifle/Sight1.kv6.weak
deleted file mode 100644
index 11058499..00000000
Binary files a/Resources/Models/Weapons/Rifle/Sight1.kv6.weak and /dev/null differ
diff --git a/Resources/Models/Weapons/Rifle/Sight2.kv6 b/Resources/Models/Weapons/Rifle/Sight2.kv6
new file mode 100644
index 00000000..518b7f14
Binary files /dev/null and b/Resources/Models/Weapons/Rifle/Sight2.kv6 differ
diff --git a/Resources/Models/Weapons/Rifle/Sight2.kv6.weak b/Resources/Models/Weapons/Rifle/Sight2.kv6.weak
deleted file mode 100644
index 11058499..00000000
Binary files a/Resources/Models/Weapons/Rifle/Sight2.kv6.weak and /dev/null differ
diff --git a/Resources/Models/Weapons/SMG/Sight1.kv6 b/Resources/Models/Weapons/SMG/Sight1.kv6
new file mode 100644
index 00000000..7b68cc7b
Binary files /dev/null and b/Resources/Models/Weapons/SMG/Sight1.kv6 differ
diff --git a/Resources/Models/Weapons/SMG/Sight1.kv6.weak b/Resources/Models/Weapons/SMG/Sight1.kv6.weak
deleted file mode 100644
index 11058499..00000000
Binary files a/Resources/Models/Weapons/SMG/Sight1.kv6.weak and /dev/null differ
diff --git a/Resources/Models/Weapons/SMG/Sight2.kv6 b/Resources/Models/Weapons/SMG/Sight2.kv6
new file mode 100644
index 00000000..b24a5629
Binary files /dev/null and b/Resources/Models/Weapons/SMG/Sight2.kv6 differ
diff --git a/Resources/Models/Weapons/SMG/Sight2.kv6.weak b/Resources/Models/Weapons/SMG/Sight2.kv6.weak
deleted file mode 100644
index 11058499..00000000
Binary files a/Resources/Models/Weapons/SMG/Sight2.kv6.weak and /dev/null differ
diff --git a/Resources/Models/Weapons/SMG/Sight3.kv6 b/Resources/Models/Weapons/SMG/Sight3.kv6
new file mode 100644
index 00000000..f5739426
Binary files /dev/null and b/Resources/Models/Weapons/SMG/Sight3.kv6 differ
diff --git a/Resources/Models/Weapons/SMG/Sight3.kv6.weak b/Resources/Models/Weapons/SMG/Sight3.kv6.weak
deleted file mode 100644
index 11058499..00000000
Binary files a/Resources/Models/Weapons/SMG/Sight3.kv6.weak and /dev/null differ
diff --git a/Resources/Models/Weapons/Shotgun/Sight1.kv6 b/Resources/Models/Weapons/Shotgun/Sight1.kv6
new file mode 100644
index 00000000..43cb630b
Binary files /dev/null and b/Resources/Models/Weapons/Shotgun/Sight1.kv6 differ
diff --git a/Resources/Models/Weapons/Shotgun/Sight1.kv6.weak b/Resources/Models/Weapons/Shotgun/Sight1.kv6.weak
deleted file mode 100644
index 11058499..00000000
Binary files a/Resources/Models/Weapons/Shotgun/Sight1.kv6.weak and /dev/null differ
diff --git a/Resources/Models/Weapons/Shotgun/Sight2.kv6 b/Resources/Models/Weapons/Shotgun/Sight2.kv6
new file mode 100644
index 00000000..7b68cc7b
Binary files /dev/null and b/Resources/Models/Weapons/Shotgun/Sight2.kv6 differ
diff --git a/Resources/Models/Weapons/Shotgun/Sight2.kv6.weak b/Resources/Models/Weapons/Shotgun/Sight2.kv6.weak
deleted file mode 100644
index 11058499..00000000
Binary files a/Resources/Models/Weapons/Shotgun/Sight2.kv6.weak and /dev/null differ
diff --git a/Resources/PakLocation.txt b/Resources/PakLocation.txt
index b125dba1..fa758158 100644
--- a/Resources/PakLocation.txt
+++ b/Resources/PakLocation.txt
@@ -3,7 +3,7 @@
 External Game Assets
 --------------------
 
-https://github.com/yvt/openspades-paks/releases/download/r30/OpenSpadesDevPackage-r30.zip
+https://github.com/yvt/openspades-paks/releases/download/r30/OpenSpadesDevPackage-r31.zip
 
 This package provides following paks:
 
diff --git a/Resources/mkpak.ps1 b/Resources/mkpak.ps1
index f5b91c22..23be5991 100644
--- a/Resources/mkpak.ps1
+++ b/Resources/mkpak.ps1
@@ -18,7 +18,7 @@ function Make-Pak
 	Echo "Creating $($PakName)..."
 
 	$OutputPak = Join-Path $OutputDirectory $PakName
-	
+
 	# Prepare a temporary directory
 	$TempDir = "mkpak.tmp"
 	if (Test-Path $TempDir) { Remove-Item $TempDir -Recurse -Force }
@@ -43,10 +43,10 @@ function Make-Pak
 	if (Test-Path $OutputPak) { Remove-Item $OutputPak -Force }
 
 	# Create zip archive
-	# PowerShell 5 supports Compress-Archive, but the method used here is 
+	# PowerShell 5 supports Compress-Archive, but the method used here is
 	# faster by a order of magnitude for some reason.
 	# However, it's still much slower than "zip" command on Linux/macOS.
-	[IO.Compression.ZipFile]::CreateFromDirectory($TempDir, $OutputPak, 
+	[IO.Compression.ZipFile]::CreateFromDirectory($TempDir, $OutputPak,
 	  [IO.Compression.CompressionLevel]::Fastest, $false)
 
 	# Clean up
@@ -64,7 +64,7 @@ Make-Pak -PakName pak005-Models.pak -RelativePaths `
 
 Make-Pak -PakName pak010-BaseSkin.pak -RelativePaths `
   License/Credits-pak010-BaseSkin.md,
-  Scripts/Skin, Sounds/Weapons
+  Scripts/Skin, Sounds/Weapons, Models/Weapons
 
 Make-Pak -PakName pak050-Locales.pak -RelativePaths `
   License/Credits-pak050-Locales.md, Locales
diff --git a/Resources/mkpak.sh b/Resources/mkpak.sh
index da4646cd..11fdd893 100755
--- a/Resources/mkpak.sh
+++ b/Resources/mkpak.sh
@@ -28,7 +28,7 @@ zip -r "$OUTPUT_DIR/pak005-Models.pak" Maps $ZIPARGS > "$LOG_FILE"
 
 zip -r "$OUTPUT_DIR/pak010-BaseSkin."pak \
 License/Credits-pak010-BaseSkin.md \
-Scripts/Skin Sounds/Weapons $ZIPARGS > "$LOG_FILE"
+Scripts/Skin Sounds/Weapons Models/Weapons $ZIPARGS > "$LOG_FILE"
 
 zip -r "$OUTPUT_DIR/pak050-Locales.pak" License/Credits-pak050-Locales.md Locales $ZIPARGS > "$LOG_FILE"