From: Severin Meyer <sev.ch@web.de>
Date: Sat, 25 Jul 2015 16:55:15 +0000 (+0200)
Subject: Update Luma sourcefiles
X-Git-Tag: xonotic-v0.8.1~4^2~12
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b4356be6675c549510b16e370593237928eae458;p=xonotic%2Fmediasource.git

Update Luma sourcefiles
---

diff --git a/gfx/luma/gfx/hud/luma/common.filters b/gfx/luma/gfx/hud/luma/common.filters
index 0b15eaa..6833325 100755
--- a/gfx/luma/gfx/hud/luma/common.filters
+++ b/gfx/luma/gfx/hud/luma/common.filters
@@ -46,5 +46,21 @@
 			<feComposite in2="highlight" operator="arithmetic" k1="0.4" k2="1" k3="0.2"/>
 			<feGaussianBlur stdDeviation="0.4"/>
 		</filter>
+		<filter id="vehicle" x="-0.5" y="-0.5" width="2" height="2">
+			<feGaussianBlur stdDeviation="7"/>
+			<feColorMatrix values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0.5 0" result="glow"/>
+			<feMerge>
+				<feMergeNode in="glow"/>
+				<feMergeNode in="SourceGraphic"/>
+			</feMerge>
+		</filter>
+		<filter id="vehicleWeapon" x="-0.5" y="-0.5" width="2" height="2">
+			<feGaussianBlur stdDeviation="3"/>
+			<feColorMatrix values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0.6 0" result="glow"/>
+			<feMerge>
+				<feMergeNode in="glow"/>
+				<feMergeNode in="SourceGraphic"/>
+			</feMerge>
+		</filter>
 	</defs>
 </svg>
