diff --git a/fonts/XekkasNum/0030.png b/fonts/XekkasNum/0030.png
new file mode 100644
index 000000000..58e3a0c25
Binary files /dev/null and b/fonts/XekkasNum/0030.png differ
diff --git a/fonts/XekkasNum/0031.png b/fonts/XekkasNum/0031.png
new file mode 100644
index 000000000..de12ca2a4
Binary files /dev/null and b/fonts/XekkasNum/0031.png differ
diff --git a/fonts/XekkasNum/0032.png b/fonts/XekkasNum/0032.png
new file mode 100644
index 000000000..6a4b40a3f
Binary files /dev/null and b/fonts/XekkasNum/0032.png differ
diff --git a/fonts/XekkasNum/0033.png b/fonts/XekkasNum/0033.png
new file mode 100644
index 000000000..61a58fe49
Binary files /dev/null and b/fonts/XekkasNum/0033.png differ
diff --git a/fonts/XekkasNum/0034.png b/fonts/XekkasNum/0034.png
new file mode 100644
index 000000000..20ed2e7f1
Binary files /dev/null and b/fonts/XekkasNum/0034.png differ
diff --git a/fonts/XekkasNum/0035.png b/fonts/XekkasNum/0035.png
new file mode 100644
index 000000000..ce842817f
Binary files /dev/null and b/fonts/XekkasNum/0035.png differ
diff --git a/fonts/XekkasNum/0036.png b/fonts/XekkasNum/0036.png
new file mode 100644
index 000000000..771e79483
Binary files /dev/null and b/fonts/XekkasNum/0036.png differ
diff --git a/fonts/XekkasNum/0037.png b/fonts/XekkasNum/0037.png
new file mode 100644
index 000000000..fa23242c2
Binary files /dev/null and b/fonts/XekkasNum/0037.png differ
diff --git a/fonts/XekkasNum/0038.png b/fonts/XekkasNum/0038.png
new file mode 100644
index 000000000..8b9b320a9
Binary files /dev/null and b/fonts/XekkasNum/0038.png differ
diff --git a/fonts/XekkasNum/0039.png b/fonts/XekkasNum/0039.png
new file mode 100644
index 000000000..2651733c4
Binary files /dev/null and b/fonts/XekkasNum/0039.png differ
diff --git a/fonts/XekkasNum/font.inf b/fonts/XekkasNum/font.inf
new file mode 100644
index 000000000..bb45bc970
--- /dev/null
+++ b/fonts/XekkasNum/font.inf
@@ -0,0 +1,3 @@
+TranslationType Standard
+SpaceWidth 4
+FontHeight 6
diff --git a/gldefs.ammo b/gldefs.ammo
index d7c15b851..f6f2e72e5 100644
--- a/gldefs.ammo
+++ b/gldefs.ammo
@@ -177,7 +177,7 @@ Object GoldShell
 
 PointLight QUADAMMOLIGHT
 {
-	Color 0.4 0.25 0.0
+	Color 1.0 0.8 0.4
 	Size 20
 	Offset 0 16 0
 	Attenuate 1
diff --git a/graphics/HUD/QuadravolDisplay.png b/graphics/HUD/QuadravolDisplay.png
index 13ff54bc7..e3e8f2ce0 100644
Binary files a/graphics/HUD/QuadravolDisplay.png and b/graphics/HUD/QuadravolDisplay.png differ
diff --git a/language.version b/language.version
index ad526876e..1d22262cd 100644
--- a/language.version
+++ b/language.version
@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r320 \cu(Sat 13 Aug 20:54:14 CEST 2022)\c-";
-SWWM_SHORTVER="\cw1.3pre r320 \cu(2022-08-13 20:54:14)\c-";
+SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r321 \cu(Sun 14 Aug 16:54:55 CEST 2022)\c-";
+SWWM_SHORTVER="\cw1.3pre r321 \cu(2022-08-14 16:54:55)\c-";
diff --git a/models/QuadCell.png b/models/QuadCell.png
index 31769ca43..71e9eea80 100644
Binary files a/models/QuadCell.png and b/models/QuadCell.png differ
diff --git a/models/QuadCell_bright.png b/models/QuadCell_bright.png
index 97a0c08ed..1a6c46165 100644
Binary files a/models/QuadCell_bright.png and b/models/QuadCell_bright.png differ
diff --git a/zscript/dlc1/swwm_dlcweapons_hud.zsc b/zscript/dlc1/swwm_dlcweapons_hud.zsc
index c535282ed..bf20213aa 100644
--- a/zscript/dlc1/swwm_dlcweapons_hud.zsc
+++ b/zscript/dlc1/swwm_dlcweapons_hud.zsc
@@ -78,8 +78,20 @@ extend Class HeavyMahSheenGun
 // Quadravol
 extend Class Quadravol
 {
+	ui TextureID WeaponBox, BulletTex[2];
+	ui Font ChargeFont;
+
 	override void DrawWeapon( double TicFrac, double bx, double by, double hs, Vector2 ss )
 	{
+		if ( !WeaponBox ) WeaponBox = TexMan.CheckForTexture("graphics/HUD/QuadravolDisplay.png",TexMan.Type_Any);
+		if ( !BulletTex[0] ) BulletTex[0] = TexMan.CheckForTexture("graphics/HUD/QuadravolRound.png",TexMan.Type_Any);
+		if ( !BulletTex[1] ) BulletTex[1] = TexMan.CheckForTexture("graphics/HUD/QuadravolCasing.png",TexMan.Type_Any);
+		if ( !ChargeFont ) ChargeFont = Font.GetFont('XekkasNum');
+		Screen.DrawTexture(WeaponBox,false,bx-16,by-44,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true);
+		for ( int i=0; i<clipcount; i++ )
+			Screen.DrawTexture(BulletTex[0],false,bx-6,by-(10+i*8),DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true);
+		if ( chambered ) Screen.DrawTexture(BulletTex[charged],false,bx-14,by-10,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true);
+		Screen.DrawText(ChargeFont,Font.CR_UNTRANSLATED,bx-14,by-20,String.Format("%d",chargelevel),DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true);
 		// PLACEHOLDER
 		String str = "THIS WEAPON IS NOT YET FUNCTIONAL";
 		Screen.DrawText(NewSmallFont,Font.CR_RED,(Screen.GetWidth()-NewSmallFont.StringWidth(str)*CleanXFac_1)/2,Screen.GetHeight()-(swwm_hudmargin*hs+NewSmallFont.GetHeight()*CleanYFac_1),str,DTA_CleanNoMove_1,true);
diff --git a/zscript/dlc1/swwm_notashotgun.zsc b/zscript/dlc1/swwm_notashotgun.zsc
index 49dd8a306..6eeee1d9c 100644
--- a/zscript/dlc1/swwm_notashotgun.zsc
+++ b/zscript/dlc1/swwm_notashotgun.zsc
@@ -21,7 +21,7 @@ Class Quadravol : SWWMWeapon
 		if ( !AmmoLedCharge ) AmmoLedCharge = TexMan.CheckForTexture("models/QuadLEDCharge.png",TexMan.Type_Any);
 		AmmoLed.Clear(0,0,64,64,0xFF101033);
 		AmmoLed.DrawTexture(AmmoLedBase,false,0,0,DTA_LegacyRenderStyle,STYLE_Add,DTA_Color,0xFF00FFFF);
-		Vector3 lainbow = SWWMUtility.HSVToRGB(((5-chargelevel)/7.5,1.,1.));
+		Vector3 lainbow = SWWMUtility.HSVToRGB((.5+(chargelevel-1)/8.,1.,1.));
 		Color col = Color(255,int(lainbow.x*255),int(lainbow.y*255),int(lainbow.z*255));
 		AmmoLed.DrawTexture(AmmoLedCharge,false,12,4,DTA_SrcX,(chargelevel%4)*64,DTA_SrcY,(chargelevel/4)*64,DTA_SrcWidth,40,DTA_SrcHeight,40,DTA_DestWidth,40,DTA_DestHeight,40,DTA_LegacyRenderStyle,STYLE_Add,DTA_Color,(chargelevel>0)?col:0xFF00FF00);
 		for ( int i=0; i<clipcount; i++ ) AmmoLed.DrawTexture(AmmoLedRound,false,36-8*i,52,DTA_LegacyRenderStyle,STYLE_Add,DTA_Color,0xFF0000FF);