From: Severin Meyer <sev.ch@web.de>
Date: Mon, 9 Jun 2014 14:56:25 +0000 (+0200)
Subject: Some more Luma graphics and revisions
X-Git-Tag: xonotic-v0.8.1~6^2~15
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=81f7dd4b77d0884804bb12ef0cd541bef4165da5;p=xonotic%2Fmediasource.git

Some more Luma graphics and revisions
---

diff --git a/gfx/luma/gfx/hud/luma/ammo_cells.svg b/gfx/luma/gfx/hud/luma/ammo_cells.svg
index df988f6..51da0ac 100644
--- a/gfx/luma/gfx/hud/luma/ammo_cells.svg
+++ b/gfx/luma/gfx/hud/luma/ammo_cells.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
-	<path class="cells glowing" d="M 24,83 56,24 80,24 51,63 104,52 55,114 75,71 z"/>
+	<path class="cells glowing" d="M 24,84 56,24 80,24 54,62 108,52 59,114 76,72 z"/>
 </svg>
diff --git a/gfx/luma/gfx/hud/luma/ammo_current_bg.svg b/gfx/luma/gfx/hud/luma/ammo_current_bg.svg
new file mode 100644
index 0000000..0b616ac
--- /dev/null
+++ b/gfx/luma/gfx/hud/luma/ammo_current_bg.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet href="common.css" type="text/css"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="512" height="128" version="1.1">
+	<path class="current_bg shadowed" d="m 20,36 0,64 -12,16 -4,0 10,8 484,0 10,-8 0,-98 -452,0 -8,8 -18,0 z"/>
+	<path class="current highlighted" d="m 20,4 -16,16 0,96 4,0 12,-16 0,-64 10,-10 18,0 8,-8 452,0 0,-4 -14,-10 z"/>
+</svg>
diff --git a/gfx/luma/gfx/hud/luma/ammo_explosives.svg b/gfx/luma/gfx/hud/luma/ammo_explosives.svg
index 4607a61..232b47a 100644
--- a/gfx/luma/gfx/hud/luma/ammo_explosives.svg
+++ b/gfx/luma/gfx/hud/luma/ammo_explosives.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
-	<path class="explosives glowing" d="M 10,73 33,82 20,47 44,68 43,51 52,60 56,19 72,60 80,47 82,65 106,34 93,79 118,75 86,107 93,87 79,94 76,76 67,90 51,68 51,96 38,88 44,107 z"/>
+	<path class="explosives glowing" d="M 12,74 35,80 28,51 48,68 54,20 74,67 96,41 91,76 116,74 84,106 91,84 72,96 58,62 54,96 38,88 l 6,18 z"/>
 </svg>
diff --git a/gfx/luma/gfx/hud/luma/ammo_fuel.svg b/gfx/luma/gfx/hud/luma/ammo_fuel.svg
index 89d23b5..b66e6f7 100644
--- a/gfx/luma/gfx/hud/luma/ammo_fuel.svg
+++ b/gfx/luma/gfx/hud/luma/ammo_fuel.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
-	<path class="fuel glowing" d="m 53,16 -17,16 -5,38 30,0 1,-54 -9,0 z m 13,0 1,54 30,0 -5,-38 -17,-16 -9,0 z m -29,57 -2,6 21,0 -1,-6 -18,0 z m 36,0 -1,6 21,0 -2,-6 -18,0 z m -32,9 c -3,2 -6,5 -6,9 0,5 6,14 11,25 5,-11 11,-20 11,-25 0,-4 -3,-7 -6,-9 4,6 -1,15 -5,15 -4,0 -9,-9 -5,-15 z m 36,0 c -3,2 -6,5 -6,9 0,5 6,14 11,25 5,-11 11,-20 11,-25 0,-4 -3,-7 -6,-9 4,6 -1,15 -5,15 -4,0 -9,-9 -5,-15 z"/>
+	<path class="fuel glowing" d="m 53,16 -17,16 -5,38 30,0 1,-54 -9,0 z m 13,0 1,54 30,0 -5,-38 -17,-16 -9,0 z m -29,57 -1,6 20,0 0,-6 -19,0 z m 35,0 0,6 20,0 -1,-6 -19,0 z m -32,9 c -3,1 -5,3 -5,7 0,4 6,16 11,27 5,-11 11,-23 11,-27 0,-4 -2,-6 -5,-7 4,6 -3,13 -6,13 -3,0 -10,-7 -6,-13 z m 36,0 c -3,1 -5,3 -5,7 0,4 6,16 11,27 5,-11 11,-23 11,-27 0,-4 -2,-6 -5,-7 4,6 -3,13 -6,13 -3,0 -10,-7 -6,-13 z"/>
 </svg>
diff --git a/gfx/luma/gfx/hud/luma/ammo_nades.svg b/gfx/luma/gfx/hud/luma/ammo_nades.svg
index a2ca95a..bdb2119 100644
--- a/gfx/luma/gfx/hud/luma/ammo_nades.svg
+++ b/gfx/luma/gfx/hud/luma/ammo_nades.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
-	<path class="nades glowing" d="m 50,20 -2,4 6,9 -5,7 -9,0 0,12 38,0 0,-10 6,1 28,39 4,-3 -16,-29 1,-3 -10,-16 z m -15,36 -5,18 16,0 0,-18 z m 15,0 0,18 18,0 0,-18 z m 22,0 0,18 16,0 -5,-18 z m -42,22 5,18 11,0 0,-18 z m 20,0 0,18 18,0 0,-18 z m 22,0 0,18 11,0 5,-18 z m -32,22 2,8 34,0 2,-8 z"/>
+	<path class="nades glowing" d="m 50,22 -2,4 L 54,35 l -4,6 -8,0 0,11 36,0 0,-10 5,1 26,37 4,-3 L 99,51 100,48 90,32 z M 37,56 33,72 48,72 48,56 z m 15,0 0,16 16,0 0,-16 z m 20,0 0,16 15,0 L 83,56 z m -39,20 4,16 11,0 0,-16 z m 19,0 0,16 16,0 0,-16 z m 20,0 0,16 11,0 4,-16 z m -30,20 2,8 32,0 2,-8 z"/>
 </svg>
diff --git a/gfx/luma/gfx/hud/luma/border_corner_northeast.svg b/gfx/luma/gfx/hud/luma/border_corner_northeast.svg
new file mode 100644
index 0000000..469c448
--- /dev/null
+++ b/gfx/luma/gfx/hud/luma/border_corner_northeast.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet href="common.css" type="text/css"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
+	<g class="blurred">
+		<g transform="matrix(1,0,0,-1,0,128)">
+			<path class="border_corner" d="m 30,-4 -36,24 0,112 140,0 0,-136 z"/>
+		</g>
+	</g>
+</svg>
diff --git a/gfx/luma/gfx/hud/luma/border_corner_northwest.svg b/gfx/luma/gfx/hud/luma/border_corner_northwest.svg
new file mode 100644
index 0000000..35d79ec
--- /dev/null
+++ b/gfx/luma/gfx/hud/luma/border_corner_northwest.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet href="common.css" type="text/css"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
+	<g class="blurred">
+		<g transform="matrix(-1,0,0,-1,128,128)">
+			<path class="border_corner" d="m 30,-4 -36,24 0,112 140,0 0,-136 z"/>
+		</g>
+	</g>
+</svg>
diff --git a/gfx/luma/gfx/hud/luma/border_corner_southeast.svg b/gfx/luma/gfx/hud/luma/border_corner_southeast.svg
new file mode 100644
index 0000000..ca96aaa
--- /dev/null
+++ b/gfx/luma/gfx/hud/luma/border_corner_southeast.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet href="common.css" type="text/css"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
+	<g class="blurred">
+		<path class="border_corner" d="m 30,-4 -36,24 0,112 140,0 0,-136 z"/>
+	</g>
+</svg>
diff --git a/gfx/luma/gfx/hud/luma/border_corner_southwest.svg b/gfx/luma/gfx/hud/luma/border_corner_southwest.svg
new file mode 100644
index 0000000..bf29e4c
--- /dev/null
+++ b/gfx/luma/gfx/hud/luma/border_corner_southwest.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet href="common.css" type="text/css"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
+	<g class="blurred">
+		<g transform="matrix(-1,0,0,1,128,0)">
+			<path class="border_corner" d="m 30,-4 -36,24 0,112 140,0 0,-136 z"/>
+		</g>
+	</g>
+</svg>
diff --git a/gfx/luma/gfx/hud/luma/border_default.svg b/gfx/luma/gfx/hud/luma/border_default.svg
index c947d7c..f58b9fe 100644
--- a/gfx/luma/gfx/hud/luma/border_default.svg
+++ b/gfx/luma/gfx/hud/luma/border_default.svg
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common.css" type="text/css"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
 	<g class="blurred">
-		<path class="border_default" d="M 69,-4 59,4 32,4 -4,31 l 0,194 36,27 27,0 10,8 118,0 10,-8 27,0 36,-27 0,-194 -36,-27 -27,0 -10,-8 z"/>
-		<path class="border_glow" d="M 69,-4 59,4 32,4 -4,31 l 0,194 36,27 27,0 10,8 118,0 10,-8 27,0 36,-27 0,-194 -36,-27 -27,0 -10,-8 z"/>
+		<path class="border_default" d="m 30,-4 -36,24 0,88 36,24 68,0 36,-24 0,-88 -36,-24 z"/>
 	</g>
 </svg>
diff --git a/gfx/luma/gfx/hud/luma/border_default_east.svg b/gfx/luma/gfx/hud/luma/border_default_east.svg
new file mode 100644
index 0000000..c1d8120
--- /dev/null
+++ b/gfx/luma/gfx/hud/luma/border_default_east.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet href="common.css" type="text/css"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
+	<g class="blurred">
+		<g transform="matrix(0,-1,1,0,0,128)">
+			<path class="border_default" d="m 20,-6 -24,36 0,104 136,0 0,-104 -24,-36 z"/>
+		</g>
+	</g>
+</svg>
diff --git a/gfx/luma/gfx/hud/luma/border_default_north.svg b/gfx/luma/gfx/hud/luma/border_default_north.svg
new file mode 100644
index 0000000..09e2eb8
--- /dev/null
+++ b/gfx/luma/gfx/hud/luma/border_default_north.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet href="common.css" type="text/css"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
+	<g class="blurred">
+		<g transform="matrix(1,0,0,-1,0,128)">
+			<path class="border_default" d="M 30,-4 -6,20 -6,132 134,132 134,20 98,-4 z"/>
+		</g>
+	</g>
+</svg>
diff --git a/gfx/luma/gfx/hud/luma/border_default_south.svg b/gfx/luma/gfx/hud/luma/border_default_south.svg
index 8ec1500..afe571e 100644
--- a/gfx/luma/gfx/hud/luma/border_default_south.svg
+++ b/gfx/luma/gfx/hud/luma/border_default_south.svg
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common.css" type="text/css"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
 	<g class="blurred">
-		<path class="border_open" d="M 69,-4 59,4 32,4 -4,31 -4,260 260,260 260,31 224,4 197,4 187,-4 z"/>
-		<path class="border_glow" d="M 69,-4 59,4 32,4 -4,31 -4,260 260,260 260,31 224,4 197,4 187,-4 z"/>
+		<path class="border_default" d="M 30,-4 -6,20 -6,132 134,132 134,20 98,-4 z"/>
 	</g>
 </svg>
diff --git a/gfx/luma/gfx/hud/luma/border_default_west.svg b/gfx/luma/gfx/hud/luma/border_default_west.svg
new file mode 100644
index 0000000..29145de
--- /dev/null
+++ b/gfx/luma/gfx/hud/luma/border_default_west.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet href="common.css" type="text/css"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
+	<g class="blurred">
+		<g transform="matrix(0,1,-1,0,128,0)">
+			<path class="border_default" d="m 20,-6 -24,36 0,104 136,0 0,-104 -24,-36 z"/>
+		</g>
+	</g>
+</svg>
diff --git a/gfx/luma/gfx/hud/luma/border_fading_east.svg b/gfx/luma/gfx/hud/luma/border_fading_east.svg
new file mode 100644
index 0000000..3c348b6
--- /dev/null
+++ b/gfx/luma/gfx/hud/luma/border_fading_east.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet href="common.css" type="text/css"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" version="1.1">
+	<g class="blurred">
+		<g transform="matrix(0,-1,1,0,0,256)">
+			<path class="border_fading" d="M 69,-4 59,4 32,4 -4,31 -4,260 260,260 260,31 224,4 197,4 187,-4 z"/>
+		</g>
+	</g>
+</svg>
diff --git a/gfx/luma/gfx/hud/luma/border_fading_north.svg b/gfx/luma/gfx/hud/luma/border_fading_north.svg
new file mode 100644
index 0000000..421da3d
--- /dev/null
+++ b/gfx/luma/gfx/hud/luma/border_fading_north.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet href="common.css" type="text/css"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" version="1.1">
+	<g class="blurred">
+		<g transform="matrix(-1,0,0,-1,256,256)">
+			<path class="border_fading" d="M 69,-4 59,4 32,4 -4,31 -4,260 260,260 260,31 224,4 197,4 187,-4 z"/>
+		</g>
+	</g>
+</svg>
diff --git a/gfx/luma/gfx/hud/luma/border_fading_south.svg b/gfx/luma/gfx/hud/luma/border_fading_south.svg
new file mode 100644
index 0000000..8c6683e
--- /dev/null
+++ b/gfx/luma/gfx/hud/luma/border_fading_south.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet href="common.css" type="text/css"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" version="1.1">
+	<g class="blurred">
+		<path class="border_fading" d="M 69,-4 59,4 32,4 -4,31 -4,260 260,260 260,31 224,4 197,4 187,-4 z"/>
+	</g>
+</svg>
diff --git a/gfx/luma/gfx/hud/luma/border_fading_west.svg b/gfx/luma/gfx/hud/luma/border_fading_west.svg
new file mode 100644
index 0000000..ff14cc9
--- /dev/null
+++ b/gfx/luma/gfx/hud/luma/border_fading_west.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet href="common.css" type="text/css"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" version="1.1">
+	<g class="blurred">
+		<g transform="matrix(0,1,-1,0,256,0)">
+			<path class="border_fading" d="M 69,-4 59,4 32,4 -4,31 -4,260 260,260 260,31 224,4 197,4 187,-4 z"/>
+		</g>
+	</g>
+</svg>
diff --git a/gfx/luma/gfx/hud/luma/border_highlighted.svg b/gfx/luma/gfx/hud/luma/border_highlighted.svg
index 01812bb..784108f 100644
--- a/gfx/luma/gfx/hud/luma/border_highlighted.svg
+++ b/gfx/luma/gfx/hud/luma/border_highlighted.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="32" height="4" version="1.1">
-	<rect class="highlighted" width="16" height="4"/>
+	<rect class="border_highlighted" width="16" height="4"/>
 </svg>
diff --git a/gfx/luma/gfx/hud/luma/border_highlighted2.svg b/gfx/luma/gfx/hud/luma/border_highlighted2.svg
index 9b6be8c..5b97245 100644
--- a/gfx/luma/gfx/hud/luma/border_highlighted2.svg
+++ b/gfx/luma/gfx/hud/luma/border_highlighted2.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="4" height="32" version="1.1">
-	<rect class="highlighted" width="4" height="16"/>
+	<rect class="border_highlighted" width="4" height="16"/>
 </svg>