diff --git a/gfx/luma/gfx/hud/luma/vehicle_bar_northeast.svg b/gfx/luma/gfx/hud/luma/vehicle_bar_northeast.svg
new file mode 100644
index 0000000..0aa60dc
--- /dev/null
+++ b/gfx/luma/gfx/hud/luma/vehicle_bar_northeast.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="256" height="128">
+	<path fill="#fff" filter="url(common.filters#blurred)" d="M 4.3,54.9 37.9,113 256,113 228.9,64.7 Z"/>
+</svg>
diff --git a/gfx/luma/gfx/hud/luma/vehicle_bar_northwest.svg b/gfx/luma/gfx/hud/luma/vehicle_bar_northwest.svg
new file mode 100644
index 0000000..1f124a3
--- /dev/null
+++ b/gfx/luma/gfx/hud/luma/vehicle_bar_northwest.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="256" height="128">
+	<path fill="#fff" filter="url(common.filters#blurred)" d="M 251.7,54.9 218.1,113 0,113 27.1,64.7 Z"/>
+</svg>
diff --git a/gfx/luma/gfx/hud/luma/vehicle_bar_southeast.svg b/gfx/luma/gfx/hud/luma/vehicle_bar_southeast.svg
new file mode 100644
index 0000000..9c8626b
--- /dev/null
+++ b/gfx/luma/gfx/hud/luma/vehicle_bar_southeast.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="256" height="128">
+	<path fill="#fff" filter="url(common.filters#blurred)" d="M 4.3,73.1 37.9,15 256,15 228.9,63.3 Z"/>
+</svg>
diff --git a/gfx/luma/gfx/hud/luma/vehicle_bar_southwest.svg b/gfx/luma/gfx/hud/luma/vehicle_bar_southwest.svg
new file mode 100644
index 0000000..720d58d
--- /dev/null
+++ b/gfx/luma/gfx/hud/luma/vehicle_bar_southwest.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="256" height="128">
+	<path fill="#fff" filter="url(common.filters#blurred)" d="M 251.7,73.1 218.1,15 0,15 27.1,63.3 Z"/>
+</svg>
diff --git a/gfx/luma/gfx/hud/luma/vehicle_bumble.svg b/gfx/luma/gfx/hud/luma/vehicle_bumble.svg
new file mode 100644
index 0000000..08485df
--- /dev/null
+++ b/gfx/luma/gfx/hud/luma/vehicle_bumble.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="256" height="256">
+	<g fill="#fff" opacity="0.85">
+		<path opacity="0.6" d="m 120,70.5 -7,5.5 -4,12 5,10 28,0 5,-10 -4,-12 -7,-5.5 z"/>
+		<path filter="url(common.filters#vehicle)" d="m 127,60 0,5 -2,0 0,-7 -2,0 -3,9 16,0 -3,-9 -2,0 0,7 -2,0 0,-5 z m -8,9 -8,5 -10,30 -5,0 -5,5 0,31 7,0 9,30 3,-10 3,0 -1,13 -3,5 -5,33 4,0 4,-4 6,-26 20,0 6,26 4,4 4,0 -5,-33 -3,-5 -1,-13 3,0 3,10 9,-30 7,0 0,-31 -5,-5 -5,0 -10,-30 -8,-5 z m 1,3 16,0 5,4 3.5,11 -3.5,8 -6,-4 -14,0 -6,4 -3.5,-8 3.5,-11 z"/>
+	</g>
+</svg>
diff --git a/gfx/luma/gfx/hud/luma/vehicle_bumble_weapon1.svg b/gfx/luma/gfx/hud/luma/vehicle_bumble_weapon1.svg
new file mode 100644
index 0000000..0e44dc9
--- /dev/null
+++ b/gfx/luma/gfx/hud/luma/vehicle_bumble_weapon1.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="256" height="256">
+	<g opacity="0.85">
+		<g fill="#fff" filter="url(common.filters#vehicleWeapon)">
+			<path d="m 86,99 0,8 -1,0 0,11.5 2,2 0,13.5 -6,0 0,-13.5 2,-2 0,-11.5 -1,0 0,-8 z m -9,5 0,7 -1,0 0,11.5 2,2 0,13.5 -6,0 0,-13.5 2,-2 0,-11.5 -1,0 0,-7 z"/>
+		</g>
+	</g>
+</svg>
diff --git a/gfx/luma/gfx/hud/luma/vehicle_bumble_weapon2.svg b/gfx/luma/gfx/hud/luma/vehicle_bumble_weapon2.svg
new file mode 100644
index 0000000..c4ff09c
--- /dev/null
+++ b/gfx/luma/gfx/hud/luma/vehicle_bumble_weapon2.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="256" height="256">
+	<g opacity="0.85">
+		<g fill="#fff" filter="url(common.filters#vehicleWeapon)">
+			<path d="m 170,99 0,8 1,0 0,11.5 -2,2 0,13.5 6,0 0,-13.5 -2,-2 0,-11.5 1,0 0,-8 z m 9,5 0,7 1,0 0,11.5 -2,2 0,13.5 6,0 0,-13.5 -2,-2 0,-11.5 1,0 0,-7 z"/>
+		</g>
+	</g>
+</svg>
diff --git a/gfx/luma/gfx/hud/luma/vehicle_frame.svg b/gfx/luma/gfx/hud/luma/vehicle_frame.svg
new file mode 100644
index 0000000..52b6137
--- /dev/null
+++ b/gfx/luma/gfx/hud/luma/vehicle_frame.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="768" height="256">
+	<g filter="url(common.filters#blurred)">
+		<path fill="#1f1f1f" opacity="0.72" d="m 264,128 60,-104 120,0 60,104 -60,104 -120,0 z"/>
+		<g fill="#272727" opacity="0.7">
+			<path d="M 11,125 257,125 305,42 52,53 Z"/>
+			<path d="m 11,131 246,0 48,83 -253,-11 z"/>
+			<path d="m 757,125 -246,0 -48,-83 253,11 z"/>
+			<path d="m 757,131 -246,0 -48,83 253,-11 z"/>
+		</g>
+	</g>
+</svg>
diff --git a/gfx/luma/gfx/hud/luma/vehicle_gunner.svg b/gfx/luma/gfx/hud/luma/vehicle_gunner.svg
new file mode 100644
index 0000000..6f8163d
--- /dev/null
+++ b/gfx/luma/gfx/hud/luma/vehicle_gunner.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="256" height="256">
+	<g fill="#fff" opacity="0.85">
+		<path opacity="0.6" d="m 166,115 22,13 3,12 -25,0 z"/>
+		<path filter="url(common.filters#vehicle)" d="m 127.5,119 c 3.8,0 7.5,1.4 10.4,4 l 19.1,0 5,2 0,19 -5,2 -19.1,0 c -2.9,2.6 -6.6,4 -10.4,4 -8.6,0 -15.5,-6.9 -15.5,-15.5 0,-8.6 6.9,-15.5 15.5,-15.5 z M 53,87 l 3.5,8 28.5,11 1,6 -8,2 1,5 6,2 -9,3 0,12 26,1 0,6 -9,2 0,9 7,1 0,5 22,6 51,-2 0,-7 9,-10 10,0 1,-5 -4,-15 -19,-12 1,-3 -23,-11 0,-6 -21,-1 -27,12 -8,-1.5 -4,-8 z m 114,30 19.5,11.5 2.5,9.5 -2,0 -2,-5 -12,-2 z m 20,33 -4,4 -3,-3 -4,4 3,3 -4,4 8,8 6,0 -9,-9 1.5,-1.5 7,7 3,-3 -7,-7 1.5,-1.5 9,9 0,-6 z"/>
+	</g>
+</svg>
diff --git a/gfx/luma/gfx/hud/luma/vehicle_gunner_weapon1.svg b/gfx/luma/gfx/hud/luma/vehicle_gunner_weapon1.svg
new file mode 100644
index 0000000..b1102d2
--- /dev/null
+++ b/gfx/luma/gfx/hud/luma/vehicle_gunner_weapon1.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="256" height="256">
+	<g opacity="0.85">
+		<g fill="#fff" filter="url(common.filters#vehicleWeapon)">
+			<path d="m 157,128 -8,0 0,1 -11.5,0 -2,-2 -13.5,0 0,6 13.5,0 2,-2 11.5,0 0,1 8,0 z m -5,9 -7,0 0,1 -11.5,0 -2,-2 -13.5,0 0,6 13.5,0 2,-2 11.5,0 0,1 7,0 z"/>
+		</g>
+	</g>
+</svg>
diff --git a/gfx/luma/gfx/hud/luma/vehicle_icon_health.svg b/gfx/luma/gfx/hud/luma/vehicle_icon_health.svg
new file mode 100644
index 0000000..060f397
--- /dev/null
+++ b/gfx/luma/gfx/hud/luma/vehicle_icon_health.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="80" height="80">
+	<g transform="scale(0.5,0.5)">
+		<g filter="url(common.filters#shining)">
+			<g transform="scale(2,2)">
+				<path fill="#fd705b" d="m 35.5,20 -2,9.5 2.5,4.5 8,0 2.5,-4.5 -2,-9.5 z m -5,12.5 -10.5,2.5 0,9 10.5,2.5 4,-3.5 11,0 4,3.5 10.5,-2.5 0,-9 -10.5,-2.5 -4,3.5 -11,0 z M 36,45 l -2.5,4.5 2,9.5 9,0 2,-9.5 L 44,45 Z"/>
+			</g>
+		</g>
+	</g>
+</svg>
diff --git a/gfx/luma/gfx/hud/luma/vehicle_icon_shield.svg b/gfx/luma/gfx/hud/luma/vehicle_icon_shield.svg
new file mode 100644
index 0000000..6a6255a
--- /dev/null
+++ b/gfx/luma/gfx/hud/luma/vehicle_icon_shield.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="80" height="80">
+	<g transform="scale(0.5,0.5)">
+		<g filter="url(common.filters#shining)">
+			<g transform="scale(2,2)">
+				<path fill="#81f13d" d="m 29.6,22 -4.2,7.3 5.2,3 2.5,-4.3 13.9,0 2.5,4.3 5.2,-3 -4.2,-7.3 -20.8,0 z m -6.2,10.7 -4.2,7.3 10.4,18 8.4,0 0,-6 -4.9,0 -6.9,-12 2.5,-4.3 -5.2,-3 z m 33.2,0 -5.2,3 2.5,4.3 -6.9,12 -4.9,0 0,6 8.4,0 10.4,-18 -4.2,-7.3 z"/>
+			</g>
+		</g>
+	</g>
+</svg>
diff --git a/gfx/luma/gfx/hud/luma/vehicle_icon_weapon1.svg b/gfx/luma/gfx/hud/luma/vehicle_icon_weapon1.svg
new file mode 100644
index 0000000..8f48812
--- /dev/null
+++ b/gfx/luma/gfx/hud/luma/vehicle_icon_weapon1.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="80" height="80">
+	<g transform="scale(0.5,0.5)">
+		<g filter="url(common.filters#shining)">
+			<g transform="scale(2,2)">
+				<path fill="#e9be57" d="M 28,55 33,60 46.5,46.5 46,44 56,34 l 0.7,0.7 7,-7 -3.4,-3.4 -7,7 L 54,32 44,42 41.5,41.5 Z M 16,50 21,55 34.5,41.5 34,39 44,29 l 0.7,0.7 7,-7 -3.4,-3.4 -7,7 L 42,27 32,37 29.5,36.5 Z"/>
+			</g>
+		</g>
+	</g>
+</svg>
diff --git a/gfx/luma/gfx/hud/luma/vehicle_icon_weapon2.svg b/gfx/luma/gfx/hud/luma/vehicle_icon_weapon2.svg
new file mode 100644
index 0000000..33ab574
--- /dev/null
+++ b/gfx/luma/gfx/hud/luma/vehicle_icon_weapon2.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="80" height="80">
+	<g transform="scale(0.5,0.5)">
+		<g filter="url(common.filters#shining)">
+			<g transform="scale(2,2)">
+				<path fill="#f08058" d="m 59.8,20.2 c 1.1,1.1 -1.7,9.4 -4.4,13.2 l -8.8,-8.8 c 3.8,-2.7 12.1,-5.5 13.2,-4.4 z m -4.9,14.8 -8.8,8.8 -3.8,0.5 -12.1,11 -4.4,1.1 -2.2,-2.2 1.1,-4.4 11,-12.1 0.5,-3.8 8.8,-8.8 z M 38.8,49.8 36.1,60.4 32.3,62 31.7,56 Z m -8.6,-8.6 -6.2,7.1 -6,-0.6 1.6,-3.8 z"/>
+			</g>
+		</g>
+	</g>
+</svg>
diff --git a/gfx/luma/gfx/hud/luma/vehicle_racer.svg b/gfx/luma/gfx/hud/luma/vehicle_racer.svg
new file mode 100644
index 0000000..c97ef3e
--- /dev/null
+++ b/gfx/luma/gfx/hud/luma/vehicle_racer.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="256" height="256">
+	<g fill="#fff" opacity="0.85">
+		<rect opacity="0.6" x="116" y="132" width="24" height="52"/>
+		<path filter="url(common.filters#vehicle)" d="m 123,62 -6,10 -5,52 -24,45 0,26 7,0 8,-12 7,0 9,7 18,0 9,-7 7,0 8,12 7,0 0,-26 -24,-45 -5,-52 -6,-10 z m 5,72 6,2 4,31 -4,15 -12,0 -4,-15 4,-31 z"/>
+	</g>
+</svg>
diff --git a/gfx/luma/gfx/hud/luma/vehicle_racer_weapon1.svg b/gfx/luma/gfx/hud/luma/vehicle_racer_weapon1.svg
new file mode 100644
index 0000000..2557dd6
--- /dev/null
+++ b/gfx/luma/gfx/hud/luma/vehicle_racer_weapon1.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="256" height="256">
+	<g opacity="0.85">
+		<g fill="#fff" filter="url(common.filters#vehicleWeapon)">
+			<path d="m 119,193 4,11 10,0 4,-11 z"/>
+			<path d="m 105.75,76 0,5 0.25,0 0,8 -1,1 0,9 4,0 0,-9 -1,-1 0,-8 0.25,0 0,-5 -2.5,0 z m -6,3 0,5 0.25,0 0,8 -1,1 0,9 4,0 0,-9 -1,-1 0,-8 0.25,0 0,-5 -2.5,0 z"/>
+			<path d="m 150.25,76 0,5 -0.25,0 0,8 1,1 0,9 -4,0 0,-9 1,-1 0,-8 -0.25,0 0,-5 2.5,0 z m 6,3 0,5 -0.25,0 0,8 1,1 0,9 -4,0 0,-9 1,-1 0,-8 -0.25,0 0,-5 2.5,0 z"/>
+		</g>
+	</g>
+</svg>
diff --git a/gfx/luma/gfx/hud/luma/vehicle_racer_weapon2.svg b/gfx/luma/gfx/hud/luma/vehicle_racer_weapon2.svg
new file mode 100644
index 0000000..f9cec12
--- /dev/null
+++ b/gfx/luma/gfx/hud/luma/vehicle_racer_weapon2.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="256" height="256">
+	<g opacity="0.85">
+		<g fill="#fff" filter="url(common.filters#vehicleWeapon)">
+			<path d="m 73.5,160 c -1,0 -3.5,5 -4,8 l 8,0 c -0.5,-3 -3,-8 -4,-8 z m -4.5,9 0,8 1.5,2 0.5,10.5 1.5,2.5 2,0 1.5,-2.5 0.5,-10.5 1.5,-2 0,-8 z m 0.6,14 -3.6,6 1,2.5 3,-2.5 z m 7.8,0 -0.4,6 3,2.5 1,-2.5 z"/>
+			<path d="m 182.5,160 c 1,0 3.5,5 4,8 l -8,0 c 0.5,-3 3,-8 4,-8 z m 4.5,9 0,8 -1.5,2 -0.5,10.5 -1.5,2.5 -2,0 -1.5,-2.5 -0.5,-10.5 -1.5,-2 0,-8 z m -0.6,14 3.6,6 -1,2.5 -3,-2.5 z m -7.8,0 0.4,6 -3,2.5 -1,-2.5 z"/>
+		</g>
+	</g>
+</svg>
diff --git a/gfx/luma/gfx/hud/luma/vehicle_raptor.svg b/gfx/luma/gfx/hud/luma/vehicle_raptor.svg
new file mode 100644
index 0000000..a5df557
--- /dev/null
+++ b/gfx/luma/gfx/hud/luma/vehicle_raptor.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="256" height="256">
+	<g fill="#fff" opacity="0.85">
+		<path opacity="0.6" d="m 125,76 -6,8 3,6 14,0 3,-6 -6,-8 z"/>
+		<path d="m 125,74 -7,9 0,27 -2,0 -1,-17 -5,0 -10,6 0,5 -13.5,0.1 c -5,-6.8 -13.1,-10.8 -21.7,-10.8 -14.7,0 -26.6,11.5 -26.6,25.7 0,3.1 0.6,6.1 1.7,8.9 l 7.2,-3 c 2,6.8 9.1,11.6 17.2,11.6 6.9,0 13.1,-3.4 16,-8.8 l 7.1,4.8 c 2.6,-4.1 4.1,-8.4 4.1,-15.4 l 7.5,0 0,5 11,19 6,0 0,-9 6,0 0,55 -16,5 0,8 17,8 2,-5 8,0 2,5 17,-8 0,-8 -16,-5 0,-55 6,0 0,9 6,0 11,-19 0,-5 7.5,0 c 0,7 1.5,11.4 4.1,15.4 l 7.1,-4.8 c 2.9,5.4 9.2,8.8 16,8.8 8.1,0 15.2,-4.8 17.2,-11.6 l 7.2,3 c 1.1,-2.9 1.7,-5.9 1.7,-8.9 0,-14.2 -11.9,-25.7 -26.6,-25.7 -8.6,0 -16.7,4 -21.7,10.8 L 158,104 l 0,-5 -10,-6 -5,0 -1,17 -2,0 0,-27 -7,-9 z m 12.5,11 -1.5,3 -7,-3 -7,3 -1.5,-3 0,-1 5.5,-7 6,0 5.5,7 z m -11.5,61 6,0 0,47 -6,0 z" filter="url(common.filters#vehicle)"/>
+	</g>
+</svg>
diff --git a/gfx/luma/gfx/hud/luma/vehicle_raptor_weapon1.svg b/gfx/luma/gfx/hud/luma/vehicle_raptor_weapon1.svg
new file mode 100644
index 0000000..192cbab
--- /dev/null
+++ b/gfx/luma/gfx/hud/luma/vehicle_raptor_weapon1.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="256" height="256">
+	<g opacity="0.85">
+		<g fill="#fff" filter="url(common.filters#vehicleWeapon)">
+			<path d="m 107.75,65 0,5 0.25,0 0,8 -1,1 0,9 4,0 0,-9 -1,-1 0,-8 0.25,0 0,-5 -2.5,0 z m -6,3 0,5 0.25,0 0,8 -1,1 0,9 4,0 0,-9 -1,-1 0,-8 0.25,0 0,-5 -2.5,0 z"/>
+			<path d="m 150.25,65 0,5 -0.25,0 0,8 1,1 0,9 -4,0 0,-9 1,-1 0,-8 -0.25,0 0,-5 2.5,0 z m 6,3 0,5 -0.25,0 0,8 1,1 0,9 -4,0 0,-9 1,-1 0,-8 -0.25,0 0,-5 2.5,0 z"/>
+		</g>
+	</g>
+</svg>
diff --git a/gfx/luma/gfx/hud/luma/vehicle_raptor_weapon2.svg b/gfx/luma/gfx/hud/luma/vehicle_raptor_weapon2.svg
new file mode 100644
index 0000000..91ae0c8
--- /dev/null
+++ b/gfx/luma/gfx/hud/luma/vehicle_raptor_weapon2.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="256" height="256">
+	<g opacity="0.85">
+		<g fill="#fff" filter="url(common.filters#vehicleWeapon)">
+			<path d="m 96.5,134 c -1,0 -3.5,5 -4,8 l 8,0 c -0.5,-3 -3,-8 -4,-8 z m -4.5,9 0,8 1.5,2 0.5,10.5 1.5,2.5 2,0 1.5,-2.5 0.5,-10.5 1.5,-2 0,-8 z m 0.6,14 -3.6,6 1,2.5 3,-2.5 z m 7.8,0 -0.4,6 3,2.5 1,-2.5 z"/>
+			<path d="m 161.5,134 c 1,0 3.5,5 4,8 l -8,0 c 0.5,-3 3,-8 4,-8 z m 4.5,9 0,8 -1.5,2 -0.5,10.5 -1.5,2.5 -2,0 -1.5,-2.5 -0.5,-10.5 -1.5,-2 0,-8 z m -0.6,14 3.6,6 -1,2.5 -3,-2.5 z m -7.8,0 0.4,6 -3,2.5 -1,-2.5 z"/>
+		</g>
+	</g>
+</svg>
diff --git a/gfx/luma/gfx/hud/luma/vehicle_shield.svg b/gfx/luma/gfx/hud/luma/vehicle_shield.svg
new file mode 100644
index 0000000..beaae07
--- /dev/null
+++ b/gfx/luma/gfx/hud/luma/vehicle_shield.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="256" height="256">
+	<defs>
+		<clipPath id="clip">
+			<path d="M 74,92 51.5,77 74,38 182,38 204.5,77 182,92 Z"/>
+		</clipPath>
+		<filter id="shield" x="-1" y="-1" width="3" height="3">
+			<feGaussianBlur stdDeviation="12"/>
+		</filter>
+	</defs>
+	<g fill="#fff" opacity="0.9">
+		<path d="m 74,38 -22.5,39 3,2 L 63,66.5 66.5,66 79,47 l 98,0 12.5,19 3.5,0.5 8.5,12.5 3,-2 L 182,38 Z" filter="url(#shield)" clip-path="url(#clip)"/>
+		<path d="m 74,38 -22.5,39 3,2 L 63,66.5 66.5,66 79,47 l 98,0 12.5,19 3.5,0.5 8.5,12.5 3,-2 L 182,38 Z" filter="url(common.filters#vehicleWeapon)"/>
+	</g>
+</svg>
diff --git a/gfx/luma/gfx/hud/luma/vehicle_spider.svg b/gfx/luma/gfx/hud/luma/vehicle_spider.svg
new file mode 100644
index 0000000..c9da333
--- /dev/null
+++ b/gfx/luma/gfx/hud/luma/vehicle_spider.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="256" height="256">
+	<g fill="#fff" opacity="0.85">
+		<path opacity="0.6" d="m 123,77 -9,12 3,3 22,0 3,-3 -9,-12 z"/>
+		<path filter="url(common.filters#vehicle)" d="m 122,75 -10,13 0,25 11,17.5 0,35.5 10,0 0,-35.5 11,-17.5 0,-25 -10,-13 z m 1,4 10,0 7,9.5 -1.5,1.5 -5.5,-4 -10,0 -5.5,4 -1.5,-1.5 z m -25.2,10 -7.9,1.8 -6.1,6.1 -1.8,7.9 8.4,8.3 18.5,0 0,-8 -4,-4 0.8,-4.2 z m 60.4,0 -8,7.9 0.8,4.2 -4,4 0,8 18.5,0 8.4,-8.3 -1.8,-7.9 -6.1,-6.1 z m -65.2,27 -11,16 0,28 15,20 14,0 10,-14 0,-35 -9.5,-15 z m 51.5,0 -9.5,15 0,35 10,14 14,0 15,-20 0,-28 -11,-16 z m -70.5,16 -5,7 0,9 5,7 6,0 0,-23 z m 102,0 0,23 6,0 5,-7 0,-9 -5,-7 z m -89.4,38.9 -6.3,5.8 1.8,7.9 6.1,6.1 7.9,1.8 10,-9.5 -10.5,0 z m 82.8,0 -8.9,12.1 -10.5,0 10,9.5 7.9,-1.8 6.1,-6.1 1.8,-7.9 z"/>
+	</g>
+</svg>
diff --git a/gfx/luma/gfx/hud/luma/vehicle_spider_weapon1.svg b/gfx/luma/gfx/hud/luma/vehicle_spider_weapon1.svg
new file mode 100644
index 0000000..89cd248
--- /dev/null
+++ b/gfx/luma/gfx/hud/luma/vehicle_spider_weapon1.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="256" height="256">
+	<g opacity="0.85">
+		<g fill="#fff" filter="url(common.filters#vehicleWeapon)">
+			<path d="m 106.75,59 0,5 0.25,0 0,8 -1,1 0,9 4,0 0,-9 -1,-1 0,-8 0.25,0 0,-5 -2.5,0 z m -6,3 0,5 0.25,0 0,8 -1,1 0,9 4,0 0,-9 -1,-1 0,-8 0.25,0 0,-5 -2.5,0 z"/>
+			<path d="m 149.25,59 0,5 -0.25,0 0,8 1,1 0,9 -4,0 0,-9 1,-1 0,-8 -0.25,0 0,-5 2.5,0 z m 6,3 0,5 -0.25,0 0,8 1,1 0,9 -4,0 0,-9 1,-1 0,-8 -0.25,0 0,-5 2.5,0 z"/>
+		</g>
+	</g>
+</svg>
diff --git a/gfx/luma/gfx/hud/luma/vehicle_spider_weapon2.svg b/gfx/luma/gfx/hud/luma/vehicle_spider_weapon2.svg
new file mode 100644
index 0000000..ac06e7f
--- /dev/null
+++ b/gfx/luma/gfx/hud/luma/vehicle_spider_weapon2.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="256" height="256">
+	<g opacity="0.85">
+		<g fill="#fff" filter="url(common.filters#vehicleWeapon)">
+			<path d="m 57.5,129 c -1,0 -3.5,5 -4,8 l 8,0 c -0.5,-3 -3,-8 -4,-8 z m -4.5,9 0,8 1.5,2 0.5,10.5 1.5,2.5 2,0 1.5,-2.5 0.5,-10.5 1.5,-2 0,-8 z m 0.6,14 -3.6,6 1,2.5 3,-2.5 z m 7.8,0 -0.4,6 3,2.5 1,-2.5 z"/>
+			<path d="m 198.5,129 c 1,0 3.5,5 4,8 l -8,0 c 0.5,-3 3,-8 4,-8 z m 4.5,9 0,8 -1.5,2 -0.5,10.5 -1.5,2.5 -2,0 -1.5,-2.5 -0.5,-10.5 -1.5,-2 0,-8 z m -0.6,14 3.6,6 -1,2.5 -3,-2.5 z m -7.8,0 0.4,6 -3,2.5 -1,-2.5 z"/>
+		</g>
+	</g>
+</svg>
diff --git a/gfx/luma/gfx/hud/luma/vehicle_template.png b/gfx/luma/gfx/hud/luma/vehicle_template.png
new file mode 100644
index 0000000..5bc53cb
Binary files /dev/null and b/gfx/luma/gfx/hud/luma/vehicle_template.png differ
diff --git a/gfx/luma/gfx/vehicles/axh-bracket.svg b/gfx/luma/gfx/vehicles/axh-bracket.svg
deleted file mode 100644
index 233c3fb..0000000
--- a/gfx/luma/gfx/vehicles/axh-bracket.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="64" height="32">
-	<g fill="#ffffff" filter="url(common.filters#shadow)">
-		<path d="m 2,2 0,28 10,0 0,-3.5 -6,0 0,-21 6,0 0,-3.5 z"/>
-		<path d="m 62,2 0,28 -10,0 0,-3.5 6,0 0,-21 -6,0 0,-3.5 z"/>
-	</g>
-</svg>
diff --git a/gfx/luma/gfx/vehicles/axh-cross.svg b/gfx/luma/gfx/vehicles/axh-cross.svg
deleted file mode 100644
index c81f755..0000000
--- a/gfx/luma/gfx/vehicles/axh-cross.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="64" height="64">
-	<g filter="url(common.filters#shadow)">
-		<path fill="#fff" d="m 31,27 -0.5,3.5 -3.5,0.5 0,2 3.5,0.5 0.5,3.5 2,0 0.5,-3.5 L 37,33 37,31 33.5,30.5 33,27 Z"/>
-		<path fill="none" stroke="#fff" stroke-width="2" opacity="0.8" d="m 25.5,8 -2,15.5 -15.5,2 0,13 15.5,2 2,15.5 13,0 2,-15.5 15.5,-2 0,-13 -15.5,-2 -2,-15.5 z"/>
-	</g>
-</svg>
diff --git a/gfx/luma/gfx/vehicles/axh-dropcross.svg b/gfx/luma/gfx/vehicles/axh-dropcross.svg
deleted file mode 100644
index e22c53b..0000000
--- a/gfx/luma/gfx/vehicles/axh-dropcross.svg
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="128" height="128">
-	<defs>
-		<clipPath id="clip">
-			<path d="M 0,0 0,44 64,64 44,0 0,0 Z M 64,64 128,44 128,0 84,0 64,64 Z m 0,0 20,64 44,0 0,-44 -64,-20 z m 0,0 -64,20 0,44 44,0 20,-64 z"/>
-		</clipPath>
-	</defs>
-	<g filter="url(common.filters#shadow)">
-		<g fill="#fff">
-			<rect x="63" y="30" width="2" height="22"/>
-			<rect x="63" y="76" width="2" height="22"/>
-			<rect x="76" y="63" width="22" height="2"/>
-			<rect x="30" y="63" width="22" height="2"/>
-			<path opacity="0.3" d="m 60,4 1.5,5 5,0 L 68,4 60,4 Z M 4,60 4,68 9,66.5 9,61.5 4,60 Z m 120,0 -5,1.5 0,5 5,1.5 0,-8 z m -62.5,59 -1.5,5 8,0 -1.5,-5 -5,0 z"/>
-		</g>
-		<g fill="none" stroke="#fff">
-			<circle stroke-width="2" cx="64" cy="64" r="12"/>
-			<circle opacity="0.85" stroke-width="4" cy="64" cx="64" r="33" clip-path="url(#clip)"/>
-			<circle opacity="0.7" stroke-width="6" cx="64" cy="64" r="56" clip-path="url(#clip)"/>
-		</g>
-	</g>
-</svg>
diff --git a/gfx/luma/gfx/vehicles/axh-ring.svg b/gfx/luma/gfx/vehicles/axh-ring.svg
deleted file mode 100644
index 214ce14..0000000
--- a/gfx/luma/gfx/vehicles/axh-ring.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="32" height="32">
-	<g filter="url(common.filters#shadow)">
-		<circle fill="none" stroke="#fff" stroke-width="2" cx="16" cy="16" r="13"/>
-	</g>
-</svg>
diff --git a/gfx/luma/gfx/vehicles/axh-special1.svg b/gfx/luma/gfx/vehicles/axh-special1.svg
deleted file mode 100644
index 6c32b8a..0000000
--- a/gfx/luma/gfx/vehicles/axh-special1.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="64" height="64">
-	<g fill="#fff" filter="url(common.filters#shadow)">
-		<rect x="3" y="31" width="22" height="2"/>
-		<rect x="39" y="31" width="22" height="2"/>
-		<rect x="31" y="9" width="2" height="16"/>
-		<rect x="31" y="38" width="2" height="16"/>
-		<g opacity="0.4">
-			<path d="m 6,27 3.5,-5 5.5,0 -3,5 z"/>
-			<path d="m 6,37 3.5,5 5.5,0 -3,-5 z"/>
-			<path d="m 58,27 -3.5,-5 -5.5,0 3,5 z"/>
-			<path d="m 58,37 -3.5,5 -5.5,0 3,-5 z"/>
-		</g>
-	</g>
-</svg>
diff --git a/gfx/luma/gfx/vehicles/axh-tag.svg b/gfx/luma/gfx/vehicles/axh-tag.svg
deleted file mode 100644
index 4dfa13e..0000000
--- a/gfx/luma/gfx/vehicles/axh-tag.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="64" height="64">
-	<defs>
-		<clipPath id="clip">
-			<rect x="0" y="0" width="25" height="25"/>
-			<rect y="0" x="39" width="25" height="25"/>
-			<rect x="39" y="39" width="25" height="25"/>
-			<rect y="39" x="0" width="25" height="25"/>
-		</clipPath>
-	</defs>
-	<g filter="url(common.filters#shadow)">
-		<circle opacity="0.4" fill="none" stroke="#fff" stroke-width="3" clip-path="url(#clip)" cx="32" cy="32" r="24.5"/>
-		<g fill="#fff">
-			<rect x="31" y="7" width="2" height="18"/>
-			<rect x="39" y="31" width="18" height="2"/>
-			<rect x="31" y="39" width="2" height="18"/>
-			<rect x="7" y="31" width="18" height="2"/>
-		</g>
-	</g>
-</svg>
diff --git a/gfx/luma/gfx/vehicles/bar_dwn_left.svg b/gfx/luma/gfx/vehicles/bar_dwn_left.svg
deleted file mode 100644
index 720d58d..0000000
--- a/gfx/luma/gfx/vehicles/bar_dwn_left.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="256" height="128">
-	<path fill="#fff" filter="url(common.filters#blurred)" d="M 251.7,73.1 218.1,15 0,15 27.1,63.3 Z"/>
-</svg>
diff --git a/gfx/luma/gfx/vehicles/bar_dwn_right.svg b/gfx/luma/gfx/vehicles/bar_dwn_right.svg
deleted file mode 100644
index 9c8626b..0000000
--- a/gfx/luma/gfx/vehicles/bar_dwn_right.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="256" height="128">
-	<path fill="#fff" filter="url(common.filters#blurred)" d="M 4.3,73.1 37.9,15 256,15 228.9,63.3 Z"/>
-</svg>
diff --git a/gfx/luma/gfx/vehicles/bar_up_left.svg b/gfx/luma/gfx/vehicles/bar_up_left.svg
deleted file mode 100644
index 1f124a3..0000000
--- a/gfx/luma/gfx/vehicles/bar_up_left.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="256" height="128">
-	<path fill="#fff" filter="url(common.filters#blurred)" d="M 251.7,54.9 218.1,113 0,113 27.1,64.7 Z"/>
-</svg>
diff --git a/gfx/luma/gfx/vehicles/bar_up_right.svg b/gfx/luma/gfx/vehicles/bar_up_right.svg
deleted file mode 100644
index 0aa60dc..0000000
--- a/gfx/luma/gfx/vehicles/bar_up_right.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="256" height="128">
-	<path fill="#fff" filter="url(common.filters#blurred)" d="M 4.3,54.9 37.9,113 256,113 228.9,64.7 Z"/>
-</svg>
diff --git a/gfx/luma/gfx/vehicles/bullets.svg b/gfx/luma/gfx/vehicles/bullets.svg
deleted file mode 100644
index 8f48812..0000000
--- a/gfx/luma/gfx/vehicles/bullets.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="80" height="80">
-	<g transform="scale(0.5,0.5)">
-		<g filter="url(common.filters#shining)">
-			<g transform="scale(2,2)">
-				<path fill="#e9be57" d="M 28,55 33,60 46.5,46.5 46,44 56,34 l 0.7,0.7 7,-7 -3.4,-3.4 -7,7 L 54,32 44,42 41.5,41.5 Z M 16,50 21,55 34.5,41.5 34,39 44,29 l 0.7,0.7 7,-7 -3.4,-3.4 -7,7 L 42,27 32,37 29.5,36.5 Z"/>
-			</g>
-		</g>
-	</g>
-</svg>
diff --git a/gfx/luma/gfx/vehicles/bumb.svg b/gfx/luma/gfx/vehicles/bumb.svg
deleted file mode 100644
index c8cd936..0000000
--- a/gfx/luma/gfx/vehicles/bumb.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="256" height="256">
-	<g fill="#fff" opacity="0.85">
-		<path opacity="0.6" d="m 120,70.5 -7,5.5 -4,12 5,10 28,0 5,-10 -4,-12 -7,-5.5 z"/>
-		<path filter="url(common.filters#model)" d="m 127,60 0,5 -2,0 0,-7 -2,0 -3,9 16,0 -3,-9 -2,0 0,7 -2,0 0,-5 z m -8,9 -8,5 -10,30 -5,0 -5,5 0,31 7,0 9,30 3,-10 3,0 -1,13 -3,5 -5,33 4,0 4,-4 6,-26 20,0 6,26 4,4 4,0 -5,-33 -3,-5 -1,-13 3,0 3,10 9,-30 7,0 0,-31 -5,-5 -5,0 -10,-30 -8,-5 z m 1,3 16,0 5,4 3.5,11 -3.5,8 -6,-4 -14,0 -6,4 -3.5,-8 3.5,-11 z"/>
-	</g>
-</svg>
diff --git a/gfx/luma/gfx/vehicles/bumb_lgun.svg b/gfx/luma/gfx/vehicles/bumb_lgun.svg
deleted file mode 100644
index 7357bae..0000000
--- a/gfx/luma/gfx/vehicles/bumb_lgun.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="256" height="256">
-	<g opacity="0.85">
-		<g fill="#fff" filter="url(common.filters#weapon)">
-			<path d="m 86,99 0,8 -1,0 0,11.5 2,2 0,13.5 -6,0 0,-13.5 2,-2 0,-11.5 -1,0 0,-8 z m -9,5 0,7 -1,0 0,11.5 2,2 0,13.5 -6,0 0,-13.5 2,-2 0,-11.5 -1,0 0,-7 z"/>
-		</g>
-	</g>
-</svg>
diff --git a/gfx/luma/gfx/vehicles/bumb_rgun.svg b/gfx/luma/gfx/vehicles/bumb_rgun.svg
deleted file mode 100644
index a566fe9..0000000
--- a/gfx/luma/gfx/vehicles/bumb_rgun.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="256" height="256">
-	<g opacity="0.85">
-		<g fill="#fff" filter="url(common.filters#weapon)">
-			<path d="m 170,99 0,8 1,0 0,11.5 -2,2 0,13.5 6,0 0,-13.5 -2,-2 0,-11.5 1,0 0,-8 z m 9,5 0,7 1,0 0,11.5 -2,2 0,13.5 6,0 0,-13.5 -2,-2 0,-11.5 1,0 0,-7 z"/>
-		</g>
-	</g>
-</svg>
diff --git a/gfx/luma/gfx/vehicles/bumb_side.svg b/gfx/luma/gfx/vehicles/bumb_side.svg
deleted file mode 100644
index de7d718..0000000
--- a/gfx/luma/gfx/vehicles/bumb_side.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="256" height="256">
-	<g fill="#fff" opacity="0.85">
-		<path opacity="0.6" d="m 166,115 22,13 3,12 -25,0 z"/>
-		<path filter="url(common.filters#model)" d="m 127.5,119 c 3.8,0 7.5,1.4 10.4,4 l 19.1,0 5,2 0,19 -5,2 -19.1,0 c -2.9,2.6 -6.6,4 -10.4,4 -8.6,0 -15.5,-6.9 -15.5,-15.5 0,-8.6 6.9,-15.5 15.5,-15.5 z M 53,87 l 3.5,8 28.5,11 1,6 -8,2 1,5 6,2 -9,3 0,12 26,1 0,6 -9,2 0,9 7,1 0,5 22,6 51,-2 0,-7 9,-10 10,0 1,-5 -4,-15 -19,-12 1,-3 -23,-11 0,-6 -21,-1 -27,12 -8,-1.5 -4,-8 z m 114,30 19.5,11.5 2.5,9.5 -2,0 -2,-5 -12,-2 z m 20,33 -4,4 -3,-3 -4,4 3,3 -4,4 8,8 6,0 -9,-9 1.5,-1.5 7,7 3,-3 -7,-7 1.5,-1.5 9,9 0,-6 z"/>
-	</g>
-</svg>
diff --git a/gfx/luma/gfx/vehicles/bumb_side_gun.svg b/gfx/luma/gfx/vehicles/bumb_side_gun.svg
deleted file mode 100644
index d70875a..0000000
--- a/gfx/luma/gfx/vehicles/bumb_side_gun.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="256" height="256">
-	<g opacity="0.85">
-		<g fill="#fff" filter="url(common.filters#weapon)">
-			<path d="m 157,128 -8,0 0,1 -11.5,0 -2,-2 -13.5,0 0,6 13.5,0 2,-2 11.5,0 0,1 8,0 z m -5,9 -7,0 0,1 -11.5,0 -2,-2 -13.5,0 0,6 13.5,0 2,-2 11.5,0 0,1 7,0 z"/>
-		</g>
-	</g>
-</svg>
diff --git a/gfx/luma/gfx/vehicles/common.filters b/gfx/luma/gfx/vehicles/common.filters
index 33479b6..9e50b94 100644
--- a/gfx/luma/gfx/vehicles/common.filters
+++ b/gfx/luma/gfx/vehicles/common.filters
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="64" height="64">
 	<defs>
-		<filter id="blurred">
-			<feGaussianBlur stdDeviation="0.4"/>
-		</filter>
 		<filter id="shadow" x="-0.5" y="-0.5" width="2" height="2">
 			<feMorphology operator="dilate" radius="0.7" in="SourceAlpha"/>
 			<feColorMatrix values="1 0 0 0 0.25 0 1 0 0 0.25 0 0 1 0 0.25 0 0 0 0.5 0"/>
@@ -13,44 +10,5 @@
 				<feMergeNode in="SourceGraphic"/>
 			</feMerge>
 		</filter>
-		<filter id="shining" x="-0.5" y="-0.5" width="2" height="2">
-			<feGaussianBlur stdDeviation="8"/>
-			<feColorMatrix values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0.5 0" result="glow"/>
-			<feGaussianBlur in="SourceGraphic" stdDeviation="8"/>
-				<!-- ./tools/hsv-matrix.pl -9 3.2 0.38 -->
-			<feColorMatrix values="1.07 -0.45 -0.24 0 0 -0.20 0.59 -0.01 0 0 -0.02 -0.72 1.13 0 0 0 0 0 1.4 0" result="shadow"/>
-			<feGaussianBlur in="SourceGraphic" stdDeviation="3"/>
-			<feColorMatrix values="0.2 0 0 0 0 0 0.2 0 0 0 0 0 0.2 0 0 0 0 0 3 0"/>
-			<feColorMatrix values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0.3 0" result="outline"/>
-			<feGaussianBlur in="SourceAlpha" stdDeviation="1" result="mask"/>
-			<feGaussianBlur in="SourceGraphic" stdDeviation="4"/>
-				<!-- ./tools/hsv-matrix.pl 12 0.5 1.4 -->
-			<feColorMatrix values="0.81 0.41 0.19 0 0 0.17 1.22 0.01 0 0 0.04 0.62 0.75 0 0 0 0 0 1 0"/>
-			<feComposite in2="mask" operator="in" result="highlight"/>
-			<feMerge>
-				<feMergeNode in="glow"/>
-				<feMergeNode in="shadow"/>
-				<feMergeNode in="outline"/>
-				<feMergeNode in="SourceGraphic"/>
-			</feMerge>
-			<feComposite in2="highlight" operator="arithmetic" k1="0.4" k2="1" k3="0.2"/>
-			<feGaussianBlur stdDeviation="0.4"/>
-		</filter>
-		<filter id="model" x="-0.5" y="-0.5" width="2" height="2">
-			<feGaussianBlur stdDeviation="7"/>
-			<feColorMatrix values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0.5 0" result="glow"/>
-			<feMerge>
-				<feMergeNode in="glow"/>
-				<feMergeNode in="SourceGraphic"/>
-			</feMerge>
-		</filter>
-		<filter id="weapon" x="-0.5" y="-0.5" width="2" height="2">
-			<feGaussianBlur stdDeviation="3"/>
-			<feColorMatrix values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0.6 0" result="glow"/>
-			<feMerge>
-				<feMergeNode in="glow"/>
-				<feMergeNode in="SourceGraphic"/>
-			</feMerge>
-		</filter>
 	</defs>
 </svg>