diff --git a/gfx/luma/gfx/hud/luma/border_small.svg b/gfx/luma/gfx/hud/luma/border_small.svg
new file mode 100644
index 0000000..d5c62c0
--- /dev/null
+++ b/gfx/luma/gfx/hud/luma/border_small.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet href="common.css" type="text/css"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
+	<g class="blurred">
+		<path class="border_small" d="m 30,-4 -36,24 0,88 36,24 68,0 36,-24 0,-88 -36,-24 z"/>
+	</g>
+</svg>
diff --git a/gfx/luma/gfx/hud/luma/border_small_east.svg b/gfx/luma/gfx/hud/luma/border_small_east.svg
new file mode 100644
index 0000000..9a38f2e
--- /dev/null
+++ b/gfx/luma/gfx/hud/luma/border_small_east.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet href="common.css" type="text/css"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
+	<g class="blurred">
+		<g transform="matrix(0,-1,1,0,0,128)">
+			<path class="border_small" d="m 20,-6 -24,36 0,104 136,0 0,-104 -24,-36 z"/>
+		</g>
+	</g>
+</svg>
diff --git a/gfx/luma/gfx/hud/luma/border_small_north.svg b/gfx/luma/gfx/hud/luma/border_small_north.svg
new file mode 100644
index 0000000..e925008
--- /dev/null
+++ b/gfx/luma/gfx/hud/luma/border_small_north.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet href="common.css" type="text/css"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
+	<g class="blurred">
+		<g transform="matrix(1,0,0,-1,0,128)">
+			<path class="border_small" d="M 30,-4 -6,20 -6,132 134,132 134,20 98,-4 z"/>
+		</g>
+	</g>
+</svg>
diff --git a/gfx/luma/gfx/hud/luma/border_small_south.svg b/gfx/luma/gfx/hud/luma/border_small_south.svg
new file mode 100644
index 0000000..2ad7855
--- /dev/null
+++ b/gfx/luma/gfx/hud/luma/border_small_south.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet href="common.css" type="text/css"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
+	<g class="blurred">
+		<path class="border_small" d="M 30,-4 -6,20 -6,132 134,132 134,20 98,-4 z"/>
+	</g>
+</svg>
diff --git a/gfx/luma/gfx/hud/luma/border_small_west.svg b/gfx/luma/gfx/hud/luma/border_small_west.svg
new file mode 100644
index 0000000..2411401
--- /dev/null
+++ b/gfx/luma/gfx/hud/luma/border_small_west.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet href="common.css" type="text/css"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
+	<g class="blurred">
+		<g transform="matrix(0,1,-1,0,128,0)">
+			<path class="border_small" d="m 20,-6 -24,36 0,104 136,0 0,-104 -24,-36 z"/>
+		</g>
+	</g>
+</svg>
diff --git a/gfx/luma/gfx/hud/luma/common.css b/gfx/luma/gfx/hud/luma/common.css
index 1de1d10..4550dff 100644
--- a/gfx/luma/gfx/hud/luma/common.css
+++ b/gfx/luma/gfx/hud/luma/common.css
@@ -1,75 +1,86 @@
-/* General */
-.backdrop    { fill:#000000; opacity:0.6 }
-.key         { fill:#a5dafb }
-.progressbar { fill:#ffffff }
-.symbol      { fill:#000000; opacity:0.5 }
-.teamcolor   { fill:#ffffff }
-
-/* Borders */
-.border_default { fill:url(common.gradients#border_default) }
-.border_open    { fill:url(common.gradients#border_open) }
-.border_glow    { fill:url(common.gradients#border_glow) }
-.highlighted    { fill:#ffffff }
-
 /* Vitals */
-.armor     { fill:#82ff4b }
-.health    { fill:#ff7353 }
+.armor     { fill:#97ff4b }
+.health    { fill:#ff9564 }
 
 /* Ammo */
-.cells      { fill:#7de5ff }
-.explosives { fill:#ffa25f }
-.fuel       { fill:#fff469 }
+.cells      { fill:#a9eeff }
+.explosives { fill:#ffc091 }
+.fuel       { fill:#fcf494 }
 .nades      { fill:#ffffff }
-.plasma     { fill:#f594fc }
+.plasma     { fill:#fbc9ff }
 
 /* Weapons */
-.arc             { fill:#40ff64 }
-.crylink         { fill:#df58fd }
-.electro         { fill:#5acbff }
-.fireball        { fill:#faa945 }
-.grenadelauncher { fill:#fa6745 }
-.hagar           { fill:#fa9245 }
-.hook            { fill:#a7fa45 }
-.laser           { fill:#ff5555 }
-.minelayer       { fill:#fd5e4d }
-.porto           { fill:#5fb9ff }
-.rifle           { fill:#f9d73c }
-.rocketlauncher  { fill:#fac145 }
-.seeker          { fill:#f9ec33 }
-.shockwave       { fill:#42fddf }
-.tuba            { fill:#f9ec33 }
-.vaporizer       { fill:#c491ff }
-.vortex          { fill:#fa50ac }
+.arc             { fill:#62ff55 }
+.crylink         { fill:#e577fb }
+.electro         { fill:#6ed1ff }
+.fireball        { fill:#ffb75a }
+.grenadelauncher { fill:#ff8669 }
+.hagar           { fill:#ffa35f }
+.hook            { fill:#adff4b }
+.laser           { fill:#ff7373 }
+.minelayer       { fill:#ff7d6e }
+.porto           { fill:#73c1ff }
+.rifle           { fill:#ffdf50 }
+.rocketlauncher  { fill:#ffca55 }
+.seeker          { fill:#fff34b }
+.shockwave       { fill:#66ffe5 }
+.tuba            { fill:#edf94b }
+.vaporizer       { fill:#a087ff }
+.vortex          { fill:#ff73c0 }
 
 /* Powerups */
-.shield       { fill:#ffffff }
-.strength     { fill:#ffffff }
-.superweapons { fill:#ffffff }
+.shield       { fill:#97ff4b }
+.strength     { fill:#ffa35f }
+.superweapons { fill:#fff34b }
 
-/* Vote */
-.no  { fill:#fa5645 }
-.yes { fill:#79ff4b }
+/* Items */
+.keepaway    { fill:#add4ff }
+.ball        { fill:#ebf1f3 }
 
-/* Death */
-.camping      { fill:#61ff55 }
+/* Notifications */
+.camping      { fill:#62ff55 }
 .death        { fill:#a5dafb }
-.fall         { fill:#ff5555 }
-.lava         { fill:#faa945 }
-.melee        { fill:#a7fa45 }
-.outofammo    { fill:#fa6745 }
+.fall         { fill:#ff7373 }
+.lava         { fill:#ffb75a }
+.melee        { fill:#adff4b }
+.outofammo    { fill:#ff8669 }
 .selfkill     { fill:#a5dafb }
-.shootingstar { fill:#f9ec33 }
-.slime        { fill:#d6fa45 }
-.telefrag     { fill:#5fb9ff }
-.void         { fill:#397fff }
-.water        { fill:#43fcf6 }
+.shootingstar { fill:#fff34b }
+.slime        { fill:#dcff4b }
+.telefrag     { fill:#73c1ff }
+.void         { fill:#c8b9ff }
+.water        { fill:#69fffa }
 
 /* Race */
-.newfail   { fill:#55ddff }
-.newrank   { fill:#f9ec33 }
-.newrecord { fill:#fa6745 }
-.newtime   { fill:#84fa50 }
+.newfail   { fill:#69e1ff }
+.newrank   { fill:#fff34b }
+.newrecord { fill:#ff8669 }
+.newtime   { fill:#81ff4b }
+
+/* Borders */
+.border_corner      { fill:url(common.gradients#border_corner) }
+.border_default     { fill:url(common.gradients#border_default) }
+.border_fading      { fill:url(common.gradients#border_fading) }
+.border_small       { fill:#2f2f2f; opacity:0.7 }
+.border_highlighted { fill:#ffffff }
+
+/* Selectors */
+.current               { fill:#b3deff }
+.current_bg            { fill:#cee4f8; opacity:0.6 }
+.weapon_accuracy       { fill:#ffffff; opacity:0.4 }
+.weapon_ammo           { fill:url(common.gradients#weapon_ammo); opacity:0.9 }
+.weapon_complainbubble { fill:#ffffff; opacity:0.6 }
+
+/* Misc */
+.backdrop    { fill:#000000; opacity:0.6 }
+.progressbar { fill:#ffffff }
+.key         { fill:#a5dafb }
+.no          { fill:#ff6a59 }
+.yes         { fill:#97ff4b }
 
 /* Filters */
-.blurred { filter:url(common.filters#blurred) }
-.glowing { filter:url(common.filters#glowing) }
+.blurred     { filter:url(common.filters#blurred) }
+.darkened    { filter:url(common.filters#darkened) }
+.glowing     { filter:url(common.filters#glowing) }
+.highlighted { filter:url(common.filters#highlighted) }
+.shadowed    { filter:url(common.filters#shadowed) }
diff --git a/gfx/luma/gfx/hud/luma/common.filters b/gfx/luma/gfx/hud/luma/common.filters
index 1810c19..f9a9e15 100644
--- a/gfx/luma/gfx/hud/luma/common.filters
+++ b/gfx/luma/gfx/hud/luma/common.filters
@@ -1,33 +1,80 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1">
 	<defs>
+		<filter id="blurred">
+			<feGaussianBlur stdDeviation="0.4"/>
+		</filter>
+		<filter id="darkened">
+			<!-- ./tools/hsv-matrix.pl -9 3.3 0.35 -->
+			<feColorMatrix values="1.01 -0.44 -0.22 0 0 -0.19 0.55 -0.01 0 0 -0.03 -0.69 1.07 0 0 0 0 0 1 0"/>
+			<feGaussianBlur stdDeviation="2"/>
+			<feComposite in2="SourceAlpha" operator="in"/>
+		</filter>
 		<filter id="glowing" x="-1" y="-1" width="3" height="3">
 			<feGaussianBlur stdDeviation="8"/>
 			<feColorMatrix values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0.4 0" result="glow"/>
-			<feGaussianBlur in="SourceGraphic"  stdDeviation="2"/>
+			<feGaussianBlur in="SourceGraphic" stdDeviation="2"/>
 			<feColorMatrix values="0.1 0 0 0 0 0 0.1 0 0 0 0 0 0.1 0 0 0 0 0 2 0"/>
-			<feColorMatrix values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0.5 0" result="outline"/>
+			<feColorMatrix values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0.4 0" result="outline"/>
 			<feGaussianBlur in="SourceGraphic" stdDeviation="8 6"/>
+			<!-- ./tools/hsv-matrix.pl -9 3.3 0.35 -->
 			<feColorMatrix values="1.01 -0.44 -0.22 0 0 -0.19 0.55 -0.01 0 0 -0.03 -0.69 1.07 0 0 0 0 0 1.7 0" result="shadow"/>
-			<feColorMatrix in="SourceAlpha" values="1 0 0 0 0.3 0 1 0 0 1 0 0 1 0 0.8 0 0 0 0.25 0"/>
-			<feOffset dx="4" dy="1" result="cyan"/>
-			<feColorMatrix in="SourceAlpha" values="1 0 0 0 1 0 1 0 0 0.3 0 0 1 0 0.3 0 0 0 0.25 0"/>
-			<feOffset dx="-4" dy="-1" result="red"/>
+			<feColorMatrix in="SourceAlpha" values="1 0 0 0 0 0 1 0 0 1 0 0 1 0 0.6 0 0 0 1 0"/>
+			<feOffset dx="4" result="cyan"/>
+			<feColorMatrix in="SourceAlpha" values="1 0 0 0 1 0 1 0 0 1 0 0 1 0 0 0 0 0 1 0"/>
+			<feOffset dx="-4" result="yellow"/>
+			<feColorMatrix in="SourceAlpha" values="1 0 0 0 0.2 0 1 0 0 0.4 0 0 1 0 1 0 0 0 1 0"/>
+			<feOffset dx="1" result="blue"/>
+			<feColorMatrix in="SourceAlpha" values="1 0 0 0 1 0 1 0 0 0 0 0 1 0 0 0 0 0 1 0"/>
+			<feOffset dx="-1" result="red"/>
 			<feMerge>
-				<feMergeNode in="cyan"/>
+				<feMergeNode in="blue"/>
 				<feMergeNode in="red"/>
 			</feMerge>
-			<feGaussianBlur stdDeviation="2 0" result="abberation"/>
+			<feGaussianBlur stdDeviation="2 0" result="bluered"/>
+			<feMerge>
+				<feMergeNode in="cyan"/>
+				<feMergeNode in="yellow"/>
+				<feMergeNode in="bluered"/>
+			</feMerge>
+			<feGaussianBlur stdDeviation="2 0"/>
+			<feColorMatrix values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0.33 0" result="abberation"/>
+			<feGaussianBlur in="SourceAlpha" stdDeviation="4"/>
+			<feColorMatrix values="1 0 0 0 1 0 1 0 0 1 0 0 1 0 1 0 0 0 1 -0.5" result="highlight"/>
 			<feMerge>
 				<feMergeNode in="glow"/>
 				<feMergeNode in="shadow"/>
-				<feMergeNode in="outline"/>
 				<feMergeNode in="abberation"/>
+				<feMergeNode in="outline"/>
 				<feMergeNode in="SourceGraphic"/>
 			</feMerge>
+			<feComposite in2="highlight" operator="arithmetic" k1="0.2" k2="1" k3="0.4"/>
 			<feGaussianBlur stdDeviation="0.4"/>
 		</filter>
-		<filter id="blurred">
+		<filter id="highlighted" height="3" width="3" y="-1" x="-1" >
+			<feGaussianBlur stdDeviation="8"/>
+			<feColorMatrix values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0.4 0" result="glow"/>
+			<feGaussianBlur in="SourceGraphic" stdDeviation="8 6"/>
+			<!-- ./tools/hsv-matrix.pl -9 3.3 0.35 -->
+			<feColorMatrix values="1.01 -0.44 -0.22 0 0 -0.19 0.55 -0.01 0 0 -0.03 -0.69 1.07 0 0 0 0 0 1.5 0" result="shadow"/>
+			<feGaussianBlur in="SourceAlpha" stdDeviation="3"/>
+			<feColorMatrix values="1 0 0 0 1 0 1 0 0 1 0 0 1 0 1 0 0 0 1 -0.5" result="highlight"/>
+			<feMerge>
+				<feMergeNode in="glow"/>
+				<feMergeNode in="shadow"/>
+				<feMergeNode in="SourceGraphic"/>
+			</feMerge>
+			<feComposite in2="highlight" operator="arithmetic" k1="1" k2="1" k3="0.5"/>
+			<feGaussianBlur stdDeviation="0.4"/>
+		</filter>
+		<filter id="shadowed" height="3" width="3" y="-1" x="-1" >
+			<feGaussianBlur in="SourceGraphic" stdDeviation="8 6"/>
+			<!-- ./tools/hsv-matrix.pl -9 3.3 0.35 -->
+			<feColorMatrix values="1.01 -0.44 -0.22 0 0 -0.19 0.55 -0.01 0 0 -0.03 -0.69 1.07 0 0 0 0 0 1.5 0" result="shadow"/>
+			<feMerge>
+				<feMergeNode in="shadow"/>
+				<feMergeNode in="SourceGraphic"/>
+			</feMerge>
 			<feGaussianBlur stdDeviation="0.4"/>
 		</filter>
 	</defs>
diff --git a/gfx/luma/gfx/hud/luma/common.gradients b/gfx/luma/gfx/hud/luma/common.gradients
index f38b9cc..8740df2 100644
--- a/gfx/luma/gfx/hud/luma/common.gradients
+++ b/gfx/luma/gfx/hud/luma/common.gradients
@@ -1,19 +1,23 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1">
 	<defs>
-		<linearGradient id="border_default" x2="0" y2="1">
-			<stop offset="0" stop-color="#2f2f2f" stop-opacity=".83"/>
-			<stop offset="1" stop-color="#1f1f1f" stop-opacity=".44"/>
+		<radialGradient id="border_corner" cx="0%" cy="0%" r="100%" gradientUnits="userSpaceOnUse">
+			<stop offset=".25" stop-color="#1f1f1f" stop-opacity=".4"/>
+			<stop offset=".75" stop-color="#2f2f2f" stop-opacity=".6"/>
+		</radialGradient>
+		<linearGradient id="border_default" x2="0%" y2="100%" gradientUnits="userSpaceOnUse">
+			<stop offset="0" stop-color="#2f2f2f" stop-opacity=".8"/>
+			<stop offset="1" stop-color="#1f1f1f" stop-opacity=".4"/>
 		</linearGradient>
-		<linearGradient id="border_open" x2="0" y2="1">
-			<stop offset="0"   stop-color="#2f2f2f" stop-opacity=".83"/>
-			<stop offset=".75" stop-color="#1f1f1f" stop-opacity=".44"/>
+		<linearGradient id="border_fading" x2="0%" y2="100%" gradientUnits="userSpaceOnUse">
+			<stop offset="0"   stop-color="#2f2f2f" stop-opacity=".8"/>
+			<stop offset=".75" stop-color="#1f1f1f" stop-opacity=".4"/>
 			<stop offset="1"   stop-color="#1f1f1f" stop-opacity="0" />
 		</linearGradient>
-		<radialGradient id="border_glow" cx="0.5" cy="-0.0625" r="0.5" gradientTransform="scale(1,0.5)">
-			<stop offset="0"  stop-color="#9f9f9f" stop-opacity=".17"/>
-			<stop offset=".5" stop-color="#9f9f9f" stop-opacity=".06"/>
-			<stop offset="1"  stop-color="#9f9f9f" stop-opacity="0"/>
-		</radialGradient>
+		<linearGradient id="weapon_ammo">
+			<stop offset="0"  stop-color="#baff13"/>
+			<stop offset=".5" stop-color="#70fb00"/>
+			<stop offset="1"  stop-color="#29da00"/>
+		</linearGradient>
 	</defs>
 </svg>
diff --git a/gfx/luma/gfx/hud/luma/common_blue.css b/gfx/luma/gfx/hud/luma/common_blue.css
index 5c22d50..0625f00 100644
--- a/gfx/luma/gfx/hud/luma/common_blue.css
+++ b/gfx/luma/gfx/hud/luma/common_blue.css
@@ -1,3 +1,3 @@
 @import "common.css";
 
-.teamcolor { fill:#397fff }
+.teamcolor { fill:#5d97ff }
diff --git a/gfx/luma/gfx/hud/luma/common_neutral.css b/gfx/luma/gfx/hud/luma/common_neutral.css
new file mode 100755
index 0000000..6562f0d
--- /dev/null
+++ b/gfx/luma/gfx/hud/luma/common_neutral.css
@@ -0,0 +1,3 @@
+@import "common.css";
+
+.teamcolor { fill:#ebf1f3 }
diff --git a/gfx/luma/gfx/hud/luma/common_pink.css b/gfx/luma/gfx/hud/luma/common_pink.css
index 9dfa0c5..b958079 100644
--- a/gfx/luma/gfx/hud/luma/common_pink.css
+++ b/gfx/luma/gfx/hud/luma/common_pink.css
@@ -1,3 +1,3 @@
 @import "common.css";
 
-.teamcolor { fill:#e949d8 }
+.teamcolor { fill:#fa5aee }
diff --git a/gfx/luma/gfx/hud/luma/common_red.css b/gfx/luma/gfx/hud/luma/common_red.css
index d6f66f0..72ff888 100644
--- a/gfx/luma/gfx/hud/luma/common_red.css
+++ b/gfx/luma/gfx/hud/luma/common_red.css
@@ -1,3 +1,3 @@
 @import "common.css";
 
-.teamcolor { fill:#e54636 }
+.teamcolor { fill:#ff6a59 }
diff --git a/gfx/luma/gfx/hud/luma/common_yellow.css b/gfx/luma/gfx/hud/luma/common_yellow.css
index 8c9031d..7a01ea0 100644
--- a/gfx/luma/gfx/hud/luma/common_yellow.css
+++ b/gfx/luma/gfx/hud/luma/common_yellow.css
@@ -1,3 +1,3 @@
 @import "common.css";
 
-.teamcolor { fill:#eeeb00 }
+.teamcolor { fill:#fffd4b }
diff --git a/gfx/luma/gfx/hud/luma/dom_icon.svg b/gfx/luma/gfx/hud/luma/dom_icon.svg
index c223747..d962bd8 100644
--- a/gfx/luma/gfx/hud/luma/dom_icon.svg
+++ b/gfx/luma/gfx/hud/luma/dom_icon.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet href="common.css" type="text/css"?>
+<?xml-stylesheet href="common_neutral.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
 	<g class="teamcolor glowing">
 		<path d="m 30,82 -8,3 -10,11 52,20 52,-20 -10,-11 -8,-3 5,7 -39,11 -39,-11 z"/>
diff --git a/gfx/luma/gfx/hud/luma/flag_blue_carrying.svg b/gfx/luma/gfx/hud/luma/flag_blue_carrying.svg
index 9dd0786..413c478 100644
--- a/gfx/luma/gfx/hud/luma/flag_blue_carrying.svg
+++ b/gfx/luma/gfx/hud/luma/flag_blue_carrying.svg
@@ -5,5 +5,5 @@
 		<path d="M 89,14 C 82.8,19.8 75.3,22.2 67,24 L 77,61 57,16 C 40,15 26,20 16,29 l 24,61 c 9,-12 30,-25 37,-25 5,0 2,6 -4,12.1 9,-13.6 -5,-7.1 -10,-1.6 2.1,4.7 7.5,5.8 13.9,4.8 L 87.2,63 l 9.6,0 3.9,6.6 c 3.4,-2.6 6,-5.2 7.3,-7.6 z M 12.5,28 8,30 l 28,80 7.5,-3 z"/>
 		<path d="m 90,68 -26,44 2.5,4 51,0 2.5,-4 -26,-44 z"/>
 	</g>
-	<path class="symbol" d="m 87,82 0,20 10,0 0,-20 z m 0,24 0,6 10,0 0,-6 z"/>
+	<path class="teamcolor darkened" d="m 87,82 0,20 10,0 0,-20 z m 0,24 0,6 10,0 0,-6 z"/>
 </svg>
diff --git a/gfx/luma/gfx/hud/luma/flag_pink_carrying.svg b/gfx/luma/gfx/hud/luma/flag_pink_carrying.svg
index 4a69a2c..40023d5 100644
--- a/gfx/luma/gfx/hud/luma/flag_pink_carrying.svg
+++ b/gfx/luma/gfx/hud/luma/flag_pink_carrying.svg
@@ -5,5 +5,5 @@
 		<path d="M 89,14 C 82.8,19.8 75.3,22.2 67,24 L 77,61 57,16 C 40,15 26,20 16,29 l 24,61 c 9,-12 30,-25 37,-25 5,0 2,6 -4,12.1 9,-13.6 -5,-7.1 -10,-1.6 2.1,4.7 7.5,5.8 13.9,4.8 L 87.2,63 l 9.6,0 3.9,6.6 c 3.4,-2.6 6,-5.2 7.3,-7.6 z M 12.5,28 8,30 l 28,80 7.5,-3 z"/>
 		<path d="m 90,68 -26,44 2.5,4 51,0 2.5,-4 -26,-44 z"/>
 	</g>
-	<path class="symbol" d="m 87,82 0,20 10,0 0,-20 z m 0,24 0,6 10,0 0,-6 z"/>
+	<path class="teamcolor darkened" d="m 87,82 0,20 10,0 0,-20 z m 0,24 0,6 10,0 0,-6 z"/>
 </svg>
diff --git a/gfx/luma/gfx/hud/luma/flag_red_carrying.svg b/gfx/luma/gfx/hud/luma/flag_red_carrying.svg
index b0e8e77..8110702 100644
--- a/gfx/luma/gfx/hud/luma/flag_red_carrying.svg
+++ b/gfx/luma/gfx/hud/luma/flag_red_carrying.svg
@@ -5,5 +5,5 @@
 		<path d="M 89,14 C 82.8,19.8 75.3,22.2 67,24 L 77,61 57,16 C 40,15 26,20 16,29 l 24,61 c 9,-12 30,-25 37,-25 5,0 2,6 -4,12.1 9,-13.6 -5,-7.1 -10,-1.6 2.1,4.7 7.5,5.8 13.9,4.8 L 87.2,63 l 9.6,0 3.9,6.6 c 3.4,-2.6 6,-5.2 7.3,-7.6 z M 12.5,28 8,30 l 28,80 7.5,-3 z"/>
 		<path d="m 90,68 -26,44 2.5,4 51,0 2.5,-4 -26,-44 z"/>
 	</g>
-	<path class="symbol" d="m 87,82 0,20 10,0 0,-20 z m 0,24 0,6 10,0 0,-6 z"/>
+	<path class="teamcolor darkened" d="m 87,82 0,20 10,0 0,-20 z m 0,24 0,6 10,0 0,-6 z"/>
 </svg>
diff --git a/gfx/luma/gfx/hud/luma/flag_yellow_carrying.svg b/gfx/luma/gfx/hud/luma/flag_yellow_carrying.svg
index 4c5fbba..05f6728 100644
--- a/gfx/luma/gfx/hud/luma/flag_yellow_carrying.svg
+++ b/gfx/luma/gfx/hud/luma/flag_yellow_carrying.svg
@@ -5,5 +5,5 @@
 		<path d="M 89,14 C 82.8,19.8 75.3,22.2 67,24 L 77,61 57,16 C 40,15 26,20 16,29 l 24,61 c 9,-12 30,-25 37,-25 5,0 2,6 -4,12.1 9,-13.6 -5,-7.1 -10,-1.6 2.1,4.7 7.5,5.8 13.9,4.8 L 87.2,63 l 9.6,0 3.9,6.6 c 3.4,-2.6 6,-5.2 7.3,-7.6 z M 12.5,28 8,30 l 28,80 7.5,-3 z"/>
 		<path d="m 90,68 -26,44 2.5,4 51,0 2.5,-4 -26,-44 z"/>
 	</g>
-	<path class="symbol" d="m 87,82 0,20 10,0 0,-20 z m 0,24 0,6 10,0 0,-6 z"/>
+	<path class="teamcolor darkened" d="m 87,82 0,20 10,0 0,-20 z m 0,24 0,6 10,0 0,-6 z"/>
 </svg>
diff --git a/gfx/luma/gfx/hud/luma/keepawayball_carrying.svg b/gfx/luma/gfx/hud/luma/keepawayball_carrying.svg
index 6bee995..ee9edd5 100644
--- a/gfx/luma/gfx/hud/luma/keepawayball_carrying.svg
+++ b/gfx/luma/gfx/hud/luma/keepawayball_carrying.svg
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
-	<g class="teamcolor glowing">
+	<g class="keepaway glowing">
 		<path d="m 20.9,21.6 c -3.5,0 -5.3,1.9 -5.3,5.4 0,6.3 6.2,17.6 16.3,30.3 l 2,-5.3 c -5.8,-8.4 -7,-12.6 -7,-14.8 0,-1.9 1.1,-2.9 2.8,-2.9 8.1,0 25.9,14.1 40.7,29.5 -15.8,17.8 -37.9,36.4 -47.1,36.4 -1.7,0 -2.8,-0.9 -2.8,-3 0,-4.3 4.9,-12.7 12.8,-22.4 l -1.4,-4.1 c -10.2,12.7 -16.3,24 -16.3,30.3 0,3.5 1.8,5.4 5.1,5.4 11.9,0 35.5,-18.3 53.9,-38.1 2,2.2 3.8,4.3 5.6,6.4 L 83.3,69.6 C 81.7,67.7 80.1,65.9 78.5,64 91,49.8 100.4,35.4 100.4,26.9 c 0,-3.5 -1.9,-5.3 -5.4,-5.3 -6.3,0 -17.6,6.2 -30.3,16.3 l 5.3,2 c 8.4,-5.8 12.7,-7 14.9,-7 1.9,0 2.9,1.1 2.9,2.8 0,5.1 -5.6,14 -13.5,23.6 -18.4,-19.7 -41.6,-37.7 -53.4,-37.7 z M 58.5,40 c 5.2,4.6 10.4,9.6 15.4,14.8 C 75.2,53.2 76.4,51.6 77.5,50 73.2,44.1 66.3,40.1 58.5,40 z M 44,44.5 C 37.9,48.9 34,56 34,64 c 0,8.5 4.4,15.9 11,20.2 7.1,-5.9 14.5,-13.2 21.1,-20.4 C 59.4,57 50.6,49.4 44,44.5 z m 30.4,28.2 c 0,0 0,0 0,0.1 0,-0 0,-0 0.1,-0.1 z M 74.4,72.8 C 69.3,78 64,83.3 58.5,88 66.7,87.8 73.9,83.5 78.1,77 76.9,75.6 75.7,74.1 74.4,72.8 z"/>
 		<path d="m 90,68 -26,44 2.5,4 51,0 2.5,-4 -26,-44 z"/>
 	</g>
-	<path class="symbol" d="m 87,82 0,20 10,0 0,-20 z m 0,24 0,6 10,0 0,-6 z"/>
+	<path class="keepaway darkened" d="m 87,82 0,20 10,0 0,-20 z m 0,24 0,6 10,0 0,-6 z"/>
 </svg>
diff --git a/gfx/luma/gfx/hud/luma/key_atck2_inv.svg b/gfx/luma/gfx/hud/luma/key_atck2_inv.svg
index a43183e..61ca74e 100644
--- a/gfx/luma/gfx/hud/luma/key_atck2_inv.svg
+++ b/gfx/luma/gfx/hud/luma/key_atck2_inv.svg
@@ -2,5 +2,5 @@
 <?xml-stylesheet href="common.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
 	<path class="key glowing" d="m 29.5,16 c -4,0 -6.8,3 -7,7 l -2,51 c -0.2,4 3,7 7,7 l 73,0 c 4,0 7.2,-3 7,-7 l -2,-51 c -0.2,-4 -3,-7 -7,-7 z M 20,22 12.5,41.5 8,103 c 0,5 4,9 9,9 l 94,0 c 5,0 9,-4 9,-9 L 115.5,41.5 108,22 l 2.5,58 6,27.5 -7.5,-20 C 108.1,85 106.5,84 104,84 l -80,0 c -2.5,0 -4.1,1 -5,3.5 l -7.5,20 6,-27.5 z"/>
-	<path class="symbol" d="m 72,58 0,-5 -30,0 0,-9 c 0,-2 1,-2 3,-2 l 15,0 c 6,0 12,0 12,-7 l 0,-3 c 0,-7 -6,-7 -12,-7 l -23,0 0,5 24,0 c 2,0 3,0 3,2 l 0,3 c 0,2 -1,2 -3,2 l -15,0 c -6,0 -12,0 -12,7 l 0,14 z"/>
+	<path class="key darkened" d="m 72,58 0,-5 -30,0 0,-9 c 0,-2 1,-2 3,-2 l 15,0 c 6,0 12,0 12,-7 l 0,-3 c 0,-7 -6,-7 -12,-7 l -23,0 0,5 24,0 c 2,0 3,0 3,2 l 0,3 c 0,2 -1,2 -3,2 l -15,0 c -6,0 -12,0 -12,7 l 0,14 z"/>
 </svg>
diff --git a/gfx/luma/gfx/hud/luma/key_atck_inv.svg b/gfx/luma/gfx/hud/luma/key_atck_inv.svg
index ef613de..8cd6215 100644
--- a/gfx/luma/gfx/hud/luma/key_atck_inv.svg
+++ b/gfx/luma/gfx/hud/luma/key_atck_inv.svg
@@ -2,5 +2,5 @@
 <?xml-stylesheet href="common.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
 	<path class="key glowing" d="m 29.5,16 c -4,0 -6.8,3 -7,7 l -2,51 c -0.2,4 3,7 7,7 l 73,0 c 4,0 7.2,-3 7,-7 l -2,-51 c -0.2,-4 -3,-7 -7,-7 z M 20,22 12.5,41.5 8,103 c 0,5 4,9 9,9 l 94,0 c 5,0 9,-4 9,-9 L 115.5,41.5 108,22 l 2.5,58 6,27.5 -7.5,-20 C 108.1,85 106.5,84 104,84 l -80,0 c -2.5,0 -4.1,1 -5,3.5 l -7.5,20 6,-27.5 z"/>
-	<path class="symbol" d="m 57,25 -19,0 0,5 11,0 0,28 8,0 z"/>
+	<path class="key darkened" d="m 57,25 -19,0 0,5 11,0 0,28 8,0 z"/>
 </svg>
diff --git a/gfx/luma/gfx/hud/luma/key_backward_inv.svg b/gfx/luma/gfx/hud/luma/key_backward_inv.svg
index b903f25..87a0626 100644
--- a/gfx/luma/gfx/hud/luma/key_backward_inv.svg
+++ b/gfx/luma/gfx/hud/luma/key_backward_inv.svg
@@ -2,5 +2,5 @@
 <?xml-stylesheet href="common.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
 	<path class="key glowing" d="m 29.5,16 c -4,0 -6.8,3 -7,7 l -2,51 c -0.2,4 3,7 7,7 l 73,0 c 4,0 7.2,-3 7,-7 l -2,-51 c -0.2,-4 -3,-7 -7,-7 z M 20,22 12.5,41.5 8,103 c 0,5 4,9 9,9 l 94,0 c 5,0 9,-4 9,-9 L 115.5,41.5 108,22 l 2.5,58 6,27.5 -7.5,-20 C 108.1,85 106.5,84 104,84 l -80,0 c -2.5,0 -4.1,1 -5,3.5 l -7.5,20 6,-27.5 z"/>
-	<path class="symbol" d="m 37,40 11,10 0,-26 8,0 0,26 11,-10 0,9 L 52,64 37,49 z"/>
+	<path class="key darkened" d="m 37,40 11,10 0,-26 8,0 0,26 11,-10 0,9 L 52,64 37,49 z"/>
 </svg>
diff --git a/gfx/luma/gfx/hud/luma/key_crouch_inv.svg b/gfx/luma/gfx/hud/luma/key_crouch_inv.svg
index 03c05cc..5efba90 100644
--- a/gfx/luma/gfx/hud/luma/key_crouch_inv.svg
+++ b/gfx/luma/gfx/hud/luma/key_crouch_inv.svg
@@ -2,5 +2,5 @@
 <?xml-stylesheet href="common.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
 	<path class="key glowing" d="m 29.5,16 c -4,0 -6.8,3 -7,7 l -2,51 c -0.2,4 3,7 7,7 l 73,0 c 4,0 7.2,-3 7,-7 l -2,-51 c -0.2,-4 -3,-7 -7,-7 z M 20,22 12.5,41.5 8,103 c 0,5 4,9 9,9 l 94,0 c 5,0 9,-4 9,-9 L 115.5,41.5 108,22 l 2.5,58 6,27.5 -7.5,-20 C 108.1,85 106.5,84 104,84 l -80,0 c -2.5,0 -4.1,1 -5,3.5 l -7.5,20 6,-27.5 z"/>
-	<path class="symbol" d="M 32,30 54,54 76,30 z"/>
+	<path class="key darkened" d="M 32,30 54,54 76,30 z"/>
 </svg>
diff --git a/gfx/luma/gfx/hud/luma/key_forward_inv.svg b/gfx/luma/gfx/hud/luma/key_forward_inv.svg
index 17b3bac..97064c0 100644
--- a/gfx/luma/gfx/hud/luma/key_forward_inv.svg
+++ b/gfx/luma/gfx/hud/luma/key_forward_inv.svg
@@ -2,5 +2,5 @@
 <?xml-stylesheet href="common.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
 	<path class="key glowing" d="m 29.5,16 c -4,0 -6.8,3 -7,7 l -2,51 c -0.2,4 3,7 7,7 l 73,0 c 4,0 7.2,-3 7,-7 l -2,-51 c -0.2,-4 -3,-7 -7,-7 z M 20,22 12.5,41.5 8,103 c 0,5 4,9 9,9 l 94,0 c 5,0 9,-4 9,-9 L 115.5,41.5 108,22 l 2.5,58 6,27.5 -7.5,-20 C 108.1,85 106.5,84 104,84 l -80,0 c -2.5,0 -4.1,1 -5,3.5 l -7.5,20 6,-27.5 z"/>
-	<path class="symbol" d="m 37,48 11,-10 0,26 8,0 0,-26 11,10 0,-9 L 52,24 37,39 z"/>
+	<path class="key darkened" d="m 37,48 11,-10 0,26 8,0 0,-26 11,10 0,-9 L 52,24 37,39 z"/>
 </svg>
diff --git a/gfx/luma/gfx/hud/luma/key_jump_inv.svg b/gfx/luma/gfx/hud/luma/key_jump_inv.svg
index 0e0408a..79945af 100644
--- a/gfx/luma/gfx/hud/luma/key_jump_inv.svg
+++ b/gfx/luma/gfx/hud/luma/key_jump_inv.svg
@@ -2,5 +2,5 @@
 <?xml-stylesheet href="common.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
 	<path class="key glowing" d="m 29.5,16 c -4,0 -6.8,3 -7,7 l -2,51 c -0.2,4 3,7 7,7 l 73,0 c 4,0 7.2,-3 7,-7 l -2,-51 c -0.2,-4 -3,-7 -7,-7 z M 20,22 12.5,41.5 8,103 c 0,5 4,9 9,9 l 94,0 c 5,0 9,-4 9,-9 L 115.5,41.5 108,22 l 2.5,58 6,27.5 -7.5,-20 C 108.1,85 106.5,84 104,84 l -80,0 c -2.5,0 -4.1,1 -5,3.5 l -7.5,20 6,-27.5 z"/>
-	<path class="symbol" d="M 32,52 54,28 76,52 z"/>
+	<path class="key darkened" d="M 32,52 54,28 76,52 z"/>
 </svg>
diff --git a/gfx/luma/gfx/hud/luma/key_left_inv.svg b/gfx/luma/gfx/hud/luma/key_left_inv.svg
index a0c4ea6..7e475c3 100644
--- a/gfx/luma/gfx/hud/luma/key_left_inv.svg
+++ b/gfx/luma/gfx/hud/luma/key_left_inv.svg
@@ -2,5 +2,5 @@
 <?xml-stylesheet href="common.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
 	<path class="key glowing" d="m 29.5,16 c -4,0 -6.8,3 -7,7 l -2,51 c -0.2,4 3,7 7,7 l 73,0 c 4,0 7.2,-3 7,-7 l -2,-51 c -0.2,-4 -3,-7 -7,-7 z M 20,22 12.5,41.5 8,103 c 0,5 4,9 9,9 l 94,0 c 5,0 9,-4 9,-9 L 115.5,41.5 108,22 l 2.5,58 6,27.5 -7.5,-20 C 108.1,85 106.5,84 104,84 l -80,0 c -2.5,0 -4.1,1 -5,3.5 l -7.5,20 6,-27.5 z"/>
-	<path class="symbol" d="m 56,29 -10,11 26,0 0,8 -26,0 10,11 -9,0 L 32,44 47,29 z"/>
+	<path class="key darkened" d="m 56,29 -10,11 26,0 0,8 -26,0 10,11 -9,0 L 32,44 47,29 z"/>
 </svg>
diff --git a/gfx/luma/gfx/hud/luma/key_right_inv.svg b/gfx/luma/gfx/hud/luma/key_right_inv.svg
index 6578170..adc0717 100644
--- a/gfx/luma/gfx/hud/luma/key_right_inv.svg
+++ b/gfx/luma/gfx/hud/luma/key_right_inv.svg
@@ -2,5 +2,5 @@
 <?xml-stylesheet href="common.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
 	<path class="key glowing" d="m 29.5,16 c -4,0 -6.8,3 -7,7 l -2,51 c -0.2,4 3,7 7,7 l 73,0 c 4,0 7.2,-3 7,-7 l -2,-51 c -0.2,-4 -3,-7 -7,-7 z M 20,22 12.5,41.5 8,103 c 0,5 4,9 9,9 l 94,0 c 5,0 9,-4 9,-9 L 115.5,41.5 108,22 l 2.5,58 6,27.5 -7.5,-20 C 108.1,85 106.5,84 104,84 l -80,0 c -2.5,0 -4.1,1 -5,3.5 l -7.5,20 6,-27.5 z"/>
-	<path class="symbol" d="m 48,29 10,11 -26,0 0,8 26,0 -10,11 9,0 L 72,44 57,29 z"/>
+	<path class="key darkened" d="m 48,29 10,11 -26,0 0,8 26,0 -10,11 9,0 L 72,44 57,29 z"/>
 </svg>
diff --git a/gfx/luma/gfx/hud/luma/kh_blue_carrying.svg b/gfx/luma/gfx/hud/luma/kh_blue_carrying.svg
index 30e05be..a6a35fe 100644
--- a/gfx/luma/gfx/hud/luma/kh_blue_carrying.svg
+++ b/gfx/luma/gfx/hud/luma/kh_blue_carrying.svg
@@ -5,5 +5,5 @@
 		<path d="M 99.5,21 50.6,56.6 C 47.1,54.9 43.1,54 39,54 24.1,54 12,66.1 12,81 c 0,14.9 12.1,27 27,27 14.9,0 27,-12.1 27,-27 0,-0.8 0,-1.5 -0.1,-2.3 L 72.5,74 70,69.5 75,66 l -1,-6 4,-3 8,3.5 3,-2.5 -1,-6.5 4,-3 4,2 2.5,-1.5 -0.5,-4.5 3,-2.5 6,3 3,-2 L 108,26 63,58.5 61,55 106.5,22 z M 39,58 C 51.7,58 62,68.3 62,81 62,93.7 51.7,104 39,104 26.3,104 16,93.7 16,81 16,68.3 26.3,58 39,58 z m -0.5,3 C 27.2,61 18,70.2 18,81.5 18,92.8 27.2,102 38.5,102 49.8,102 59,92.8 59,81.5 59,70.2 49.8,61 38.5,61 z M 33,77 c 4.4,0 8,3.6 8,8 0,4.4 -3.6,8 -8,8 -4.4,0 -8,-3.6 -8,-8 0,-4.4 3.6,-8 8,-8 z"/>
 		<path d="m 90,68 -26,44 2.5,4 51,0 2.5,-4 -26,-44 z"/>
 	</g>
-	<path class="symbol" d="m 87,82 0,20 10,0 0,-20 z m 0,24 0,6 10,0 0,-6 z"/>
+	<path class="teamcolor darkened" d="m 87,82 0,20 10,0 0,-20 z m 0,24 0,6 10,0 0,-6 z"/>
 </svg>
diff --git a/gfx/luma/gfx/hud/luma/kh_blue_taken.svg b/gfx/luma/gfx/hud/luma/kh_blue_taken.svg
new file mode 100755
index 0000000..a7abe38
--- /dev/null
+++ b/gfx/luma/gfx/hud/luma/kh_blue_taken.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet href="common_blue.css" type="text/css"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
+	<path class="teamcolor glowing" d="M 103.5,21 54.6,56.6 C 51.1,54.9 47.1,54 43,54 28.1,54 16,66.1 16,81 c 0,14.9 12.1,27 27,27 14.9,0 27,-12.1 27,-27 0,-0.8 0,-1.5 -0.1,-2.3 L 76.5,74 74,69.5 79,66 l -1,-6 4,-3 8,3.5 3,-2.5 -1,-6.5 4,-3 4,2 2.5,-1.5 -0.5,-4.5 3,-2.5 6,3 3,-2 L 112,26 67,58.5 65,55 110.5,22 z M 43,58 C 55.7,58 66,68.3 66,81 66,93.7 55.7,104 43,104 30.3,104 20,93.7 20,81 20,68.3 30.3,58 43,58 z m -0.5,3 C 31.2,61 22,70.2 22,81.5 22,92.8 31.2,102 42.5,102 53.8,102 63,92.8 63,81.5 63,70.2 53.8,61 42.5,61 z M 37,77 c 4.4,0 8,3.6 8,8 0,4.4 -3.6,8 -8,8 -4.4,0 -8,-3.6 -8,-8 0,-4.4 3.6,-8 8,-8 z"/>
+</svg>
diff --git a/gfx/luma/gfx/hud/luma/kh_pink_carrying.svg b/gfx/luma/gfx/hud/luma/kh_pink_carrying.svg
index aed394d..62e7dbf 100644
--- a/gfx/luma/gfx/hud/luma/kh_pink_carrying.svg
+++ b/gfx/luma/gfx/hud/luma/kh_pink_carrying.svg
@@ -5,5 +5,5 @@
 		<path d="M 99.5,21 50.6,56.6 C 47.1,54.9 43.1,54 39,54 24.1,54 12,66.1 12,81 c 0,14.9 12.1,27 27,27 14.9,0 27,-12.1 27,-27 0,-0.8 0,-1.5 -0.1,-2.3 L 72.5,74 70,69.5 75,66 l -1,-6 4,-3 8,3.5 3,-2.5 -1,-6.5 4,-3 4,2 2.5,-1.5 -0.5,-4.5 3,-2.5 6,3 3,-2 L 108,26 63,58.5 61,55 106.5,22 z M 39,58 C 51.7,58 62,68.3 62,81 62,93.7 51.7,104 39,104 26.3,104 16,93.7 16,81 16,68.3 26.3,58 39,58 z m -0.5,3 C 27.2,61 18,70.2 18,81.5 18,92.8 27.2,102 38.5,102 49.8,102 59,92.8 59,81.5 59,70.2 49.8,61 38.5,61 z M 33,77 c 4.4,0 8,3.6 8,8 0,4.4 -3.6,8 -8,8 -4.4,0 -8,-3.6 -8,-8 0,-4.4 3.6,-8 8,-8 z"/>
 		<path d="m 90,68 -26,44 2.5,4 51,0 2.5,-4 -26,-44 z"/>
 	</g>
-	<path class="symbol" d="m 87,82 0,20 10,0 0,-20 z m 0,24 0,6 10,0 0,-6 z"/>
+	<path class="teamcolor darkened" d="m 87,82 0,20 10,0 0,-20 z m 0,24 0,6 10,0 0,-6 z"/>
 </svg>
diff --git a/gfx/luma/gfx/hud/luma/kh_pink_taken.svg b/gfx/luma/gfx/hud/luma/kh_pink_taken.svg
new file mode 100755
index 0000000..40433ae
--- /dev/null
+++ b/gfx/luma/gfx/hud/luma/kh_pink_taken.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet href="common_pink.css" type="text/css"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
+	<path class="teamcolor glowing" d="M 103.5,21 54.6,56.6 C 51.1,54.9 47.1,54 43,54 28.1,54 16,66.1 16,81 c 0,14.9 12.1,27 27,27 14.9,0 27,-12.1 27,-27 0,-0.8 0,-1.5 -0.1,-2.3 L 76.5,74 74,69.5 79,66 l -1,-6 4,-3 8,3.5 3,-2.5 -1,-6.5 4,-3 4,2 2.5,-1.5 -0.5,-4.5 3,-2.5 6,3 3,-2 L 112,26 67,58.5 65,55 110.5,22 z M 43,58 C 55.7,58 66,68.3 66,81 66,93.7 55.7,104 43,104 30.3,104 20,93.7 20,81 20,68.3 30.3,58 43,58 z m -0.5,3 C 31.2,61 22,70.2 22,81.5 22,92.8 31.2,102 42.5,102 53.8,102 63,92.8 63,81.5 63,70.2 53.8,61 42.5,61 z M 37,77 c 4.4,0 8,3.6 8,8 0,4.4 -3.6,8 -8,8 -4.4,0 -8,-3.6 -8,-8 0,-4.4 3.6,-8 8,-8 z"/>
+</svg>
diff --git a/gfx/luma/gfx/hud/luma/kh_red_carrying.svg b/gfx/luma/gfx/hud/luma/kh_red_carrying.svg
index 7fc8174..757b5db 100644
--- a/gfx/luma/gfx/hud/luma/kh_red_carrying.svg
+++ b/gfx/luma/gfx/hud/luma/kh_red_carrying.svg
@@ -5,5 +5,5 @@
 		<path d="M 99.5,21 50.6,56.6 C 47.1,54.9 43.1,54 39,54 24.1,54 12,66.1 12,81 c 0,14.9 12.1,27 27,27 14.9,0 27,-12.1 27,-27 0,-0.8 0,-1.5 -0.1,-2.3 L 72.5,74 70,69.5 75,66 l -1,-6 4,-3 8,3.5 3,-2.5 -1,-6.5 4,-3 4,2 2.5,-1.5 -0.5,-4.5 3,-2.5 6,3 3,-2 L 108,26 63,58.5 61,55 106.5,22 z M 39,58 C 51.7,58 62,68.3 62,81 62,93.7 51.7,104 39,104 26.3,104 16,93.7 16,81 16,68.3 26.3,58 39,58 z m -0.5,3 C 27.2,61 18,70.2 18,81.5 18,92.8 27.2,102 38.5,102 49.8,102 59,92.8 59,81.5 59,70.2 49.8,61 38.5,61 z M 33,77 c 4.4,0 8,3.6 8,8 0,4.4 -3.6,8 -8,8 -4.4,0 -8,-3.6 -8,-8 0,-4.4 3.6,-8 8,-8 z"/>
 		<path d="m 90,68 -26,44 2.5,4 51,0 2.5,-4 -26,-44 z"/>
 	</g>
-	<path class="symbol" d="m 87,82 0,20 10,0 0,-20 z m 0,24 0,6 10,0 0,-6 z"/>
+	<path class="teamcolor darkened" d="m 87,82 0,20 10,0 0,-20 z m 0,24 0,6 10,0 0,-6 z"/>
 </svg>
diff --git a/gfx/luma/gfx/hud/luma/kh_red_taken.svg b/gfx/luma/gfx/hud/luma/kh_red_taken.svg
new file mode 100755
index 0000000..b0d721b
--- /dev/null
+++ b/gfx/luma/gfx/hud/luma/kh_red_taken.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet href="common_red.css" type="text/css"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
+	<path class="teamcolor glowing" d="M 103.5,21 54.6,56.6 C 51.1,54.9 47.1,54 43,54 28.1,54 16,66.1 16,81 c 0,14.9 12.1,27 27,27 14.9,0 27,-12.1 27,-27 0,-0.8 0,-1.5 -0.1,-2.3 L 76.5,74 74,69.5 79,66 l -1,-6 4,-3 8,3.5 3,-2.5 -1,-6.5 4,-3 4,2 2.5,-1.5 -0.5,-4.5 3,-2.5 6,3 3,-2 L 112,26 67,58.5 65,55 110.5,22 z M 43,58 C 55.7,58 66,68.3 66,81 66,93.7 55.7,104 43,104 30.3,104 20,93.7 20,81 20,68.3 30.3,58 43,58 z m -0.5,3 C 31.2,61 22,70.2 22,81.5 22,92.8 31.2,102 42.5,102 53.8,102 63,92.8 63,81.5 63,70.2 53.8,61 42.5,61 z M 37,77 c 4.4,0 8,3.6 8,8 0,4.4 -3.6,8 -8,8 -4.4,0 -8,-3.6 -8,-8 0,-4.4 3.6,-8 8,-8 z"/>
+</svg>
diff --git a/gfx/luma/gfx/hud/luma/kh_yellow_carrying.svg b/gfx/luma/gfx/hud/luma/kh_yellow_carrying.svg
index 14fca42..3dea5fd 100644
--- a/gfx/luma/gfx/hud/luma/kh_yellow_carrying.svg
+++ b/gfx/luma/gfx/hud/luma/kh_yellow_carrying.svg
@@ -5,5 +5,5 @@
 		<path d="M 99.5,21 50.6,56.6 C 47.1,54.9 43.1,54 39,54 24.1,54 12,66.1 12,81 c 0,14.9 12.1,27 27,27 14.9,0 27,-12.1 27,-27 0,-0.8 0,-1.5 -0.1,-2.3 L 72.5,74 70,69.5 75,66 l -1,-6 4,-3 8,3.5 3,-2.5 -1,-6.5 4,-3 4,2 2.5,-1.5 -0.5,-4.5 3,-2.5 6,3 3,-2 L 108,26 63,58.5 61,55 106.5,22 z M 39,58 C 51.7,58 62,68.3 62,81 62,93.7 51.7,104 39,104 26.3,104 16,93.7 16,81 16,68.3 26.3,58 39,58 z m -0.5,3 C 27.2,61 18,70.2 18,81.5 18,92.8 27.2,102 38.5,102 49.8,102 59,92.8 59,81.5 59,70.2 49.8,61 38.5,61 z M 33,77 c 4.4,0 8,3.6 8,8 0,4.4 -3.6,8 -8,8 -4.4,0 -8,-3.6 -8,-8 0,-4.4 3.6,-8 8,-8 z"/>
 		<path d="m 90,68 -26,44 2.5,4 51,0 2.5,-4 -26,-44 z"/>
 	</g>
-	<path class="symbol" d="m 87,82 0,20 10,0 0,-20 z m 0,24 0,6 10,0 0,-6 z"/>
+	<path class="teamcolor darkened" d="m 87,82 0,20 10,0 0,-20 z m 0,24 0,6 10,0 0,-6 z"/>
 </svg>
diff --git a/gfx/luma/gfx/hud/luma/kh_yellow_taken.svg b/gfx/luma/gfx/hud/luma/kh_yellow_taken.svg
new file mode 100755
index 0000000..a33c020
--- /dev/null
+++ b/gfx/luma/gfx/hud/luma/kh_yellow_taken.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet href="common_yellow.css" type="text/css"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
+	<path class="teamcolor glowing" d="M 103.5,21 54.6,56.6 C 51.1,54.9 47.1,54 43,54 28.1,54 16,66.1 16,81 c 0,14.9 12.1,27 27,27 14.9,0 27,-12.1 27,-27 0,-0.8 0,-1.5 -0.1,-2.3 L 76.5,74 74,69.5 79,66 l -1,-6 4,-3 8,3.5 3,-2.5 -1,-6.5 4,-3 4,2 2.5,-1.5 -0.5,-4.5 3,-2.5 6,3 3,-2 L 112,26 67,58.5 65,55 110.5,22 z M 43,58 C 55.7,58 66,68.3 66,81 66,93.7 55.7,104 43,104 30.3,104 20,93.7 20,81 20,68.3 30.3,58 43,58 z m -0.5,3 C 31.2,61 22,70.2 22,81.5 22,92.8 31.2,102 42.5,102 53.8,102 63,92.8 63,81.5 63,70.2 53.8,61 42.5,61 z M 37,77 c 4.4,0 8,3.6 8,8 0,4.4 -3.6,8 -8,8 -4.4,0 -8,-3.6 -8,-8 0,-4.4 3.6,-8 8,-8 z"/>
+</svg>
diff --git a/gfx/luma/gfx/hud/luma/nexball_carrying.svg b/gfx/luma/gfx/hud/luma/nexball_carrying.svg
index 0aab5c7..a9e334b 100644
--- a/gfx/luma/gfx/hud/luma/nexball_carrying.svg
+++ b/gfx/luma/gfx/hud/luma/nexball_carrying.svg
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
-	<g class="teamcolor glowing">
+	<g class="ball glowing">
 		<path d="M 62.5,20 C 51.9,20.4 42.3,24.5 34.9,31 L 48.5,31 l 14,-7.2 z m 3,0 0,3.8 14,7.2 13.6,0 C 85.7,24.5 76.1,20.4 65.5,20 z M 31.8,34 c -4.5,4.8 -7.9,10.6 -9.9,17.1 l 7.5,13 L 42.1,62 51.9,45 47.7,34 z m 48.5,0 -4.2,11 10.4,18 6.3,0 3.2,5.4 10,-17.3 C 104.1,44.6 100.7,38.8 96.2,34 z m 17.5,37.4 6.3,10.6 C 106.6,76.5 108,70.4 108,64 c 0,-3 -0.3,-5.9 -0.9,-8.7 z M 55.4,46.8 l -10,17.4 9.2,15.8 18.5,0 9.4,-15.9 -9.9,-17.3 z m -34.5,8.5 C 20.3,58.1 20,61 20,64 c 0,7.5 1.9,14.5 5.2,20.7 L 29,82.4 28.3,68.3 z M 53.3,84 l -7.2,8.9 8,14 c 0.9,0.2 1.9,0.4 2.8,0.5 L 70.8,84 z M 31,84.8 l -4.3,2.5 c 5.3,8.5 13.5,15.1 23.3,18.4 l -8.1,-14 z"/>
 		<path d="m 86,68 -26,44 2.5,4 51,0 2.5,-4 -26,-44 z"/>
 	</g>
-	<path class="symbol" d="m 83,82 0,20 10,0 0,-20 z m 0,24 0,6 10,0 0,-6 z"/>
+	<path class="ball darkened" d="m 83,82 0,20 10,0 0,-20 z m 0,24 0,6 10,0 0,-6 z"/>
 </svg>
diff --git a/gfx/luma/gfx/hud/luma/notify_balldropped.svg b/gfx/luma/gfx/hud/luma/notify_balldropped.svg
index bd596f8..9db9e61 100644
--- a/gfx/luma/gfx/hud/luma/notify_balldropped.svg
+++ b/gfx/luma/gfx/hud/luma/notify_balldropped.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
-	<g class="teamcolor glowing">
+	<g class="keepaway glowing">
 		<path d="m 31.5,117.1 c -3.1,0 -4.6,-1.7 -4.6,-4.7 0,-5.5 5.4,-15.4 14.3,-26.5 l 1.8,4.6 c -5.1,7.4 -6.1,11 -6.1,13 0,1.7 1,2.5 2.5,2.5 C 46.3,106 61.9,93.7 74.9,80.2 61,64.6 41.7,48.3 33.6,48.3 c -1.5,0 -2.5,0.8 -2.5,2.6 0,3.8 4.3,11.1 11.2,19.6 l -1.2,3.6 C 32.2,63 26.9,53.1 26.9,47.6 c 0,-3.1 1.6,-4.7 4.5,-4.7 10.4,0 31.1,16 47.2,33.3 9.6,-10.6 17.1,-21.2 17.1,-26.6 0,-1.5 -0.8,-2.5 -2.6,-2.5 -3.8,0 -11.1,4.3 -19.6,11.2 l -3.5,-1.2 C 81,48.3 90.9,42.9 96.4,42.9 c 3.1,0 4.7,1.6 4.7,4.5 C 101.1,54.8 93,67.5 81.9,80 92.9,92.4 101.1,105 101.1,112.5 c 0,3.1 -1.7,4.6 -4.7,4.6 -5.5,0 -15.4,-5.4 -26.5,-14.3 l 4.6,-1.8 c 7.4,5.1 11.1,6.1 13,6.1 1.7,0 2.5,-1 2.5,-2.5 0,-4.5 -4.9,-12.3 -11.8,-20.7 -16.1,17.2 -36.4,33 -46.7,33 z m 32.9,-16.1 c 4.6,-4 9.1,-8.4 13.5,-13 1.1,1.4 2.2,2.8 3.2,4.2 -3.8,5.2 -9.8,8.7 -16.6,8.8 z M 51.8,97.1 C 46.4,93.2 43,87 43,80 c 0,-7.4 3.9,-13.9 9.6,-17.7 6.2,5.2 12.7,11.6 18.5,17.9 C 65.2,86.1 57.5,92.8 51.8,97.1 z M 78.4,72.4 C 73.9,67.8 69.3,63.1 64.4,59 c 7.2,0.2 13.5,3.9 17.2,9.6 -1.1,1.2 -2.1,2.5 -3.2,3.8 z"/>
 		<path d="M 64,44 40,20 88,20 z"/>
 	</g>
diff --git a/gfx/luma/gfx/hud/luma/notify_ballpickedup.svg b/gfx/luma/gfx/hud/luma/notify_ballpickedup.svg
index 2b8de21..c553ce2 100644
--- a/gfx/luma/gfx/hud/luma/notify_ballpickedup.svg
+++ b/gfx/luma/gfx/hud/luma/notify_ballpickedup.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
-	<path class="teamcolor glowing" d="m 26.9,21.6 c -3.5,0 -5.3,1.9 -5.3,5.4 0,6.3 6.2,17.6 16.3,30.3 l 2,-5.3 c -5.8,-8.4 -7,-12.6 -7,-14.8 0,-1.9 1.1,-2.9 2.8,-2.9 8.1,0 25.9,14.1 40.7,29.5 -15.8,17.8 -37.9,36.4 -47.1,36.4 -1.7,0 -2.8,-0.9 -2.8,-3 0,-4.3 4.9,-12.7 12.8,-22.4 l -1.4,-4.1 c -10.2,12.7 -16.3,24 -16.3,30.3 0,3.5 1.8,5.4 5.1,5.4 11.9,0 35.5,-18.3 53.9,-38.1 11,12.1 19.5,24.2 19.5,30.4 0,1.7 -0.9,2.8 -3,2.8 -4.3,0 -12.7,-4.9 -22.4,-12.8 l -4,1.4 c 12.7,10.1 24,16.3 30.3,16.3 3.5,0 5.4,-1.8 5.4,-5.1 0,-8.5 -9.3,-23 -21.9,-37.3 12.5,-14.2 21.9,-28.6 21.9,-37.1 0,-3.5 -1.9,-5.3 -5.4,-5.3 -6.3,0 -17.6,6.2 -30.3,16.3 l 5.3,2 c 8.4,-5.8 12.7,-7 14.9,-7 1.9,0 2.9,1.1 2.9,2.8 0,5.1 -5.6,14 -13.5,23.6 C 61.9,39.6 38.7,21.6 26.9,21.6 z M 64.5,40 c 5.2,4.6 10.4,9.6 15.4,14.8 1.3,-1.6 2.5,-3.2 3.6,-4.8 -4.3,-5.9 -11.2,-9.9 -19,-10 z M 50,44.5 C 43.9,48.9 40,56 40,64 40,72.5 44.4,79.9 51,84.2 58.1,78.3 65.5,71 72.1,63.8 65.4,57 56.6,49.4 50,44.5 z M 80.5,72.7 C 75.3,78 70,83.3 64.5,88 72.7,87.8 79.9,83.5 84.1,77 82.9,75.6 81.7,74.1 80.4,72.7 z"/>
+	<path class="keepaway glowing" d="m 26.9,21.6 c -3.5,0 -5.3,1.9 -5.3,5.4 0,6.3 6.2,17.6 16.3,30.3 l 2,-5.3 c -5.8,-8.4 -7,-12.6 -7,-14.8 0,-1.9 1.1,-2.9 2.8,-2.9 8.1,0 25.9,14.1 40.7,29.5 -15.8,17.8 -37.9,36.4 -47.1,36.4 -1.7,0 -2.8,-0.9 -2.8,-3 0,-4.3 4.9,-12.7 12.8,-22.4 l -1.4,-4.1 c -10.2,12.7 -16.3,24 -16.3,30.3 0,3.5 1.8,5.4 5.1,5.4 11.9,0 35.5,-18.3 53.9,-38.1 11,12.1 19.5,24.2 19.5,30.4 0,1.7 -0.9,2.8 -3,2.8 -4.3,0 -12.7,-4.9 -22.4,-12.8 l -4,1.4 c 12.7,10.1 24,16.3 30.3,16.3 3.5,0 5.4,-1.8 5.4,-5.1 0,-8.5 -9.3,-23 -21.9,-37.3 12.5,-14.2 21.9,-28.6 21.9,-37.1 0,-3.5 -1.9,-5.3 -5.4,-5.3 -6.3,0 -17.6,6.2 -30.3,16.3 l 5.3,2 c 8.4,-5.8 12.7,-7 14.9,-7 1.9,0 2.9,1.1 2.9,2.8 0,5.1 -5.6,14 -13.5,23.6 C 61.9,39.6 38.7,21.6 26.9,21.6 z M 64.5,40 c 5.2,4.6 10.4,9.6 15.4,14.8 1.3,-1.6 2.5,-3.2 3.6,-4.8 -4.3,-5.9 -11.2,-9.9 -19,-10 z M 50,44.5 C 43.9,48.9 40,56 40,64 40,72.5 44.4,79.9 51,84.2 58.1,78.3 65.5,71 72.1,63.8 65.4,57 56.6,49.4 50,44.5 z M 80.5,72.7 C 75.3,78 70,83.3 64.5,88 72.7,87.8 79.9,83.5 84.1,77 82.9,75.6 81.7,74.1 80.4,72.7 z"/>
 </svg>
diff --git a/gfx/luma/gfx/hud/luma/notify_selfkill.svg b/gfx/luma/gfx/hud/luma/notify_selfkill.svg
index 8b2f6c4..cb79e2c 100644
--- a/gfx/luma/gfx/hud/luma/notify_selfkill.svg
+++ b/gfx/luma/gfx/hud/luma/notify_selfkill.svg
@@ -2,5 +2,5 @@
 <?xml-stylesheet href="common.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
 	<path class="selfkill glowing" d="m 34,24 c -4,0 -6.8,3 -7,7 l -2,44 c -0.2,4 3,7 7,7 L 96,82 c 4,0 7.2,-3 7,-7 l -2,-44 c -0.2,-4 -3,-7 -7,-7 z m -9.5,6 -6.5,17 -4,54 c 0,5 4,9 9,9 l 82,0 c 5,0 9,-4 9,-9 L 110,47 103.5,30 106,81 110.5,105.5 104.5,88.5 c -1,-2.5 -2.5,-3.5 -5,-3.5 l -71,0 c -2.5,-0 -4,1 -5,3.5 l -6,17 4.5,-24.5 z"/>
-	<path class="symbol" d="m 64,25.8 c -7.4,0 -19,5.3 -18.8,11.3 l 0.4,9 8.1,-10 -9.7,17.2 6.3,7.8 c 4.2,0 4.7,0.3 4.7,3.5 4.1,2.8 4.1,2.8 8.9,2.8 4.8,0 4.8,-0 8.9,-2.8 0,-3.2 0.5,-3.5 4.7,-3.5 l 6.3,-7.8 -9.7,-17.2 8.1,10 0.4,-9 C 83,31.2 71.4,25.8 64,25.8 z M 37.4,47.6 c -2.7,0 -4.9,1.1 -4.9,2.3 0,2.3 1.6,1.7 1.6,4.5 0,2.3 -2.1,1.7 -2.1,4.9 7.4,0 9.3,0 16,2.3 l -6,-7.3 c -2.9,-1.3 -3.9,-2.5 -4.7,-6.6 z m 53.3,0 c -0.8,4.1 -1.8,5.3 -4.7,6.6 L 80,61.5 c 6.7,-2.3 8.6,-2.3 16,-2.3 0,-3.1 -2.1,-2.5 -2.1,-4.9 0,-2.7 1.6,-2.1 1.6,-4.5 0,-1.2 -2.2,-2.3 -4.9,-2.3 z m -36.8,0.3 c 1,0 7.7,1.6 7.7,3.7 0,3.6 -4.7,5.4 -8.8,5.4 -1.8,0 -2.8,-2.1 -2.8,-5.8 0,-2.2 1.2,-3.3 3.9,-3.3 z m 20.4,0 c 2.8,0 3.9,1.1 3.9,3.3 0,3.7 -1,5.8 -2.8,5.8 -4.2,0 -8.8,-1.8 -8.8,-5.4 0,-2.1 6.6,-3.7 7.7,-3.7 z M 64,55.6 67.3,61 65.9,62 64,61 62.1,62 60.7,61 64,55.6 z m -8.9,10.3 0.8,2.4 1.5,1 0,-1.9 -2.2,-1.5 z m 17.9,0 -2.2,1.5 0,1.9 1.5,-1 0.8,-2.4 z m -20.1,0.3 c -3.9,2 -8.6,2.9 -11.5,2.9 -1.5,0 -2.8,1.1 -2.8,2.8 6.4,1.3 4.3,5.9 7.2,5.9 3.4,0 3,-4.3 10.2,-6.9 L 53.9,69.5 52.8,66.2 z m 22.3,0 -1,3.3 -2.1,1.4 c 7.2,2.6 6.8,6.9 10.2,6.9 2.9,0 0.8,-4.7 7.2,-5.9 0,-1.7 -1.4,-2.8 -2.8,-2.8 -2.8,0 -7.5,-0.9 -11.5,-2.9 z m -17.1,1.6 0,2.2 2.2,0.7 0,-2.3 -2.2,-0.7 z m 11.9,0 -2.2,0.7 0,2.3 2.2,-0.7 0,-2.2 z m -8.9,0.7 0,2.3 2.6,0 0,-2.3 -2.6,0 z m 3.4,0 0,2.3 2.6,0 0,-2.3 -2.6,0 z"/>
+	<path class="selfkill darkened" d="m 64,25.8 c -7.4,0 -19,5.3 -18.8,11.3 l 0.4,9 8.1,-10 -9.7,17.2 6.3,7.8 c 4.2,0 4.7,0.3 4.7,3.5 4.1,2.8 4.1,2.8 8.9,2.8 4.8,0 4.8,-0 8.9,-2.8 0,-3.2 0.5,-3.5 4.7,-3.5 l 6.3,-7.8 -9.7,-17.2 8.1,10 0.4,-9 C 83,31.2 71.4,25.8 64,25.8 z M 37.4,47.6 c -2.7,0 -4.9,1.1 -4.9,2.3 0,2.3 1.6,1.7 1.6,4.5 0,2.3 -2.1,1.7 -2.1,4.9 7.4,0 9.3,0 16,2.3 l -6,-7.3 c -2.9,-1.3 -3.9,-2.5 -4.7,-6.6 z m 53.3,0 c -0.8,4.1 -1.8,5.3 -4.7,6.6 L 80,61.5 c 6.7,-2.3 8.6,-2.3 16,-2.3 0,-3.1 -2.1,-2.5 -2.1,-4.9 0,-2.7 1.6,-2.1 1.6,-4.5 0,-1.2 -2.2,-2.3 -4.9,-2.3 z m -36.8,0.3 c 1,0 7.7,1.6 7.7,3.7 0,3.6 -4.7,5.4 -8.8,5.4 -1.8,0 -2.8,-2.1 -2.8,-5.8 0,-2.2 1.2,-3.3 3.9,-3.3 z m 20.4,0 c 2.8,0 3.9,1.1 3.9,3.3 0,3.7 -1,5.8 -2.8,5.8 -4.2,0 -8.8,-1.8 -8.8,-5.4 0,-2.1 6.6,-3.7 7.7,-3.7 z M 64,55.6 67.3,61 65.9,62 64,61 62.1,62 60.7,61 64,55.6 z m -8.9,10.3 0.8,2.4 1.5,1 0,-1.9 -2.2,-1.5 z m 17.9,0 -2.2,1.5 0,1.9 1.5,-1 0.8,-2.4 z m -20.1,0.3 c -3.9,2 -8.6,2.9 -11.5,2.9 -1.5,0 -2.8,1.1 -2.8,2.8 6.4,1.3 4.3,5.9 7.2,5.9 3.4,0 3,-4.3 10.2,-6.9 L 53.9,69.5 52.8,66.2 z m 22.3,0 -1,3.3 -2.1,1.4 c 7.2,2.6 6.8,6.9 10.2,6.9 2.9,0 0.8,-4.7 7.2,-5.9 0,-1.7 -1.4,-2.8 -2.8,-2.8 -2.8,0 -7.5,-0.9 -11.5,-2.9 z m -17.1,1.6 0,2.2 2.2,0.7 0,-2.3 -2.2,-0.7 z m 11.9,0 -2.2,0.7 0,2.3 2.2,-0.7 0,-2.2 z m -8.9,0.7 0,2.3 2.6,0 0,-2.3 -2.6,0 z m 3.4,0 0,2.3 2.6,0 0,-2.3 -2.6,0 z"/>
 </svg>
diff --git a/gfx/luma/gfx/hud/luma/notify_teamkill_blue.svg b/gfx/luma/gfx/hud/luma/notify_teamkill_blue.svg
index 5eb7b4d..826cf95 100644
--- a/gfx/luma/gfx/hud/luma/notify_teamkill_blue.svg
+++ b/gfx/luma/gfx/hud/luma/notify_teamkill_blue.svg
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common_blue.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
-	<path class="teamcolor glowing" d="m 73,58 -7,3 7,1 -10,2 -5,-5 z m -11,-20 6,0 4,2 -14,0 z m 3,-18.5 c 2.5,0 5,0.5 6,1.5 l 0,8 c 0,5 -12,5 -12,0 l 0,-8 c 1,-1 3.5,-1.5 6,-1.5 z M 65,16 c -5,0.1 -8.5,3 -8.5,9 L 56,93 54,93 54,63.6 C 54,61.8 40,61.5 39.9,63.4 l -1.3,30.4 c -0.4,9.8 2.2,17.2 4.1,17.3 l 6.9,0.5 c 2.3,0.2 2.8,-1.4 5.5,-1.3 2.4,0.1 4.3,5.6 6.8,5.6 l 7.3,0 c 2.7,0 3.8,-4.2 6.2,-4.3 2.5,-0.2 3.3,1.7 5.4,1.6 l 5.5,-0.4 c 3.1,-0.2 4.5,-5.3 7,-5.8 2.3,-0.4 3.2,1.3 5.4,0.4 l 4.9,-1.9 c 1.8,-0.7 3,-6.7 2.1,-13.3 L 102.1,68.1 C 101.9,66.6 91.9,66.8 91.9,68.2 L 93,93 91,93 89.6,63.5 C 89.5,61.9 76,61.8 76,63.4 L 76,93 74,93 73.5,25 C 73.5,19 70,16 65,16 z M 36.7,57.3 22.7,79 c -2.5,3.8 -1.8,5.9 0.5,8.1 l 13,12.5 1.7,-36.3 c 0.2,-3.7 7.5,-3.5 14.7,-2.7 l -9.3,-5.3 c -2.7,-1.5 -5,-0.6 -6.6,1.9 z"/>
+	<path class="teamcolor glowing" d="M 36.7,57.3 22.7,79 c -2.5,3.8 -1.8,5.9 0.5,8.1 l 13,12.5 1.7,-36.3 c 0.2,-3.7 7.5,-3.5 14.7,-2.7 l -9.3,-5.3 c -2.7,-1.5 -5,-0.6 -6.6,1.9 z M 65,16 c -5,0.1 -8.5,3 -8.5,9 L 56,93 54,93 54,63.6 C 54,61.8 40,61.5 39.9,63.4 l -1.3,30.4 c -0.4,9.8 2.2,17.2 4.1,17.3 l 6.9,0.5 c 2.3,0.2 2.8,-1.4 5.5,-1.3 2.4,0.1 4.3,5.6 6.8,5.6 l 7.3,0 c 2.7,0 3.8,-4.2 6.2,-4.3 2.5,-0.2 3.3,1.7 5.4,1.6 l 5.5,-0.4 c 3.1,-0.2 4.5,-5.3 7,-5.8 2.3,-0.4 3.2,1.3 5.4,0.4 l 4.9,-1.9 c 1.8,-0.7 3,-6.7 2.1,-13.3 L 102.1,68.1 C 101.9,66.6 91.9,66.8 91.9,68.2 L 93,93 91,93 89.6,63.5 C 89.5,61.9 76,61.8 76,63.4 L 76,93 74,93 73.5,25 C 73.5,19 70,16 65,16 z"/>
+	<path class="teamcolor darkened" d="m 65,19.5 c 2.5,0 5,0.5 6,1.5 l 0,8 c 0,5 -12,5 -12,0 l 0,-8 c 1,-1 3.5,-1.5 6,-1.5 z m -3,18.5 6,0 4,2 -14,0 z m 11,20 -7,3 7,1 -10,2 -5,-5 z"/>
 </svg>
diff --git a/gfx/luma/gfx/hud/luma/notify_teamkill_pink.svg b/gfx/luma/gfx/hud/luma/notify_teamkill_pink.svg
index 03fdfb3..31aa942 100644
--- a/gfx/luma/gfx/hud/luma/notify_teamkill_pink.svg
+++ b/gfx/luma/gfx/hud/luma/notify_teamkill_pink.svg
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common_pink.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
-	<path class="teamcolor glowing" d="m 73,58 -7,3 7,1 -10,2 -5,-5 z m -11,-20 6,0 4,2 -14,0 z m 3,-18.5 c 2.5,0 5,0.5 6,1.5 l 0,8 c 0,5 -12,5 -12,0 l 0,-8 c 1,-1 3.5,-1.5 6,-1.5 z M 65,16 c -5,0.1 -8.5,3 -8.5,9 L 56,93 54,93 54,63.6 C 54,61.8 40,61.5 39.9,63.4 l -1.3,30.4 c -0.4,9.8 2.2,17.2 4.1,17.3 l 6.9,0.5 c 2.3,0.2 2.8,-1.4 5.5,-1.3 2.4,0.1 4.3,5.6 6.8,5.6 l 7.3,0 c 2.7,0 3.8,-4.2 6.2,-4.3 2.5,-0.2 3.3,1.7 5.4,1.6 l 5.5,-0.4 c 3.1,-0.2 4.5,-5.3 7,-5.8 2.3,-0.4 3.2,1.3 5.4,0.4 l 4.9,-1.9 c 1.8,-0.7 3,-6.7 2.1,-13.3 L 102.1,68.1 C 101.9,66.6 91.9,66.8 91.9,68.2 L 93,93 91,93 89.6,63.5 C 89.5,61.9 76,61.8 76,63.4 L 76,93 74,93 73.5,25 C 73.5,19 70,16 65,16 z M 36.7,57.3 22.7,79 c -2.5,3.8 -1.8,5.9 0.5,8.1 l 13,12.5 1.7,-36.3 c 0.2,-3.7 7.5,-3.5 14.7,-2.7 l -9.3,-5.3 c -2.7,-1.5 -5,-0.6 -6.6,1.9 z"/>
+	<path class="teamcolor glowing" d="M 36.7,57.3 22.7,79 c -2.5,3.8 -1.8,5.9 0.5,8.1 l 13,12.5 1.7,-36.3 c 0.2,-3.7 7.5,-3.5 14.7,-2.7 l -9.3,-5.3 c -2.7,-1.5 -5,-0.6 -6.6,1.9 z M 65,16 c -5,0.1 -8.5,3 -8.5,9 L 56,93 54,93 54,63.6 C 54,61.8 40,61.5 39.9,63.4 l -1.3,30.4 c -0.4,9.8 2.2,17.2 4.1,17.3 l 6.9,0.5 c 2.3,0.2 2.8,-1.4 5.5,-1.3 2.4,0.1 4.3,5.6 6.8,5.6 l 7.3,0 c 2.7,0 3.8,-4.2 6.2,-4.3 2.5,-0.2 3.3,1.7 5.4,1.6 l 5.5,-0.4 c 3.1,-0.2 4.5,-5.3 7,-5.8 2.3,-0.4 3.2,1.3 5.4,0.4 l 4.9,-1.9 c 1.8,-0.7 3,-6.7 2.1,-13.3 L 102.1,68.1 C 101.9,66.6 91.9,66.8 91.9,68.2 L 93,93 91,93 89.6,63.5 C 89.5,61.9 76,61.8 76,63.4 L 76,93 74,93 73.5,25 C 73.5,19 70,16 65,16 z"/>
+	<path class="teamcolor darkened" d="m 65,19.5 c 2.5,0 5,0.5 6,1.5 l 0,8 c 0,5 -12,5 -12,0 l 0,-8 c 1,-1 3.5,-1.5 6,-1.5 z m -3,18.5 6,0 4,2 -14,0 z m 11,20 -7,3 7,1 -10,2 -5,-5 z"/>
 </svg>
diff --git a/gfx/luma/gfx/hud/luma/notify_teamkill_red.svg b/gfx/luma/gfx/hud/luma/notify_teamkill_red.svg
index ae3985c..22b4ba4 100644
--- a/gfx/luma/gfx/hud/luma/notify_teamkill_red.svg
+++ b/gfx/luma/gfx/hud/luma/notify_teamkill_red.svg
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common_red.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
-	<path class="teamcolor glowing" d="m 73,58 -7,3 7,1 -10,2 -5,-5 z m -11,-20 6,0 4,2 -14,0 z m 3,-18.5 c 2.5,0 5,0.5 6,1.5 l 0,8 c 0,5 -12,5 -12,0 l 0,-8 c 1,-1 3.5,-1.5 6,-1.5 z M 65,16 c -5,0.1 -8.5,3 -8.5,9 L 56,93 54,93 54,63.6 C 54,61.8 40,61.5 39.9,63.4 l -1.3,30.4 c -0.4,9.8 2.2,17.2 4.1,17.3 l 6.9,0.5 c 2.3,0.2 2.8,-1.4 5.5,-1.3 2.4,0.1 4.3,5.6 6.8,5.6 l 7.3,0 c 2.7,0 3.8,-4.2 6.2,-4.3 2.5,-0.2 3.3,1.7 5.4,1.6 l 5.5,-0.4 c 3.1,-0.2 4.5,-5.3 7,-5.8 2.3,-0.4 3.2,1.3 5.4,0.4 l 4.9,-1.9 c 1.8,-0.7 3,-6.7 2.1,-13.3 L 102.1,68.1 C 101.9,66.6 91.9,66.8 91.9,68.2 L 93,93 91,93 89.6,63.5 C 89.5,61.9 76,61.8 76,63.4 L 76,93 74,93 73.5,25 C 73.5,19 70,16 65,16 z M 36.7,57.3 22.7,79 c -2.5,3.8 -1.8,5.9 0.5,8.1 l 13,12.5 1.7,-36.3 c 0.2,-3.7 7.5,-3.5 14.7,-2.7 l -9.3,-5.3 c -2.7,-1.5 -5,-0.6 -6.6,1.9 z"/>
+	<path class="teamcolor glowing" d="M 36.7,57.3 22.7,79 c -2.5,3.8 -1.8,5.9 0.5,8.1 l 13,12.5 1.7,-36.3 c 0.2,-3.7 7.5,-3.5 14.7,-2.7 l -9.3,-5.3 c -2.7,-1.5 -5,-0.6 -6.6,1.9 z M 65,16 c -5,0.1 -8.5,3 -8.5,9 L 56,93 54,93 54,63.6 C 54,61.8 40,61.5 39.9,63.4 l -1.3,30.4 c -0.4,9.8 2.2,17.2 4.1,17.3 l 6.9,0.5 c 2.3,0.2 2.8,-1.4 5.5,-1.3 2.4,0.1 4.3,5.6 6.8,5.6 l 7.3,0 c 2.7,0 3.8,-4.2 6.2,-4.3 2.5,-0.2 3.3,1.7 5.4,1.6 l 5.5,-0.4 c 3.1,-0.2 4.5,-5.3 7,-5.8 2.3,-0.4 3.2,1.3 5.4,0.4 l 4.9,-1.9 c 1.8,-0.7 3,-6.7 2.1,-13.3 L 102.1,68.1 C 101.9,66.6 91.9,66.8 91.9,68.2 L 93,93 91,93 89.6,63.5 C 89.5,61.9 76,61.8 76,63.4 L 76,93 74,93 73.5,25 C 73.5,19 70,16 65,16 z"/>
+	<path class="teamcolor darkened" d="m 65,19.5 c 2.5,0 5,0.5 6,1.5 l 0,8 c 0,5 -12,5 -12,0 l 0,-8 c 1,-1 3.5,-1.5 6,-1.5 z m -3,18.5 6,0 4,2 -14,0 z m 11,20 -7,3 7,1 -10,2 -5,-5 z"/>
 </svg>
diff --git a/gfx/luma/gfx/hud/luma/notify_teamkill_yellow.svg b/gfx/luma/gfx/hud/luma/notify_teamkill_yellow.svg
index 8b281ec..6f55d39 100644
--- a/gfx/luma/gfx/hud/luma/notify_teamkill_yellow.svg
+++ b/gfx/luma/gfx/hud/luma/notify_teamkill_yellow.svg
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common_yellow.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
-	<path class="teamcolor glowing" d="m 73,58 -7,3 7,1 -10,2 -5,-5 z m -11,-20 6,0 4,2 -14,0 z m 3,-18.5 c 2.5,0 5,0.5 6,1.5 l 0,8 c 0,5 -12,5 -12,0 l 0,-8 c 1,-1 3.5,-1.5 6,-1.5 z M 65,16 c -5,0.1 -8.5,3 -8.5,9 L 56,93 54,93 54,63.6 C 54,61.8 40,61.5 39.9,63.4 l -1.3,30.4 c -0.4,9.8 2.2,17.2 4.1,17.3 l 6.9,0.5 c 2.3,0.2 2.8,-1.4 5.5,-1.3 2.4,0.1 4.3,5.6 6.8,5.6 l 7.3,0 c 2.7,0 3.8,-4.2 6.2,-4.3 2.5,-0.2 3.3,1.7 5.4,1.6 l 5.5,-0.4 c 3.1,-0.2 4.5,-5.3 7,-5.8 2.3,-0.4 3.2,1.3 5.4,0.4 l 4.9,-1.9 c 1.8,-0.7 3,-6.7 2.1,-13.3 L 102.1,68.1 C 101.9,66.6 91.9,66.8 91.9,68.2 L 93,93 91,93 89.6,63.5 C 89.5,61.9 76,61.8 76,63.4 L 76,93 74,93 73.5,25 C 73.5,19 70,16 65,16 z M 36.7,57.3 22.7,79 c -2.5,3.8 -1.8,5.9 0.5,8.1 l 13,12.5 1.7,-36.3 c 0.2,-3.7 7.5,-3.5 14.7,-2.7 l -9.3,-5.3 c -2.7,-1.5 -5,-0.6 -6.6,1.9 z"/>
+	<path class="teamcolor glowing" d="M 36.7,57.3 22.7,79 c -2.5,3.8 -1.8,5.9 0.5,8.1 l 13,12.5 1.7,-36.3 c 0.2,-3.7 7.5,-3.5 14.7,-2.7 l -9.3,-5.3 c -2.7,-1.5 -5,-0.6 -6.6,1.9 z M 65,16 c -5,0.1 -8.5,3 -8.5,9 L 56,93 54,93 54,63.6 C 54,61.8 40,61.5 39.9,63.4 l -1.3,30.4 c -0.4,9.8 2.2,17.2 4.1,17.3 l 6.9,0.5 c 2.3,0.2 2.8,-1.4 5.5,-1.3 2.4,0.1 4.3,5.6 6.8,5.6 l 7.3,0 c 2.7,0 3.8,-4.2 6.2,-4.3 2.5,-0.2 3.3,1.7 5.4,1.6 l 5.5,-0.4 c 3.1,-0.2 4.5,-5.3 7,-5.8 2.3,-0.4 3.2,1.3 5.4,0.4 l 4.9,-1.9 c 1.8,-0.7 3,-6.7 2.1,-13.3 L 102.1,68.1 C 101.9,66.6 91.9,66.8 91.9,68.2 L 93,93 91,93 89.6,63.5 C 89.5,61.9 76,61.8 76,63.4 L 76,93 74,93 73.5,25 C 73.5,19 70,16 65,16 z"/>
+	<path class="teamcolor darkened" d="m 65,19.5 c 2.5,0 5,0.5 6,1.5 l 0,8 c 0,5 -12,5 -12,0 l 0,-8 c 1,-1 3.5,-1.5 6,-1.5 z m -3,18.5 6,0 4,2 -14,0 z m 11,20 -7,3 7,1 -10,2 -5,-5 z"/>
 </svg>
diff --git a/gfx/luma/gfx/hud/luma/num_leading.svg b/gfx/luma/gfx/hud/luma/num_leading.svg
new file mode 100755
index 0000000..93e1ba5
--- /dev/null
+++ b/gfx/luma/gfx/hud/luma/num_leading.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet href="common_yellow.css" type="text/css"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="1" height="1" version="1.1">
+</svg>
diff --git a/gfx/luma/gfx/hud/luma/progressbar.svg b/gfx/luma/gfx/hud/luma/progressbar.svg
index 21afdb0..75e5775 100644
--- a/gfx/luma/gfx/hud/luma/progressbar.svg
+++ b/gfx/luma/gfx/hud/luma/progressbar.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common_yellow.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
-	<rect class="progressbar" fill="#ffffff" x="0" y="8" width="128" height="112"/>
+	<rect class="progressbar" x="0" y="8" width="128" height="112"/>
 </svg>
diff --git a/gfx/luma/gfx/hud/luma/progressbar_vertical.svg b/gfx/luma/gfx/hud/luma/progressbar_vertical.svg
index 7f03108..ebab738 100644
--- a/gfx/luma/gfx/hud/luma/progressbar_vertical.svg
+++ b/gfx/luma/gfx/hud/luma/progressbar_vertical.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common_yellow.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
-	<rect class="progressbar" fill="#ffffff" x="8" y="0" width="112" height="128"/>
+	<rect class="progressbar" x="8" y="0" width="112" height="128"/>
 </svg>
diff --git a/gfx/luma/gfx/hud/luma/race_newfail.svg b/gfx/luma/gfx/hud/luma/race_newfail.svg
index 80fc6ba..018fda7 100644
--- a/gfx/luma/gfx/hud/luma/race_newfail.svg
+++ b/gfx/luma/gfx/hud/luma/race_newfail.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
-	<path class="newfail glowing" d="m 57.9,56 c -4.8,0 -8.4,3.5 -9.5,7.3 l -20.3,5.2 0.3,3 21.5,0.5 c 2,2.8 5.5,4.5 9.2,4.1 5.5,-0.6 9.4,-5.6 8.8,-11.1 C 67.3,59.7 62.9,56 57.9,56 z M 36,80 l 0,11 76,0 L 112,80 z m 8,2 3,0 0,3 7,0 L 54,82 l 3,0 0,7 -3,0 0,-3 -7,0 0,3 -3,0 z m 20,0 4,0 5.5,7 -3,0 -1.5,-2 -6,0 -1.5,2 -3,0 z m 11,0 3,0 0,3 7,0 L 85,82 l 3,0 0,7 -3,0 0,-3 -7,0 0,3 -3,0 z m 20,0 4,0 5.5,7 -3,0 -1.5,-2 -6,0 -1.5,2 -3,0 z m -29,1.5 -2,2.5 4,0 z m 31,0 -2,2.5 4,0 z m -61,11.5 0,15 4.2,0 0,-6.9 12.5,0 0,-2.5 -12.5,0 0,-3.1 13.9,0 0,-2.5 z m 28.4,0 -8.1,15 4.4,0 2.3,-4.3 8.3,0 2.3,4.3 4.4,0 -8.1,-15 z m 18.9,0 0,15 4.2,0 0,-15 z m 10.6,0 0,15 18.1,0 0,-2.5 -14,0 0,-12.5 z m -26.7,3 2.8,5.2 -5.6,0 z m 29,-69.6 L 82.3,43.7 c 6.3,7 9,15.4 8.7,24.1 l 20.5,3 C 111.8,68.5 112,66.3 112,64 112,49.9 105.9,37.2 96.2,28.4 z m 0,4.5 C 106.2,43.3 109.8,56 108.8,67.3 L 93.9,65.2 C 93.7,57.1 90.9,49.8 86.2,43.9 z M 64,16 c -5.1,0 -10,0.8 -14.6,2.3 l 3.7,15.1 c 9.2,-1.2 17.1,0.8 24.8,6.3 l 13.6,-15 C 83.7,19.2 74.2,16 64,16 z M 86.8,25.3 77.3,35.8 C 71.7,32.1 63.3,29.3 55.4,30.2 l -2.4,-9.7 c 9.6,-2.4 21.2,-2.4 33.8,4.9 z M 17,54.1 C 16.4,57.3 16,60.6 16,64 c 0,8.7 2.3,16.9 6.4,23.9 L 29.6,82.8 C 24.7,74.8 24,64.9 26.1,57.4 z m 26.8,-33.6 c -11.7,5.5 -20.9,15.5 -25.1,27.8 L 28.2,51.8 C 32,43.9 38.9,37.7 47.3,34.8 l -3.5,-14.3 z m -1.9,4.6 1.9,8 c -7.1,3.1 -13,8.4 -16.9,15.1 l -4.2,-1.6 c 3.9,-9.1 10.6,-16.6 19.1,-21.5 z"/>
+	<path class="newfail glowing" d="m 60,28.1 c -2.7,0 -5.4,0.3 -8,0.8 l 1.1,4.5 c 9.3,-1.3 17.9,1.2 24.8,6.3 l 4.2,-4.6 c -6.2,-4.4 -13.8,-7.1 -22.1,-7.1 z m -13.8,2.6 c -9.4,3.7 -17,10.9 -21,20.1 l 3,1.1 c 3.8,-8 10.7,-14.1 19.1,-17 l -1,-4.2 z M 86.7,39 l -4.3,4.8 c 5.3,5.9 9.1,14 8.7,24.1 l 6.9,1 C 98.9,56.5 93.7,45.9 86.7,39 z M 17,54.1 c -0.6,3.2 -1,6.5 -1,9.9 0,8.7 2.3,16.9 6.4,23.9 l 7.2,-5.1 c -4.9,-8 -5.6,-17.9 -3.5,-25.4 l -9.1,-3.3 z M 57.9,56 c -4.8,0 -8.4,3.5 -9.5,7.3 l -20.3,5.2 0.3,3 21.5,0.5 c 2,2.8 5.5,4.5 9.2,4.1 5.5,-0.6 9.4,-5.6 8.8,-11.1 -0.6,-5.3 -5,-9 -10,-9 z m -21.9,24 0,11 L 112,91 112,80 36,80 z m 8,2 3,0 0,3 7,0 0,-3 3,0 0,7 -3,0 0,-3 -7,0 0,3 -3,0 0,-7 z m 20,0 4,0 5.5,7 -3,0 -1.5,-2 -6,0 -1.5,2 -3,0 5.5,-7 z m 11,0 3,0 0,3 7,0 0,-3 3,0 0,7 -3,0 0,-3 -7,0 0,3 -3,0 0,-7 z m 20,0 4,0 5.5,7 -3,0 -1.5,-2 -6,0 -1.5,2 -3,0 5.5,-7 z m -29,1.5 -2,2.5 4,0 -2,-2.5 z m 31,0 -2,2.5 4,0 -2,-2.5 z m -61,11.5 0,15 4.2,0 0,-6.9 12.5,0 0,-2.5 -12.5,0 0,-3.1 13.9,0 0,-2.5 -18.1,0 z m 28.4,0 L 56.3,110 l 4.4,0 2.3,-4.3 8.3,0 2.3,4.3 4.4,0 -8.1,-15 -5.5,0 z m 18.9,0 0,15 4.2,0 0,-15 -4.2,0 z m 10.6,0 0,15 18.1,0 0,-2.5 -14,0 0,-12.5 -4.1,0 z m -26.7,3 2.8,5.2 -5.6,0 2.8,-5.2 z"/>
 </svg>
diff --git a/gfx/luma/gfx/hud/luma/race_newrankyellow.svg b/gfx/luma/gfx/hud/luma/race_newrankyellow.svg
index 2e68158..b2e00bf 100644
--- a/gfx/luma/gfx/hud/luma/race_newrankyellow.svg
+++ b/gfx/luma/gfx/hud/luma/race_newrankyellow.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
-	<path class="newrank glowing" d="m 36,80 0,11 76,0 0,-11 z m 13,2 3.5,0 7.5,5 0,-5 3,0 0,7 -3.5,0 -7.5,-5 0,5 -3,0 z m 16,0 13,0 0,1 L 68,83 l 0,2 9,0 0,1 L 68,86 l 0,2 10,0 0,1 L 65,89 z m 14.5,0 3,0 2.5,5 3,-5 4,0 3,5 2.5,-5 3,0 -3.5,7 -4,0 -3,-5 -3,5 -4,0 z M 36,95 l 0,15 3.9,0 0,-6.1 4.1,0 6.2,6.1 4.8,0 -6.2,-6.1 c 2.5,0 5.3,-0 5.3,-3.1 L 54,98.1 C 54,95 51.3,95 48.5,95 z M 62.5,95 55,110 l 4.1,0 2.2,-4.3 7.8,0 2.2,4.3 4.1,0 -7.5,-15 z m 13.8,0 0,15 3.9,0 0,-10.7 9.8,10.7 4.3,0 0,-15 -3.9,0 0,10.7 L 80.6,95 z m 20.1,0 0,15 3.9,0 0,-2.3 3.3,-3.3 5.6,5.6 4.8,0 -8,-8 7.1,-7 -4.8,0 -8,8 0,-8 z M 39.9,97.5 l 8.9,0 c 0.7,0 1.4,-0 1.4,0.8 l 0,2.3 c 0,0.8 -0.7,0.8 -1.4,0.8 l -8.9,0 z m 25.3,0.5 2.6,5.2 -5.3,0 z M 96.2,28.4 82.3,43.7 c 6.3,7 9,15.4 8.7,24.1 l 20.5,3 C 111.8,68.5 112,66.3 112,64 112,49.9 105.9,37.2 96.2,28.4 z m 0,4.5 C 106.2,43.3 109.8,56 108.8,67.3 L 93.9,65.2 C 93.7,57.1 90.9,49.8 86.2,43.9 z M 64,16 c -5.1,0 -10,0.8 -14.6,2.3 l 3.7,15.1 c 9.2,-1.2 17.1,0.8 24.8,6.3 l 13.6,-15 C 83.7,19.2 74.2,16 64,16 z M 17,54.1 C 16.4,57.3 16,60.6 16,64 c 0,8.7 2.3,16.9 6.4,23.9 L 29.6,82.8 C 24.7,74.8 24,64.9 26.1,57.4 z m 26.8,-33.6 c -11.7,5.5 -20.9,15.5 -25.1,27.8 L 28.2,51.8 C 32,43.9 38.9,37.7 47.3,34.8 z M 63.6,36.4 55.4,56.3 C 52.1,57.2 49.2,59.9 48.3,63.5 46.9,68.8 50.2,74.3 55.5,75.7 60.8,77.1 66.3,73.8 67.7,68.5 68.7,64.5 67.2,60.4 64,58 l 2.4,-20.8 z"/>
+	<path class="newrank glowing" d="m 64,16 c -5.1,0 -10,0.8 -14.6,2.3 l 3.7,15.1 c 9.2,-1.2 17.1,0.8 24.8,6.3 L 91.5,24.7 c -7.8,-5.5 -17.3,-8.7 -27.5,-8.7 z m -20.2,4.5 c -11.7,5.5 -20.9,15.5 -25.1,27.8 l 9.5,3.5 c 3.8,-7.9 10.7,-14.1 19.1,-17 l -3.5,-14.3 z M 63.6,36.4 55.4,56.3 C 52.1,57.2 49.2,59.9 48.3,63.5 46.9,68.8 50.2,74.3 55.5,75.7 60.8,77.1 66.3,73.8 67.7,68.5 68.7,64.5 67.2,60.4 64,58 l 2.4,-20.8 -2.8,-0.8 z M 86.7,39 82.3,43.8 C 87.7,49.7 91.5,57.7 91,67.8 l 6.9,1 C 98.9,56.5 93.7,45.9 86.7,39 z M 17,54.1 C 16.4,57.3 16,60.6 16,64 c 0,8.7 2.3,16.9 6.4,23.9 l 7.2,-5.1 c -4.9,-8 -5.6,-17.9 -3.5,-25.4 L 17,54.1 z M 36,80 l 0,11 76,0 0,-11 -76,0 z m 13,2 3.5,0 7.5,5 0,-5 3,0 0,7 -3.5,0 -7.5,-5 0,5 -3,0 0,-7 z m 16,0 13,0 0,1 -10,0 0,2 9,0 0,1 -9,0 0,2 10,0 0,1 -13,0 0,-7 z m 14.5,0 3,0 2.5,5 3,-5 4,0 3,5 2.5,-5 3,0 -3.5,7 -4,0 -3,-5 -3,5 -4,0 -3.5,-7 z M 36,95 l 0,15 3.9,0 0,-6.1 4.1,0 L 50.2,110 55,110 48.8,103.9 c 2.5,0 5.3,0 5.3,-3.1 l -0.1,-2.7 c 0,-3.1 -2.7,-3.1 -5.5,-3.1 l -12.5,0 z m 19,15 4.1,0 2.2,-4.3 7.8,0 2.2,4.3 4.1,0 -7.5,-15 L 62.5,95 55,110 z m 21.3,-15 0,15 3.9,0 0,-10.7 L 90,110 l 4.3,0 0,-15 -3.9,0 0,10.7 L 80.6,95 76.3,95 z m 20.1,0 0,15 3.9,0 0,-2.3 3.3,-3.3 5.6,5.6 4.8,0 -8,-8 7.1,-7 -4.8,0 -8,8 0,-8 -3.9,0 z m -56.5,2.5 8.9,0 c 0.7,0 1.4,0 1.4,0.8 l 0,2.3 c 0,0.8 -0.7,0.8 -1.4,0.8 l -8.9,0 0,-3.9 z m 25.3,0.5 2.6,5.2 -5.3,0 L 65.2,98 z"/>
 </svg>
diff --git a/gfx/luma/gfx/hud/luma/race_newtime.svg b/gfx/luma/gfx/hud/luma/race_newtime.svg
index ee66965..bbcefc2 100644
--- a/gfx/luma/gfx/hud/luma/race_newtime.svg
+++ b/gfx/luma/gfx/hud/luma/race_newtime.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
-	<path class="newtime glowing" d="M 96.2,28.4 82.3,43.7 c 6.3,7 9,15.4 8.7,24.1 l 20.5,3 C 111.8,68.5 112,66.3 112,64 112,49.9 105.9,37.2 96.2,28.4 z m 0,4.5 C 106.2,43.3 109.8,56 108.8,67.3 L 93.9,65.2 C 93.7,57.1 90.9,49.8 86.2,43.9 z M 64,16 c -5.1,0 -10,0.8 -14.6,2.3 l 3.7,15.1 c 9.2,-1.2 17.1,0.8 24.8,6.3 l 13.6,-15 C 83.7,19.2 74.2,16 64,16 z M 86.8,25.3 77.3,35.8 C 71.7,32.1 63.3,29.3 55.4,30.2 l -2.4,-9.7 c 9.6,-2.4 21.2,-2.4 33.8,4.9 z M 17,54.1 C 16.4,57.3 16,60.6 16,64 c 0,8.7 2.3,16.9 6.4,23.9 L 29.6,82.8 C 24.7,74.8 24,64.9 26.1,57.4 z m 26.8,-33.6 c -11.7,5.5 -20.9,15.5 -25.1,27.8 L 28.2,51.8 C 32,43.9 38.9,37.7 47.3,34.8 z M 36,80 l 0,11 76,0 0,-11 z m 13,2 3.5,0 7.5,5 0,-5 3,0 0,7 -3.5,0 -7.5,-5 0,5 -3,0 z m 16,0 13,0 0,1 -10,0 0,2 9,0 0,1 -9,0 0,2 10,0 0,1 -13,0 z m 14.5,0 3,0 2.5,5 3,-5 4,0 3,5 2.5,-5 3,0 -3.5,7 -4,0 -3,-5 -3,5 -4,0 z M 36,95 l 0,2.5 7.7,0 0,12.5 3.9,0 0,-12.5 7.7,0 0,-2.5 z m 23.5,0 0,15 3.8,0 0,-15 z m 9,0 0,15 3.9,0 0,-10.2 L 77.5,110 l 3.6,0 5.1,-10.2 0,10.2 3.9,0 0,-15 L 85,95 79.3,106.4 73.6,95 z m 26.7,0 0,15 16.8,0 0,-2.5 -12.9,0 0,-4.4 11.8,0 0,-2.5 -11.8,0 0,-3.1 L 112,97.5 112,95 z M 39.5,42.3 l -2.3,1.9 11.4,18.2 c -1.2,3.3 -0.7,7.1 1.7,9.9 3.5,4.2 9.8,4.8 14.1,1.3 4.2,-3.5 4.8,-9.8 1.3,-14.1 C 63,56.4 58.7,55.3 55,56.4 z"/>
+	<path class="newtime glowing" d="m 43.8,20.5 c -11.7,5.5 -20.9,15.5 -25.1,27.8 l 9.5,3.5 c 3.8,-7.9 10.7,-14.1 19.1,-17 z m 8.2,8.4 1.1,4.5 c 9.3,-1.3 17.9,1.2 24.8,6.3 L 82.1,35.1 C 72.3,28.2 61.5,26.9 52,28.9 z M 86.7,39 82.3,43.8 C 87.7,49.7 91.5,57.7 91,67.8 l 6.9,1 C 98.9,56.5 93.7,45.9 86.7,39 z m -47.2,3.3 -2.3,1.9 11.4,18.2 c -1.2,3.3 -0.7,7.1 1.7,9.9 3.5,4.2 9.8,4.8 14.1,1.3 4.2,-3.5 4.8,-9.8 1.3,-14.1 -2.7,-3.1 -7,-4.2 -10.7,-3.1 z m -22.5,11.8 c -0.6,3.2 -1,6.5 -1,9.9 0,8.7 2.3,16.9 6.4,23.9 l 7.2,-5.1 c -4.9,-8 -5.6,-17.9 -3.5,-25.4 z m 19,25.9 0,11 L 112,91 112,80 z m 13,2 3.5,0 7.5,5 0,-5 3,0 0,7 -3.5,0 -7.5,-5 0,5 -3,0 z m 16,0 L 78,82 l 0,1 -10,0 0,2 L 77,85 l 0,1 -9,0 0,2 L 78,88 78,89 65,89 z M 79.5,82 l 3,0 2.5,5 3,-5 4,0 3,5 2.5,-5 3,0 -3.5,7 -4,0 -3,-5 -3,5 -4,0 z m -43.5,13 0,2.5 7.7,0 0,12.5 3.9,0 0,-12.5 7.7,0 0,-2.5 z m 23.5,0 0,15 3.8,0 0,-15 z m 9,0 0,15 3.9,0 0,-10.2 L 77.5,110 l 3.6,0 5.1,-10.2 0,10.2 3.9,0 0,-15 L 85,95 79.3,106.4 73.6,95 z m 26.7,0 0,15 16.8,0 0,-2.5 -12.9,0 0,-4.4 11.8,0 0,-2.5 -11.8,0 0,-3.1 12.9,0 0,-2.5 z"/>
 </svg>
diff --git a/gfx/luma/gfx/hud/luma/shield.svg b/gfx/luma/gfx/hud/luma/shield.svg
new file mode 100644
index 0000000..dfabaed
--- /dev/null
+++ b/gfx/luma/gfx/hud/luma/shield.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet href="common.css" type="text/css"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
+	<path class="shield glowing" d="m 55,16 -47,81 9,16 94,0 9,-16 -47,-81 -9,0 z"/>
+	<path class="shield darkened" d="m 48,47 -16,28 5,8.7 6.9,-4 L 41.2,75 52.6,55 58,55 58,47 48,47 z m 22,0 0,8 5.4,0 11.4,20 -2.7,4.7 6.9,4 L 96,75 80,47 70,47 z M 49.8,90.1 42.9,94.1 48,103 80,103 85.1,94.1 78.2,90.1 75.4,95 52.6,95 49.8,90.1 z"/>
+</svg>
diff --git a/gfx/luma/gfx/hud/luma/strength.svg b/gfx/luma/gfx/hud/luma/strength.svg
new file mode 100644
index 0000000..92bd73f
--- /dev/null
+++ b/gfx/luma/gfx/hud/luma/strength.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet href="common.css" type="text/css"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
+	<path class="strength glowing" d="m 55,16 -47,81 9,16 94,0 9,-16 -47,-81 -9,0 z"/>
+	<path class="strength darkened" d="m 58.7,52.3 c -2.2,0.5 -2.4,4.1 -4.4,4.7 -2,0.6 -3,-0.8 -4.7,-0.3 l -4.5,1.4 c -2.5,0.8 -2.6,5.1 -4.5,5.9 -1.8,0.8 -2.8,-0.5 -4.5,0.6 l -3.7,2.5 c -1.1,0.7 -1.3,5.5 0.7,10.7 l 7.4,19.4 c 0.4,1 8,-0.8 7.8,-1.7 L 42.8,75.4 l 2.7,-0.6 6.3,23.9 c 0.2,0.9 10.8,-1.2 10.6,-2.2 L 57,72 59.3,71.4 65.2,96.1 c 0.3,1.2 13.4,-1.5 13.1,-2.9 L 73.3,68 l 2.4,-0.6 5.3,24.8 c 0.2,1.1 11.3,-1 11,-2.3 L 87.6,64.4 C 86.1,56.2 82.7,51.2 81.4,51.4 l -5.8,0.8 c -1.9,0.3 -2.1,1.7 -4.3,2.1 -2,0.3 -4.5,-3.8 -6.6,-3.4 z M 91.5,70.4 95,89.8 c 0.2,1.1 -1.1,3.2 -5.1,4.2 L 73,98.2 c -1.2,1.2 -2,3.1 -1.5,5.7 l 21.6,-1.8 c 1.2,-0.1 4.3,-3.3 4.3,-4.3 L 98.3,74.7 z"/>
+</svg>
diff --git a/gfx/luma/gfx/hud/luma/superweapons.svg b/gfx/luma/gfx/hud/luma/superweapons.svg
new file mode 100644
index 0000000..433f0ef
--- /dev/null
+++ b/gfx/luma/gfx/hud/luma/superweapons.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet href="common.css" type="text/css"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
+	<path class="superweapons glowing" d="m 55,16 -47,81 9,16 94,0 9,-16 -47,-81 -9,0 z"/>
+	<path class="superweapons darkened" d="m 64,73 c -14.4,0 -26,2.9 -26,6.5 0,2.8 7.1,5.2 17,6.1 L 55,83.4 C 49.6,82.7 46,81.5 46,80 c 0,-2.2 8.1,-4 18,-4 9.9,0 18,1.8 18,4 0,1.5 -3.6,2.7 -9,3.4 l 0,2.2 C 82.9,84.7 90,82.3 90,79.5 90,75.9 78.4,73 64,73 z M 58.5,79 58,90 c 5,2 8,6 8,9 -8,-11 -21,-9 -24,-3 2.7,1.1 5,3 5,6 -8,-9 -18,-3 -19,3 l 72,0 c -1,-8 -14,-10 -19,-4 0,-3 3,-6 5,-6 -3,-4 -13.5,-3 -15.5,1 l -1,-17 z M 69,70 68.5,63 c 7,7 19,3 18.5,-3 -2,1 -5,1 -6,0 16,-4 4,-19 -10,-9 1,-3 3,-4 6,-5 -2,-7 -20,-8 -28,6 -1,-2 1,-6 4,-8 -11,-1 -21,17 -3,17 -2,2 -4,2 -7,1 1,4 9.5,4 16.5,1 L 59,70 z"/>
+</svg>
diff --git a/gfx/luma/gfx/hud/luma/weapon_accuracy.svg b/gfx/luma/gfx/hud/luma/weapon_accuracy.svg
new file mode 100644
index 0000000..e2502f4
--- /dev/null
+++ b/gfx/luma/gfx/hud/luma/weapon_accuracy.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet href="common.css" type="text/css"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
+	<path class="weapon_accuracy blurred" d="m 4,98 0,20 8,6 104,0 8,-6 0,-106 -84,0 -6,6 -16,0 -6,6 0,66 -6,8 z"/>
+</svg>
diff --git a/gfx/luma/gfx/hud/luma/weapon_ammo.svg b/gfx/luma/gfx/hud/luma/weapon_ammo.svg
new file mode 100644
index 0000000..f98765f
--- /dev/null
+++ b/gfx/luma/gfx/hud/luma/weapon_ammo.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet href="common.css" type="text/css"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
+	<path class="weapon_ammo shadowed" d="m 108,88 0,32 7,0 5,-4 0,-28 z m -3,2.4 -11,9.3 0,20.3 11,0 z m -14,11 -10,3.9 0,14.7 10,0 z m -13,4.7 -9,1.7 0,12.2 9,0 z m -12,2.1 -9,0.8 0,10.9 9,0 z M 54,109.3 45,109.7 45,120 l 9,0 z m -12,0.5 -9,0.2 0,10.1 9,0 z m -12,0.2 -9,0 0,10 9,0 z M 18,110 8,110 l 0,6 5,4 5,0 z"/>
+</svg>
diff --git a/gfx/luma/gfx/hud/luma/weapon_complainbubble.svg b/gfx/luma/gfx/hud/luma/weapon_complainbubble.svg
new file mode 100644
index 0000000..7eec210
--- /dev/null
+++ b/gfx/luma/gfx/hud/luma/weapon_complainbubble.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet href="common.css" type="text/css"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="256" height="128" version="1.1">
+	<path class="weapon_complainbubble blurred" d="M 4,10 4,118 12,124 244,124 252,118 252,10 244,4 12,4 z"/>
+</svg>
diff --git a/gfx/luma/gfx/hud/luma/weapon_current_bg.svg b/gfx/luma/gfx/hud/luma/weapon_current_bg.svg
new file mode 100644
index 0000000..daa6252
--- /dev/null
+++ b/gfx/luma/gfx/hud/luma/weapon_current_bg.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet href="common.css" type="text/css"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
+	<path class="current_bg shadowed" d="m 4,98 0,20 8,6 104,0 8,-6 0,-106 -84,0 -6,6 -16,0 -6,6 0,66 -6,8 z"/>
+	<path class="current highlighted" d="M 16,4 4,16 l 0,82 2,0 6,-8 0,-66 6,-6 16,0 6,-6 84,0 0,-2 -8,-6 z"/>
+</svg>
diff --git a/gfx/luma/gfx/hud/luma/weaponelectro.svg b/gfx/luma/gfx/hud/luma/weaponelectro.svg
index 8ad791e..6653374 100644
--- a/gfx/luma/gfx/hud/luma/weaponelectro.svg
+++ b/gfx/luma/gfx/hud/luma/weaponelectro.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
-	<path class="electro glowing" d="m 63.3,18 c -8.2,0.1 -15.9,2.2 -22.6,5.8 l 7.4,32.8 c 2.9,-1.7 6.2,-2.5 9.7,-2.6 l 5.5,-36 z m 29.4,9.1 -22.5,31.1 c 1.3,1 2.5,2.2 3.5,3.5 l 27.5,-26.6 C 98.8,32.1 95.9,29.4 92.8,27.2 z m -73,19 c -1.6,3.6 -2.7,7.4 -3.3,11.3 L 38.2,71.3 c 0.2,-1.7 0.7,-3.3 1.3,-4.8 L 19.8,46.2 z M 58,58 c -8.8,0 -16,7.2 -16,16 0,8.8 7.2,16 16,16 8.8,0 16,-7.2 16,-16 0,-8.8 -7.2,-16 -16,-16 z m 54,6.4 -34,9.8 c -0,3.4 -0.9,6.8 -2.6,9.7 l 29.8,3.7 C 109.5,80.8 111.9,72.9 112,64.4 z m -71.2,19.8 -17.6,4.1 c 4.3,6.6 10.2,12.1 17.3,15.9 L 47.9,91.3 c -2.9,-1.7 -5.3,-4.1 -7.1,-7.1 z m 24.8,8.4 C 64,93.2 62.4,93.6 60.8,93.8 l 8.9,15.8 c 3.9,-0.4 7.6,-1.3 11.1,-2.5 L 65.5,92.5 z"/>
+	<path class="electro glowing" d="m 64,22 c -4.4,0 -8.7,0.7 -12.7,1.9 l 3.5,24.7 C 56.5,48.2 58.2,48 60,48 c 1.8,0 3.5,0.2 5.2,0.6 L 76.7,23.9 C 72.7,22.7 68.4,22 64,22 z M 29.9,39.6 C 25,46.4 22.1,54.7 22,63.7 l 15.1,5.4 c 0.3,-3.6 1.4,-7 3.2,-10 z m 68.3,0 -18.5,19.5 c 1.8,2.9 2.9,6.4 3.2,10 L 106,63.7 c -0.1,-9 -3,-17.3 -7.9,-24.1 z M 60,52 C 49.5,52 41,60.5 41,71 41,81.5 49.5,90 60,90 70.5,90 79,81.5 79,71 79,60.5 70.5,52 60,52 z M 42.6,86 30.2,88.9 c 5.1,6.9 12.3,12.2 20.6,14.9 L 51.1,92.2 C 47.8,90.8 44.9,88.7 42.6,86 z m 34.8,0 c -2.3,2.7 -5.2,4.8 -8.5,6.2 l 8.4,11.6 c 8.3,-2.8 15.5,-8 20.6,-14.9 z"/>
 </svg>
diff --git a/gfx/luma/gfx/hud/luma/weapongrenadelauncher.svg b/gfx/luma/gfx/hud/luma/weapongrenadelauncher.svg
index 61d57a6..7196f72 100644
--- a/gfx/luma/gfx/hud/luma/weapongrenadelauncher.svg
+++ b/gfx/luma/gfx/hud/luma/weapongrenadelauncher.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
-	<path class="grenadelauncher glowing" d="m 51,18 -4,0 2,16 5,0 z m 8,6 -2,10 26,0 -2,-10 z m -10,13 -7,1 0,6 7,1 0,7 -7,1 0,7 7,1 0,7 -7,1 0,7 7,1 0,7 -7,1 0,6 7,1 34,0 7,-1 0,-6 -33,0 0,-41 33,0 0,-6 -7,-1 z m 11,11 0,33 26,0 0,-33 z m -11,47 4,11 26,0 4,-11 z"/>
+	<path class="grenadelauncher glowing" d="m 49,18 -4,0 2,16 5,0 z m 8,6 -2,10 28,0 -2,-10 z m -10,13 -7,1 0,6 7,1 0,7 -7,1 0,7 7,1 0,7 -7,1 0,7 7,1 0,7 -7,1 0,6 7,1 36,0 7,-1 0,-6 -34,0 0,-41 34,0 0,-6 -7,-1 z m 12,11 0,33 27,0 0,-33 z m -12,47 4,11 28,0 4,-11 z"/>
 </svg>
diff --git a/gfx/luma/gfx/hud/luma/weaponporto.svg b/gfx/luma/gfx/hud/luma/weaponporto.svg
index 967890b..f7a8a6a 100644
--- a/gfx/luma/gfx/hud/luma/weaponporto.svg
+++ b/gfx/luma/gfx/hud/luma/weaponporto.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
-	<path class="porto glowing" d="m 69,112 c 11,0 8.8,-12 1.5,-24 L 66,88 c 4,6 6,15 0,15 C 60,103 50,97 40.5,87.5 31,78 25,68 25,62 c 0,-6 9,-4 15,0 l 0,-4.5 C 28,50.2 16,48 16,59 16,67 23,80 35.5,92.5 48,105 61,112 69,112 z M 59,16 C 48,16 50.2,28 57.5,40 L 62,40 C 58,34 56,25 62,25 68,25 78,31 87.5,40.5 97,50 103,60 103,66 c 0,6 -9,4 -15,0 l 0,4.5 C 100,77.8 112,80 112,69 112,61 105,48 92.5,35.5 80,23 67,16 59,16 z m 0,29 7,7 -13,15 -8,-8 0,24 24,0 -8,-8 15,-13 7,7 0,-24 z"/>
+	<path class="porto glowing" d="m 70,111 c 10,0 9,-10 3,-21 l -4.5,0 c 3,6 3.5,12 -1.5,12 -14,0 -41,-27 -41,-41 0,-5 6,-4.5 12,-1.5 L 38,55 c -11,-6 -21,-7 -21,3 0,19 34,53 53,53 z m -14,-67 9,9 -12,12 -9,-9 0,28 28,0 -9,-9 12,-12 9,9 0,-28 -28,0 z m 2,-27 c -10,0 -9,10 -3,21 l 4.5,0 C 56.5,32 56,26 61,26 c 14,0 41,27 41,41 0,5 -6,4.5 -12,1.5 l 0,4.5 c 11,6 21,7 21,-3 C 111,51 77,17 58,17 z"/>
 </svg>
diff --git a/gfx/luma/gfx/hud/luma/weaponseeker.svg b/gfx/luma/gfx/hud/luma/weaponseeker.svg
index 2f96156..2065390 100644
--- a/gfx/luma/gfx/hud/luma/weaponseeker.svg
+++ b/gfx/luma/gfx/hud/luma/weaponseeker.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
-	<path class="seeker glowing" d="m 60,20 0,28 8,0 0,-28 -8,0 z m -32,8 0,20 8,0 0,-12 12,0 0,-8 -20,0 z m 52,0 0,8 12,0 0,12 8,0 0,-20 -20,0 z m -60,32 0,8 28,0 0,-8 -28,0 z m 60,0 0,8 28,0 0,-8 -28,0 z m -52,20 0,20 20,0 0,-8 -12,0 0,-12 -8,0 z m 32,0 0,28 8,0 0,-28 -8,0 z m 32,0 0,12 -12,0 0,8 20,0 0,-20 -8,0 z"/>
+	<path class="seeker glowing" d="m 60,24 0,26 8,0 0,-26 -8,0 z m -28,8 0,20 8,0 0,-12 12,0 0,-8 -20,0 z m 44,0 0,8 12,0 0,12 8,0 0,-20 -20,0 z m -52,28 0,8 26,0 0,-8 -26,0 z m 54,0 0,8 26,0 0,-8 -26,0 z m -46,16 0,20 20,0 0,-8 -12,0 0,-12 -8,0 z m 56,0 0,12 -12,0 0,8 20,0 0,-20 -8,0 z m -28,2 0,26 8,0 0,-26 -8,0 z"/>
 </svg>
diff --git a/gfx/luma/gfx/hud/luma/weaponvaporizer.svg b/gfx/luma/gfx/hud/luma/weaponvaporizer.svg
index 943f86b..8b92f54 100644
--- a/gfx/luma/gfx/hud/luma/weaponvaporizer.svg
+++ b/gfx/luma/gfx/hud/luma/weaponvaporizer.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
-	<path class="vaporizer glowing" d="m 46.5,58 c -10.3,-2.4 -10.2,5.9 -4.3,14.9 L 60,49 l -15,4 26,-19 -24,2 c 24,-13 51,-18 57,-12 6,6 1,33 -12,57 L 94,57 75,83 79,68 55.1,85.8 C 64.1,91.7 72.4,91.8 70,81.5 78.5,98.5 63,103 44,84 25,65 29.5,49.5 46.5,58 z M 49.6,81.5 99,40 c 3,-2.5 3,-12 2,-13 -1,-1 -10.5,-1 -13,2 l -41.5,49.4 z M 31,77 c -8.9,-2.1 -8.4,5.8 -2.3,14 l 8.1,-10.8 4.2,4.8 L 32.5,95.5 43,87.1 l 4.8,4.2 -10.8,8.1 C 45.2,105.4 53.1,105.9 51,97 58.5,113.5 43,113 29,99 15,85 14.5,69.5 31,77 z m -15,31 7.8,-10.4 3.1,3.5 3.5,3.1 L 20,112 c -2.5,0 -4,-1.5 -4,-4 z"/>
+	<path class="vaporizer glowing" d="M 46.5,58 C 36.2,55.6 36.3,63.9 42.2,72.9 L 60,49 45,53 71,34 47,36 c 24,-13 51,-18 57,-12 6,6 1,33 -12,57 L 94,57 75,83 79,68 55.1,85.8 c 9,5.9 17.3,6 14.9,-4.3 C 78.5,98.5 63,103 44,84 25,65 29.5,49.5 46.5,58 z M 49.6,81.5 99,40 c 3,-2.5 3,-12 2,-13 -1,-1 -10.5,-1 -13,2 L 46.5,78.4 z M 31,77 c -8.9,-2.1 -8.4,5.8 -2.3,14 L 36.8,80.2 41,85 32.5,95.5 43,87.1 47.8,91.3 37,99.4 c 8.2,6 16.1,6.5 14,-2.4 7.5,16.5 -8,16 -22,2 C 15,85 14.5,69.5 31,77 z m -15,31 7.8,-10.4 3.1,3.5 3.5,3.1 L 20,112 c -2,0 -4,-2 -4,-4 z"/>
 </svg>
diff --git a/gfx/luma/gfx/hud/luma/weaponvortex.svg b/gfx/luma/gfx/hud/luma/weaponvortex.svg
index 205e8cd..0176a2d 100644
--- a/gfx/luma/gfx/hud/luma/weaponvortex.svg
+++ b/gfx/luma/gfx/hud/luma/weaponvortex.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
-	<path class="vortex glowing" d="M 20,112 79,68 75,83 94,57 92,81 C 105,57 110,30 104,24 98,18 71,23 47,36 L 71,34 45,53 60,49 16,108 c 0,2.5 1.5,4 4,4 z M 88,29 c 2.5,-3 12,-3 13,-2 1,1 1,10.5 -2,13 L 30,98 z"/>
+	<path class="vortex glowing" d="M 20,112 79,68 75,83 94,57 92,81 C 105,57 110,30 104,24 98,18 71,23 47,36 L 71,34 45,53 60,49 16,108 c 0,2 2,4 4,4 z M 88,29 c 2.5,-3 12,-3 13,-2 1,1 1,10.5 -2,13 L 30,98 z"/>
 </svg>
diff --git a/gfx/luma/gfx/menu/luma/background_l2.svg b/gfx/luma/gfx/menu/luma/background_l2.svg
index 9068103..ec50011 100644
--- a/gfx/luma/gfx/menu/luma/background_l2.svg
+++ b/gfx/luma/gfx/menu/luma/background_l2.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="2560" height="2048">
 	<defs>
-		<text id="version" x="756" y="432" text-align="center" text-anchor="middle" font-size="64px" font-family="Xolonium">LUMINOS</text>
+		<text id="version" x="756" y="432" text-align="center" text-anchor="middle" font-size="64px" font-family="Xolonium">LUMA</text>
 		<g id="wings">
 			<path id="wing" d="m622,220.8c-1.8,57.4,32.9,107.6,83.1,128.2-33.9-6.5-64.4-4.7-70.1-20.6-9.1-25.3-35.7-19.5-35.5,5.3-15.9-0.6-41.5-6.8-66.4,23.1-0.3-69.3,88.7-51.4,68.3-92.2-11.5-23-47.1-3.6-33.2,11.7-43.7,8.6-78.7-8-143.8,23.7,57.9-87.5,183.2-49.3,177.4-97-4.4-36.5-59.1-17.9-40.3,5.9-32.9,11.1-92.8-23.7-186-6,86.9-71.8,245.6-13.5,252.3-59.8,5.2-36.5-48.6-37.4-47-7.3-69.5-34.2-90.8-6.9-182.7-37.8,106.8-1.4,205.2-40.05,296.9,7.5-42.1,21.55-71.4,64.7-73,115.3zm-73.1-69.4c-72.1-4.1-67.8,6.7-105.8,2.9,9.6-35-83.4-18.2-24.9,4.2-122.4-6-120.2,41.3-243.2,18.5,138.9-14.5,251.7-95.7,373.9-25.6zm-199.2,59.9c-33.6,14.8-54,42.5-124,36.5,47.2,2.2,83.7-55.8,124-36.5zm186.3,13c-71.8,7.7-47.6,20.7-82.3,23.2,4.3-33.9-76.6-6.3-21.7,7.1-109.4,15.8-83.3,59.8-196.5,44.4,114.6-15,146-121.5,300.5-74.7zm25.5,71.4c-33.6,9.8-25.5,19.3-43.7,22.9-7-35.8-69.7,19-12.5,15.3-61.6,10.6-48.8,43.1-111.4,35.2,56.3-14.2,68.1-100.9,167.6-73.3zm-153.2,22.9c-25.8,15.1-22.8,30.8-86.2,35.7,32.9-0.2,60.6-52.6,86.2-35.7z"/>
 			<use xlink:href="#wing" transform="matrix(-1,0,0,1,1512,0)"/>
diff --git a/gfx/luma/gfx/menu/luma/bigbutton_c.svg b/gfx/luma/gfx/menu/luma/bigbutton_c.svg
index 06fbade..3243543 100644
--- a/gfx/luma/gfx/menu/luma/bigbutton_c.svg
+++ b/gfx/luma/gfx/menu/luma/bigbutton_c.svg
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common_c.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="512" height="128">
-	<path class="button" d="m 42,12 -8,96 60,8 376,0 8,-96 -60,-8 z"/>
-	<path class="stripes blurred" d="m 41,18 0,4 376,0 -5,-4 z m -1,8 0,4 386,0 -5,-4 z m -1,8 0,4 440,0 0,-4 z m -1,8 0,4 441,0 0,-4 z m -1,8 0,4 441,0 0,-4 z m -1,8 0,4 441,0 0,-4 z m -1,8 0,4 441,0 0,-4 z m -1,8 0,4 441,0 0,-4 z m -1,8 0,4 441,0 0,-4 z m 0,8 0,4 440,0 0,-4 z m 53,8 5,4 381,0 0,-4 z m 9,8 5,4 371,0 0,-4 z"/>
+	<path class="button" d="m 42,12 -8,96 76,8 360,0 8,-96 -76,-8 z"/>
 	<g class="glowing">
-		<path class="frame" d="m 44,8 c -4,0 -5.5,3 -6,6 l -7,42 c -1,6 -2,9 -5,12 l -14,14 0,14 24,20 58,0 -16,-12 -34,0 -6,-8 6,-80 360,0 21,15 44.5,0 -3,-4 L 433,27 408,8 z m 374,4 16,12 34,0 6,8 -6,80 -360,0 -21,-15 -44.5,0 3,4 33.5,0 25,19 364,0 c 4,0 5.5,-3 6,-6 l 7,-42 c 1,-6 2,-9 5,-12 l 14,-14 0,-14 -24,-20 z"/>
+		<path class="frame" d="m 44,8 c -4,0 -5.5,3 -6,6 l -7,42 c -1,6 -2,9 -5,12 l -14,14 0,14 28,24 428,0 c 4,0 5.5,-3 6,-6 l 7,-42 c 1,-6 2,-9 5,-12 L 500,46 500,32 472,8 z m 0,8 358,0 18,12 48,0 6,6 -6,78 -358,0 -18,-12 -48,0 -6,-6 z"/>
 		<path class="detail" d="m 28,16 -12,8 0,49.5 7,-7 C 26.5,63 27,61 28.5,52 l 6,-36 -6.5,0 z m 468,38.5 -7,7 c -3.5,3.5 -4,5.5 -5.5,14.5 l -6,36 6.5,0 12,-8 0,-49.5 z"/>
 	</g>
 </svg>
diff --git a/gfx/luma/gfx/menu/luma/bigbutton_d.svg b/gfx/luma/gfx/menu/luma/bigbutton_d.svg
index 95510e7..e329921 100644
--- a/gfx/luma/gfx/menu/luma/bigbutton_d.svg
+++ b/gfx/luma/gfx/menu/luma/bigbutton_d.svg
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common_d.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="512" height="128">
-	<path class="button" d="m 42,12 -8,96 60,8 376,0 8,-96 -60,-8 z"/>
-	<path class="stripes blurred" d="m 41,18 0,4 376,0 -5,-4 z m -1,8 0,4 386,0 -5,-4 z m -1,8 0,4 440,0 0,-4 z m -1,8 0,4 441,0 0,-4 z m -1,8 0,4 441,0 0,-4 z m -1,8 0,4 441,0 0,-4 z m -1,8 0,4 441,0 0,-4 z m -1,8 0,4 441,0 0,-4 z m -1,8 0,4 441,0 0,-4 z m 0,8 0,4 440,0 0,-4 z m 53,8 5,4 381,0 0,-4 z m 9,8 5,4 371,0 0,-4 z"/>
+	<path class="button" d="m 42,12 -8,96 76,8 360,0 8,-96 -76,-8 z"/>
 	<g class="glowing">
-		<path class="frame" d="m 44,8 c -4,0 -5.5,3 -6,6 l -7,42 c -1,6 -2,9 -5,12 l -14,14 0,14 24,20 58,0 -16,-12 -34,0 -6,-8 6,-80 360,0 21,15 44.5,0 -3,-4 L 433,27 408,8 z m 374,4 16,12 34,0 6,8 -6,80 -360,0 -21,-15 -44.5,0 3,4 33.5,0 25,19 364,0 c 4,0 5.5,-3 6,-6 l 7,-42 c 1,-6 2,-9 5,-12 l 14,-14 0,-14 -24,-20 z"/>
+		<path class="frame" d="m 44,8 c -4,0 -5.5,3 -6,6 l -7,42 c -1,6 -2,9 -5,12 l -14,14 0,14 28,24 428,0 c 4,0 5.5,-3 6,-6 l 7,-42 c 1,-6 2,-9 5,-12 L 500,46 500,32 472,8 z m 0,8 358,0 18,12 48,0 6,6 -6,78 -358,0 -18,-12 -48,0 -6,-6 z"/>
 		<path class="detail" d="m 28,16 -12,8 0,49.5 7,-7 C 26.5,63 27,61 28.5,52 l 6,-36 -6.5,0 z m 468,38.5 -7,7 c -3.5,3.5 -4,5.5 -5.5,14.5 l -6,36 6.5,0 12,-8 0,-49.5 z"/>
 	</g>
 </svg>
diff --git a/gfx/luma/gfx/menu/luma/bigbutton_f.svg b/gfx/luma/gfx/menu/luma/bigbutton_f.svg
index e08c07e..4453462 100644
--- a/gfx/luma/gfx/menu/luma/bigbutton_f.svg
+++ b/gfx/luma/gfx/menu/luma/bigbutton_f.svg
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common_f.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="512" height="128">
-	<path class="button" d="m 42,12 -8,96 60,8 376,0 8,-96 -60,-8 z"/>
-	<path class="stripes blurred" d="m 41,18 0,4 376,0 -5,-4 z m -1,8 0,4 386,0 -5,-4 z m -1,8 0,4 440,0 0,-4 z m -1,8 0,4 441,0 0,-4 z m -1,8 0,4 441,0 0,-4 z m -1,8 0,4 441,0 0,-4 z m -1,8 0,4 441,0 0,-4 z m -1,8 0,4 441,0 0,-4 z m -1,8 0,4 441,0 0,-4 z m 0,8 0,4 440,0 0,-4 z m 53,8 5,4 381,0 0,-4 z m 9,8 5,4 371,0 0,-4 z"/>
+	<path class="button" d="m 42,12 -8,96 76,8 360,0 8,-96 -76,-8 z"/>
 	<g class="glowing">
-		<path class="frame" d="m 44,8 c -4,0 -5.5,3 -6,6 l -7,42 c -1,6 -2,9 -5,12 l -14,14 0,14 24,20 58,0 -16,-12 -34,0 -6,-8 6,-80 360,0 21,15 44.5,0 -3,-4 L 433,27 408,8 z m 374,4 16,12 34,0 6,8 -6,80 -360,0 -21,-15 -44.5,0 3,4 33.5,0 25,19 364,0 c 4,0 5.5,-3 6,-6 l 7,-42 c 1,-6 2,-9 5,-12 l 14,-14 0,-14 -24,-20 z"/>
+		<path class="frame" d="m 44,8 c -4,0 -5.5,3 -6,6 l -7,42 c -1,6 -2,9 -5,12 l -14,14 0,14 28,24 428,0 c 4,0 5.5,-3 6,-6 l 7,-42 c 1,-6 2,-9 5,-12 L 500,46 500,32 472,8 z m 0,8 358,0 18,12 48,0 6,6 -6,78 -358,0 -18,-12 -48,0 -6,-6 z"/>
 		<path class="detail" d="m 28,16 -12,8 0,49.5 7,-7 C 26.5,63 27,61 28.5,52 l 6,-36 -6.5,0 z m 468,38.5 -7,7 c -3.5,3.5 -4,5.5 -5.5,14.5 l -6,36 6.5,0 12,-8 0,-49.5 z"/>
 	</g>
 </svg>
diff --git a/gfx/luma/gfx/menu/luma/bigbutton_n.svg b/gfx/luma/gfx/menu/luma/bigbutton_n.svg
index 8a29590..c6915dd 100644
--- a/gfx/luma/gfx/menu/luma/bigbutton_n.svg
+++ b/gfx/luma/gfx/menu/luma/bigbutton_n.svg
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common_n.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="512" height="128">
-	<path class="button" d="m 42,12 -8,96 60,8 376,0 8,-96 -60,-8 z"/>
-	<path class="stripes blurred" d="m 41,18 0,4 376,0 -5,-4 z m -1,8 0,4 386,0 -5,-4 z m -1,8 0,4 440,0 0,-4 z m -1,8 0,4 441,0 0,-4 z m -1,8 0,4 441,0 0,-4 z m -1,8 0,4 441,0 0,-4 z m -1,8 0,4 441,0 0,-4 z m -1,8 0,4 441,0 0,-4 z m -1,8 0,4 441,0 0,-4 z m 0,8 0,4 440,0 0,-4 z m 53,8 5,4 381,0 0,-4 z m 9,8 5,4 371,0 0,-4 z"/>
+	<path class="button" d="m 42,12 -8,96 76,8 360,0 8,-96 -76,-8 z"/>
 	<g class="glowing">
-		<path class="frame" d="m 44,8 c -4,0 -5.5,3 -6,6 l -7,42 c -1,6 -2,9 -5,12 l -14,14 0,14 24,20 58,0 -16,-12 -34,0 -6,-8 6,-80 360,0 21,15 44.5,0 -3,-4 L 433,27 408,8 z m 374,4 16,12 34,0 6,8 -6,80 -360,0 -21,-15 -44.5,0 3,4 33.5,0 25,19 364,0 c 4,0 5.5,-3 6,-6 l 7,-42 c 1,-6 2,-9 5,-12 l 14,-14 0,-14 -24,-20 z"/>
+		<path class="frame" d="m 44,8 c -4,0 -5.5,3 -6,6 l -7,42 c -1,6 -2,9 -5,12 l -14,14 0,14 28,24 428,0 c 4,0 5.5,-3 6,-6 l 7,-42 c 1,-6 2,-9 5,-12 L 500,46 500,32 472,8 z m 0,8 358,0 18,12 48,0 6,6 -6,78 -358,0 -18,-12 -48,0 -6,-6 z"/>
 		<path class="detail" d="m 28,16 -12,8 0,49.5 7,-7 C 26.5,63 27,61 28.5,52 l 6,-36 -6.5,0 z m 468,38.5 -7,7 c -3.5,3.5 -4,5.5 -5.5,14.5 l -6,36 6.5,0 12,-8 0,-49.5 z"/>
 	</g>
 </svg>
diff --git a/gfx/luma/gfx/menu/luma/bigbuttongray_d.svg b/gfx/luma/gfx/menu/luma/bigbuttongray_d.svg
index 0d092d0..72ed87e 100644
--- a/gfx/luma/gfx/menu/luma/bigbuttongray_d.svg
+++ b/gfx/luma/gfx/menu/luma/bigbuttongray_d.svg
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common_d.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="512" height="128" class="grayed">
-	<path class="button" d="m 42,12 -8,96 60,8 376,0 8,-96 -60,-8 z"/>
-	<path class="stripes blurred" d="m 41,18 0,4 376,0 -5,-4 z m -1,8 0,4 386,0 -5,-4 z m -1,8 0,4 440,0 0,-4 z m -1,8 0,4 441,0 0,-4 z m -1,8 0,4 441,0 0,-4 z m -1,8 0,4 441,0 0,-4 z m -1,8 0,4 441,0 0,-4 z m -1,8 0,4 441,0 0,-4 z m -1,8 0,4 441,0 0,-4 z m 0,8 0,4 440,0 0,-4 z m 53,8 5,4 381,0 0,-4 z m 9,8 5,4 371,0 0,-4 z"/>
+	<path class="button" d="m 42,12 -8,96 76,8 360,0 8,-96 -76,-8 z"/>
 	<g class="glowing">
-		<path class="frame" d="m 44,8 c -4,0 -5.5,3 -6,6 l -7,42 c -1,6 -2,9 -5,12 l -14,14 0,14 24,20 58,0 -16,-12 -34,0 -6,-8 6,-80 360,0 21,15 44.5,0 -3,-4 L 433,27 408,8 z m 374,4 16,12 34,0 6,8 -6,80 -360,0 -21,-15 -44.5,0 3,4 33.5,0 25,19 364,0 c 4,0 5.5,-3 6,-6 l 7,-42 c 1,-6 2,-9 5,-12 l 14,-14 0,-14 -24,-20 z"/>
+		<path class="frame" d="m 44,8 c -4,0 -5.5,3 -6,6 l -7,42 c -1,6 -2,9 -5,12 l -14,14 0,14 28,24 428,0 c 4,0 5.5,-3 6,-6 l 7,-42 c 1,-6 2,-9 5,-12 L 500,46 500,32 472,8 z m 0,8 358,0 18,12 48,0 6,6 -6,78 -358,0 -18,-12 -48,0 -6,-6 z"/>
 		<path class="detail" d="m 28,16 -12,8 0,49.5 7,-7 C 26.5,63 27,61 28.5,52 l 6,-36 -6.5,0 z m 468,38.5 -7,7 c -3.5,3.5 -4,5.5 -5.5,14.5 l -6,36 6.5,0 12,-8 0,-49.5 z"/>
 	</g>
 </svg>
diff --git a/gfx/luma/gfx/menu/luma/bigbuttongray_f.svg b/gfx/luma/gfx/menu/luma/bigbuttongray_f.svg
index f7d4577..e0cb831 100644
--- a/gfx/luma/gfx/menu/luma/bigbuttongray_f.svg
+++ b/gfx/luma/gfx/menu/luma/bigbuttongray_f.svg
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common_f.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="512" height="128" class="grayed">
-	<path class="button" d="m 42,12 -8,96 60,8 376,0 8,-96 -60,-8 z"/>
-	<path class="stripes blurred" d="m 41,18 0,4 376,0 -5,-4 z m -1,8 0,4 386,0 -5,-4 z m -1,8 0,4 440,0 0,-4 z m -1,8 0,4 441,0 0,-4 z m -1,8 0,4 441,0 0,-4 z m -1,8 0,4 441,0 0,-4 z m -1,8 0,4 441,0 0,-4 z m -1,8 0,4 441,0 0,-4 z m -1,8 0,4 441,0 0,-4 z m 0,8 0,4 440,0 0,-4 z m 53,8 5,4 381,0 0,-4 z m 9,8 5,4 371,0 0,-4 z"/>
+	<path class="button" d="m 42,12 -8,96 76,8 360,0 8,-96 -76,-8 z"/>
 	<g class="glowing">
-		<path class="frame" d="m 44,8 c -4,0 -5.5,3 -6,6 l -7,42 c -1,6 -2,9 -5,12 l -14,14 0,14 24,20 58,0 -16,-12 -34,0 -6,-8 6,-80 360,0 21,15 44.5,0 -3,-4 L 433,27 408,8 z m 374,4 16,12 34,0 6,8 -6,80 -360,0 -21,-15 -44.5,0 3,4 33.5,0 25,19 364,0 c 4,0 5.5,-3 6,-6 l 7,-42 c 1,-6 2,-9 5,-12 l 14,-14 0,-14 -24,-20 z"/>
+		<path class="frame" d="m 44,8 c -4,0 -5.5,3 -6,6 l -7,42 c -1,6 -2,9 -5,12 l -14,14 0,14 28,24 428,0 c 4,0 5.5,-3 6,-6 l 7,-42 c 1,-6 2,-9 5,-12 L 500,46 500,32 472,8 z m 0,8 358,0 18,12 48,0 6,6 -6,78 -358,0 -18,-12 -48,0 -6,-6 z"/>
 		<path class="detail" d="m 28,16 -12,8 0,49.5 7,-7 C 26.5,63 27,61 28.5,52 l 6,-36 -6.5,0 z m 468,38.5 -7,7 c -3.5,3.5 -4,5.5 -5.5,14.5 l -6,36 6.5,0 12,-8 0,-49.5 z"/>
 	</g>
 </svg>
diff --git a/gfx/luma/gfx/menu/luma/bigbuttongray_n.svg b/gfx/luma/gfx/menu/luma/bigbuttongray_n.svg
index 16883a0..737cbe3 100644
--- a/gfx/luma/gfx/menu/luma/bigbuttongray_n.svg
+++ b/gfx/luma/gfx/menu/luma/bigbuttongray_n.svg
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common_n.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="512" height="128" class="grayed">
-	<path class="button" d="m 42,12 -8,96 60,8 376,0 8,-96 -60,-8 z"/>
-	<path class="stripes blurred" d="m 41,18 0,4 376,0 -5,-4 z m -1,8 0,4 386,0 -5,-4 z m -1,8 0,4 440,0 0,-4 z m -1,8 0,4 441,0 0,-4 z m -1,8 0,4 441,0 0,-4 z m -1,8 0,4 441,0 0,-4 z m -1,8 0,4 441,0 0,-4 z m -1,8 0,4 441,0 0,-4 z m -1,8 0,4 441,0 0,-4 z m 0,8 0,4 440,0 0,-4 z m 53,8 5,4 381,0 0,-4 z m 9,8 5,4 371,0 0,-4 z"/>
+	<path class="button" d="m 42,12 -8,96 76,8 360,0 8,-96 -76,-8 z"/>
 	<g class="glowing">
-		<path class="frame" d="m 44,8 c -4,0 -5.5,3 -6,6 l -7,42 c -1,6 -2,9 -5,12 l -14,14 0,14 24,20 58,0 -16,-12 -34,0 -6,-8 6,-80 360,0 21,15 44.5,0 -3,-4 L 433,27 408,8 z m 374,4 16,12 34,0 6,8 -6,80 -360,0 -21,-15 -44.5,0 3,4 33.5,0 25,19 364,0 c 4,0 5.5,-3 6,-6 l 7,-42 c 1,-6 2,-9 5,-12 l 14,-14 0,-14 -24,-20 z"/>
+		<path class="frame" d="m 44,8 c -4,0 -5.5,3 -6,6 l -7,42 c -1,6 -2,9 -5,12 l -14,14 0,14 28,24 428,0 c 4,0 5.5,-3 6,-6 l 7,-42 c 1,-6 2,-9 5,-12 L 500,46 500,32 472,8 z m 0,8 358,0 18,12 48,0 6,6 -6,78 -358,0 -18,-12 -48,0 -6,-6 z"/>
 		<path class="detail" d="m 28,16 -12,8 0,49.5 7,-7 C 26.5,63 27,61 28.5,52 l 6,-36 -6.5,0 z m 468,38.5 -7,7 c -3.5,3.5 -4,5.5 -5.5,14.5 l -6,36 6.5,0 12,-8 0,-49.5 z"/>
 	</g>
 </svg>
diff --git a/gfx/luma/gfx/menu/luma/border.svg b/gfx/luma/gfx/menu/luma/border.svg
index 24682a3..87b685c 100644
--- a/gfx/luma/gfx/menu/luma/border.svg
+++ b/gfx/luma/gfx/menu/luma/border.svg
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common_n.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="384" height="384">
-	<path class="dialog" d="m 17,80 0,266 17,14 316,0 17,-14 0,-266 -63,7 -224,0 z"/>
-	<path class="header" d="M 89,14 66,74 80,87 304,87 318,74 295,14 z"/>
+	<path class="dialog" d="m 17,87 0,259 17,14 316,0 17,-14 0,-259 z"/>
+	<path class="header" d="m 89,14 -25,52 0,21 128,0 128,0 0,-21 -25,-52 -103,0 -103,0 z"/>
 	<g class="glowing">
-		<path class="frame" d="M 86,10 50,58 c -4.5,6 -8,7.5 -14,8 l -24,2 0,286 21,21 c 2,2 4,2 6,0 l 12,-12 282,0 12,12 c 2,2 4,2 6,0 l 21,-21 0,-286 -24,-2 c -6,-0.5 -9.5,-2 -14,-8 L 298,10 z m 6,8 200,0 18,50 c 0,6 -8,16 -18,16 L 92,84 C 82,84 74,74 74,68 z M 28,86 c 8,0 40,4 48,4 l 232,0 c 8,0 40,-4 48,-4 4,0 6,2 6,6 l 0,252 -16,13 -308,0 -16,-13 0,-252 c 0,-4 2,-6 6,-6 z"/>
-		<path class="detail" d="M 36,13 15,34 15,64.5 33,63 c 9,-0.75 11,-2 14,-6 L 80,13 z m 18,353 -2,3 c 6,5 26,7 40,7 l 200,0 c 14,0 34,-2 40,-7 l -2,-3 z"/>
+		<path class="frame" d="M 86,10 50,58 c -4.5,6 -8,7.5 -14,8 l -24,2 0,286 22,22 4,0 13,-13 282,0 13,13 4,0 22,-22 0,-286 -24,-2 c -6,-0.5 -9.5,-2 -14,-8 L 298,10 z m 7,8 198,0 20,47 0,3 -19,16 -200,0 -19,-16 0,-3 z m -66,72 330,0 5,4 0,250 -16,13 -308,0 -16,-13 0,-250 z"/>
+		<path class="detail" d="M 36,13 15,34 15,64.5 33,63 c 9,-0.75 11,-2 14,-6 L 80,13 z m 16,353 -3,3 c 39,7 41,7 45,7 l 196,0 c 4,0 6,0 45,-7 l -3,-3 z"/>
 	</g>
 </svg>
diff --git a/gfx/luma/gfx/menu/luma/button_c.svg b/gfx/luma/gfx/menu/luma/button_c.svg
index ca9cc8a..0647123 100644
--- a/gfx/luma/gfx/menu/luma/button_c.svg
+++ b/gfx/luma/gfx/menu/luma/button_c.svg
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common_c.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="256" height="64">
-	<path class="button" d="m 21,6 -4,48 30,4 188,0 4,-48 -30,-4 z"/>
-	<path class="stripes blurred" d="m 20,10 0,4 192,0 -5,-4 z m -1,8 0,4 220,0 0,-4 z m -1,8 0,4 221,0 0,-4 z m -1,8 0,4 221,0 0,-4 z m 0,8 0,4 220,0 0,-4 z m 27,8 5,4 187,0 0,-4 z"/>
+	<path class="button" d="m 21,6 -4,48 38,4 180,0 4,-48 -38,-4 z"/>
 	<g class="glowing">
-		<path class="frame" d="m 22,4 c -2,0 -2.75,1.5 -3,3 l -3.5,21 c -0.5,3 -1,4.5 -2.5,6 l -7,7 0,7 12,10 29,0 -8,-6 -17,0 -3,-4 3,-40 179,0 11,8 22.5,0 -1.5,-2 -17,0 -13,-10 z m 187,2 8,6 17,0 3,4 -3,40 -179,0 -11,-8 -22.5,0 1.5,2 17,0 13,10 181,0 c 2,0 2.75,-1.5 3,-3 l 3.5,-21 c 0.5,-3 1,-4.5 2.5,-6 l 7,-7 0,-7 -12,-10 z"/>
+		<path class="frame" d="m 22,4 c -2,0 -2.75,1.5 -3,3 l -3.5,21 c -0.5,3 -1,4.5 -2.5,6 l -7,7 0,7 14,12 214,0 c 2,0 2.75,-1.5 3,-3 l 3.5,-21 c 0.5,-3 1,-4.5 2.5,-6 l 7,-7 0,-7 -14,-12 z m 0,4 179,0 9,6 24,0 3,3 -3,39 -179,0 -9,-6 -24,0 -3,-3 z"/>
 		<path class="detail" d="m 14,8 -6,4 0,24 3.5,-3.5 c 1,-1 1.5,-2 2.25,-6.5 L 16.75,8 14,8 z m 234,20 -3.5,3.5 c -1,1 -1.5,2 -2.25,6.5 l -3,18 2.75,0 6,-4 0,-24 z"/>
 	</g>
 </svg>
diff --git a/gfx/luma/gfx/menu/luma/button_d.svg b/gfx/luma/gfx/menu/luma/button_d.svg
index 627f38e..d7ebabe 100644
--- a/gfx/luma/gfx/menu/luma/button_d.svg
+++ b/gfx/luma/gfx/menu/luma/button_d.svg
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common_d.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="256" height="64">
-	<path class="button" d="m 21,6 -4,48 30,4 188,0 4,-48 -30,-4 z"/>
-	<path class="stripes blurred" d="m 20,10 0,4 192,0 -5,-4 z m -1,8 0,4 220,0 0,-4 z m -1,8 0,4 221,0 0,-4 z m -1,8 0,4 221,0 0,-4 z m 0,8 0,4 220,0 0,-4 z m 27,8 5,4 187,0 0,-4 z"/>
+	<path class="button" d="m 21,6 -4,48 38,4 180,0 4,-48 -38,-4 z"/>
 	<g class="glowing">
-		<path class="frame" d="m 22,4 c -2,0 -2.75,1.5 -3,3 l -3.5,21 c -0.5,3 -1,4.5 -2.5,6 l -7,7 0,7 12,10 29,0 -8,-6 -17,0 -3,-4 3,-40 179,0 11,8 22.5,0 -1.5,-2 -17,0 -13,-10 z m 187,2 8,6 17,0 3,4 -3,40 -179,0 -11,-8 -22.5,0 1.5,2 17,0 13,10 181,0 c 2,0 2.75,-1.5 3,-3 l 3.5,-21 c 0.5,-3 1,-4.5 2.5,-6 l 7,-7 0,-7 -12,-10 z"/>
+		<path class="frame" d="m 22,4 c -2,0 -2.75,1.5 -3,3 l -3.5,21 c -0.5,3 -1,4.5 -2.5,6 l -7,7 0,7 14,12 214,0 c 2,0 2.75,-1.5 3,-3 l 3.5,-21 c 0.5,-3 1,-4.5 2.5,-6 l 7,-7 0,-7 -14,-12 z m 0,4 179,0 9,6 24,0 3,3 -3,39 -179,0 -9,-6 -24,0 -3,-3 z"/>
 		<path class="detail" d="m 14,8 -6,4 0,24 3.5,-3.5 c 1,-1 1.5,-2 2.25,-6.5 L 16.75,8 14,8 z m 234,20 -3.5,3.5 c -1,1 -1.5,2 -2.25,6.5 l -3,18 2.75,0 6,-4 0,-24 z"/>
 	</g>
 </svg>
diff --git a/gfx/luma/gfx/menu/luma/button_f.svg b/gfx/luma/gfx/menu/luma/button_f.svg
index 656045c..4530acd 100644
--- a/gfx/luma/gfx/menu/luma/button_f.svg
+++ b/gfx/luma/gfx/menu/luma/button_f.svg
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common_f.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="256" height="64">
-	<path class="button" d="m 21,6 -4,48 30,4 188,0 4,-48 -30,-4 z"/>
-	<path class="stripes blurred" d="m 20,10 0,4 192,0 -5,-4 z m -1,8 0,4 220,0 0,-4 z m -1,8 0,4 221,0 0,-4 z m -1,8 0,4 221,0 0,-4 z m 0,8 0,4 220,0 0,-4 z m 27,8 5,4 187,0 0,-4 z"/>
+	<path class="button" d="m 21,6 -4,48 38,4 180,0 4,-48 -38,-4 z"/>
 	<g class="glowing">
-		<path class="frame" d="m 22,4 c -2,0 -2.75,1.5 -3,3 l -3.5,21 c -0.5,3 -1,4.5 -2.5,6 l -7,7 0,7 12,10 29,0 -8,-6 -17,0 -3,-4 3,-40 179,0 11,8 22.5,0 -1.5,-2 -17,0 -13,-10 z m 187,2 8,6 17,0 3,4 -3,40 -179,0 -11,-8 -22.5,0 1.5,2 17,0 13,10 181,0 c 2,0 2.75,-1.5 3,-3 l 3.5,-21 c 0.5,-3 1,-4.5 2.5,-6 l 7,-7 0,-7 -12,-10 z"/>
+		<path class="frame" d="m 22,4 c -2,0 -2.75,1.5 -3,3 l -3.5,21 c -0.5,3 -1,4.5 -2.5,6 l -7,7 0,7 14,12 214,0 c 2,0 2.75,-1.5 3,-3 l 3.5,-21 c 0.5,-3 1,-4.5 2.5,-6 l 7,-7 0,-7 -14,-12 z m 0,4 179,0 9,6 24,0 3,3 -3,39 -179,0 -9,-6 -24,0 -3,-3 z"/>
 		<path class="detail" d="m 14,8 -6,4 0,24 3.5,-3.5 c 1,-1 1.5,-2 2.25,-6.5 L 16.75,8 14,8 z m 234,20 -3.5,3.5 c -1,1 -1.5,2 -2.25,6.5 l -3,18 2.75,0 6,-4 0,-24 z"/>
 	</g>
 </svg>
diff --git a/gfx/luma/gfx/menu/luma/button_n.svg b/gfx/luma/gfx/menu/luma/button_n.svg
index 39561fb..0b236b1 100644
--- a/gfx/luma/gfx/menu/luma/button_n.svg
+++ b/gfx/luma/gfx/menu/luma/button_n.svg
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common_n.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="256" height="64">
-	<path class="button" d="m 21,6 -4,48 30,4 188,0 4,-48 -30,-4 z"/>
-	<path class="stripes blurred" d="m 20,10 0,4 192,0 -5,-4 z m -1,8 0,4 220,0 0,-4 z m -1,8 0,4 221,0 0,-4 z m -1,8 0,4 221,0 0,-4 z m 0,8 0,4 220,0 0,-4 z m 27,8 5,4 187,0 0,-4 z"/>
+	<path class="button" d="m 21,6 -4,48 38,4 180,0 4,-48 -38,-4 z"/>
 	<g class="glowing">
-		<path class="frame" d="m 22,4 c -2,0 -2.75,1.5 -3,3 l -3.5,21 c -0.5,3 -1,4.5 -2.5,6 l -7,7 0,7 12,10 29,0 -8,-6 -17,0 -3,-4 3,-40 179,0 11,8 22.5,0 -1.5,-2 -17,0 -13,-10 z m 187,2 8,6 17,0 3,4 -3,40 -179,0 -11,-8 -22.5,0 1.5,2 17,0 13,10 181,0 c 2,0 2.75,-1.5 3,-3 l 3.5,-21 c 0.5,-3 1,-4.5 2.5,-6 l 7,-7 0,-7 -12,-10 z"/>
+		<path class="frame" d="m 22,4 c -2,0 -2.75,1.5 -3,3 l -3.5,21 c -0.5,3 -1,4.5 -2.5,6 l -7,7 0,7 14,12 214,0 c 2,0 2.75,-1.5 3,-3 l 3.5,-21 c 0.5,-3 1,-4.5 2.5,-6 l 7,-7 0,-7 -14,-12 z m 0,4 179,0 9,6 24,0 3,3 -3,39 -179,0 -9,-6 -24,0 -3,-3 z"/>
 		<path class="detail" d="m 14,8 -6,4 0,24 3.5,-3.5 c 1,-1 1.5,-2 2.25,-6.5 L 16.75,8 14,8 z m 234,20 -3.5,3.5 c -1,1 -1.5,2 -2.25,6.5 l -3,18 2.75,0 6,-4 0,-24 z"/>
 	</g>
 </svg>
diff --git a/gfx/luma/gfx/menu/luma/buttongray_d.svg b/gfx/luma/gfx/menu/luma/buttongray_d.svg
index 2c6632f..c51a7c6 100644
--- a/gfx/luma/gfx/menu/luma/buttongray_d.svg
+++ b/gfx/luma/gfx/menu/luma/buttongray_d.svg
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common_d.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="256" height="64" class="grayed">
-	<path class="button" d="m 21,6 -4,48 30,4 188,0 4,-48 -30,-4 z"/>
-	<path class="stripes blurred" d="m 20,10 0,4 192,0 -5,-4 z m -1,8 0,4 220,0 0,-4 z m -1,8 0,4 221,0 0,-4 z m -1,8 0,4 221,0 0,-4 z m 0,8 0,4 220,0 0,-4 z m 27,8 5,4 187,0 0,-4 z"/>
+	<path class="button" d="m 21,6 -4,48 38,4 180,0 4,-48 -38,-4 z"/>
 	<g class="glowing">
-		<path class="frame" d="m 22,4 c -2,0 -2.75,1.5 -3,3 l -3.5,21 c -0.5,3 -1,4.5 -2.5,6 l -7,7 0,7 12,10 29,0 -8,-6 -17,0 -3,-4 3,-40 179,0 11,8 22.5,0 -1.5,-2 -17,0 -13,-10 z m 187,2 8,6 17,0 3,4 -3,40 -179,0 -11,-8 -22.5,0 1.5,2 17,0 13,10 181,0 c 2,0 2.75,-1.5 3,-3 l 3.5,-21 c 0.5,-3 1,-4.5 2.5,-6 l 7,-7 0,-7 -12,-10 z"/>
+		<path class="frame" d="m 22,4 c -2,0 -2.75,1.5 -3,3 l -3.5,21 c -0.5,3 -1,4.5 -2.5,6 l -7,7 0,7 14,12 214,0 c 2,0 2.75,-1.5 3,-3 l 3.5,-21 c 0.5,-3 1,-4.5 2.5,-6 l 7,-7 0,-7 -14,-12 z m 0,4 179,0 9,6 24,0 3,3 -3,39 -179,0 -9,-6 -24,0 -3,-3 z"/>
 		<path class="detail" d="m 14,8 -6,4 0,24 3.5,-3.5 c 1,-1 1.5,-2 2.25,-6.5 L 16.75,8 14,8 z m 234,20 -3.5,3.5 c -1,1 -1.5,2 -2.25,6.5 l -3,18 2.75,0 6,-4 0,-24 z"/>
 	</g>
 </svg>
diff --git a/gfx/luma/gfx/menu/luma/buttongray_f.svg b/gfx/luma/gfx/menu/luma/buttongray_f.svg
index 60ee8ac..fb4d22b 100644
--- a/gfx/luma/gfx/menu/luma/buttongray_f.svg
+++ b/gfx/luma/gfx/menu/luma/buttongray_f.svg
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common_f.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="256" height="64" class="grayed">
-	<path class="button" d="m 21,6 -4,48 30,4 188,0 4,-48 -30,-4 z"/>
-	<path class="stripes blurred" d="m 20,10 0,4 192,0 -5,-4 z m -1,8 0,4 220,0 0,-4 z m -1,8 0,4 221,0 0,-4 z m -1,8 0,4 221,0 0,-4 z m 0,8 0,4 220,0 0,-4 z m 27,8 5,4 187,0 0,-4 z"/>
+	<path class="button" d="m 21,6 -4,48 38,4 180,0 4,-48 -38,-4 z"/>
 	<g class="glowing">
-		<path class="frame" d="m 22,4 c -2,0 -2.75,1.5 -3,3 l -3.5,21 c -0.5,3 -1,4.5 -2.5,6 l -7,7 0,7 12,10 29,0 -8,-6 -17,0 -3,-4 3,-40 179,0 11,8 22.5,0 -1.5,-2 -17,0 -13,-10 z m 187,2 8,6 17,0 3,4 -3,40 -179,0 -11,-8 -22.5,0 1.5,2 17,0 13,10 181,0 c 2,0 2.75,-1.5 3,-3 l 3.5,-21 c 0.5,-3 1,-4.5 2.5,-6 l 7,-7 0,-7 -12,-10 z"/>
+		<path class="frame" d="m 22,4 c -2,0 -2.75,1.5 -3,3 l -3.5,21 c -0.5,3 -1,4.5 -2.5,6 l -7,7 0,7 14,12 214,0 c 2,0 2.75,-1.5 3,-3 l 3.5,-21 c 0.5,-3 1,-4.5 2.5,-6 l 7,-7 0,-7 -14,-12 z m 0,4 179,0 9,6 24,0 3,3 -3,39 -179,0 -9,-6 -24,0 -3,-3 z"/>
 		<path class="detail" d="m 14,8 -6,4 0,24 3.5,-3.5 c 1,-1 1.5,-2 2.25,-6.5 L 16.75,8 14,8 z m 234,20 -3.5,3.5 c -1,1 -1.5,2 -2.25,6.5 l -3,18 2.75,0 6,-4 0,-24 z"/>
 	</g>
 </svg>
diff --git a/gfx/luma/gfx/menu/luma/buttongray_n.svg b/gfx/luma/gfx/menu/luma/buttongray_n.svg
index 77cf434..107a8d2 100644
--- a/gfx/luma/gfx/menu/luma/buttongray_n.svg
+++ b/gfx/luma/gfx/menu/luma/buttongray_n.svg
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common_n.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="256" height="64" class="grayed">
-	<path class="button" d="m 21,6 -4,48 30,4 188,0 4,-48 -30,-4 z"/>
-	<path class="stripes blurred" d="m 20,10 0,4 192,0 -5,-4 z m -1,8 0,4 220,0 0,-4 z m -1,8 0,4 221,0 0,-4 z m -1,8 0,4 221,0 0,-4 z m 0,8 0,4 220,0 0,-4 z m 27,8 5,4 187,0 0,-4 z"/>
+	<path class="button" d="m 21,6 -4,48 38,4 180,0 4,-48 -38,-4 z"/>
 	<g class="glowing">
-		<path class="frame" d="m 22,4 c -2,0 -2.75,1.5 -3,3 l -3.5,21 c -0.5,3 -1,4.5 -2.5,6 l -7,7 0,7 12,10 29,0 -8,-6 -17,0 -3,-4 3,-40 179,0 11,8 22.5,0 -1.5,-2 -17,0 -13,-10 z m 187,2 8,6 17,0 3,4 -3,40 -179,0 -11,-8 -22.5,0 1.5,2 17,0 13,10 181,0 c 2,0 2.75,-1.5 3,-3 l 3.5,-21 c 0.5,-3 1,-4.5 2.5,-6 l 7,-7 0,-7 -12,-10 z"/>
+		<path class="frame" d="m 22,4 c -2,0 -2.75,1.5 -3,3 l -3.5,21 c -0.5,3 -1,4.5 -2.5,6 l -7,7 0,7 14,12 214,0 c 2,0 2.75,-1.5 3,-3 l 3.5,-21 c 0.5,-3 1,-4.5 2.5,-6 l 7,-7 0,-7 -14,-12 z m 0,4 179,0 9,6 24,0 3,3 -3,39 -179,0 -9,-6 -24,0 -3,-3 z"/>
 		<path class="detail" d="m 14,8 -6,4 0,24 3.5,-3.5 c 1,-1 1.5,-2 2.25,-6.5 L 16.75,8 14,8 z m 234,20 -3.5,3.5 c -1,1 -1.5,2 -2.25,6.5 l -3,18 2.75,0 6,-4 0,-24 z"/>
 	</g>
 </svg>
diff --git a/gfx/luma/gfx/menu/luma/checkmark.svg b/gfx/luma/gfx/menu/luma/checkmark.svg
index 1ce485c..8655d71 100644
--- a/gfx/luma/gfx/menu/luma/checkmark.svg
+++ b/gfx/luma/gfx/menu/luma/checkmark.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet href="common_n.css" type="text/css"?>
+<?xml-stylesheet href="common.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="128" height="128">
-	<path class="frame glowing" d="m 91.5,30.5 -37,45 -17,-17 -7,7 25,32 42,-62 z"/>
+	<path class="checkmark lumatic" d="m 91.5,30.5 -37,45 -17,-17 -7,7 25,32 42,-62 z"/>
 </svg>
diff --git a/gfx/luma/gfx/menu/luma/closebutton_c.svg b/gfx/luma/gfx/menu/luma/closebutton_c.svg
index 8cfe486..b6c7d7d 100644
--- a/gfx/luma/gfx/menu/luma/closebutton_c.svg
+++ b/gfx/luma/gfx/menu/luma/closebutton_c.svg
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common_c.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="96" height="96">
-	<path class="frame glowing" d="m 16,13 33,44 c 3,4 5,5.25 14,6 L 81,64.5 81,34 60,13 16,13 z M 49.5,27 56,32 62.5,27 65,29.5 60,36 65,42.5 62.5,45 56,40 49.5,45 47,42.5 52,36 47,29.5 49.5,27 z"/>
+	<defs>
+		<clipPath id="clip">
+			<path d="M 2.5,0 46,58 c 4.5,6 8,7.5 14,8 l 36,3 0,-69 z"/>
+		</clipPath>
+	</defs>
+	<path class="detail glowing" clip-path="url(#clip)" d="m 16,13 33,44 c 3,4 5,5.25 14,6 L 81,64.5 81,34 60,13 16,13 z M 49.5,27 56,32 62.5,27 65,29.5 60,36 65,42.5 62.5,45 56,40 49.5,45 47,42.5 52,36 47,29.5 49.5,27 z"/>
 </svg>
diff --git a/gfx/luma/gfx/menu/luma/closebutton_f.svg b/gfx/luma/gfx/menu/luma/closebutton_f.svg
index 50e3047..b8caced 100644
--- a/gfx/luma/gfx/menu/luma/closebutton_f.svg
+++ b/gfx/luma/gfx/menu/luma/closebutton_f.svg
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common_f.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="96" height="96">
-	<path class="detail glowing" d="m 16,13 33,44 c 3,4 5,5.25 14,6 L 81,64.5 81,34 60,13 16,13 z M 49.5,27 56,32 62.5,27 65,29.5 60,36 65,42.5 62.5,45 56,40 49.5,45 47,42.5 52,36 47,29.5 49.5,27 z"/>
+	<defs>
+		<clipPath id="clip">
+			<path d="M 2.5,0 46,58 c 4.5,6 8,7.5 14,8 l 36,3 0,-69 z"/>
+		</clipPath>
+	</defs>
+	<path class="detail glowing" clip-path="url(#clip)" d="m 16,13 33,44 c 3,4 5,5.25 14,6 L 81,64.5 81,34 60,13 16,13 z M 49.5,27 56,32 62.5,27 65,29.5 60,36 65,42.5 62.5,45 56,40 49.5,45 47,42.5 52,36 47,29.5 49.5,27 z"/>
 </svg>
diff --git a/gfx/luma/gfx/menu/luma/closebutton_n.svg b/gfx/luma/gfx/menu/luma/closebutton_n.svg
index 77f0e85..ac51130 100644
--- a/gfx/luma/gfx/menu/luma/closebutton_n.svg
+++ b/gfx/luma/gfx/menu/luma/closebutton_n.svg
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common_n.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="96" height="96">
-	<path class="detail glowing" d="m 16,13 33,44 c 3,4 5,5.25 14,6 L 81,64.5 81,34 60,13 16,13 z M 49.5,27 56,32 62.5,27 65,29.5 60,36 65,42.5 62.5,45 56,40 49.5,45 47,42.5 52,36 47,29.5 49.5,27 z"/>
+	<defs>
+		<clipPath id="clip">
+			<path d="M 2.5,0 46,58 c 4.5,6 8,7.5 14,8 l 36,3 0,-69 z"/>
+		</clipPath>
+	</defs>
+	<path class="detail glowing" clip-path="url(#clip)" d="m 16,13 33,44 c 3,4 5,5.25 14,6 L 81,64.5 81,34 60,13 16,13 z M 49.5,27 56,32 62.5,27 65,29.5 60,36 65,42.5 62.5,45 56,40 49.5,45 47,42.5 52,36 47,29.5 49.5,27 z"/>
 </svg>
diff --git a/gfx/luma/gfx/menu/luma/common.css b/gfx/luma/gfx/menu/luma/common.css
index 7299ba9..d462b0a 100644
--- a/gfx/luma/gfx/menu/luma/common.css
+++ b/gfx/luma/gfx/menu/luma/common.css
@@ -3,23 +3,22 @@
 .clearbutton { fill:#000000; opacity:0.30 }
 
 /* Components */
+.checkmark   { fill:#c7e4ff }
 .color       { fill:#f7f7f7 }
 .colorpicker { fill:#ffffff }
+.gametype    { fill:#c7e4ff }
 .mark        { fill:#efefef }
 .nopreview   { fill:#37628a; opacity:0.75 }
 
 /* Icons */
-.aes   { fill:#d8c246 }
+.aes   { fill:#deca40 }
 .mod   { fill:#5ea1da }
 .pure  { fill:#bd4f1b }
 .stats { fill:#85c935 }
 
-/* Gametypes */
-.gametype { fill:#ffffff }
-
 /* Filters */
 .blurred  { filter:url(common.filters#blurred) }
-.glowing  { filter:url(common.filters#glowint) }
+.glowing  { filter:url(common.filters#glowing) }
 .grayed   { filter:url(common.filters#grayed) }
+.lumatic  { filter:url(common.filters#lumatic) }
 .shadowed { filter:url(common.filters#shadowed) }
-.shining  { filter:url(common.filters#shining) }
diff --git a/gfx/luma/gfx/menu/luma/common.filters b/gfx/luma/gfx/menu/luma/common.filters
index ff3fe98..c46d19f 100644
--- a/gfx/luma/gfx/menu/luma/common.filters
+++ b/gfx/luma/gfx/menu/luma/common.filters
@@ -4,58 +4,92 @@
 		<filter id="blurred" x="-0.5" y="-0.5" width="2" height="2">
 			<feGaussianBlur stdDeviation="0.5"/>
 		</filter>
-		<filter id="glowing" x="-0.5" y="-0.5" width="2" height="2">
-			<feGaussianBlur stdDeviation="4"/>
-			<feColorMatrix values="1.32 -0.53 -0.29 0 0 -0.24 0.75 0 0 0 -0.02 -0.87 1.39 0 0 0 0 0 1.6 0" result="glow"/>
-			<feColorMatrix values="1 0 0 0 0 0 1 0 0 1 0 0 1 0 0.3 0 0 0 0.15 0" in="SourceAlpha"/>
-			<feOffset dx="1.8" result="cyan"/>
-			<feColorMatrix values="1 0 0 0 1 0 1 0 0 0.3 0 0 1 0 0.2 0 0 0 0.3 0" in="SourceAlpha"/>
-			<feOffset dx="-1.8" result="red"/>
+		<filter id="glowing" x="-1" y="-1" width="3" height="3">
+			<feGaussianBlur stdDeviation="6"/>
+			<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="4"/>
+			<!-- ./tools/hsv-matrix.pl -9 3 0.45 -->
+			<feColorMatrix values="1.19 -0.48 -0.26 0 0 -0.22 0.67 0 0 0 -0.02 -0.78 1.25 0 0 0 0 0 1.6 0" result="shadow"/>
+			<feColorMatrix in="SourceAlpha" values="1 0 0 0 0 0 1 0 0 1 0 0 1 0 0.6 0 0 0 1 0"/>
+			<feOffset dx="2" result="cyan"/>
+			<feColorMatrix in="SourceAlpha" values="1 0 0 0 1 0 1 0 0 1 0 0 1 0 0 0 0 0 1 0"/>
+			<feOffset dx="-2" result="yellow"/>
+			<feColorMatrix in="SourceAlpha" values="1 0 0 0 0.2 0 1 0 0 0.4 0 0 1 0 1 0 0 0 1 0"/>
+			<feOffset dx="1" result="blue"/>
+			<feColorMatrix in="SourceAlpha" values="1 0 0 0 1 0 1 0 0 0 0 0 1 0 0 0 0 0 1 0"/>
+			<feOffset dx="-1" result="red"/>
 			<feMerge>
-				<feMergeNode in="glow"/>
-				<feMergeNode in="cyan"/>
+				<feMergeNode in="blue"/>
 				<feMergeNode in="red"/>
-				<feMergeNode in="SourceGraphic"/>
 			</feMerge>
-			<feGaussianBlur stdDeviation="0.2"/>
-		</filter>
-		<filter id="grayed">
-			<feColorMatrix type="saturate" values="0"/>
-		</filter>
-		<filter id="shadowed" x="-0.5" y="-0.5" width="2" height="2">
-			<feGaussianBlur stdDeviation="1.5" in="SourceAlpha"/>
-			<feColorMatrix values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 2 0" result="shadow"/>
+			<feGaussianBlur stdDeviation="1 0" result="bluered"/>
+			<feMerge>
+				<feMergeNode in="cyan"/>
+				<feMergeNode in="yellow"/>
+				<feMergeNode in="bluered"/>
+			</feMerge>
+			<feGaussianBlur stdDeviation="1 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="abberation"/>
 			<feMerge>
+				<feMergeNode in="glow"/>
 				<feMergeNode in="shadow"/>
+				<feMergeNode in="abberation"/>
 				<feMergeNode in="SourceGraphic"/>
 			</feMerge>
 			<feGaussianBlur stdDeviation="0.2"/>
 		</filter>
-		<filter id="shining" x="-1" y="-1" width="3" height="3">
+		<filter id="grayed">
+			<feColorMatrix type="saturate" values="0"/>
+		</filter>
+		<filter id="lumatic" x="-1" y="-1" width="3" height="3">
 			<feGaussianBlur stdDeviation="8"/>
 			<feColorMatrix values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0.4 0" result="glow"/>
-			<feGaussianBlur in="SourceGraphic"  stdDeviation="2"/>
+			<feGaussianBlur in="SourceGraphic" stdDeviation="2"/>
 			<feColorMatrix values="0.1 0 0 0 0 0 0.1 0 0 0 0 0 0.1 0 0 0 0 0 2 0"/>
-			<feColorMatrix values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0.5 0" result="outline"/>
+			<feColorMatrix values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0.4 0" result="outline"/>
 			<feGaussianBlur in="SourceGraphic" stdDeviation="8 6"/>
+			<!-- ./tools/hsv-matrix.pl -9 3.3 0.35 -->
 			<feColorMatrix values="1.01 -0.44 -0.22 0 0 -0.19 0.55 -0.01 0 0 -0.03 -0.69 1.07 0 0 0 0 0 1.7 0" result="shadow"/>
-			<feColorMatrix in="SourceAlpha" values="1 0 0 0 0.3 0 1 0 0 1 0 0 1 0 0.8 0 0 0 0.25 0"/>
-			<feOffset dx="4" dy="1" result="cyan"/>
-			<feColorMatrix in="SourceAlpha" values="1 0 0 0 1 0 1 0 0 0.3 0 0 1 0 0.3 0 0 0 0.25 0"/>
-			<feOffset dx="-4" dy="-1" result="red"/>
+			<feColorMatrix in="SourceAlpha" values="1 0 0 0 0 0 1 0 0 1 0 0 1 0 0.6 0 0 0 1 0"/>
+			<feOffset dx="4" result="cyan"/>
+			<feColorMatrix in="SourceAlpha" values="1 0 0 0 1 0 1 0 0 1 0 0 1 0 0 0 0 0 1 0"/>
+			<feOffset dx="-4" result="yellow"/>
+			<feColorMatrix in="SourceAlpha" values="1 0 0 0 0.2 0 1 0 0 0.4 0 0 1 0 1 0 0 0 1 0"/>
+			<feOffset dx="1" result="blue"/>
+			<feColorMatrix in="SourceAlpha" values="1 0 0 0 1 0 1 0 0 0 0 0 1 0 0 0 0 0 1 0"/>
+			<feOffset dx="-1" result="red"/>
 			<feMerge>
-				<feMergeNode in="cyan"/>
+				<feMergeNode in="blue"/>
 				<feMergeNode in="red"/>
 			</feMerge>
-			<feGaussianBlur stdDeviation="2 0" result="abberation"/>
+			<feGaussianBlur stdDeviation="2 0" result="bluered"/>
+			<feMerge>
+				<feMergeNode in="cyan"/>
+				<feMergeNode in="yellow"/>
+				<feMergeNode in="bluered"/>
+			</feMerge>
+			<feGaussianBlur stdDeviation="2 0"/>
+			<feColorMatrix values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0.33 0" result="abberation"/>
+			<feGaussianBlur in="SourceAlpha" stdDeviation="4"/>
+			<feColorMatrix values="1 0 0 0 1 0 1 0 0 1 0 0 1 0 1 0 0 0 1 -0.5" result="highlight"/>
 			<feMerge>
 				<feMergeNode in="glow"/>
 				<feMergeNode in="shadow"/>
-				<feMergeNode in="outline"/>
 				<feMergeNode in="abberation"/>
+				<feMergeNode in="outline"/>
 				<feMergeNode in="SourceGraphic"/>
 			</feMerge>
-			<feGaussianBlur stdDeviation="0.6"/>
+			<feComposite in2="highlight" operator="arithmetic" k1="0.2" k2="1" k3="0.4"/>
+			<feGaussianBlur stdDeviation="0.7"/>
+		</filter>
+		<filter id="shadowed" x="-0.5" y="-0.5" width="2" height="2">
+			<feGaussianBlur stdDeviation="1.5" in="SourceAlpha"/>
+			<feColorMatrix values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 2 0" result="shadow"/>
+			<feMerge>
+				<feMergeNode in="shadow"/>
+				<feMergeNode in="SourceGraphic"/>
+			</feMerge>
+			<feGaussianBlur stdDeviation="0.2"/>
 		</filter>
 	</defs>
 </svg>
diff --git a/gfx/luma/gfx/menu/luma/common_c.css b/gfx/luma/gfx/menu/luma/common_c.css
index aa1f6b8..d460338 100644
--- a/gfx/luma/gfx/menu/luma/common_c.css
+++ b/gfx/luma/gfx/menu/luma/common_c.css
@@ -1,13 +1,12 @@
 @import "common.css";
 
 /* Backgrounds */
-.button      { opacity:0.85; fill:#602d1d }
+.button      { opacity:0.85; fill:#6d3321 }
 .checkbox    { opacity:0.85; fill:url(common_c.gradients#checkbox) }
-.dialog      { opacity:0.90; fill:#2b1603 }
+.dialog      { opacity:0.90; fill:#321a04 }
 .inputbox    { opacity:0.85; fill:url(common_c.gradients#inputbox) }
 .radiobutton { opacity:0.85; fill:url(common_c.gradients#radiobutton) }
 
 /* Components */
-.detail  { fill:#f0c484 }
-.frame   { fill:#e79155 }
-.stripes { fill:url(common_c.gradients#stripes); opacity:0.04 }
+.detail  { fill:#f4cd9a }
+.frame   { fill:#ee9c62 }
diff --git a/gfx/luma/gfx/menu/luma/common_c.gradients b/gfx/luma/gfx/menu/luma/common_c.gradients
index d7b0825..577edb2 100644
--- a/gfx/luma/gfx/menu/luma/common_c.gradients
+++ b/gfx/luma/gfx/menu/luma/common_c.gradients
@@ -2,15 +2,9 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1">
 	<defs>
 		<radialGradient id="radiobutton">
-			<stop offset="0" stop-color="#602d1d" stop-opacity="0"/>
-			<stop offset="1" stop-color="#602d1d"/>
+			<stop offset="0" stop-color="#6d3321" stop-opacity="0"/>
+			<stop offset="1" stop-color="#6d3321"/>
 		</radialGradient>
-		<linearGradient id="stripes" x1="0" y1="0" x2="100%" y2="0" gradientUnits="userSpaceOnUse">
-			<stop stop-color="#ff491f" offset=".25"/>
-			<stop stop-color="#ff491f" offset=".42" stop-opacity=".1"/>
-			<stop stop-color="#ff491f" offset=".58" stop-opacity=".1"/>
-			<stop stop-color="#ff491f" offset=".75"/>
-		</linearGradient>
 		<linearGradient id="checkbox" xlink:href="#radiobutton" x1="1" x2="0" y2="1"/>
 		<linearGradient id="inputbox" xlink:href="#radiobutton" x2="0" y2="1"/>
 	</defs>
diff --git a/gfx/luma/gfx/menu/luma/common_f.css b/gfx/luma/gfx/menu/luma/common_f.css
index d625632..1180a6c 100644
--- a/gfx/luma/gfx/menu/luma/common_f.css
+++ b/gfx/luma/gfx/menu/luma/common_f.css
@@ -1,12 +1,11 @@
 @import "common.css";
 
 /* Backgrounds */
-.button      { opacity:0.85; fill:#145892 }
+.button      { opacity:0.85; fill:#1766a9 }
 .checkbox    { opacity:0.85; fill:url(common_f.gradients#checkbox) }
 .inputbox    { opacity:0.85; fill:url(common_f.gradients#inputbox) }
 .radiobutton { opacity:0.85; fill:url(common_f.gradients#radiobutton) }
 
 /* Components */
-.detail  { fill:#ddf1fb }
-.frame   { fill:#bad2e6 }
-.stripes { fill:url(common_f.gradients#stripes); opacity:0.2 }
+.detail  { fill:#eaf6fc }
+.frame   { fill:#c0d6e8 }
diff --git a/gfx/luma/gfx/menu/luma/common_f.gradients b/gfx/luma/gfx/menu/luma/common_f.gradients
index bf56166..3eea7ff 100644
--- a/gfx/luma/gfx/menu/luma/common_f.gradients
+++ b/gfx/luma/gfx/menu/luma/common_f.gradients
@@ -2,15 +2,9 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1">
 	<defs>
 		<radialGradient id="radiobutton">
-			<stop stop-color="#145892" offset="0" stop-opacity="0"/>
-			<stop stop-color="#145892" offset="1" />
+			<stop stop-color="#1766a9" offset="0" stop-opacity="0"/>
+			<stop stop-color="#1766a9" offset="1" />
 		</radialGradient>
-		<linearGradient id="stripes" x1="0" y1="0" x2="100%" y2="0" gradientUnits="userSpaceOnUse">
-			<stop stop-color="#1f7fff" offset=".25"/>
-			<stop stop-color="#1f7fff" offset=".42" stop-opacity=".1"/>
-			<stop stop-color="#1f7fff" offset=".58" stop-opacity=".1"/>
-			<stop stop-color="#1f7fff" offset=".75"/>
-		</linearGradient>
 		<linearGradient id="checkbox" xlink:href="#radiobutton" x1="1" x2="0" y2="1"/>
 		<linearGradient id="inputbox" xlink:href="#radiobutton" x2="0" y2="1"/>
 	</defs>
diff --git a/gfx/luma/gfx/menu/luma/common_n.css b/gfx/luma/gfx/menu/luma/common_n.css
index 7a2c117..45e5151 100644
--- a/gfx/luma/gfx/menu/luma/common_n.css
+++ b/gfx/luma/gfx/menu/luma/common_n.css
@@ -1,7 +1,7 @@
 @import "common.css";
 
 /* Backgrounds */
-.button      { opacity:0.85; fill:#0f436f }
+.button      { opacity:0.85; fill:#114b7d }
 .checkbox    { opacity:0.85; fill:url(common_n.gradients#checkbox) }
 .dialog      { opacity:0.90; fill:url(common_n.gradients#dialog) }
 .header      { opacity:0.90; fill:url(common_n.gradients#header) }
@@ -11,4 +11,3 @@
 /* Components */
 .detail  { fill:#c0e5f8 }
 .frame   { fill:#8eb8db }
-.stripes { fill:url(common_n.gradients#stripes); opacity:0.1 }
diff --git a/gfx/luma/gfx/menu/luma/common_n.gradients b/gfx/luma/gfx/menu/luma/common_n.gradients
index f6f072a..ea5ef39 100644
--- a/gfx/luma/gfx/menu/luma/common_n.gradients
+++ b/gfx/luma/gfx/menu/luma/common_n.gradients
@@ -1,28 +1,22 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1">
 	<defs>
-		<linearGradient id="dialog" x1="0" y1="25%" x2="0" y2="75%" gradientUnits="userSpaceOnUse">
-			<stop stop-color="#082c51" offset="0"/>
-			<stop stop-color="#090c0f" offset=".2"/>
-			<stop stop-color="#090c0f" offset=".8"/>
-			<stop stop-color="#082c51" offset="1"/>
+		<linearGradient id="dialog" x1="0%" y1="25%" x2="0%" y2="75%" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#082d54" offset="0"/>
+			<stop stop-color="#06101a" offset=".2"/>
+			<stop stop-color="#06101a" offset=".8"/>
+			<stop stop-color="#082d54" offset="1"/>
 		</linearGradient>
-		<linearGradient id="header" x1="25%" y1="0" x2="75%" y2="0" gradientUnits="userSpaceOnUse">
+		<linearGradient id="header" x1="25%" y1="0%" x2="75%" y2="0%" gradientUnits="userSpaceOnUse">
 			<stop stop-color="#145892" offset="0"/>
 			<stop stop-color="#0a3766" offset=".33"/>
 			<stop stop-color="#0a3766" offset=".67"/>
 			<stop stop-color="#145892" offset="1"/>
 		</linearGradient>
 		<radialGradient id="radiobutton">
-			<stop stop-color="#0f436f" offset="0" stop-opacity="0"/>
-			<stop stop-color="#0f436f" offset="1"/>
+			<stop stop-color="#114b7d" offset="0" stop-opacity="0"/>
+			<stop stop-color="#114b7d" offset="1"/>
 		</radialGradient>
-		<linearGradient id="stripes" x1="25%" y1="0" x2="75%" y2="0" gradientUnits="userSpaceOnUse">
-			<stop stop-color="#1f7fff" offset="0"/>
-			<stop stop-color="#1f7fff" offset=".33" stop-opacity=".1"/>
-			<stop stop-color="#1f7fff" offset=".67" stop-opacity=".1"/>
-			<stop stop-color="#1f7fff" offset="1"/>
-		</linearGradient>
 		<linearGradient id="checkbox" xlink:href="#radiobutton" x1="1" x2="0" y2="1"/>
 		<linearGradient id="inputbox" xlink:href="#radiobutton" x2="0" y2="1"/>
 		<linearGradient id="scrolltrack" xlink:href="#radiobutton" x1="1" x2="0"/>
diff --git a/gfx/luma/gfx/menu/luma/gametype_as.svg b/gfx/luma/gfx/menu/luma/gametype_as.svg
index ff45959..f34fb29 100644
--- a/gfx/luma/gfx/menu/luma/gametype_as.svg
+++ b/gfx/luma/gfx/menu/luma/gametype_as.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
-	<path class="gametype shining" d="m 43,16 -4,10 7.5,-1 1,-4 33,0 1,4 7.5,1 -4,-10 z m 6,7 c -3.8,13.8 -4.7,41.7 -3.5,56 l 8.5,0 c 0,-21 0.5,-27 2,-39 l 16,0 c 1.5,12 2,18 2,39 l 8.5,0 C 83.7,64.7 82.8,36.8 79,23 z m -3.5,3.5 -14,2 C 28,37 24.5,55.5 25,71 29.5,73.5 37,75 42.5,75 42,55 43,38 45.5,26.5 z m 37,0 C 85,38 86,55 85.5,75 91,75 98.5,73.5 103,71 103.5,55.5 100,37 96.5,28.5 z M 64,48 c -3.9,0 -7,3.1 -7,7 l -0.8,9.4 C 56.9,60.7 60.1,58 64,58 c 3.9,0 7.1,2.7 7.8,6.4 L 71,55 c 0,-3.9 -3.1,-7 -7,-7 z m 0,12 c -3.3,0 -6,2.7 -6,6 l 0,3.7 C 59.5,68.1 61.6,67 64,67 c 2.4,0 4.5,1.1 6,2.7 L 70,66 c 0,-3.3 -2.7,-6 -6,-6 z m 0,8 c -4.4,0 -8,3.6 -8,8 l 0,5 c 0,4.4 3.6,8 8,8 4.4,0 8,-3.6 8,-8 l 0,-5 c 0,-4.4 -3.6,-8 -8,-8 z m 0,5 c 3.9,0 7.2,2.8 7.8,6.5 C 71.1,76.4 67.8,74 64,74 60.2,74 56.9,76.4 56.2,79.5 56.8,75.8 60.1,73 64,73 z m 0,3.5 c 3,0 5.5,2.2 5.5,5 0,2.8 -2.5,5 -5.5,5 -3,0 -5.5,-2.2 -5.5,-5 0,-2.8 2.5,-5 5.5,-5 z m -23,2 -9.3,0.9 L 24.5,83 18,93 l 1,2 L 27,97 36,82 z m 46,0 5,3.5 9,15 8,-2 1,-2 -6.5,-10 -7.3,-3.7 z m -50,5.5 -6.5,11 17,9 4,-13.5 z m 54,0 -14.5,6.5 4,13.5 17,-9 z m -37,6 -5,17 4,5 22,0 4,-5 -5,-17 c -4,1.5 -7,2 -10,2 -3,0 -6,-0.5 -10,-2 z"/>
+	<path class="gametype lumatic" d="m 43,16 -4,10 7.5,-1 1,-4 33,0 1,4 7.5,1 -4,-10 z m 6,7 c -3.8,13.8 -4.7,41.7 -3.5,56 l 8.5,0 c 0,-21 0.5,-27 2,-39 l 16,0 c 1.5,12 2,18 2,39 l 8.5,0 C 83.7,64.7 82.8,36.8 79,23 z m -3.5,3.5 -14,2 C 28,37 24.5,55.5 25,71 29.5,73.5 37,75 42.5,75 42,55 43,38 45.5,26.5 z m 37,0 C 85,38 86,55 85.5,75 91,75 98.5,73.5 103,71 103.5,55.5 100,37 96.5,28.5 z M 64,48 c -3.9,0 -7,3.1 -7,7 l -0.8,9.4 C 56.9,60.7 60.1,58 64,58 c 3.9,0 7.1,2.7 7.8,6.4 L 71,55 c 0,-3.9 -3.1,-7 -7,-7 z m 0,12 c -3.3,0 -6,2.7 -6,6 l 0,3.7 C 59.5,68.1 61.6,67 64,67 c 2.4,0 4.5,1.1 6,2.7 L 70,66 c 0,-3.3 -2.7,-6 -6,-6 z m 0,8 c -4.4,0 -8,3.6 -8,8 l 0,5 c 0,4.4 3.6,8 8,8 4.4,0 8,-3.6 8,-8 l 0,-5 c 0,-4.4 -3.6,-8 -8,-8 z m 0,5 c 3.9,0 7.2,2.8 7.8,6.5 C 71.1,76.4 67.8,74 64,74 60.2,74 56.9,76.4 56.2,79.5 56.8,75.8 60.1,73 64,73 z m 0,3.5 c 3,0 5.5,2.2 5.5,5 0,2.8 -2.5,5 -5.5,5 -3,0 -5.5,-2.2 -5.5,-5 0,-2.8 2.5,-5 5.5,-5 z m -23,2 -9.3,0.9 L 24.5,83 18,93 l 1,2 L 27,97 36,82 z m 46,0 5,3.5 9,15 8,-2 1,-2 -6.5,-10 -7.3,-3.7 z m -50,5.5 -6.5,11 17,9 4,-13.5 z m 54,0 -14.5,6.5 4,13.5 17,-9 z m -37,6 -5,17 4,5 22,0 4,-5 -5,-17 c -4,1.5 -7,2 -10,2 -3,0 -6,-0.5 -10,-2 z"/>
 </svg>
diff --git a/gfx/luma/gfx/menu/luma/gametype_ca.svg b/gfx/luma/gfx/menu/luma/gametype_ca.svg
index 809fb90..fe2c917 100644
--- a/gfx/luma/gfx/menu/luma/gametype_ca.svg
+++ b/gfx/luma/gfx/menu/luma/gametype_ca.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
-	<path class="gametype shining" d="m 40.9,66.3 5.5,1.7 4,0 -3.1,3.2 L 45.5,82.5 44.9,70.9 z M 27.4,26.6 18.6,40.2 c -0.9,1.4 -1.1,2.4 -0.1,3.8 l 14.7,21.1 -2.9,19.4 26.6,0 0,-7.6 L 46.3,61.6 C 44.3,51.9 39.3,45.3 31.1,41.8 l 2.3,-4.5 c 9.5,5.1 13,-3.6 11.5,-4.3 L 30.2,25.9 c -1.2,-0.6 -2,-0.6 -2.7,0.7 z m 28,0.8 -10,13.6 C 45,41.8 51.2,47.1 51.6,46.5 56.9,39.3 58.7,33.2 62.4,34.2 63.6,32.9 56.2,26.4 55.5,27.4 z m -9.5,-7.2 -5.3,9 4.8,2.5 c 1.2,0.6 1.6,2.5 0.5,6.6 l 8.6,-12.5 c 0.9,-1.3 -7.8,-6.9 -8.5,-5.6 z m -10.1,-4.4 -4.9,8.8 8.2,3.9 5.1,-8.4 c 0.8,-1.4 -7.6,-5.7 -8.4,-4.3 z m 41.8,73 7,2.2 6.5,-0.5 -5.3,4.6 -2.4,14.3 -0.7,-14.7 z M 60.5,38.3 49.3,55.7 c -1.1,1.8 -1.4,3 -0.1,4.8 L 67.9,87.4 64.2,112 l 33.8,0 0,-21 9.3,-18.8 c 1.2,-2.4 1.4,-4 1.4,-9.3 L 97.6,74.4 88.2,69.5 85.3,84.8 C 82.3,70.7 75.7,62.1 65.2,57.7 l 3,-5.7 c 12,6.4 16.5,-4.6 14.6,-5.5 L 64,37.5 c -1.6,-0.8 -2.5,-0.7 -3.5,0.8 z m 44.8,12.1 -13,14.4 c -0.8,0.9 4.5,6.4 5.3,5.7 L 111.4,58.1 c 1.2,-1.1 -5.1,-8.8 -6.1,-7.7 z M 96.2,39.4 83.5,56.7 c -0.7,1 6.8,7.6 7.5,6.9 l 14,-15.5 c 1.4,-1.6 -7.9,-10 -8.8,-8.6 z m -12.1,-9.2 -6.8,11.4 6.1,3.2 c 1.6,0.8 2,3.1 0.6,8.4 L 94.9,37.3 c 1.2,-1.7 -9.9,-8.7 -10.9,-7.1 z m -12.8,-5.6 -6.2,11.2 10.5,5 6.5,-10.7 c 1.1,-1.7 -9.7,-7.2 -10.7,-5.5 z"/>
+	<path class="gametype lumatic" d="m 40.9,66.3 5.5,1.7 4,0 -3.1,3.2 L 45.5,82.5 44.9,70.9 z M 27.4,26.6 18.6,40.2 c -0.9,1.4 -1.1,2.4 -0.1,3.8 l 14.7,21.1 -2.9,19.4 26.6,0 0,-7.6 L 46.3,61.6 C 44.3,51.9 39.3,45.3 31.1,41.8 l 2.3,-4.5 c 9.5,5.1 13,-3.6 11.5,-4.3 L 30.2,25.9 c -1.2,-0.6 -2,-0.6 -2.7,0.7 z m 28,0.8 -10,13.6 C 45,41.8 51.2,47.1 51.6,46.5 56.9,39.3 58.7,33.2 62.4,34.2 63.6,32.9 56.2,26.4 55.5,27.4 z m -9.5,-7.2 -5.3,9 4.8,2.5 c 1.2,0.6 1.6,2.5 0.5,6.6 l 8.6,-12.5 c 0.9,-1.3 -7.8,-6.9 -8.5,-5.6 z m -10.1,-4.4 -4.9,8.8 8.2,3.9 5.1,-8.4 c 0.8,-1.4 -7.6,-5.7 -8.4,-4.3 z m 41.8,73 7,2.2 6.5,-0.5 -5.3,4.6 -2.4,14.3 -0.7,-14.7 z M 60.5,38.3 49.3,55.7 c -1.1,1.8 -1.4,3 -0.1,4.8 L 67.9,87.4 64.2,112 l 33.8,0 0,-21 9.3,-18.8 c 1.2,-2.4 1.4,-4 1.4,-9.3 L 97.6,74.4 88.2,69.5 85.3,84.8 C 82.3,70.7 75.7,62.1 65.2,57.7 l 3,-5.7 c 12,6.4 16.5,-4.6 14.6,-5.5 L 64,37.5 c -1.6,-0.8 -2.5,-0.7 -3.5,0.8 z m 44.8,12.1 -13,14.4 c -0.8,0.9 4.5,6.4 5.3,5.7 L 111.4,58.1 c 1.2,-1.1 -5.1,-8.8 -6.1,-7.7 z M 96.2,39.4 83.5,56.7 c -0.7,1 6.8,7.6 7.5,6.9 l 14,-15.5 c 1.4,-1.6 -7.9,-10 -8.8,-8.6 z m -12.1,-9.2 -6.8,11.4 6.1,3.2 c 1.6,0.8 2,3.1 0.6,8.4 L 94.9,37.3 c 1.2,-1.7 -9.9,-8.7 -10.9,-7.1 z m -12.8,-5.6 -6.2,11.2 10.5,5 6.5,-10.7 c 1.1,-1.7 -9.7,-7.2 -10.7,-5.5 z"/>
 </svg>
diff --git a/gfx/luma/gfx/menu/luma/gametype_ctf.svg b/gfx/luma/gfx/menu/luma/gametype_ctf.svg
index d5e8ca3..c8df59d 100644
--- a/gfx/luma/gfx/menu/luma/gametype_ctf.svg
+++ b/gfx/luma/gfx/menu/luma/gametype_ctf.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
-	<path class="gametype shining" d="m 97,16 c -6.2,5.8 -13.7,8.2 -22,10 l 10,37 -20,-45 c -17,-1 -31,4 -41,13 l 24,61 c 9,-12 30,-25 37,-25 5,0 2,6 -4,12.1 9,-13.6 -5,-7.1 -10,-1.6 6,13.5 39,-2.5 45,-13.5 z m -76.5,14 L 16,32 44,112 l 7.5,-3 z"/>
+	<path class="gametype lumatic" d="m 97,16 c -6.2,5.8 -13.7,8.2 -22,10 l 10,37 -20,-45 c -17,-1 -31,4 -41,13 l 24,61 c 9,-12 30,-25 37,-25 5,0 2,6 -4,12.1 9,-13.6 -5,-7.1 -10,-1.6 6,13.5 39,-2.5 45,-13.5 z m -76.5,14 L 16,32 44,112 l 7.5,-3 z"/>
 </svg>
diff --git a/gfx/luma/gfx/menu/luma/gametype_cts.svg b/gfx/luma/gfx/menu/luma/gametype_cts.svg
index b70d630..cb475ea 100644
--- a/gfx/luma/gfx/menu/luma/gametype_cts.svg
+++ b/gfx/luma/gfx/menu/luma/gametype_cts.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
-	<path class="gametype shining" d="m 39,18 -13,13 0,1 3,5 16,-16 -5,-3 z m 49,0 -5,3 16,16 3,-5 0,-1 -13,-13 z m -35,2 c -2,0 -3,0 -5,2 L 30,40 c -2,2 -2,3 -2,5 l 0,8 c 0,8 0,8 -4,10 l 0,8 c 0,4 0,6 2,9 l 14,21 c 2,3 3,3 7,3 l 9,0 1,7 14,0 1,-7 9,0 c 4,0 5,0 7,-3 l 14,-21 c 2,-3 2,-5 2,-9 l 0,-8 c -4,-2 -4,-2 -4,-10 l 0,-8 c 0,-2 0,-3 -2,-5 L 80,22 c -2,-2 -3,-2 -5,-2 z m -3.5,12 29,0 C 89,37 96,48 96,60 c 0,8 -3,15 -7.75,20.5 l 4,6.4 -0.4,2.1 -11,7 -2,-0.4 L 74,88 49.5,88 C 39,83 32,72 32,60 32,48 39,37 49.5,32 z m -9.5,14 -3,3 0,21 3,3 48,0 3,-3 0,-21 -3,-3 z m 3.5,2 6,0 1.5,1.5 -1.5,1.5 -6,0 -1.5,-1.5 z m 20,0 6,0 1.5,1.5 -1.5,1.5 -6,0 -1.5,-1.5 z m 15,0 6,0 1.5,1.5 -1.5,1.5 -6,0 -1.5,-1.5 z m -37,2 1.5,1.5 0,6 -1.5,1.5 -1.5,-1.5 0,-6 z m 10,0 1.5,1.5 0,6 -1.5,1.5 -1.5,-1.5 0,-6 z m 20,0 1.5,1.5 0,6 -1.5,1.5 -1.5,-1.5 0,-6 z m 5,0 1.5,1.5 0,6 -1.5,1.5 -1.5,-1.5 0,-6 z m 10,0 1.5,1.5 0,6 -1.5,1.5 -1.5,-1.5 0,-6 z m -31.5,4 3,0 0,3 -3,0 z m 8.5,4 6,0 1.5,1.5 -1.5,1.5 -6,0 -1.5,-1.5 z m 15,0 6,0 1.5,1.5 -1.5,1.5 -6,0 -1.5,-1.5 z m -37,2 1.5,1.5 0,6 -1.5,1.5 -1.5,-1.5 0,-6 z m 10,0 1.5,1.5 0,6 -1.5,1.5 -1.5,-1.5 0,-6 z m 10,0 1.5,1.5 0,6 -1.5,1.5 -1.5,-1.5 0,-6 z m 25,0 1.5,1.5 0,6 -1.5,1.5 -1.5,-1.5 0,-6 z m -31.5,2 3,0 0,3 -3,0 z m -11.5,6 6,0 1.5,1.5 -1.5,1.5 -6,0 -1.5,-1.5 z m 20,0 6,0 1.5,1.5 -1.5,1.5 -6,0 -1.5,-1.5 z m 15,0 6,0 1.5,1.5 -1.5,1.5 -6,0 -1.5,-1.5 z m 9.8,17.3 -9.2,6 -0.2,0.7 1.1,1.7 0.7,0.1 9.2,-5.9 0.2,-0.7 -1.1,-1.7 z"/>
+	<path class="gametype lumatic" d="m 39,18 -13,13 0,1 3,5 16,-16 -5,-3 z m 49,0 -5,3 16,16 3,-5 0,-1 -13,-13 z m -35,2 c -2,0 -3,0 -5,2 L 30,40 c -2,2 -2,3 -2,5 l 0,8 c 0,8 0,8 -4,10 l 0,8 c 0,4 0,6 2,9 l 14,21 c 2,3 3,3 7,3 l 9,0 1,7 14,0 1,-7 9,0 c 4,0 5,0 7,-3 l 14,-21 c 2,-3 2,-5 2,-9 l 0,-8 c -4,-2 -4,-2 -4,-10 l 0,-8 c 0,-2 0,-3 -2,-5 L 80,22 c -2,-2 -3,-2 -5,-2 z m -3.5,12 29,0 C 89,37 96,48 96,60 c 0,8 -3,15 -7.75,20.5 l 4,6.4 -0.4,2.1 -11,7 -2,-0.4 L 74,88 49.5,88 C 39,83 32,72 32,60 32,48 39,37 49.5,32 z m -9.5,14 -3,3 0,21 3,3 48,0 3,-3 0,-21 -3,-3 z m 3.5,2 6,0 1.5,1.5 -1.5,1.5 -6,0 -1.5,-1.5 z m 20,0 6,0 1.5,1.5 -1.5,1.5 -6,0 -1.5,-1.5 z m 15,0 6,0 1.5,1.5 -1.5,1.5 -6,0 -1.5,-1.5 z m -37,2 1.5,1.5 0,6 -1.5,1.5 -1.5,-1.5 0,-6 z m 10,0 1.5,1.5 0,6 -1.5,1.5 -1.5,-1.5 0,-6 z m 20,0 1.5,1.5 0,6 -1.5,1.5 -1.5,-1.5 0,-6 z m 5,0 1.5,1.5 0,6 -1.5,1.5 -1.5,-1.5 0,-6 z m 10,0 1.5,1.5 0,6 -1.5,1.5 -1.5,-1.5 0,-6 z m -31.5,4 3,0 0,3 -3,0 z m 8.5,4 6,0 1.5,1.5 -1.5,1.5 -6,0 -1.5,-1.5 z m 15,0 6,0 1.5,1.5 -1.5,1.5 -6,0 -1.5,-1.5 z m -37,2 1.5,1.5 0,6 -1.5,1.5 -1.5,-1.5 0,-6 z m 10,0 1.5,1.5 0,6 -1.5,1.5 -1.5,-1.5 0,-6 z m 10,0 1.5,1.5 0,6 -1.5,1.5 -1.5,-1.5 0,-6 z m 25,0 1.5,1.5 0,6 -1.5,1.5 -1.5,-1.5 0,-6 z m -31.5,2 3,0 0,3 -3,0 z m -11.5,6 6,0 1.5,1.5 -1.5,1.5 -6,0 -1.5,-1.5 z m 20,0 6,0 1.5,1.5 -1.5,1.5 -6,0 -1.5,-1.5 z m 15,0 6,0 1.5,1.5 -1.5,1.5 -6,0 -1.5,-1.5 z m 9.8,17.3 -9.2,6 -0.2,0.7 1.1,1.7 0.7,0.1 9.2,-5.9 0.2,-0.7 -1.1,-1.7 z"/>
 </svg>
diff --git a/gfx/luma/gfx/menu/luma/gametype_dm.svg b/gfx/luma/gfx/menu/luma/gametype_dm.svg
index ef12af1..207dfb0 100644
--- a/gfx/luma/gfx/menu/luma/gametype_dm.svg
+++ b/gfx/luma/gfx/menu/luma/gametype_dm.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
-	<path class="gametype shining" d="m 64,20 c -4,0 -8,1 -10,2 -0.5,7 0,17.5 1.5,25 l 3.5,5 10,0 3.5,-5 C 74,39.5 74.5,29 74,22 72,21 68,20 64,20 z M 51,24.5 C 44,29.5 42,36 42,45 l 5,3 0,13 8,7 18,0 8,-7 0,-13 5,-3 C 86,36 84,29.5 77,24.5 77,33 76,42 74,47 c 2,0 4,2 4,4.5 0,2.5 -2,4.5 -4.5,4.5 -2,0 -3,-0.5 -4,-2 l -11,0 c -1,1.5 -2,2 -4,2 C 52,56 50,54 50,51.5 50,49 52,47 54,47 52,42 51,33 51,24.5 z M 64,35 c 3,0 5.5,2.5 5.5,5.5 0,3 -2.5,5.5 -5.5,5.5 -3,0 -5.5,-2.5 -5.5,-5.5 0,-3 2.5,-5.5 5.5,-5.5 z m -23,11.5 -2,1.5 0,9 4,3 0,9 9,9 24,0 9,-9 0,-9 4,-3 0,-9 L 87,46.5 83,49 83,61.5 74,70 54,70 45,61.5 45,49 z m -0.5,24 -7.5,1 -3,11.5 c 2,6 12,10 20,10 L 51,81 C 37,77 33,74 43,73 z m 47,0 L 85,73 c 10,1 6,4 -8,8 l 1,12 c 8,0 18,-4 20,-10 L 95,71.5 z M 53,83 52,96 C 45,96 33,94 28,85 17,88 12,97 12,104 22,98 29,99 40,99 l 8,7 32,0 8,-7 c 11,0 18,-1 28,5 0,-7 -5,-16 -16,-19 -5,9 -17,11 -24,11 L 75,83 z"/>
+	<path class="gametype lumatic" d="m 64,20 c -4,0 -8,1 -10,2 -0.5,7 0,17.5 1.5,25 l 3.5,5 10,0 3.5,-5 C 74,39.5 74.5,29 74,22 72,21 68,20 64,20 z M 51,24.5 C 44,29.5 42,36 42,45 l 5,3 0,13 8,7 18,0 8,-7 0,-13 5,-3 C 86,36 84,29.5 77,24.5 77,33 76,42 74,47 c 2,0 4,2 4,4.5 0,2.5 -2,4.5 -4.5,4.5 -2,0 -3,-0.5 -4,-2 l -11,0 c -1,1.5 -2,2 -4,2 C 52,56 50,54 50,51.5 50,49 52,47 54,47 52,42 51,33 51,24.5 z M 64,35 c 3,0 5.5,2.5 5.5,5.5 0,3 -2.5,5.5 -5.5,5.5 -3,0 -5.5,-2.5 -5.5,-5.5 0,-3 2.5,-5.5 5.5,-5.5 z m -23,11.5 -2,1.5 0,9 4,3 0,9 9,9 24,0 9,-9 0,-9 4,-3 0,-9 L 87,46.5 83,49 83,61.5 74,70 54,70 45,61.5 45,49 z m -0.5,24 -7.5,1 -3,11.5 c 2,6 12,10 20,10 L 51,81 C 37,77 33,74 43,73 z m 47,0 L 85,73 c 10,1 6,4 -8,8 l 1,12 c 8,0 18,-4 20,-10 L 95,71.5 z M 53,83 52,96 C 45,96 33,94 28,85 17,88 12,97 12,104 22,98 29,99 40,99 l 8,7 32,0 8,-7 c 11,0 18,-1 28,5 0,-7 -5,-16 -16,-19 -5,9 -17,11 -24,11 L 75,83 z"/>
 </svg>
diff --git a/gfx/luma/gfx/menu/luma/gametype_dom.svg b/gfx/luma/gfx/menu/luma/gametype_dom.svg
index ae77ebe..3213aa1 100644
--- a/gfx/luma/gfx/menu/luma/gametype_dom.svg
+++ b/gfx/luma/gfx/menu/luma/gametype_dom.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
-	<g class="gametype shining">
+	<g class="gametype lumatic">
 		<path d="m 30,82 -8,3 -10,11 52,20 52,-20 -10,-11 -8,-3 5,7 -39,11 -39,-11 z"/>
 		<path d="m 51,17 -24,40 0,4 10,24 23,5 0,-21 -12,-5 -2,-4 9,-41 z m 26,0 -4,2 9,41 -2,4 -12,5 0,21 23,-5 10,-24 0,-4 z"/>
 	</g>
diff --git a/gfx/luma/gfx/menu/luma/gametype_duel.svg b/gfx/luma/gfx/menu/luma/gametype_duel.svg
index 2106d51..86aae77 100644
--- a/gfx/luma/gfx/menu/luma/gametype_duel.svg
+++ b/gfx/luma/gfx/menu/luma/gametype_duel.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
-	<path class="gametype shining" d="m 25.3,19 c 5.1,17.3 23.2,38.2 53.8,63.9 l 1.8,-3.7 C 51.8,54.8 36.9,37.8 29.6,20 c 8.6,17.7 23.9,34.3 53,58.7 l -2.7,6.3 3.8,3.2 -3.9,4.6 2.3,1.9 c 6,-4.1 6,-4.1 9.8,-0.9 l 17,14.2 c 1.6,0 7.1,-7 7.1,-8.4 L 99.2,85.5 C 95.4,82.3 95.4,82.3 98.3,75.6 L 96,73.7 91.5,79 C 68.5,59.7 43.9,37.2 34.6,20.3 z m 77.5,0 -9.3,1.3 C 88.2,29.8 78.1,41.4 66.3,52.7 l 4.1,3.8 C 84,43.3 92.7,31.8 98.4,20 93.5,32 85.2,43.9 71.3,57.5 l 2.9,2.6 C 89.7,44.6 99.3,30.8 102.8,19 z M 53.7,64.2 C 48,69.2 42.2,74.2 36.5,79 L 32,73.7 29.7,75.6 c 3,6.6 3,6.7 -0.9,9.9 L 12,99.6 c 0,1.4 5.5,8.4 7.1,8.4 L 36,93.8 c 3.8,-3.2 3.8,-3.2 9.8,0.9 L 48.1,92.8 44.2,88.2 48,85 45.3,78.7 C 49.7,75 53.8,71.4 57.6,68.1 z m 5.2,4.9 c -3.6,3.2 -7.5,6.6 -11.7,10.1 l 1.8,3.7 c 4.6,-3.8 8.8,-7.5 12.8,-11.1 z"/>
+	<path class="gametype lumatic" d="m 25.3,19 c 5.1,17.3 23.2,38.2 53.8,63.9 l 1.8,-3.7 C 51.8,54.8 36.9,37.8 29.6,20 c 8.6,17.7 23.9,34.3 53,58.7 l -2.7,6.3 3.8,3.2 -3.9,4.6 2.3,1.9 c 6,-4.1 6,-4.1 9.8,-0.9 l 17,14.2 c 1.6,0 7.1,-7 7.1,-8.4 L 99.2,85.5 C 95.4,82.3 95.4,82.3 98.3,75.6 L 96,73.7 91.5,79 C 68.5,59.7 43.9,37.2 34.6,20.3 z m 77.5,0 -9.3,1.3 C 88.2,29.8 78.1,41.4 66.3,52.7 l 4.1,3.8 C 84,43.3 92.7,31.8 98.4,20 93.5,32 85.2,43.9 71.3,57.5 l 2.9,2.6 C 89.7,44.6 99.3,30.8 102.8,19 z M 53.7,64.2 C 48,69.2 42.2,74.2 36.5,79 L 32,73.7 29.7,75.6 c 3,6.6 3,6.7 -0.9,9.9 L 12,99.6 c 0,1.4 5.5,8.4 7.1,8.4 L 36,93.8 c 3.8,-3.2 3.8,-3.2 9.8,0.9 L 48.1,92.8 44.2,88.2 48,85 45.3,78.7 C 49.7,75 53.8,71.4 57.6,68.1 z m 5.2,4.9 c -3.6,3.2 -7.5,6.6 -11.7,10.1 l 1.8,3.7 c 4.6,-3.8 8.8,-7.5 12.8,-11.1 z"/>
 </svg>
diff --git a/gfx/luma/gfx/menu/luma/gametype_ft.svg b/gfx/luma/gfx/menu/luma/gametype_ft.svg
index 9eb3897..0e23ad2 100644
--- a/gfx/luma/gfx/menu/luma/gametype_ft.svg
+++ b/gfx/luma/gfx/menu/luma/gametype_ft.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
-	<path class="gametype shining" d="m 60,12 -17,4 -4,12 -9,1 -4,15 8,12 -4,14 6,36 4,-23 7,3 3,12 3,-10 6,0 5,28 5,-28 5,0 2,16 2,-17 5,-2 4,28 6,-38 6,-6 1,-15 L 92,42 98,26 82,14 64,16 60,12 z m 4,10 c 4,0 8,1 10,2 0.5,7 0,17.5 -1.5,25 L 69,54 59,54 55.5,49 C 54,41.5 53.5,31 54,24 c 2,-1 6,-2 10,-2 z m -13,4.5 c 0,8.5 1,17.5 3,22.5 -2,0 -4,2 -4,4.5 0,2.5 2,4.5 4.5,4.5 2,0 3,-0.5 4,-2 l 11,0 c 1,1.5 2,2 4,2 C 76,58 78,56 78,53.5 78,51 76,49 74,49 c 2,-5 3,-14 3,-22.5 7,5 9,11.5 9,20.5 l -5,3 0,13 -8,7 -18,0 -8,-7 0,-13 -5,-3 c 0,-9 2,-15.5 9,-20.5 z M 64,37 c -3,0 -5.5,2.5 -5.5,5.5 0,3 2.5,5.5 5.5,5.5 3,0 5.5,-2.5 5.5,-5.5 C 69.5,39.5 67,37 64,37 z m -23,11.5 4,2.5 0,12.5 9,8.5 20,0 9,-8.5 0,-12.5 4,-2.5 2,1.5 0,9 -4,3 0,9 -9,9 -24,0 -9,-9 0,-9 -4,-3 0,-9 2,-1.5 z"/>
+	<path class="gametype lumatic" d="m 60,12 -17,4 -4,12 -9,1 -4,15 8,12 -4,14 6,36 4,-23 7,3 3,12 3,-10 6,0 5,28 5,-28 5,0 2,16 2,-17 5,-2 4,28 6,-38 6,-6 1,-15 L 92,42 98,26 82,14 64,16 60,12 z m 4,10 c 4,0 8,1 10,2 0.5,7 0,17.5 -1.5,25 L 69,54 59,54 55.5,49 C 54,41.5 53.5,31 54,24 c 2,-1 6,-2 10,-2 z m -13,4.5 c 0,8.5 1,17.5 3,22.5 -2,0 -4,2 -4,4.5 0,2.5 2,4.5 4.5,4.5 2,0 3,-0.5 4,-2 l 11,0 c 1,1.5 2,2 4,2 C 76,58 78,56 78,53.5 78,51 76,49 74,49 c 2,-5 3,-14 3,-22.5 7,5 9,11.5 9,20.5 l -5,3 0,13 -8,7 -18,0 -8,-7 0,-13 -5,-3 c 0,-9 2,-15.5 9,-20.5 z M 64,37 c -3,0 -5.5,2.5 -5.5,5.5 0,3 2.5,5.5 5.5,5.5 3,0 5.5,-2.5 5.5,-5.5 C 69.5,39.5 67,37 64,37 z m -23,11.5 4,2.5 0,12.5 9,8.5 20,0 9,-8.5 0,-12.5 4,-2.5 2,1.5 0,9 -4,3 0,9 -9,9 -24,0 -9,-9 0,-9 -4,-3 0,-9 2,-1.5 z"/>
 </svg>
diff --git a/gfx/luma/gfx/menu/luma/gametype_inf.svg b/gfx/luma/gfx/menu/luma/gametype_inf.svg
index d73b80f..06f4903 100644
--- a/gfx/luma/gfx/menu/luma/gametype_inf.svg
+++ b/gfx/luma/gfx/menu/luma/gametype_inf.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
-	<path class="gametype shining" d="m 18,73.1 c 0,-9.8 5.8,-19.4 16.5,-25 0,-18.4 10.5,-28.9 24.2,-30.3 -8.4,3 -14,10.2 -14,19.2 0,10.6 8.6,19.2 19.2,19.2 10.6,0 19.2,-8.6 19.2,-19.2 0,-9 -5.6,-16.2 -14,-19.2 C 83,19.2 93.5,29.7 93.5,48.1 104.2,53.7 110,63.4 110,73.1 c 0,4.1 -1,8 -2.4,10.8 0.2,-1 0.3,-2.6 0.3,-4.2 0,-11.2 -8.9,-20 -19.7,-20 -10.6,0 -19.2,8.6 -19.2,19.2 0,10.6 8.7,19.2 19.4,19.2 5.7,0 10.4,-2.2 13.7,-5.1 C 97.5,99.7 90.2,104 80.9,104 74.1,104 66.9,100.7 64,98.8 61.1,100.7 53.9,104 47.1,104 37.8,104 30.5,99.7 25.8,93.1 c 3.4,2.9 8,5.1 13.7,5.1 10.7,0 19.4,-8.6 19.4,-19.2 0,-10.6 -8.6,-19.2 -19.2,-19.2 -10.8,0 -19.7,8.9 -19.7,20 0,1.6 0.1,3.1 0.3,4.2 C 19,81.2 18,77.2 18,73.1 z m 18.5,-9.5 h 7 c 0,9.7 4.8,16.3 11.4,19.7 l -3.4,6.1 C 41.6,84.1 36.5,75.1 36.5,63.6 z M 49.1,42 c 4.3,-2.8 9.4,-4.4 14.9,-4.4 5.5,0 10.6,1.6 14.9,4.4 l -3.6,5.9 C 72.2,45.9 68.2,44.6 64,44.6 c -4.2,0 -8.2,1.3 -11.3,3.4 z m 9.1,22.9 c 0,3.3 2.6,5.8 5.8,5.8 3.3,0 5.8,-2.6 5.8,-5.8 0,-3.3 -2.6,-5.8 -5.8,-5.8 -3.3,0 -5.8,2.6 -5.8,5.8 z m 14.9,18.3 C 79.7,79.9 84.5,73.3 84.5,63.6 h 7 c 0,11.5 -5.1,20.5 -15,25.7 z"/>
+	<path class="gametype lumatic" d="m 18,73.1 c 0,-9.8 5.8,-19.4 16.5,-25 0,-18.4 10.5,-28.9 24.2,-30.3 -8.4,3 -14,10.2 -14,19.2 0,10.6 8.6,19.2 19.2,19.2 10.6,0 19.2,-8.6 19.2,-19.2 0,-9 -5.6,-16.2 -14,-19.2 C 83,19.2 93.5,29.7 93.5,48.1 104.2,53.7 110,63.4 110,73.1 c 0,4.1 -1,8 -2.4,10.8 0.2,-1 0.3,-2.6 0.3,-4.2 0,-11.2 -8.9,-20 -19.7,-20 -10.6,0 -19.2,8.6 -19.2,19.2 0,10.6 8.7,19.2 19.4,19.2 5.7,0 10.4,-2.2 13.7,-5.1 C 97.5,99.7 90.2,104 80.9,104 74.1,104 66.9,100.7 64,98.8 61.1,100.7 53.9,104 47.1,104 37.8,104 30.5,99.7 25.8,93.1 c 3.4,2.9 8,5.1 13.7,5.1 10.7,0 19.4,-8.6 19.4,-19.2 0,-10.6 -8.6,-19.2 -19.2,-19.2 -10.8,0 -19.7,8.9 -19.7,20 0,1.6 0.1,3.1 0.3,4.2 C 19,81.2 18,77.2 18,73.1 z m 18.5,-9.5 h 7 c 0,9.7 4.8,16.3 11.4,19.7 l -3.4,6.1 C 41.6,84.1 36.5,75.1 36.5,63.6 z M 49.1,42 c 4.3,-2.8 9.4,-4.4 14.9,-4.4 5.5,0 10.6,1.6 14.9,4.4 l -3.6,5.9 C 72.2,45.9 68.2,44.6 64,44.6 c -4.2,0 -8.2,1.3 -11.3,3.4 z m 9.1,22.9 c 0,3.3 2.6,5.8 5.8,5.8 3.3,0 5.8,-2.6 5.8,-5.8 0,-3.3 -2.6,-5.8 -5.8,-5.8 -3.3,0 -5.8,2.6 -5.8,5.8 z m 14.9,18.3 C 79.7,79.9 84.5,73.3 84.5,63.6 h 7 c 0,11.5 -5.1,20.5 -15,25.7 z"/>
 </svg>
diff --git a/gfx/luma/gfx/menu/luma/gametype_jb.svg b/gfx/luma/gfx/menu/luma/gametype_jb.svg
index 936c177..7471e64 100644
--- a/gfx/luma/gfx/menu/luma/gametype_jb.svg
+++ b/gfx/luma/gfx/menu/luma/gametype_jb.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
-	<path class="gametype shining" d="M 28,36 16,26 16,102 28,92 z m 3,-2 -12,-10 90,0 -12,10 -4,0 0,-3 C 91,26 81,26 79,31 l 0,3 -8,0 0,-3 C 69,26 59,26 57,31 l 0,3 -8,0 0,-3 C 47,26 37,26 35,31 l 0,3 z m 15,62 c -1,2 -7,2 -8,0 l 0,-64 c 1,-2 7,-2 8,0 z m 22,0 c -1,2 -7,2 -8,0 l 0,-64 c 1,-2 7,-2 8,0 z m 22,0 c -1,2 -7,2 -8,0 l 0,-64 c 1,-2 7,-2 8,0 z m 22,6 -12,-10 0,-56 12,-10 z m -81,-8 -12,10 90,0 -12,-10 -4,0 0,3 c -2,5 -12,5 -14,0 l 0,-3 -8,0 0,3 c -2,5 -12,5 -14,0 l 0,-3 -8,0 0,3 c -2,5 -12,5 -14,0 l 0,-3 z"/>
+	<path class="gametype lumatic" d="M 28,36 16,26 16,102 28,92 z m 3,-2 -12,-10 90,0 -12,10 -4,0 0,-3 C 91,26 81,26 79,31 l 0,3 -8,0 0,-3 C 69,26 59,26 57,31 l 0,3 -8,0 0,-3 C 47,26 37,26 35,31 l 0,3 z m 15,62 c -1,2 -7,2 -8,0 l 0,-64 c 1,-2 7,-2 8,0 z m 22,0 c -1,2 -7,2 -8,0 l 0,-64 c 1,-2 7,-2 8,0 z m 22,0 c -1,2 -7,2 -8,0 l 0,-64 c 1,-2 7,-2 8,0 z m 22,6 -12,-10 0,-56 12,-10 z m -81,-8 -12,10 90,0 -12,-10 -4,0 0,3 c -2,5 -12,5 -14,0 l 0,-3 -8,0 0,3 c -2,5 -12,5 -14,0 l 0,-3 -8,0 0,3 c -2,5 -12,5 -14,0 l 0,-3 z"/>
 </svg>
diff --git a/gfx/luma/gfx/menu/luma/gametype_ka.svg b/gfx/luma/gfx/menu/luma/gametype_ka.svg
index 463c0c2..f7169d1 100644
--- a/gfx/luma/gfx/menu/luma/gametype_ka.svg
+++ b/gfx/luma/gfx/menu/luma/gametype_ka.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
-	<path class="gametype shining" d="m 26.9,21.6 c -3.5,0 -5.3,1.9 -5.3,5.4 0,6.3 6.2,17.6 16.3,30.3 l 2,-5.3 c -5.8,-8.4 -7,-12.6 -7,-14.8 0,-1.9 1.1,-2.9 2.8,-2.9 8.1,0 25.9,14.1 40.7,29.5 -15.8,17.8 -37.9,36.4 -47.1,36.4 -1.7,0 -2.8,-0.9 -2.8,-3 0,-4.3 4.9,-12.7 12.8,-22.4 l -1.4,-4.1 c -10.2,12.7 -16.3,24 -16.3,30.3 0,3.5 1.8,5.4 5.1,5.4 11.9,0 35.5,-18.3 53.9,-38.1 11,12.1 19.5,24.2 19.5,30.4 0,1.7 -0.9,2.8 -3,2.8 -4.3,0 -12.7,-4.9 -22.4,-12.8 l -4,1.4 c 12.7,10.1 24,16.3 30.3,16.3 3.5,0 5.4,-1.8 5.4,-5.1 0,-8.5 -9.3,-23 -21.9,-37.3 12.5,-14.2 21.9,-28.6 21.9,-37.1 0,-3.5 -1.9,-5.3 -5.4,-5.3 -6.3,0 -17.6,6.2 -30.3,16.3 l 5.3,2 c 8.4,-5.8 12.7,-7 14.9,-7 1.9,0 2.9,1.1 2.9,2.8 0,5.1 -5.6,14 -13.5,23.6 C 61.9,39.6 38.7,21.6 26.9,21.6 z M 64.5,40 c 5.2,4.6 10.4,9.6 15.4,14.8 1.3,-1.6 2.5,-3.2 3.6,-4.8 -4.3,-5.9 -11.2,-9.9 -19,-10 z M 50,44.5 C 43.9,48.9 40,56 40,64 40,72.5 44.4,79.9 51,84.2 58.1,78.3 65.5,71 72.1,63.8 65.4,57 56.6,49.4 50,44.5 z M 80.5,72.7 C 75.3,78 70,83.3 64.5,88 72.7,87.8 79.9,83.5 84.1,77 82.9,75.6 81.7,74.1 80.4,72.7 z"/>
+	<path class="gametype lumatic" d="m 26.9,21.6 c -3.5,0 -5.3,1.9 -5.3,5.4 0,6.3 6.2,17.6 16.3,30.3 l 2,-5.3 c -5.8,-8.4 -7,-12.6 -7,-14.8 0,-1.9 1.1,-2.9 2.8,-2.9 8.1,0 25.9,14.1 40.7,29.5 -15.8,17.8 -37.9,36.4 -47.1,36.4 -1.7,0 -2.8,-0.9 -2.8,-3 0,-4.3 4.9,-12.7 12.8,-22.4 l -1.4,-4.1 c -10.2,12.7 -16.3,24 -16.3,30.3 0,3.5 1.8,5.4 5.1,5.4 11.9,0 35.5,-18.3 53.9,-38.1 11,12.1 19.5,24.2 19.5,30.4 0,1.7 -0.9,2.8 -3,2.8 -4.3,0 -12.7,-4.9 -22.4,-12.8 l -4,1.4 c 12.7,10.1 24,16.3 30.3,16.3 3.5,0 5.4,-1.8 5.4,-5.1 0,-8.5 -9.3,-23 -21.9,-37.3 12.5,-14.2 21.9,-28.6 21.9,-37.1 0,-3.5 -1.9,-5.3 -5.4,-5.3 -6.3,0 -17.6,6.2 -30.3,16.3 l 5.3,2 c 8.4,-5.8 12.7,-7 14.9,-7 1.9,0 2.9,1.1 2.9,2.8 0,5.1 -5.6,14 -13.5,23.6 C 61.9,39.6 38.7,21.6 26.9,21.6 z M 64.5,40 c 5.2,4.6 10.4,9.6 15.4,14.8 1.3,-1.6 2.5,-3.2 3.6,-4.8 -4.3,-5.9 -11.2,-9.9 -19,-10 z M 50,44.5 C 43.9,48.9 40,56 40,64 40,72.5 44.4,79.9 51,84.2 58.1,78.3 65.5,71 72.1,63.8 65.4,57 56.6,49.4 50,44.5 z M 80.5,72.7 C 75.3,78 70,83.3 64.5,88 72.7,87.8 79.9,83.5 84.1,77 82.9,75.6 81.7,74.1 80.4,72.7 z"/>
 </svg>
diff --git a/gfx/luma/gfx/menu/luma/gametype_kh.svg b/gfx/luma/gfx/menu/luma/gametype_kh.svg
index a7bd9bf..9c7afb1 100644
--- a/gfx/luma/gfx/menu/luma/gametype_kh.svg
+++ b/gfx/luma/gfx/menu/luma/gametype_kh.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
-	<path class="gametype shining" d="M 103.5,21 54.6,56.6 C 51.1,54.9 47.1,54 43,54 28.1,54 16,66.1 16,81 c 0,14.9 12.1,27 27,27 14.9,0 27,-12.1 27,-27 0,-0.8 0,-1.5 -0.1,-2.3 L 76.5,74 74,69.5 79,66 l -1,-6 4,-3 8,3.5 3,-2.5 -1,-6.5 4,-3 4,2 2.5,-1.5 -0.5,-4.5 3,-2.5 6,3 3,-2 L 112,26 67,58.5 65,55 110.5,22 z M 43,58 C 55.7,58 66,68.3 66,81 66,93.7 55.7,104 43,104 30.3,104 20,93.7 20,81 20,68.3 30.3,58 43,58 z m -0.5,3 C 31.2,61 22,70.2 22,81.5 22,92.8 31.2,102 42.5,102 53.8,102 63,92.8 63,81.5 63,70.2 53.8,61 42.5,61 z M 37,77 c 4.4,0 8,3.6 8,8 0,4.4 -3.6,8 -8,8 -4.4,0 -8,-3.6 -8,-8 0,-4.4 3.6,-8 8,-8 z"/>
+	<path class="gametype lumatic" d="M 103.5,21 54.6,56.6 C 51.1,54.9 47.1,54 43,54 28.1,54 16,66.1 16,81 c 0,14.9 12.1,27 27,27 14.9,0 27,-12.1 27,-27 0,-0.8 0,-1.5 -0.1,-2.3 L 76.5,74 74,69.5 79,66 l -1,-6 4,-3 8,3.5 3,-2.5 -1,-6.5 4,-3 4,2 2.5,-1.5 -0.5,-4.5 3,-2.5 6,3 3,-2 L 112,26 67,58.5 65,55 110.5,22 z M 43,58 C 55.7,58 66,68.3 66,81 66,93.7 55.7,104 43,104 30.3,104 20,93.7 20,81 20,68.3 30.3,58 43,58 z m -0.5,3 C 31.2,61 22,70.2 22,81.5 22,92.8 31.2,102 42.5,102 53.8,102 63,92.8 63,81.5 63,70.2 53.8,61 42.5,61 z M 37,77 c 4.4,0 8,3.6 8,8 0,4.4 -3.6,8 -8,8 -4.4,0 -8,-3.6 -8,-8 0,-4.4 3.6,-8 8,-8 z"/>
 </svg>
diff --git a/gfx/luma/gfx/menu/luma/gametype_lms.svg b/gfx/luma/gfx/menu/luma/gametype_lms.svg
index 6c4d499..aabc79e 100644
--- a/gfx/luma/gfx/menu/luma/gametype_lms.svg
+++ b/gfx/luma/gfx/menu/luma/gametype_lms.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
-	<path class="gametype shining" d="m 61.8,86.6 7.7,2.4 7.1,-0.6 -5.8,5 -2.7,15.7 -0.7,-16.1 z m -18.8,-55.2 -12.3,19 c -1.2,1.9 -1.5,3.3 -0.2,5.2 L 51,85.1 47,112 l 37,0 0,-23 10.2,-20.6 c 1.3,-2.7 1.6,-4.4 1.6,-10.2 l -12.2,12.6 -10.3,-5.3 -3.1,16.7 C 66.9,66.8 59.6,57.4 48.1,52.6 l 3.2,-6.3 c 13.2,7 18.1,-5 16,-6 l -20.6,-9.8 c -1.7,-0.8 -2.7,-0.8 -3.8,0.9 z m 49.1,13.2 -14.3,15.7 c -0.9,1 5,7 5.9,6.2 l 15,-13.5 c 1.3,-1.2 -5.6,-9.7 -6.6,-8.5 z M 82,32.5 68.2,51.4 c -0.8,1 7.5,8.3 8.2,7.5 l 15.3,-17 c 1.6,-1.7 -8.6,-10.9 -9.7,-9.4 z m -13.3,-10 -7.4,12.5 6.7,3.5 c 1.7,0.9 2.2,3.4 0.6,9.2 l 12,-17.4 c 1.3,-1.9 -10.8,-9.5 -11.9,-7.8 z m -14,-6.1 -6.8,12.3 11.5,5.4 7.1,-11.7 c 1.2,-1.9 -10.6,-7.9 -11.7,-6 z"/>
+	<path class="gametype lumatic" d="m 61.8,86.6 7.7,2.4 7.1,-0.6 -5.8,5 -2.7,15.7 -0.7,-16.1 z m -18.8,-55.2 -12.3,19 c -1.2,1.9 -1.5,3.3 -0.2,5.2 L 51,85.1 47,112 l 37,0 0,-23 10.2,-20.6 c 1.3,-2.7 1.6,-4.4 1.6,-10.2 l -12.2,12.6 -10.3,-5.3 -3.1,16.7 C 66.9,66.8 59.6,57.4 48.1,52.6 l 3.2,-6.3 c 13.2,7 18.1,-5 16,-6 l -20.6,-9.8 c -1.7,-0.8 -2.7,-0.8 -3.8,0.9 z m 49.1,13.2 -14.3,15.7 c -0.9,1 5,7 5.9,6.2 l 15,-13.5 c 1.3,-1.2 -5.6,-9.7 -6.6,-8.5 z M 82,32.5 68.2,51.4 c -0.8,1 7.5,8.3 8.2,7.5 l 15.3,-17 c 1.6,-1.7 -8.6,-10.9 -9.7,-9.4 z m -13.3,-10 -7.4,12.5 6.7,3.5 c 1.7,0.9 2.2,3.4 0.6,9.2 l 12,-17.4 c 1.3,-1.9 -10.8,-9.5 -11.9,-7.8 z m -14,-6.1 -6.8,12.3 11.5,5.4 7.1,-11.7 c 1.2,-1.9 -10.6,-7.9 -11.7,-6 z"/>
 </svg>
diff --git a/gfx/luma/gfx/menu/luma/gametype_nb.svg b/gfx/luma/gfx/menu/luma/gametype_nb.svg
index 0f31065..c9c5379 100644
--- a/gfx/luma/gfx/menu/luma/gametype_nb.svg
+++ b/gfx/luma/gfx/menu/luma/gametype_nb.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
-	<path class="gametype shining" d="M 62.5,20 C 51.9,20.4 42.3,24.5 34.9,31 l 13.6,0 14,-7.2 0,-3.8 z m 3,0 0,3.8 14,7.2 13.6,0 C 85.7,24.5 76.1,20.4 65.5,20 z M 31.8,34 c -4.5,4.8 -7.9,10.6 -9.9,17.1 l 7.5,13 L 42.1,62 51.9,45 47.7,34 31.8,34 z m 48.5,0 -4.2,11 10.6,18.3 11.3,1.8 8.1,-14 c -2,-6.5 -5.4,-12.3 -9.9,-17.1 l -15.9,0 z m -24.9,12.8 -10,17.4 9.2,15.8 18.8,0 9.2,-15.8 -10,-17.4 -17.2,0 z M 20.9,55.3 C 20.3,58.1 20,61 20,64 c 0,7.5 1.9,14.5 5.2,20.7 L 29,82.4 28.3,68.3 20.9,55.3 z m 86.2,0 -8,14 -0.6,12.8 4.3,2.6 c 3.3,-6.2 5.2,-13.2 5.2,-20.7 0,-3 -0.3,-5.9 -0.9,-8.7 z M 53.3,84 l -7.2,8.9 8,14 c 3.2,0.7 6.5,1.1 9.9,1.1 3.4,0 6.7,-0.4 9.9,-1.1 l 7.4,-13 -8,-9.9 -20,0 z M 31,84.8 26.7,87.3 C 32,95.8 40.2,102.4 50,105.7 L 41.9,91.7 31,84.8 z m 66.5,0.3 -12,7.6 -7.5,13 c 9.8,-3.3 18,-9.9 23.3,-18.4 l -3.8,-2.2 z"/>
+	<path class="gametype lumatic" d="M 62.5,20 C 51.9,20.4 42.3,24.5 34.9,31 l 13.6,0 14,-7.2 0,-3.8 z m 3,0 0,3.8 14,7.2 13.6,0 C 85.7,24.5 76.1,20.4 65.5,20 z M 31.8,34 c -4.5,4.8 -7.9,10.6 -9.9,17.1 l 7.5,13 L 42.1,62 51.9,45 47.7,34 31.8,34 z m 48.5,0 -4.2,11 10.6,18.3 11.3,1.8 8.1,-14 c -2,-6.5 -5.4,-12.3 -9.9,-17.1 l -15.9,0 z m -24.9,12.8 -10,17.4 9.2,15.8 18.8,0 9.2,-15.8 -10,-17.4 -17.2,0 z M 20.9,55.3 C 20.3,58.1 20,61 20,64 c 0,7.5 1.9,14.5 5.2,20.7 L 29,82.4 28.3,68.3 20.9,55.3 z m 86.2,0 -8,14 -0.6,12.8 4.3,2.6 c 3.3,-6.2 5.2,-13.2 5.2,-20.7 0,-3 -0.3,-5.9 -0.9,-8.7 z M 53.3,84 l -7.2,8.9 8,14 c 3.2,0.7 6.5,1.1 9.9,1.1 3.4,0 6.7,-0.4 9.9,-1.1 l 7.4,-13 -8,-9.9 -20,0 z M 31,84.8 26.7,87.3 C 32,95.8 40.2,102.4 50,105.7 L 41.9,91.7 31,84.8 z m 66.5,0.3 -12,7.6 -7.5,13 c 9.8,-3.3 18,-9.9 23.3,-18.4 l -3.8,-2.2 z"/>
 </svg>
diff --git a/gfx/luma/gfx/menu/luma/gametype_ons.svg b/gfx/luma/gfx/menu/luma/gametype_ons.svg
index 1b11c66..e11c2de 100644
--- a/gfx/luma/gfx/menu/luma/gametype_ons.svg
+++ b/gfx/luma/gfx/menu/luma/gametype_ons.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
-	<path class="gametype shining" d="m 86,20 -1.7,7.6 c -2.1,0.5 -4,1.3 -5.8,2.4 l -6.5,-4.2 -4.3,4.3 4.2,6.5 c -1.1,1.8 -1.9,3.7 -2.4,5.8 L 62,44 l 0,6 7.6,1.7 c 0.5,2.1 1.3,4 2.4,5.8 l -4.2,6.5 4.3,4.3 6.5,-4.2 c 1.8,1.1 3.7,1.9 5.8,2.4 l 1.6,7.5 6,0 1.7,-7.6 c 2.1,-0.5 4,-1.3 5.8,-2.4 l 6.5,4.2 4.3,-4.3 -4.2,-6.5 c 1.1,-1.8 1.9,-3.7 2.4,-5.8 l 7.5,-1.6 0,-6 -7.6,-1.7 c -0.5,-2.1 -1.3,-4 -2.4,-5.8 l 4.2,-6.5 -4.3,-4.3 -6.5,4.2 C 97.6,28.8 95.7,28 93.6,27.5 L 92,20 86,20 z m 3,12 c 8.3,0 15,6.7 15,15 0,8.3 -6.7,15 -15,15 -8.3,0 -15,-6.7 -15,-15 0,-8.3 6.7,-15 15,-15 z m 0,5 c -5.5,0 -10,4.5 -10,10 0,5.5 4.5,10 10,10 5.5,0 10,-4.5 10,-10 0,-5.5 -4.5,-10 -10,-10 z m 0,3 c 3.9,0 7,3.1 7,7 0,3.9 -3.1,7 -7,7 -3.9,0 -7,-3.1 -7,-7 0,-3.9 3.1,-7 7,-7 z m -48.5,6 -2.2,8.7 c -2.4,0.6 -4.7,1.5 -6.8,2.8 l -7.7,-4.6 -4.9,4.9 4.6,7.7 c -1.3,2.1 -2.2,4.4 -2.8,6.8 l -8.7,2.2 0,7 8.7,2.2 c 0.6,2.4 1.5,4.7 2.8,6.8 l -4.6,7.7 4.9,4.9 7.7,-4.6 c 2.1,1.3 4.4,2.2 6.8,2.8 l 2.2,8.7 7,0 2.2,-8.7 c 2.4,-0.6 4.7,-1.5 6.8,-2.8 l 7.7,4.6 4.9,-4.9 -4.6,-7.7 c 1.3,-2.1 2.2,-4.4 2.8,-6.8 l 8.7,-2.2 0,-7 -8.7,-2.2 c -0.6,-2.4 -1.5,-4.7 -2.8,-6.8 l 4.6,-7.7 -4.9,-4.9 -7.7,4.6 c -2.1,-1.3 -4.4,-2.2 -6.8,-2.8 l -2.2,-8.7 -7,0 z M 44,60 c 9.9,0 18,8.1 18,18 0,9.9 -8.1,18 -18,18 -9.9,0 -18,-8.1 -18,-18 0,-9.9 8.1,-18 18,-18 z m 0,6 c -6.6,0 -12,5.4 -12,12 0,6.6 5.4,12 12,12 6.6,0 12,-5.4 12,-12 0,-6.6 -5.4,-12 -12,-12 z m 0,4 c 4.4,0 8,3.6 8,8 0,4.4 -3.6,8 -8,8 -4.4,0 -8,-3.6 -8,-8 0,-4.4 3.6,-8 8,-8 z"/>
+	<path class="gametype lumatic" d="m 86,20 -1.7,7.6 c -2.1,0.5 -4,1.3 -5.8,2.4 l -6.5,-4.2 -4.3,4.3 4.2,6.5 c -1.1,1.8 -1.9,3.7 -2.4,5.8 L 62,44 l 0,6 7.6,1.7 c 0.5,2.1 1.3,4 2.4,5.8 l -4.2,6.5 4.3,4.3 6.5,-4.2 c 1.8,1.1 3.7,1.9 5.8,2.4 l 1.6,7.5 6,0 1.7,-7.6 c 2.1,-0.5 4,-1.3 5.8,-2.4 l 6.5,4.2 4.3,-4.3 -4.2,-6.5 c 1.1,-1.8 1.9,-3.7 2.4,-5.8 l 7.5,-1.6 0,-6 -7.6,-1.7 c -0.5,-2.1 -1.3,-4 -2.4,-5.8 l 4.2,-6.5 -4.3,-4.3 -6.5,4.2 C 97.6,28.8 95.7,28 93.6,27.5 L 92,20 86,20 z m 3,12 c 8.3,0 15,6.7 15,15 0,8.3 -6.7,15 -15,15 -8.3,0 -15,-6.7 -15,-15 0,-8.3 6.7,-15 15,-15 z m 0,5 c -5.5,0 -10,4.5 -10,10 0,5.5 4.5,10 10,10 5.5,0 10,-4.5 10,-10 0,-5.5 -4.5,-10 -10,-10 z m 0,3 c 3.9,0 7,3.1 7,7 0,3.9 -3.1,7 -7,7 -3.9,0 -7,-3.1 -7,-7 0,-3.9 3.1,-7 7,-7 z m -48.5,6 -2.2,8.7 c -2.4,0.6 -4.7,1.5 -6.8,2.8 l -7.7,-4.6 -4.9,4.9 4.6,7.7 c -1.3,2.1 -2.2,4.4 -2.8,6.8 l -8.7,2.2 0,7 8.7,2.2 c 0.6,2.4 1.5,4.7 2.8,6.8 l -4.6,7.7 4.9,4.9 7.7,-4.6 c 2.1,1.3 4.4,2.2 6.8,2.8 l 2.2,8.7 7,0 2.2,-8.7 c 2.4,-0.6 4.7,-1.5 6.8,-2.8 l 7.7,4.6 4.9,-4.9 -4.6,-7.7 c 1.3,-2.1 2.2,-4.4 2.8,-6.8 l 8.7,-2.2 0,-7 -8.7,-2.2 c -0.6,-2.4 -1.5,-4.7 -2.8,-6.8 l 4.6,-7.7 -4.9,-4.9 -7.7,4.6 c -2.1,-1.3 -4.4,-2.2 -6.8,-2.8 l -2.2,-8.7 -7,0 z M 44,60 c 9.9,0 18,8.1 18,18 0,9.9 -8.1,18 -18,18 -9.9,0 -18,-8.1 -18,-18 0,-9.9 8.1,-18 18,-18 z m 0,6 c -6.6,0 -12,5.4 -12,12 0,6.6 5.4,12 12,12 6.6,0 12,-5.4 12,-12 0,-6.6 -5.4,-12 -12,-12 z m 0,4 c 4.4,0 8,3.6 8,8 0,4.4 -3.6,8 -8,8 -4.4,0 -8,-3.6 -8,-8 0,-4.4 3.6,-8 8,-8 z"/>
 </svg>
diff --git a/gfx/luma/gfx/menu/luma/gametype_rc.svg b/gfx/luma/gfx/menu/luma/gametype_rc.svg
index 5687374..6c82fb6 100644
--- a/gfx/luma/gfx/menu/luma/gametype_rc.svg
+++ b/gfx/luma/gfx/menu/luma/gametype_rc.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
-	<path class="gametype shining" d="m 97,16 c -6.2,5.8 -13.7,8.2 -22,10 l 5.1,18.9 c 2.6,-0.5 4.7,-1.1 7.8,-2.3 L 82.3,27.3 c 5.5,-1.5 9.5,-3.5 13.4,-6.3 l 5.7,14.2 c -4.8,3.8 -8.7,5.8 -13.5,7.4 L 94,59.5 c 6.1,-2.8 9.8,-5.4 13.5,-9 l 5.2,13.2 c -2.8,3.8 -8.4,7.8 -13.4,10.4 L 94,59.5 c -2.3,1.2 -6.1,2.7 -9,3.5 L 65,18 c -17,-1 -31,4 -41,13 L 48,92 C 57,80 78,67 85,67 90,67 87,73 81,79.1 90,65.5 76,72 71,77.5 77,91 110,75 116,64 L 97,16 z m -34,5 6,13 c -6.5,0.5 -13,2 -18,4 L 59,56.5 c 4.9,-2.1 11.9,-4.5 17.5,-5.2 L 82.3,64.3 c -5.2,1.2 -12.4,5.3 -16.6,8.2 L 59,56.5 c -6,3 -12,6.4 -17.5,11 L 34,48 c 5,-4 10,-7 17,-10 l -6,-15 c 6,-2 12,-2 18,-2 z m -42.5,9 -4.5,2 L 44,112 l 7.5,-3 -31,-79 z"/>
+	<path class="gametype lumatic" d="m 97,16 c -6.2,5.8 -13.7,8.2 -22,10 l 5.1,18.9 c 2.6,-0.5 4.7,-1.1 7.8,-2.3 L 82.3,27.3 c 5.5,-1.5 9.5,-3.5 13.4,-6.3 l 5.7,14.2 c -4.8,3.8 -8.7,5.8 -13.5,7.4 L 94,59.5 c 6.1,-2.8 9.8,-5.4 13.5,-9 l 5.2,13.2 c -2.8,3.8 -8.4,7.8 -13.4,10.4 L 94,59.5 c -2.3,1.2 -6.1,2.7 -9,3.5 L 65,18 c -17,-1 -31,4 -41,13 L 48,92 C 57,80 78,67 85,67 90,67 87,73 81,79.1 90,65.5 76,72 71,77.5 77,91 110,75 116,64 L 97,16 z m -34,5 6,13 c -6.5,0.5 -13,2 -18,4 L 59,56.5 c 4.9,-2.1 11.9,-4.5 17.5,-5.2 L 82.3,64.3 c -5.2,1.2 -12.4,5.3 -16.6,8.2 L 59,56.5 c -6,3 -12,6.4 -17.5,11 L 34,48 c 5,-4 10,-7 17,-10 l -6,-15 c 6,-2 12,-2 18,-2 z m -42.5,9 -4.5,2 L 44,112 l 7.5,-3 -31,-79 z"/>
 </svg>
diff --git a/gfx/luma/gfx/menu/luma/gametype_tdm.svg b/gfx/luma/gfx/menu/luma/gametype_tdm.svg
index 39b3a92..c75ae8c 100644
--- a/gfx/luma/gfx/menu/luma/gametype_tdm.svg
+++ b/gfx/luma/gfx/menu/luma/gametype_tdm.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
-	<path class="gametype shining" d="m 40.5,22 c -2.4,0 -4.8,0.6 -6,1.2 -0.3,4.3 0,10.6 0.9,15.1 l 2.1,3 6,0 2.1,-3 C 46.5,33.8 46.8,27.5 46.5,23.2 45.3,22.6 42.9,22 40.5,22 z m -7.9,2.7 c -4.2,3 -5.4,7 -5.4,12.4 l 3,1.8 0,7.9 4.9,4.2 10.8,0 4.9,-4.2 0,-7.9 3,-1.8 c 0,-5.4 -1.2,-9.4 -5.4,-12.4 0,5.2 -0.7,10.6 -1.9,13.6 1.2,0 2.5,1.2 2.5,2.7 0,1.5 -1.2,2.8 -2.7,2.8 -1.3,0 -1.9,-0.3 -2.5,-1.2 l -6.6,0 c -0.6,0.9 -1.2,1.2 -2.4,1.2 -1.6,0 -2.8,-1.3 -2.8,-2.8 0,-1.5 1.3,-2.7 2.5,-2.7 -1.2,-3 -1.9,-8.4 -1.9,-13.6 z m 7.9,6.4 c 1.8,0 3.3,1.5 3.3,3.3 0,1.8 -1.5,3.3 -3.3,3.3 -1.8,0 -3.3,-1.5 -3.3,-3.3 0,-1.8 1.5,-3.3 3.3,-3.3 z M 76,32 c -3.3,0 -6.5,0.8 -8.1,1.6 -0.4,5.7 0,14.3 1.2,20.4 l 2.8,4 8.2,0 2.8,-4 C 84.1,47.9 84.5,39.3 84.1,33.6 82.5,32.8 79.3,32 76,32 z m -10.6,3.7 c -5.7,4 -7.3,9.3 -7.3,16.6 l 4.1,2.5 0,10.6 6.5,5.7 14.6,0 6.5,-5.7 0,-10.6 4.1,-2.5 c 0,-7.3 -1.6,-12.6 -7.3,-16.6 0,6.9 -0.8,14.2 -2.5,18.3 1.7,0 3.3,1.6 3.3,3.6 0,2.1 -1.6,3.7 -3.7,3.7 -1.6,0 -2.4,-0.4 -3.2,-1.6 l -9,0 c -0.8,1.2 -1.6,1.6 -3.2,1.6 -2.1,0 -3.7,-1.6 -3.7,-3.7 0,-2 1.6,-3.6 3.3,-3.6 -1.7,-4.1 -2.5,-11.4 -2.5,-18.3 z m -38.8,2.3 -1.2,0.9 0,5.5 2.4,1.8 0,5.4 5.5,5.5 14.5,0 5.4,-5.5 0,-5.4 2.4,-1.8 0,-5.5 -1.2,-0.9 -2.4,1.5 0,7.6 -5.5,5.1 -12,0 L 29,47.1 29,39.5 26.6,38 z M 76,44.2 c 2.4,0 4.5,2 4.5,4.5 0,2.4 -2.1,4.5 -4.5,4.5 -2.4,0 -4.5,-2.1 -4.5,-4.5 0,-2.5 2.1,-4.5 4.5,-4.5 z m -49.7,8.3 -4.5,0.6 -1.9,7 c 1.2,3.6 7.3,6 12.1,6 l 0.6,-7.2 C 24.2,56.5 21.8,54.6 27.8,54 l -1.5,-1.5 z m 31,1.1 -1.6,1.2 0,7.3 3.2,2.5 0,7.3 7.3,7.3 19.6,0 7.3,-7.3 0,-7.3 3.2,-2.5 0,-7.3 -1.6,-1.2 -3.2,2 0,10.2 -7.4,6.9 -16.2,0 -7.4,-6.9 0,-10.2 -3.2,-2 z m -5.2,4.1 c -1.1,0.4 -2.3,0.8 -3.7,1.2 l 0.6,7.2 c 2,0 4.3,-0.4 6.3,-1.2 l -2,-1.5 -1.2,-0.9 0,-1.5 0,-3.3 z M 33.8,60.1 33.3,68 C 29,68 21.7,66.8 18.7,61.3 c -6.6,1.8 -9.6,7.2 -9.6,11.5 6,-3.6 10.2,-3 16.9,-3 l 4.8,4.2 15.9,0 0.5,-1.7 0.5,-1.9 2,-0.2 5.7,-0.8 0,-2.7 c -2.7,1 -5.6,1.3 -7.6,1.3 l -0.6,-7.9 -13.4,0 z m 23.1,13 -6.1,0.8 -2.5,9.4 c 1.6,4.9 9.8,8.1 16.3,8.1 l 0.8,-9.7 C 54,78.4 50.8,75.9 58.9,75.1 l -2,-2 z m 38.2,0 -2,2 c 8.1,0.8 4.9,3.3 -6.5,6.6 l 0.8,9.7 c 6.5,0 14.7,-3.2 16.3,-8.1 l -2.5,-9.4 -6.1,-0.8 z M 67,83.3 66.2,93.9 c -5.7,0 -15.4,-1.7 -19.5,-9 -9,2.4 -13,9.8 -13,15.5 8.1,-4.9 13.8,-4.1 22.8,-4.1 l 6.5,5.7 26,0 6.5,-5.7 c 9,0 14.7,-0.8 22.8,4.1 0,-5.7 -4,-13.1 -13,-15.5 -4.1,7.3 -13.8,9 -19.5,9 L 85,83.3 l -18,0 z"/>
+	<path class="gametype lumatic" d="m 40.5,22 c -2.4,0 -4.8,0.6 -6,1.2 -0.3,4.3 0,10.6 0.9,15.1 l 2.1,3 6,0 2.1,-3 C 46.5,33.8 46.8,27.5 46.5,23.2 45.3,22.6 42.9,22 40.5,22 z m -7.9,2.7 c -4.2,3 -5.4,7 -5.4,12.4 l 3,1.8 0,7.9 4.9,4.2 10.8,0 4.9,-4.2 0,-7.9 3,-1.8 c 0,-5.4 -1.2,-9.4 -5.4,-12.4 0,5.2 -0.7,10.6 -1.9,13.6 1.2,0 2.5,1.2 2.5,2.7 0,1.5 -1.2,2.8 -2.7,2.8 -1.3,0 -1.9,-0.3 -2.5,-1.2 l -6.6,0 c -0.6,0.9 -1.2,1.2 -2.4,1.2 -1.6,0 -2.8,-1.3 -2.8,-2.8 0,-1.5 1.3,-2.7 2.5,-2.7 -1.2,-3 -1.9,-8.4 -1.9,-13.6 z m 7.9,6.4 c 1.8,0 3.3,1.5 3.3,3.3 0,1.8 -1.5,3.3 -3.3,3.3 -1.8,0 -3.3,-1.5 -3.3,-3.3 0,-1.8 1.5,-3.3 3.3,-3.3 z M 76,32 c -3.3,0 -6.5,0.8 -8.1,1.6 -0.4,5.7 0,14.3 1.2,20.4 l 2.8,4 8.2,0 2.8,-4 C 84.1,47.9 84.5,39.3 84.1,33.6 82.5,32.8 79.3,32 76,32 z m -10.6,3.7 c -5.7,4 -7.3,9.3 -7.3,16.6 l 4.1,2.5 0,10.6 6.5,5.7 14.6,0 6.5,-5.7 0,-10.6 4.1,-2.5 c 0,-7.3 -1.6,-12.6 -7.3,-16.6 0,6.9 -0.8,14.2 -2.5,18.3 1.7,0 3.3,1.6 3.3,3.6 0,2.1 -1.6,3.7 -3.7,3.7 -1.6,0 -2.4,-0.4 -3.2,-1.6 l -9,0 c -0.8,1.2 -1.6,1.6 -3.2,1.6 -2.1,0 -3.7,-1.6 -3.7,-3.7 0,-2 1.6,-3.6 3.3,-3.6 -1.7,-4.1 -2.5,-11.4 -2.5,-18.3 z m -38.8,2.3 -1.2,0.9 0,5.5 2.4,1.8 0,5.4 5.5,5.5 14.5,0 5.4,-5.5 0,-5.4 2.4,-1.8 0,-5.5 -1.2,-0.9 -2.4,1.5 0,7.6 -5.5,5.1 -12,0 L 29,47.1 29,39.5 26.6,38 z M 76,44.2 c 2.4,0 4.5,2 4.5,4.5 0,2.4 -2.1,4.5 -4.5,4.5 -2.4,0 -4.5,-2.1 -4.5,-4.5 0,-2.5 2.1,-4.5 4.5,-4.5 z m -49.7,8.3 -4.5,0.6 -1.9,7 c 1.2,3.6 7.3,6 12.1,6 l 0.6,-7.2 C 24.2,56.5 21.8,54.6 27.8,54 l -1.5,-1.5 z m 31,1.1 -1.6,1.2 0,7.3 3.2,2.5 0,7.3 7.3,7.3 19.6,0 7.3,-7.3 0,-7.3 3.2,-2.5 0,-7.3 -1.6,-1.2 -3.2,2 0,10.2 -7.4,6.9 -16.2,0 -7.4,-6.9 0,-10.2 -3.2,-2 z m -5.2,4.1 c -1.1,0.4 -2.3,0.8 -3.7,1.2 l 0.6,7.2 c 2,0 4.3,-0.4 6.3,-1.2 l -2,-1.5 -1.2,-0.9 0,-1.5 0,-3.3 z M 33.8,60.1 33.3,68 C 29,68 21.7,66.8 18.7,61.3 c -6.6,1.8 -9.6,7.2 -9.6,11.5 6,-3.6 10.2,-3 16.9,-3 l 4.8,4.2 15.9,0 0.5,-1.7 0.5,-1.9 2,-0.2 5.7,-0.8 0,-2.7 c -2.7,1 -5.6,1.3 -7.6,1.3 l -0.6,-7.9 -13.4,0 z m 23.1,13 -6.1,0.8 -2.5,9.4 c 1.6,4.9 9.8,8.1 16.3,8.1 l 0.8,-9.7 C 54,78.4 50.8,75.9 58.9,75.1 l -2,-2 z m 38.2,0 -2,2 c 8.1,0.8 4.9,3.3 -6.5,6.6 l 0.8,9.7 c 6.5,0 14.7,-3.2 16.3,-8.1 l -2.5,-9.4 -6.1,-0.8 z M 67,83.3 66.2,93.9 c -5.7,0 -15.4,-1.7 -19.5,-9 -9,2.4 -13,9.8 -13,15.5 8.1,-4.9 13.8,-4.1 22.8,-4.1 l 6.5,5.7 26,0 6.5,-5.7 c 9,0 14.7,-0.8 22.8,4.1 0,-5.7 -4,-13.1 -13,-15.5 -4.1,7.3 -13.8,9 -19.5,9 L 85,83.3 l -18,0 z"/>
 </svg>
diff --git a/gfx/luma/gfx/menu/luma/gametype_vip.svg b/gfx/luma/gfx/menu/luma/gametype_vip.svg
index b8cb4b9..605a21f 100644
--- a/gfx/luma/gfx/menu/luma/gametype_vip.svg
+++ b/gfx/luma/gfx/menu/luma/gametype_vip.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="common.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" version="1.1">
-	<path class="gametype shining" d="M 60,24 51,67 37,70 18.5,43.5 16,45 l 13,36 23,8 7,11 10,0 7,-11 23,-8 13,-36 -2.5,-1.5 L 91,70 77,67 68,24 z M 41,46 38.5,46.5 40,67 48,65 z m 46,0 -7,19 8,2 1.5,-20.5 z m -60,37.5 0,4 C 32,93 44,98 53.5,99 L 49,91.5 z m 74,0 -22,8 -4.5,7.5 C 84,98 96,93 101,87.5 z"/>
+	<path class="gametype lumatic" d="M 60,24 51,67 37,70 18.5,43.5 16,45 l 13,36 23,8 7,11 10,0 7,-11 23,-8 13,-36 -2.5,-1.5 L 91,70 77,67 68,24 z M 41,46 38.5,46.5 40,67 48,65 z m 46,0 -7,19 8,2 1.5,-20.5 z m -60,37.5 0,4 C 32,93 44,98 53.5,99 L 49,91.5 z m 74,0 -22,8 -4.5,7.5 C 84,98 96,93 101,87.5 z"/>
 </svg>
diff --git a/gfx/luma/gfx/menu/luma/tab_c.svg b/gfx/luma/gfx/menu/luma/tab_c.svg
index 2229a70..ce35832 100644
--- a/gfx/luma/gfx/menu/luma/tab_c.svg
+++ b/gfx/luma/gfx/menu/luma/tab_c.svg
@@ -2,7 +2,6 @@
 <?xml-stylesheet href="common_c.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="256" height="64">
 	<path class="button" d="M 27,6 9,59 247,59 229,6 z"/>
-	<path class="stripes blurred" d="m 24,11 0,4 208,0 0,-4 z m -3,8 0,4 214,0 0,-4 z m -3,8 0,4 220,0 0,-4 z m -3,8 0,4 226,0 0,-4 z m -2,8 0,4 230,0 0,-4 z m 0,8 0,4 230,0 0,-4 z"/>
 	<g class="glowing">
 		<path class="frame" d="M 26,4 C 24.5,4 23.5,4.5 22.5,6.5 L 21,10.5 22,12 9.5,45 7,45.5 4,53 l 3,7 242,0 3,-7 -3,-7.5 -2.5,-0.5 -12.5,-33 1,-1.5 -1.5,-4 c -1,-2 -2,-2.5 -3.5,-2.5 z m 2,4 200,0 12,36 -4,14 -216,0 -4,-14 z"/>
 		<path class="detail" d="m 20,12 -10,3 -5,25.5 3,3 z m 216,0 12,31.5 3,-3 -5,-25.5 z"/>
diff --git a/gfx/luma/gfx/menu/luma/tab_d.svg b/gfx/luma/gfx/menu/luma/tab_d.svg
index 86719a2..6f22a76 100644
--- a/gfx/luma/gfx/menu/luma/tab_d.svg
+++ b/gfx/luma/gfx/menu/luma/tab_d.svg
@@ -2,7 +2,6 @@
 <?xml-stylesheet href="common_d.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="256" height="64">
 	<path class="button" d="M 27,6 9,59 247,59 229,6 z"/>
-	<path class="stripes blurred" d="m 24,11 0,4 208,0 0,-4 z m -3,8 0,4 214,0 0,-4 z m -3,8 0,4 220,0 0,-4 z m -3,8 0,4 226,0 0,-4 z m -2,8 0,4 230,0 0,-4 z m 0,8 0,4 230,0 0,-4 z"/>
 	<g class="glowing">
 		<path class="frame" d="M 26,4 C 24.5,4 23.5,4.5 22.5,6.5 L 21,10.5 22,12 9.5,45 7,45.5 4,53 l 3,7 242,0 3,-7 -3,-7.5 -2.5,-0.5 -12.5,-33 1,-1.5 -1.5,-4 c -1,-2 -2,-2.5 -3.5,-2.5 z m 2,4 200,0 12,36 -4,14 -216,0 -4,-14 z"/>
 		<path class="detail" d="m 20,12 -10,3 -5,25.5 3,3 z m 216,0 12,31.5 3,-3 -5,-25.5 z"/>
diff --git a/gfx/luma/gfx/menu/luma/tab_f.svg b/gfx/luma/gfx/menu/luma/tab_f.svg
index 4b640db..9d9fadf 100644
--- a/gfx/luma/gfx/menu/luma/tab_f.svg
+++ b/gfx/luma/gfx/menu/luma/tab_f.svg
@@ -2,7 +2,6 @@
 <?xml-stylesheet href="common_f.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="256" height="64">
 	<path class="button" d="M 27,6 9,59 247,59 229,6 z"/>
-	<path class="stripes blurred" d="m 24,11 0,4 208,0 0,-4 z m -3,8 0,4 214,0 0,-4 z m -3,8 0,4 220,0 0,-4 z m -3,8 0,4 226,0 0,-4 z m -2,8 0,4 230,0 0,-4 z m 0,8 0,4 230,0 0,-4 z"/>
 	<g class="glowing">
 		<path class="frame" d="M 26,4 C 24.5,4 23.5,4.5 22.5,6.5 L 21,10.5 22,12 9.5,45 7,45.5 4,53 l 3,7 242,0 3,-7 -3,-7.5 -2.5,-0.5 -12.5,-33 1,-1.5 -1.5,-4 c -1,-2 -2,-2.5 -3.5,-2.5 z m 2,4 200,0 12,36 -4,14 -216,0 -4,-14 z"/>
 		<path class="detail" d="m 20,12 -10,3 -5,25.5 3,3 z m 216,0 12,31.5 3,-3 -5,-25.5 z"/>
diff --git a/gfx/luma/gfx/menu/luma/tab_n.svg b/gfx/luma/gfx/menu/luma/tab_n.svg
index 976b321..30a0f0b 100644
--- a/gfx/luma/gfx/menu/luma/tab_n.svg
+++ b/gfx/luma/gfx/menu/luma/tab_n.svg
@@ -2,7 +2,6 @@
 <?xml-stylesheet href="common_n.css" type="text/css"?>
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="256" height="64">
 	<path class="button" d="M 27,6 9,59 247,59 229,6 z"/>
-	<path class="stripes blurred" d="m 24,11 0,4 208,0 0,-4 z m -3,8 0,4 214,0 0,-4 z m -3,8 0,4 220,0 0,-4 z m -3,8 0,4 226,0 0,-4 z m -2,8 0,4 230,0 0,-4 z m 0,8 0,4 230,0 0,-4 z"/>
 	<g class="glowing">
 		<path class="frame" d="M 26,4 C 24.5,4 23.5,4.5 22.5,6.5 L 21,10.5 22,12 9.5,45 7,45.5 4,53 l 3,7 242,0 3,-7 -3,-7.5 -2.5,-0.5 -12.5,-33 1,-1.5 -1.5,-4 c -1,-2 -2,-2.5 -3.5,-2.5 z m 2,4 200,0 12,36 -4,14 -216,0 -4,-14 z"/>
 		<path class="detail" d="m 20,12 -10,3 -5,25.5 3,3 z m 216,0 12,31.5 3,-3 -5,-25.5 z"/>
diff --git a/gfx/luma/render-version.sh b/gfx/luma/render-version.sh
index 6ea3e1d..859b39c 100755
--- a/gfx/luma/render-version.sh
+++ b/gfx/luma/render-version.sh
@@ -38,8 +38,8 @@ fi
 
 data="$1"
 version="$2"
-layers="gfx/menu/luminos/background_l2.svg
-        gfx/menu/luminos/background_ingame_l2.svg"
+layers="gfx/menu/luma/background_l2.svg
+        gfx/menu/luma/background_ingame_l2.svg"
 
 
 for svg in $layers; do
@@ -47,6 +47,6 @@ for svg in $layers; do
 	tga="$data/${svg%.*}.tga"
 
 	mkdir -p "$dir"
-	sed "s/LUMINOS/$version/g" "$svg" | rsvg-convert -z 2 |\
+	sed "s/LUMA/$version/g" "$svg" | rsvg-convert -z 2 |\
 		convert - -scale "50%" -gaussian-blur "4x0.7" "$tga"
 done