diff --git a/gfx/luma/gfx/vehicles/crosshair_aim.svg b/gfx/luma/gfx/vehicles/crosshair_aim.svg
new file mode 100644
index 0000000..6c32b8a
--- /dev/null
+++ b/gfx/luma/gfx/vehicles/crosshair_aim.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="64" height="64">
+	<g fill="#fff" filter="url(common.filters#shadow)">
+		<rect x="3" y="31" width="22" height="2"/>
+		<rect x="39" y="31" width="22" height="2"/>
+		<rect x="31" y="9" width="2" height="16"/>
+		<rect x="31" y="38" width="2" height="16"/>
+		<g opacity="0.4">
+			<path d="m 6,27 3.5,-5 5.5,0 -3,5 z"/>
+			<path d="m 6,37 3.5,5 5.5,0 -3,-5 z"/>
+			<path d="m 58,27 -3.5,-5 -5.5,0 3,5 z"/>
+			<path d="m 58,37 -3.5,5 -5.5,0 3,-5 z"/>
+		</g>
+	</g>
+</svg>
diff --git a/gfx/luma/gfx/vehicles/crosshair_drop.svg b/gfx/luma/gfx/vehicles/crosshair_drop.svg
new file mode 100644
index 0000000..e22c53b
--- /dev/null
+++ b/gfx/luma/gfx/vehicles/crosshair_drop.svg
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="128" height="128">
+	<defs>
+		<clipPath id="clip">
+			<path d="M 0,0 0,44 64,64 44,0 0,0 Z M 64,64 128,44 128,0 84,0 64,64 Z m 0,0 20,64 44,0 0,-44 -64,-20 z m 0,0 -64,20 0,44 44,0 20,-64 z"/>
+		</clipPath>
+	</defs>
+	<g filter="url(common.filters#shadow)">
+		<g fill="#fff">
+			<rect x="63" y="30" width="2" height="22"/>
+			<rect x="63" y="76" width="2" height="22"/>
+			<rect x="76" y="63" width="22" height="2"/>
+			<rect x="30" y="63" width="22" height="2"/>
+			<path opacity="0.3" d="m 60,4 1.5,5 5,0 L 68,4 60,4 Z M 4,60 4,68 9,66.5 9,61.5 4,60 Z m 120,0 -5,1.5 0,5 5,1.5 0,-8 z m -62.5,59 -1.5,5 8,0 -1.5,-5 -5,0 z"/>
+		</g>
+		<g fill="none" stroke="#fff">
+			<circle stroke-width="2" cx="64" cy="64" r="12"/>
+			<circle opacity="0.85" stroke-width="4" cy="64" cx="64" r="33" clip-path="url(#clip)"/>
+			<circle opacity="0.7" stroke-width="6" cx="64" cy="64" r="56" clip-path="url(#clip)"/>
+		</g>
+	</g>
+</svg>
diff --git a/gfx/luma/gfx/vehicles/crosshair_heal.svg b/gfx/luma/gfx/vehicles/crosshair_heal.svg
new file mode 100644
index 0000000..c81f755
--- /dev/null
+++ b/gfx/luma/gfx/vehicles/crosshair_heal.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="64" height="64">
+	<g filter="url(common.filters#shadow)">
+		<path fill="#fff" d="m 31,27 -0.5,3.5 -3.5,0.5 0,2 3.5,0.5 0.5,3.5 2,0 0.5,-3.5 L 37,33 37,31 33.5,30.5 33,27 Z"/>
+		<path fill="none" stroke="#fff" stroke-width="2" opacity="0.8" d="m 25.5,8 -2,15.5 -15.5,2 0,13 15.5,2 2,15.5 13,0 2,-15.5 15.5,-2 0,-13 -15.5,-2 -2,-15.5 z"/>
+	</g>
+</svg>
diff --git a/gfx/luma/gfx/vehicles/crosshair_hint.svg b/gfx/luma/gfx/vehicles/crosshair_hint.svg
new file mode 100644
index 0000000..214ce14
--- /dev/null
+++ b/gfx/luma/gfx/vehicles/crosshair_hint.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="32" height="32">
+	<g filter="url(common.filters#shadow)">
+		<circle fill="none" stroke="#fff" stroke-width="2" cx="16" cy="16" r="13"/>
+	</g>
+</svg>
diff --git a/gfx/luma/gfx/vehicles/crosshair_lock.svg b/gfx/luma/gfx/vehicles/crosshair_lock.svg
new file mode 100644
index 0000000..233c3fb
--- /dev/null
+++ b/gfx/luma/gfx/vehicles/crosshair_lock.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="64" height="32">
+	<g fill="#ffffff" filter="url(common.filters#shadow)">
+		<path d="m 2,2 0,28 10,0 0,-3.5 -6,0 0,-21 6,0 0,-3.5 z"/>
+		<path d="m 62,2 0,28 -10,0 0,-3.5 6,0 0,-21 -6,0 0,-3.5 z"/>
+	</g>
+</svg>
diff --git a/gfx/luma/gfx/vehicles/crosshair_tag.svg b/gfx/luma/gfx/vehicles/crosshair_tag.svg
new file mode 100644
index 0000000..4dfa13e
--- /dev/null
+++ b/gfx/luma/gfx/vehicles/crosshair_tag.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="64" height="64">
+	<defs>
+		<clipPath id="clip">
+			<rect x="0" y="0" width="25" height="25"/>
+			<rect y="0" x="39" width="25" height="25"/>
+			<rect x="39" y="39" width="25" height="25"/>
+			<rect y="39" x="0" width="25" height="25"/>
+		</clipPath>
+	</defs>
+	<g filter="url(common.filters#shadow)">
+		<circle opacity="0.4" fill="none" stroke="#fff" stroke-width="3" clip-path="url(#clip)" cx="32" cy="32" r="24.5"/>
+		<g fill="#fff">
+			<rect x="31" y="7" width="2" height="18"/>
+			<rect x="39" y="31" width="18" height="2"/>
+			<rect x="31" y="39" width="2" height="18"/>
+			<rect x="7" y="31" width="18" height="2"/>
+		</g>
+	</g>
+</svg>
diff --git a/gfx/luma/gfx/vehicles/frame.svg b/gfx/luma/gfx/vehicles/frame.svg
deleted file mode 100644
index 9cb203c..0000000
--- a/gfx/luma/gfx/vehicles/frame.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="768" height="256">
-	<g fill="#2f2f2f" filter="url(common.filters#blurred)">
-		<path opacity="0.75" d="m 264,128 60,-104 120,0 60,104 -60,104 -120,0 z"/>
-		<g opacity="0.7">
-			<path d="M 11,125 257,125 305,42 52,53 Z"/>
-			<path d="m 11,131 246,0 48,83 -253,-11 z"/>
-			<path d="m 757,125 -246,0 -48,-83 253,11 z"/>
-			<path d="m 757,131 -246,0 -48,83 253,-11 z"/>
-		</g>
-	</g>
-</svg>
diff --git a/gfx/luma/gfx/vehicles/health.svg b/gfx/luma/gfx/vehicles/health.svg
deleted file mode 100644
index 060f397..0000000
--- a/gfx/luma/gfx/vehicles/health.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="80" height="80">
-	<g transform="scale(0.5,0.5)">
-		<g filter="url(common.filters#shining)">
-			<g transform="scale(2,2)">
-				<path fill="#fd705b" d="m 35.5,20 -2,9.5 2.5,4.5 8,0 2.5,-4.5 -2,-9.5 z m -5,12.5 -10.5,2.5 0,9 10.5,2.5 4,-3.5 11,0 4,3.5 10.5,-2.5 0,-9 -10.5,-2.5 -4,3.5 -11,0 z M 36,45 l -2.5,4.5 2,9.5 9,0 2,-9.5 L 44,45 Z"/>
-			</g>
-		</g>
-	</g>
-</svg>
diff --git a/gfx/luma/gfx/vehicles/null.svg b/gfx/luma/gfx/vehicles/null.svg
deleted file mode 100644
index 22ac022..0000000
--- a/gfx/luma/gfx/vehicles/null.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="1" height="1">
-</svg>
diff --git a/gfx/luma/gfx/vehicles/raptor.svg b/gfx/luma/gfx/vehicles/raptor.svg
deleted file mode 100644
index 1f005ae..0000000
--- a/gfx/luma/gfx/vehicles/raptor.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="256" height="256">
-	<g fill="#fff" opacity="0.85">
-		<path opacity="0.6" d="m 125,76 -6,8 3,6 14,0 3,-6 -6,-8 z"/>
-		<path d="m 125,74 -7,9 0,27 -2,0 -1,-17 -5,0 -10,6 0,5 -13.5,0.1 c -5,-6.8 -13.1,-10.8 -21.7,-10.8 -14.7,0 -26.6,11.5 -26.6,25.7 0,3.1 0.6,6.1 1.7,8.9 l 7.2,-3 c 2,6.8 9.1,11.6 17.2,11.6 6.9,0 13.1,-3.4 16,-8.8 l 7.1,4.8 c 2.6,-4.1 4.1,-8.4 4.1,-15.4 l 7.5,0 0,5 11,19 6,0 0,-9 6,0 0,55 -16,5 0,8 17,8 2,-5 8,0 2,5 17,-8 0,-8 -16,-5 0,-55 6,0 0,9 6,0 11,-19 0,-5 7.5,0 c 0,7 1.5,11.4 4.1,15.4 l 7.1,-4.8 c 2.9,5.4 9.2,8.8 16,8.8 8.1,0 15.2,-4.8 17.2,-11.6 l 7.2,3 c 1.1,-2.9 1.7,-5.9 1.7,-8.9 0,-14.2 -11.9,-25.7 -26.6,-25.7 -8.6,0 -16.7,4 -21.7,10.8 L 158,104 l 0,-5 -10,-6 -5,0 -1,17 -2,0 0,-27 -7,-9 z m 12.5,11 -1.5,3 -7,-3 -7,3 -1.5,-3 0,-1 5.5,-7 6,0 5.5,7 z m -11.5,61 6,0 0,47 -6,0 z" filter="url(common.filters#model)"/>
-	</g>
-</svg>
diff --git a/gfx/luma/gfx/vehicles/raptor_bombs.svg b/gfx/luma/gfx/vehicles/raptor_bombs.svg
deleted file mode 100644
index eda3a4c..0000000
--- a/gfx/luma/gfx/vehicles/raptor_bombs.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="256" height="256">
-	<g opacity="0.85">
-		<g fill="#fff" filter="url(common.filters#weapon)">
-			<path d="m 96.5,134 c -1,0 -3.5,5 -4,8 l 8,0 c -0.5,-3 -3,-8 -4,-8 z m -4.5,9 0,8 1.5,2 0.5,10.5 1.5,2.5 2,0 1.5,-2.5 0.5,-10.5 1.5,-2 0,-8 z m 0.6,14 -3.6,6 1,2.5 3,-2.5 z m 7.8,0 -0.4,6 3,2.5 1,-2.5 z"/>
-			<path d="m 161.5,134 c 1,0 3.5,5 4,8 l -8,0 c 0.5,-3 3,-8 4,-8 z m 4.5,9 0,8 -1.5,2 -0.5,10.5 -1.5,2.5 -2,0 -1.5,-2.5 -0.5,-10.5 -1.5,-2 0,-8 z m -0.6,14 3.6,6 -1,2.5 -3,-2.5 z m -7.8,0 0.4,6 -3,2.5 -1,-2.5 z"/>
-		</g>
-	</g>
-</svg>
diff --git a/gfx/luma/gfx/vehicles/raptor_guns.svg b/gfx/luma/gfx/vehicles/raptor_guns.svg
deleted file mode 100644
index 4818eba..0000000
--- a/gfx/luma/gfx/vehicles/raptor_guns.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="256" height="256">
-	<g opacity="0.85">
-		<g fill="#fff" filter="url(common.filters#weapon)">
-			<path d="m 107.75,65 0,5 0.25,0 0,8 -1,1 0,9 4,0 0,-9 -1,-1 0,-8 0.25,0 0,-5 -2.5,0 z m -6,3 0,5 0.25,0 0,8 -1,1 0,9 4,0 0,-9 -1,-1 0,-8 0.25,0 0,-5 -2.5,0 z"/>
-			<path d="m 150.25,65 0,5 -0.25,0 0,8 1,1 0,9 -4,0 0,-9 1,-1 0,-8 -0.25,0 0,-5 2.5,0 z m 6,3 0,5 -0.25,0 0,8 1,1 0,9 -4,0 0,-9 1,-1 0,-8 -0.25,0 0,-5 2.5,0 z"/>
-		</g>
-	</g>
-</svg>
diff --git a/gfx/luma/gfx/vehicles/rocket.svg b/gfx/luma/gfx/vehicles/rocket.svg
deleted file mode 100644
index 33ab574..0000000
--- a/gfx/luma/gfx/vehicles/rocket.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="80" height="80">
-	<g transform="scale(0.5,0.5)">
-		<g filter="url(common.filters#shining)">
-			<g transform="scale(2,2)">
-				<path fill="#f08058" d="m 59.8,20.2 c 1.1,1.1 -1.7,9.4 -4.4,13.2 l -8.8,-8.8 c 3.8,-2.7 12.1,-5.5 13.2,-4.4 z m -4.9,14.8 -8.8,8.8 -3.8,0.5 -12.1,11 -4.4,1.1 -2.2,-2.2 1.1,-4.4 11,-12.1 0.5,-3.8 8.8,-8.8 z M 38.8,49.8 36.1,60.4 32.3,62 31.7,56 Z m -8.6,-8.6 -6.2,7.1 -6,-0.6 1.6,-3.8 z"/>
-			</g>
-		</g>
-	</g>
-</svg>
diff --git a/gfx/luma/gfx/vehicles/sbot.svg b/gfx/luma/gfx/vehicles/sbot.svg
deleted file mode 100644
index f260d3c..0000000
--- a/gfx/luma/gfx/vehicles/sbot.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="256" height="256">
-	<g fill="#fff" opacity="0.85">
-		<path opacity="0.6" d="m 123,77 -9,12 3,3 22,0 3,-3 -9,-12 z"/>
-		<path filter="url(common.filters#model)" d="m 122,75 -10,13 0,25 11,17.5 0,35.5 10,0 0,-35.5 11,-17.5 0,-25 -10,-13 z m 1,4 10,0 7,9.5 -1.5,1.5 -5.5,-4 -10,0 -5.5,4 -1.5,-1.5 z m -25.2,10 -7.9,1.8 -6.1,6.1 -1.8,7.9 8.4,8.3 18.5,0 0,-8 -4,-4 0.8,-4.2 z m 60.4,0 -8,7.9 0.8,4.2 -4,4 0,8 18.5,0 8.4,-8.3 -1.8,-7.9 -6.1,-6.1 z m -65.2,27 -11,16 0,28 15,20 14,0 10,-14 0,-35 -9.5,-15 z m 51.5,0 -9.5,15 0,35 10,14 14,0 15,-20 0,-28 -11,-16 z m -70.5,16 -5,7 0,9 5,7 6,0 0,-23 z m 102,0 0,23 6,0 5,-7 0,-9 -5,-7 z m -89.4,38.9 -6.3,5.8 1.8,7.9 6.1,6.1 7.9,1.8 10,-9.5 -10.5,0 z m 82.8,0 -8.9,12.1 -10.5,0 10,9.5 7.9,-1.8 6.1,-6.1 1.8,-7.9 z"/>
-	</g>
-</svg>
diff --git a/gfx/luma/gfx/vehicles/sbot_mguns.svg b/gfx/luma/gfx/vehicles/sbot_mguns.svg
deleted file mode 100644
index f5bcc94..0000000
--- a/gfx/luma/gfx/vehicles/sbot_mguns.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="256" height="256">
-	<g opacity="0.85">
-		<g fill="#fff" filter="url(common.filters#weapon)">
-			<path d="m 106.75,59 0,5 0.25,0 0,8 -1,1 0,9 4,0 0,-9 -1,-1 0,-8 0.25,0 0,-5 -2.5,0 z m -6,3 0,5 0.25,0 0,8 -1,1 0,9 4,0 0,-9 -1,-1 0,-8 0.25,0 0,-5 -2.5,0 z"/>
-			<path d="m 149.25,59 0,5 -0.25,0 0,8 1,1 0,9 -4,0 0,-9 1,-1 0,-8 -0.25,0 0,-5 2.5,0 z m 6,3 0,5 -0.25,0 0,8 1,1 0,9 -4,0 0,-9 1,-1 0,-8 -0.25,0 0,-5 2.5,0 z"/>
-		</g>
-	</g>
-</svg>
diff --git a/gfx/luma/gfx/vehicles/sbot_rpods.svg b/gfx/luma/gfx/vehicles/sbot_rpods.svg
deleted file mode 100644
index c6d9872..0000000
--- a/gfx/luma/gfx/vehicles/sbot_rpods.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="256" height="256">
-	<g opacity="0.85">
-		<g fill="#fff" filter="url(common.filters#weapon)">
-			<path d="m 57.5,129 c -1,0 -3.5,5 -4,8 l 8,0 c -0.5,-3 -3,-8 -4,-8 z m -4.5,9 0,8 1.5,2 0.5,10.5 1.5,2.5 2,0 1.5,-2.5 0.5,-10.5 1.5,-2 0,-8 z m 0.6,14 -3.6,6 1,2.5 3,-2.5 z m 7.8,0 -0.4,6 3,2.5 1,-2.5 z"/>
-			<path d="m 198.5,129 c 1,0 3.5,5 4,8 l -8,0 c 0.5,-3 3,-8 4,-8 z m 4.5,9 0,8 -1.5,2 -0.5,10.5 -1.5,2.5 -2,0 -1.5,-2.5 -0.5,-10.5 -1.5,-2 0,-8 z m -0.6,14 3.6,6 -1,2.5 -3,-2.5 z m -7.8,0 0.4,6 -3,2.5 -1,-2.5 z"/>
-		</g>
-	</g>
-</svg>
diff --git a/gfx/luma/gfx/vehicles/shield.svg b/gfx/luma/gfx/vehicles/shield.svg
deleted file mode 100644
index 6a6255a..0000000
--- a/gfx/luma/gfx/vehicles/shield.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="80" height="80">
-	<g transform="scale(0.5,0.5)">
-		<g filter="url(common.filters#shining)">
-			<g transform="scale(2,2)">
-				<path fill="#81f13d" d="m 29.6,22 -4.2,7.3 5.2,3 2.5,-4.3 13.9,0 2.5,4.3 5.2,-3 -4.2,-7.3 -20.8,0 z m -6.2,10.7 -4.2,7.3 10.4,18 8.4,0 0,-6 -4.9,0 -6.9,-12 2.5,-4.3 -5.2,-3 z m 33.2,0 -5.2,3 2.5,4.3 -6.9,12 -4.9,0 0,6 8.4,0 10.4,-18 -4.2,-7.3 z"/>
-			</g>
-		</g>
-	</g>
-</svg>
diff --git a/gfx/luma/gfx/vehicles/turret_moving.svg b/gfx/luma/gfx/vehicles/turret_moving.svg
new file mode 100644
index 0000000..3242ca5
--- /dev/null
+++ b/gfx/luma/gfx/vehicles/turret_moving.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="64" height="64">
+	<g fill="#fff" filter="url(common.filters#shadow)">
+		<path d="m 8,8 0,17 4,0 0,-13 13,0 0,-4 z"/>
+		<path d="m 56,8 0,17 -4,0 0,-13 -13,0 0,-4 z"/>
+		<path d="m 8,56 0,-17 4,0 0,13 13,0 0,4 z"/>
+		<path d="m 56,56 0,-17 -4,0 0,13 -13,0 0,4 z"/>
+	</g>
+</svg>
diff --git a/gfx/luma/gfx/vehicles/turret_stationary.svg b/gfx/luma/gfx/vehicles/turret_stationary.svg
new file mode 100644
index 0000000..bbe6432
--- /dev/null
+++ b/gfx/luma/gfx/vehicles/turret_stationary.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="64" height="64">
+	<g fill="#fff" filter="url(common.filters#shadow)">
+		<path d="M 32,3 3,32 32,61 61,32 Z M 32,9 55,32 32,55 9,32 Z"/>
+	</g>
+</svg>
diff --git a/gfx/luma/gfx/vehicles/vh-shield.svg b/gfx/luma/gfx/vehicles/vh-shield.svg
deleted file mode 100644
index ca591bd..0000000
--- a/gfx/luma/gfx/vehicles/vh-shield.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="256" height="256">
-	<defs>
-		<clipPath id="clip">
-			<path d="M 74,92 51.5,77 74,38 182,38 204.5,77 182,92 Z" opacity="0.5" fill="#73d216"/>
-		</clipPath>
-		<filter id="shield" x="-1" y="-1" width="3" height="3">
-			<feGaussianBlur stdDeviation="12"/>
-		</filter>
-	</defs>
-	<g fill="#fff" opacity="0.9">
-		<path d="m 74,38 -22.5,39 3,2 L 63,66.5 66.5,66 79,47 l 98,0 12.5,19 3.5,0.5 8.5,12.5 3,-2 L 182,38 Z" filter="url(#shield)" clip-path="url(#clip)"/>
-		<path d="m 74,38 -22.5,39 3,2 L 63,66.5 66.5,66 79,47 l 98,0 12.5,19 3.5,0.5 8.5,12.5 3,-2 L 182,38 Z" filter="url(common.filters#weapon)"/>
-	</g>
-</svg>
diff --git a/gfx/luma/gfx/vehicles/vth-mover.svg b/gfx/luma/gfx/vehicles/vth-mover.svg
deleted file mode 100644
index 3242ca5..0000000
--- a/gfx/luma/gfx/vehicles/vth-mover.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="64" height="64">
-	<g fill="#fff" filter="url(common.filters#shadow)">
-		<path d="m 8,8 0,17 4,0 0,-13 13,0 0,-4 z"/>
-		<path d="m 56,8 0,17 -4,0 0,-13 -13,0 0,-4 z"/>
-		<path d="m 8,56 0,-17 4,0 0,13 13,0 0,4 z"/>
-		<path d="m 56,56 0,-17 -4,0 0,13 -13,0 0,4 z"/>
-	</g>
-</svg>
diff --git a/gfx/luma/gfx/vehicles/vth-stationary.svg b/gfx/luma/gfx/vehicles/vth-stationary.svg
deleted file mode 100644
index bbe6432..0000000
--- a/gfx/luma/gfx/vehicles/vth-stationary.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="64" height="64">
-	<g fill="#fff" filter="url(common.filters#shadow)">
-		<path d="M 32,3 3,32 32,61 61,32 Z M 32,9 55,32 32,55 9,32 Z"/>
-	</g>
-</svg>
diff --git a/gfx/luma/gfx/vehicles/waki.svg b/gfx/luma/gfx/vehicles/waki.svg
deleted file mode 100644
index 8caddd6..0000000
--- a/gfx/luma/gfx/vehicles/waki.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="256" height="256">
-	<g fill="#fff" opacity="0.85">
-		<rect opacity="0.6" x="116" y="132" width="24" height="52"/>
-		<path filter="url(common.filters#model)" d="m 123,62 -6,10 -5,52 -24,45 0,26 7,0 8,-12 7,0 9,7 18,0 9,-7 7,0 8,12 7,0 0,-26 -24,-45 -5,-52 -6,-10 z m 5,72 6,2 4,31 -4,15 -12,0 -4,-15 4,-31 z"/>
-	</g>
-</svg>
diff --git a/gfx/luma/gfx/vehicles/waki_guns.svg b/gfx/luma/gfx/vehicles/waki_guns.svg
deleted file mode 100644
index 5623bba..0000000
--- a/gfx/luma/gfx/vehicles/waki_guns.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="256" height="256">
-	<g opacity="0.85">
-		<g fill="#fff" filter="url(common.filters#weapon)">
-			<path d="m 119,193 4,11 10,0 4,-11 z"/>
-			<path d="m 105.75,76 0,5 0.25,0 0,8 -1,1 0,9 4,0 0,-9 -1,-1 0,-8 0.25,0 0,-5 -2.5,0 z m -6,3 0,5 0.25,0 0,8 -1,1 0,9 4,0 0,-9 -1,-1 0,-8 0.25,0 0,-5 -2.5,0 z"/>
-			<path d="m 150.25,76 0,5 -0.25,0 0,8 1,1 0,9 -4,0 0,-9 1,-1 0,-8 -0.25,0 0,-5 2.5,0 z m 6,3 0,5 -0.25,0 0,8 1,1 0,9 -4,0 0,-9 1,-1 0,-8 -0.25,0 0,-5 2.5,0 z"/>
-		</g>
-	</g>
-</svg>
diff --git a/gfx/luma/gfx/vehicles/waki_rockets.svg b/gfx/luma/gfx/vehicles/waki_rockets.svg
deleted file mode 100644
index 65fad19..0000000
--- a/gfx/luma/gfx/vehicles/waki_rockets.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="256" height="256">
-	<g opacity="0.85">
-		<g fill="#fff" filter="url(common.filters#weapon)">
-			<path d="m 73.5,160 c -1,0 -3.5,5 -4,8 l 8,0 c -0.5,-3 -3,-8 -4,-8 z m -4.5,9 0,8 1.5,2 0.5,10.5 1.5,2.5 2,0 1.5,-2.5 0.5,-10.5 1.5,-2 0,-8 z m 0.6,14 -3.6,6 1,2.5 3,-2.5 z m 7.8,0 -0.4,6 3,2.5 1,-2.5 z"/>
-			<path d="m 182.5,160 c 1,0 3.5,5 4,8 l -8,0 c 0.5,-3 3,-8 4,-8 z m 4.5,9 0,8 -1.5,2 -0.5,10.5 -1.5,2.5 -2,0 -1.5,-2.5 -0.5,-10.5 -1.5,-2 0,-8 z m -0.6,14 3.6,6 -1,2.5 -3,-2.5 z m -7.8,0 0.4,6 -3,2.5 -1,-2.5 z"/>
-		</g>
-	</g>
-</svg>
diff --git a/gfx/luma/render-svg.sh b/gfx/luma/render-svg.sh
index ee220de..06fc923 100755
--- a/gfx/luma/render-svg.sh
+++ b/gfx/luma/render-svg.sh
@@ -8,14 +8,14 @@
 #   the svg files are rendered at a large size and then scaled down.
 #
 # DEPENDENCIES
-#   rsvg-convert (librsvg)
-#   convert (imagemagick)
+#   rsvg-convert (librsvg 2.39.0)
+#   convert (imagemagick 6.8.6-9)
 #
 # USAGE
 #   ./render-svg.sh DATADIR [SVGFILE...]
 #
 # USAGE EXAMPLES
-#   Single file: ./render-svg.sh ~/.xonotic/data gfx/menu/luminos/cursor.svg
+#   Single file: ./render-svg.sh ~/.xonotic/data gfx/menu/luma/cursor.svg
 #   All files:   ./render-svg.sh ~/.xonotic/data $(find . -name "*.svg")
 
 
diff --git a/gfx/luma/render-version.sh b/gfx/luma/render-version.sh
index 581f8f2..aec318b 100755
--- a/gfx/luma/render-version.sh
+++ b/gfx/luma/render-version.sh
@@ -9,8 +9,8 @@
 #   the svg files are rendered at a large size and then scaled down.
 #
 # DEPENDENCIES
-#   rsvg-convert (librsvg)
-#   convert (imagemagick)
+#   rsvg-convert (librsvg 2.39.0)
+#   convert (imagemagick 6.8.6-9)
 #   Xolonium-Regular font
 #
 # USAGE