From 0f2551038e66440005bc76ec99357a9b1fc5e7bb Mon Sep 17 00:00:00 2001
From: shadash <sophiahadash@gmail.com>
Date: Tue, 26 Oct 2021 23:16:53 +0200
Subject: [PATCH] fix 21:9, add gamelistInfo

Signed-off-by: Sophia Hadash <sophiahadash@gmail.com>
---
 .../{light => }/controllers/classic.svg       |   1 +
 .../{light => }/controllers/dualshock4.svg    |   1 +
 .../{light => }/controllers/generic.svg       |   1 +
 .../assets/{light => }/controllers/gun.svg    |   1 +
 .../{light => }/controllers/joycon-left.svg   |   3 +-
 .../{light => }/controllers/joycon-pair.svg   |   4 +-
 .../controllers/joystick-arcade.svg           |   1 +
 .../{light => }/controllers/joystick.svg      |   1 +
 .../controllers/keyboard-mouse.svg            |   3 +-
 .../{light => }/controllers/keyboard.svg      |   2 +-
 .../assets/{light => }/controllers/mouse.svg  |   2 +-
 .../assets/{light => }/controllers/n64.svg    |  31 ++--
 .../assets/controllers/trackball.svg          | 159 ++++++++++++++++++
 .../assets/{light => }/controllers/wheel.svg  |   1 +
 .../controllers/wiimote-nunchuck.svg          |   1 +
 .../{light => }/controllers/wiimote.svg       |   1 +
 .../assets/{light => }/controllers/xbox.svg   |   1 +
 themes/modern-DE/settings/16_9.xml            |   7 +
 themes/modern-DE/settings/21_9.xml            |  99 +++++++++++
 themes/modern-DE/settings/4_3.xml             |   7 +
 themes/modern-DE/settings/dark.xml            |   4 +
 themes/modern-DE/settings/light.xml           |  26 ---
 themes/modern-DE/theme.xml                    |  38 ++++-
 .../modern-DE/variants/dark21_9/default.xml   |  14 ++
 .../modern-DE/variants/light21_9/default.xml  |  14 ++
 25 files changed, 378 insertions(+), 45 deletions(-)
 rename themes/modern-DE/assets/{light => }/controllers/classic.svg (99%)
 rename themes/modern-DE/assets/{light => }/controllers/dualshock4.svg (99%)
 rename themes/modern-DE/assets/{light => }/controllers/generic.svg (99%)
 rename themes/modern-DE/assets/{light => }/controllers/gun.svg (99%)
 rename themes/modern-DE/assets/{light => }/controllers/joycon-left.svg (98%)
 rename themes/modern-DE/assets/{light => }/controllers/joycon-pair.svg (98%)
 rename themes/modern-DE/assets/{light => }/controllers/joystick-arcade.svg (99%)
 rename themes/modern-DE/assets/{light => }/controllers/joystick.svg (99%)
 rename themes/modern-DE/assets/{light => }/controllers/keyboard-mouse.svg (98%)
 rename themes/modern-DE/assets/{light => }/controllers/keyboard.svg (99%)
 rename themes/modern-DE/assets/{light => }/controllers/mouse.svg (98%)
 rename themes/modern-DE/assets/{light => }/controllers/n64.svg (95%)
 create mode 100644 themes/modern-DE/assets/controllers/trackball.svg
 rename themes/modern-DE/assets/{light => }/controllers/wheel.svg (99%)
 rename themes/modern-DE/assets/{light => }/controllers/wiimote-nunchuck.svg (99%)
 rename themes/modern-DE/assets/{light => }/controllers/wiimote.svg (99%)
 rename themes/modern-DE/assets/{light => }/controllers/xbox.svg (99%)
 create mode 100644 themes/modern-DE/settings/21_9.xml
 create mode 100644 themes/modern-DE/variants/dark21_9/default.xml
 create mode 100644 themes/modern-DE/variants/light21_9/default.xml

diff --git a/themes/modern-DE/assets/light/controllers/classic.svg b/themes/modern-DE/assets/controllers/classic.svg
similarity index 99%
rename from themes/modern-DE/assets/light/controllers/classic.svg
rename to themes/modern-DE/assets/controllers/classic.svg
index c6ab257ff..6ddcebab5 100644
--- a/themes/modern-DE/assets/light/controllers/classic.svg
+++ b/themes/modern-DE/assets/controllers/classic.svg
@@ -16,6 +16,7 @@
         sodipodi:docname="classic.svg"
         width="500"
         height="500"
+        fill="#FE7269"
         inkscape:version="1.0.2 (e86c870879, 2021-01-15)"><metadata
    id="metadata39"><rdf:RDF><cc:Work
        rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
diff --git a/themes/modern-DE/assets/light/controllers/dualshock4.svg b/themes/modern-DE/assets/controllers/dualshock4.svg
similarity index 99%
rename from themes/modern-DE/assets/light/controllers/dualshock4.svg
rename to themes/modern-DE/assets/controllers/dualshock4.svg
index bee8148e6..58b61d7d5 100644
--- a/themes/modern-DE/assets/light/controllers/dualshock4.svg
+++ b/themes/modern-DE/assets/controllers/dualshock4.svg
@@ -13,6 +13,7 @@
         y="0px"
         width="500"
         height="500"
+        fill="#1d9bf3"
         viewBox="0 0 499.99998 499.99998"
         xml:space="preserve"
         sodipodi:docname="dualshock4.svg"
diff --git a/themes/modern-DE/assets/light/controllers/generic.svg b/themes/modern-DE/assets/controllers/generic.svg
similarity index 99%
rename from themes/modern-DE/assets/light/controllers/generic.svg
rename to themes/modern-DE/assets/controllers/generic.svg
index a405f0bcb..0e2277f93 100644
--- a/themes/modern-DE/assets/light/controllers/generic.svg
+++ b/themes/modern-DE/assets/controllers/generic.svg
@@ -16,6 +16,7 @@
         sodipodi:docname="generic.svg"
         width="500"
         height="500"
+        fill="#e60012"
         inkscape:version="1.0.2 (e86c870879, 2021-01-15)"><metadata
    id="metadata39"><rdf:RDF><cc:Work
        rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
diff --git a/themes/modern-DE/assets/light/controllers/gun.svg b/themes/modern-DE/assets/controllers/gun.svg
similarity index 99%
rename from themes/modern-DE/assets/light/controllers/gun.svg
rename to themes/modern-DE/assets/controllers/gun.svg
index 095b9d8e7..bb277801e 100644
--- a/themes/modern-DE/assets/light/controllers/gun.svg
+++ b/themes/modern-DE/assets/controllers/gun.svg
@@ -16,6 +16,7 @@
         sodipodi:docname="gun.svg"
         width="500"
         height="500"
+        fill="#e60012"
         inkscape:version="1.0.2 (e86c870879, 2021-01-15)"><metadata
    id="metadata39"><rdf:RDF><cc:Work
        rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
diff --git a/themes/modern-DE/assets/light/controllers/joycon-left.svg b/themes/modern-DE/assets/controllers/joycon-left.svg
similarity index 98%
rename from themes/modern-DE/assets/light/controllers/joycon-left.svg
rename to themes/modern-DE/assets/controllers/joycon-left.svg
index 49795192a..14aa7928c 100644
--- a/themes/modern-DE/assets/light/controllers/joycon-left.svg
+++ b/themes/modern-DE/assets/controllers/joycon-left.svg
@@ -10,6 +10,7 @@
         version="1.0"
         width="500pt"
         height="500pt"
+        fill="#ff5130"
         viewBox="0 0 500.00001 500.00001"
         preserveAspectRatio="xMidYMid meet"
         id="svg10"
@@ -58,5 +59,5 @@
     <path
             d="M 229.75694,0.30321422 C 219.86816,0.69484908 215.65809,1.4781188 205.86722,4.7091063 194.4119,8.5275459 182.0754,15.479065 171.25649,24.19294 157.59822,35.256625 145.26172,50.873064 141.39433,62.034657 l -1.41968,4.063212 1.02804,1.12595 c 0.5385,0.587452 1.6155,1.223859 2.34981,1.370722 l 1.37072,0.293726 -1.46863,4.014258 c -2.10503,5.629751 -3.57366,11.210547 -4.89543,18.113112 l -1.12595,5.972431 -0.14687,152.737592 c -0.0979,106.32886 0,154.40204 0.39164,158.26944 3.4268,36.12831 25.40731,67.60596 58.01091,83.1245 6.70675,3.18204 12.09173,5.09126 19.87547,7.00048 10.91682,2.74144 15.37167,2.98621 50.71672,2.98621 h 31.96719 v -11.06368 -11.0637 l 1.41968,1.51759 c 1.22386,1.27281 1.76235,1.51758 3.81844,1.51758 2.83935,0 6.80465,2.10504 8.51805,4.5038 0.97909,1.37073 1.17491,2.30086 1.32177,6.75572 0.0979,2.83935 0.34268,5.28707 0.5385,5.53184 0.19582,0.19582 2.49667,-0.29373 5.14021,-1.12595 17.37879,-5.33603 31.86928,-19.82653 37.93962,-37.93964 2.88831,-8.66492 2.98622,-10.0846 2.98622,-49.83553 v -36.07936 h 3.86739 c 3.13308,0 4.06322,-0.19582 5.14021,-1.02805 l 1.27282,-0.97908 v -33.24001 -33.24001 l -1.27282,-0.97909 c -1.07699,-0.83222 -2.00713,-1.02804 -5.14021,-1.02804 h -3.86739 v -65.35406 -65.35407 h 4.16112 c 6.80466,0 6.1193,3.81844 6.1193,-35.14923 0,-31.03706 -0.049,-33.28896 -0.83223,-34.02328 -0.63641,-0.53849 -2.10504,-0.78327 -5.0423,-0.93013 l -4.16112,-0.14686 -0.29372,-23.00855 -0.24478,-23.008548 -1.37072,-5.042299 C 351.80015,27.962426 334.81299,11.709579 311.36386,6.618326 307.15378,5.7371476 304.46129,5.5902845 287.66995,5.3455127 l -18.99429,-0.2937261 0.29372,-1.811311 c 0.48955,-3.08412445 0.0979,-3.18203316 -16.20389,-3.23098752 -7.78374,-0.04895436 -18.16207,0.09790871 -23.00855,0.29372614 z M 284.58582,52.929147 v 3.426805 h -12.72813 -12.72813 l -0.14687,-2.839353 c -0.0979,-1.713402 0.0979,-3.133079 0.44059,-3.573668 0.48955,-0.587452 2.69249,-0.685361 12.875,-0.587452 l 12.28754,0.146863 z m -54.19247,39.21244 c 21.78469,4.454846 35.34505,26.386403 29.42157,47.632593 -4.60171,16.79134 -19.48384,28.05084 -36.91159,28.05084 -15.32271,0 -28.14875,-8.17538 -34.70864,-22.17632 -4.99334,-10.52519 -4.84648,-22.4211 0.39164,-32.94628 7.78374,-15.567489 24.96672,-24.036593 41.80702,-20.560833 z m -4.21007,119.693403 c 7.44106,1.61549 12.77708,7.04943 14.1478,14.53944 1.37073,7.19629 -2.93726,15.37167 -9.69296,18.5537 -10.76996,4.99335 -22.66587,-1.02804 -25.11358,-12.72813 -1.81131,-8.90969 4.16112,-17.91729 13.46245,-20.21815 3.18203,-0.81386 4.06321,-0.78327 7.19629,-0.14686 z m -34.36596,38.91871 c 3.4268,1.51759 7.3921,5.43394 8.95864,8.86074 0.83223,1.90922 1.077,3.27994 1.077,7.00047 0,4.01426 -0.19582,5.0423 -1.27281,7.39211 -1.76236,3.72053 -4.2139,6.31511 -7.88165,8.32224 -2.93727,1.56654 -3.3289,1.66445 -7.97957,1.66445 -4.25903,0 -5.23811,-0.14686 -7.68583,-1.32177 -3.57367,-1.66444 -6.70675,-4.79752 -8.51806,-8.51805 -1.22386,-2.54563 -1.41968,-3.42681 -1.41968,-7.2942 0,-3.76949 0.19582,-4.79753 1.32177,-7.19629 4.25903,-9.10551 14.39258,-12.97291 23.40019,-8.9097 z m 76.66252,-0.0979 c 3.67158,1.66445 6.80465,4.74858 8.66492,8.56702 1.41968,2.93726 1.56654,3.62262 1.56654,7.63688 -0.0489,3.81844 -0.24477,4.79752 -1.46863,7.2942 -1.76236,3.72053 -4.89544,6.85361 -8.4691,8.51805 -2.44772,1.17491 -3.37786,1.32177 -7.68584,1.32177 -4.11216,0 -5.23811,-0.19582 -7.19629,-1.1749 -3.47576,-1.66445 -6.36407,-4.5038 -8.27329,-7.97956 -1.56653,-2.93727 -1.66444,-3.3289 -1.66444,-7.97956 0,-4.30799 0.14686,-5.18917 1.32176,-7.58793 2.30086,-4.69962 6.95152,-8.51806 11.99382,-9.79087 2.88831,-0.68536 8.32224,-0.14686 11.21055,1.1749 z m -39.21244,39.21244 c 3.47576,1.66445 6.65779,4.89544 8.42015,8.46911 1.22386,2.44772 1.37072,3.32889 1.37072,7.44106 0,4.01426 -0.19582,5.0423 -1.32177,7.44106 -1.66444,3.57367 -5.0423,6.95152 -8.61596,8.61597 -2.39877,1.12595 -3.42681,1.32177 -7.44107,1.32177 -4.11216,0 -4.99334,-0.14687 -7.44106,-1.37073 -3.62262,-1.76235 -6.80465,-4.94439 -8.56701,-8.56701 -1.22386,-2.44772 -1.37072,-3.32889 -1.37072,-7.44106 0,-4.06321 0.14686,-4.99334 1.32177,-7.34315 2.30085,-4.69962 7.00047,-8.61597 11.84695,-9.83983 2.98622,-0.78327 8.95865,-0.14686 11.798,1.27281 z m 33.82746,57.57033 1.41968,1.46863 0.14686,10.62309 c 0.19582,11.60219 -0.0979,13.60931 -2.20295,15.22481 -1.1749,0.97909 -1.90922,1.02804 -12.9729,1.02804 -7.09838,0 -12.09173,-0.19582 -12.67918,-0.48954 -2.15399,-1.17491 -2.39876,-2.69249 -2.39876,-14.93108 v -11.60219 l 1.41967,-1.41967 1.41968,-1.41968 h 12.18963 12.18964 z"
             id="path4"
-            style="fill:#000000;stroke:none;stroke-width:0.0489544"/>
+            style="stroke:none;stroke-width:0.0489544"/>
 </svg>
diff --git a/themes/modern-DE/assets/light/controllers/joycon-pair.svg b/themes/modern-DE/assets/controllers/joycon-pair.svg
similarity index 98%
rename from themes/modern-DE/assets/light/controllers/joycon-pair.svg
rename to themes/modern-DE/assets/controllers/joycon-pair.svg
index cf0196a4f..a4df040aa 100644
--- a/themes/modern-DE/assets/light/controllers/joycon-pair.svg
+++ b/themes/modern-DE/assets/controllers/joycon-pair.svg
@@ -58,9 +58,9 @@
     <path
             d="M 108.39966,31.297143 C 99.760804,31.639276 96.082876,32.323541 87.529556,35.146137 77.522172,38.481931 66.744986,44.554788 57.293568,52.167243 45.361687,61.832494 34.584504,75.475039 31.205943,85.225824 l -1.240232,3.549627 0.898099,0.983633 c 0.470432,0.513199 1.411297,1.069164 2.052797,1.197464 l 1.197464,0.2566 -1.282998,3.506861 c -1.838963,4.918159 -3.121961,9.793551 -4.27666,15.823641 l -0.983631,5.21753 -0.1283,133.43178 c -0.08553,92.88906 0,134.88586 0.342133,138.26442 2.993662,31.56176 22.195865,59.06068 50.678422,72.61769 5.859024,2.77984 10.56335,4.44774 17.363239,6.11563 9.536954,2.39493 13.428714,2.60876 44.306204,2.60876 h 27.92659 v -9.66525 -9.66526 l 1.24022,1.32576 c 1.06916,1.11194 1.53961,1.32577 3.3358,1.32577 2.48046,0 5.94455,1.83896 7.44138,3.93453 0.85534,1.19746 1.02641,2.01003 1.15471,5.9018 0.0855,2.48046 0.29936,4.61879 0.47043,4.83262 0.17107,0.17107 2.1811,-0.2566 4.49049,-0.98363 15.18215,-4.66156 27.84106,-17.32048 33.14412,-33.14412 2.52322,-7.56969 2.60876,-8.80992 2.60876,-43.5364 v -31.51899 h 3.37856 c 2.73706,0 3.54963,-0.17106 4.49049,-0.89809 l 1.11193,-0.85533 v -29.03853 -29.03852 l -1.11193,-0.85533 c -0.94086,-0.72703 -1.75343,-0.89809 -4.49049,-0.89809 h -3.37856 v -57.09342 -57.09341 h 3.63516 c 5.94456,0 5.34582,3.3358 5.34582,-30.70641 0,-27.11404 -0.0427,-29.0813 -0.72703,-29.7228 -0.55597,-0.47043 -1.83896,-0.68426 -4.40496,-0.81256 l -3.63515,-0.1283 -0.25661,-20.1003 -0.21384,-20.100302 -1.19746,-4.404959 C 215.01679,55.460271 200.17678,41.26176 179.69158,36.814034 c -3.67793,-0.769799 -6.03009,-0.898099 -20.69904,-1.111932 l -16.59344,-0.256599 0.2566,-1.582364 c 0.42766,-2.694296 0.0856,-2.779829 -14.15574,-2.822596 -6.79989,-0.04277 -15.86641,0.08553 -20.1003,0.2566 z m 47.89858,45.974093 v 2.993662 h -11.11931 -11.11931 l -0.12831,-2.480462 c -0.0855,-1.496831 0.0855,-2.737063 0.38491,-3.121962 0.42766,-0.513199 2.35216,-0.598733 11.24761,-0.513199 l 10.73441,0.1283 z m -47.34262,34.256044 c 19.03114,3.89176 30.87748,23.0512 25.70273,41.6119 -4.02006,14.66895 -17.02111,24.50526 -32.24602,24.50526 -13.385943,0 -24.590792,-7.14202 -30.321517,-19.37326 -4.362194,-9.19483 -4.233894,-19.58711 0.342133,-28.78192 6.79989,-13.59978 21.810966,-20.99841 36.522674,-17.96198 z m -3.67793,104.56434 c 6.50053,1.41129 11.16208,6.15839 12.35955,12.70168 1.19746,6.28669 -2.56599,13.42871 -8.46778,16.20854 -9.408656,4.36219 -19.80094,-0.8981 -21.93927,-11.11931 -1.582365,-7.78353 3.635161,-15.65259 11.760814,-17.66261 2.779826,-0.711 3.549626,-0.68427 6.286686,-0.1283 z m -30.022148,33.99945 c 2.993661,1.32576 6.457756,4.74709 7.826287,7.74075 0.727033,1.6679 0.940866,2.86537 0.940866,6.11563 0,3.50686 -0.171067,4.40495 -1.111931,6.45775 -1.539599,3.25026 -3.681268,5.51689 -6.885423,7.27032 -2.565997,1.36853 -2.90813,1.45407 -6.970958,1.45407 -3.720694,0 -4.576026,-0.12831 -6.714356,-1.15471 -3.121961,-1.45405 -5.859024,-4.19112 -7.441389,-7.44138 -1.069164,-2.22386 -1.240231,-2.99366 -1.240231,-6.37222 0,-3.29304 0.171067,-4.19113 1.154698,-6.28669 3.720695,-7.95459 12.573381,-11.33316 20.442437,-7.78352 z m 66.972488,-0.0856 c 3.2075,1.45407 5.94456,4.14836 7.56969,7.48416 1.24023,2.566 1.36854,3.16472 1.36854,6.67159 -0.0427,3.33579 -0.21383,4.19112 -1.283,6.37222 -1.5396,3.25026 -4.27666,5.98733 -7.39862,7.44139 -2.13833,1.02639 -2.9509,1.1547 -6.71436,1.1547 -3.59239,0 -4.57602,-0.17107 -6.28669,-1.0264 -3.03642,-1.45407 -5.55966,-3.93453 -7.22756,-6.97096 -1.36853,-2.56599 -1.45406,-2.90813 -1.45406,-6.97095 0,-3.76347 0.1283,-4.53326 1.1547,-6.62883 2.01003,-4.10559 6.07286,-7.44138 10.47781,-8.55331 2.52324,-0.59874 7.27033,-0.12831 9.79355,1.02639 z m -34.25604,34.25605 c 3.03643,1.45406 5.81626,4.27666 7.35586,7.39862 1.06916,2.13833 1.19746,2.90813 1.19746,6.50053 0,3.50686 -0.17107,4.40495 -1.1547,6.50052 -1.45406,3.12196 -4.40496,6.07286 -7.52692,7.52691 -2.09556,0.98364 -2.99366,1.15471 -6.50052,1.15471 -3.592397,0 -4.362196,-0.12831 -6.500525,-1.19747 -3.164729,-1.5396 -5.944558,-4.31943 -7.484156,-7.48415 -1.069164,-2.13833 -1.197464,-2.90814 -1.197464,-6.50052 0,-3.54964 0.1283,-4.3622 1.154698,-6.415 2.01003,-4.10559 6.115623,-7.52692 10.349517,-8.59609 2.60876,-0.68426 7.82629,-0.12829 10.30675,1.11194 z m 29.55172,50.29352 1.24023,1.283 0.1283,9.28035 c 0.17107,10.13568 -0.0855,11.88911 -1.9245,13.30041 -1.0264,0.85533 -1.66789,0.8981 -11.33314,0.8981 -6.20116,0 -10.56335,-0.17107 -11.07655,-0.42767 -1.88173,-1.0264 -2.09557,-2.35216 -2.09557,-13.04381 v -10.13568 l 1.24023,-1.24024 1.24024,-1.24022 h 10.64888 10.64888 z"
             id="path4"
-            style="fill:#000000;stroke:none;stroke-width:0.0427666"/>
+            style="fill:#ff5130;stroke:none;stroke-width:0.0427666"/>
     <path
             d="m 359.02725,31.254376 c -2.18109,0.3849 -2.73705,1.069165 -2.43769,2.865362 l 0.21383,1.368531 -16.123,0.213833 c -17.66261,0.213833 -20.57074,0.513199 -27.58446,2.865363 -7.61246,2.565995 -14.41234,6.799889 -20.2286,12.616146 -7.56969,7.526922 -12.01742,15.609809 -14.62618,26.515292 -0.55596,2.480462 -0.72703,6.457756 -0.94086,22.880127 l -0.2566,19.88647 -3.63517,0.1283 c -2.56599,0.1283 -3.84899,0.34213 -4.36219,0.81256 -0.72703,0.6415 -0.7698,2.60876 -0.7698,29.68002 v 28.99576 l 0.94087,0.89809 c 0.76979,0.72704 1.49683,0.85534 4.49049,0.85534 h 3.54963 v 57.09341 57.09342 h -3.37856 c -2.73706,0 -3.54963,0.17106 -4.4905,0.89809 l -1.11193,0.85533 v 29.03852 29.03853 l 1.11193,0.85533 c 0.94087,0.72703 1.75344,0.89809 4.4905,0.89809 h 3.3358 l 0.12829,33.27242 0.1283,33.22965 1.4113,5.13199 c 4.66156,17.406 17.87644,31.56176 34.12775,36.56545 2.26662,0.72703 4.27666,1.283 4.49049,1.283 0.21384,0 0.38489,-1.88173 0.38489,-4.19113 0,-3.50686 0.17107,-4.4905 0.98364,-6.07287 1.283,-2.60876 4.74709,-4.70432 7.69799,-4.70432 1.71066,0 2.26663,-0.21383 3.33579,-1.24023 l 1.24024,-1.24023 v 9.57972 9.62249 l 30.70641,-0.17107 c 29.08129,-0.17106 30.92025,-0.21383 35.45351,-1.06916 25.31783,-4.78986 45.88856,-18.26135 59.61661,-38.96038 6.97095,-10.47782 11.37591,-21.6399 13.77084,-34.81202 l 0.94087,-5.21752 V 252.82812 c 0,-108.84099 -0.1283,-136.55374 -0.55597,-139.63294 -0.76979,-5.43136 -2.52322,-12.57338 -4.19112,-17.23494 -0.81257,-2.181096 -1.45407,-4.148359 -1.45407,-4.362192 0,-0.213834 0.47043,-0.5132 1.0264,-0.684266 0.55597,-0.1283 1.45407,-0.684265 1.96726,-1.240232 l 0.8981,-0.940865 -1.06916,-3.121962 C 464.10476,73.764376 451.10375,58.3684 436.4348,47.976116 425.27272,40.064295 413.46914,34.804004 401.49449,32.366308 c -4.83263,-0.983632 -6.24392,-1.069165 -22.88013,-1.240232 -9.75078,-0.1283 -18.60347,-0.08553 -19.58711,0.1283 z m -1.71066,39.259738 0.1283,4.191127 3.849,0.213833 3.84899,0.213832 v 2.993663 2.993661 l -3.93453,0.1283 -3.93453,0.1283 -0.12829,3.506861 -0.1283,3.506862 -2.73707,0.1283 c -1.92449,0.08553 -2.86536,-0.04277 -3.07919,-0.427667 -0.21384,-0.299366 -0.3849,-1.924497 -0.3849,-3.635161 V 81.37683 l -3.7207,-0.1283 -3.76345,-0.1283 -0.12831,-3.121961 -0.12829,-3.079195 h 3.89176 3.84899 V 70.94178 c 0,-2.223863 0.1283,-4.14836 0.29937,-4.27666 0.12829,-0.171067 1.58236,-0.299366 3.16472,-0.299366 h 2.90813 z m 47.04327,26.558058 c 8.76714,4.319428 11.41867,15.224908 5.55965,22.965668 -4.49049,5.98732 -12.35955,7.82628 -19.07391,4.53326 -9.15205,-4.4905 -11.46145,-16.42238 -4.66155,-23.99207 1.79619,-2.010027 4.70433,-3.891757 7.39862,-4.74709 0.59873,-0.213833 2.60876,-0.299366 4.4905,-0.256599 2.90812,0.08553 3.89176,0.299366 6.28669,1.496831 z m -33.74285,33.357948 c 3.20749,1.49683 5.94455,4.19112 7.48415,7.35585 1.0264,2.09557 1.1547,2.86536 1.1547,6.62883 0,4.06282 -0.0855,4.40496 -1.45407,6.97095 -1.6679,3.0792 -3.76345,5.13199 -6.97095,6.79989 -2.0528,1.06917 -2.6943,1.19747 -6.54329,1.19747 -3.76346,0 -4.57602,-0.1283 -6.71435,-1.15471 -3.12197,-1.45405 -5.85903,-4.19112 -7.4414,-7.44138 -1.06916,-2.22386 -1.24022,-2.99366 -1.24022,-6.37222 0,-3.3358 0.17106,-4.19113 1.24022,-6.50052 1.88173,-4.14837 6.03009,-7.56969 10.39229,-8.68163 2.82259,-0.68426 7.18479,-0.17106 10.09292,1.19747 z m 66.80142,-0.17107 c 3.25026,1.45407 5.94456,4.14836 7.61246,7.48416 1.24023,2.566 1.36853,3.16472 1.36853,6.67159 -0.0427,3.33579 -0.21383,4.19112 -1.283,6.37222 -1.53959,3.25026 -4.27666,5.98733 -7.39862,7.44138 -2.13833,1.02641 -2.9509,1.15471 -6.71435,1.15471 -3.849,0 -4.4905,-0.1283 -6.54329,-1.19747 -3.2075,-1.6679 -5.30306,-3.72069 -6.97096,-6.79989 -1.36853,-2.56599 -1.45406,-2.90813 -1.45406,-6.97095 0,-3.80623 0.12829,-4.53326 1.19746,-6.71436 3.72069,-7.56968 12.70168,-10.86272 20.18583,-7.44139 z m -36.39438,32.54539 c 2.48047,0.42766 5.3886,2.01003 7.48416,4.10559 6.07286,6.07286 6.07286,15.65258 0,21.72543 -3.59239,3.54963 -8.72438,5.21753 -13.38594,4.31943 -5.3886,-1.06917 -9.23759,-4.02006 -11.50422,-8.89545 -1.15469,-2.43771 -1.32576,-3.3358 -1.32576,-6.28669 0,-2.9509 0.17107,-3.849 1.32576,-6.28669 2.26663,-4.78987 6.37222,-7.99736 11.33315,-8.85269 2.26663,-0.3849 2.82259,-0.34214 6.07285,0.17107 z m 4.31943,69.36742 c 7.4414,1.62513 14.84002,6.50052 19.24497,12.74445 6.71436,9.45141 8.29672,20.3569 4.53326,31.04855 -1.75343,4.96092 -3.67792,7.86905 -8.16842,12.35954 -3.46409,3.50686 -4.66155,4.40496 -8.12565,6.07286 -5.90179,2.90813 -8.55332,3.50686 -15.18214,3.50686 -6.58606,0 -9.32312,-0.59873 -14.96831,-3.37856 -6.5433,-3.25026 -11.71805,-8.42502 -14.96831,-14.96831 -4.10559,-8.38225 -4.66156,-16.85004 -1.6679,-25.78825 5.43136,-16.16578 22.1531,-25.3606 39.3025,-21.59714 z m -33.14411,105.54796 v 6.20116 h 5.55966 5.55966 v -1.6679 c 0,-2.05279 -0.51321,-2.26662 -4.6188,-2.13833 l -2.86536,0.12831 -0.1283,-4.44773 -0.1283,-4.40496 1.5396,0.2566 c 3.97729,0.6415 8.16842,3.89176 10.34952,8.08289 1.06916,2.05279 1.19746,2.69429 1.19746,6.54329 0,3.84899 -0.1283,4.49049 -1.19746,6.54329 -0.6415,1.24023 -1.88173,2.99366 -2.6943,3.93452 -1.75343,1.9245 -6.11562,4.27666 -7.95458,4.27666 h -1.19747 v -6.20116 -6.20115 h -5.60243 -5.55966 l 0.1283,1.7962 0.12831,1.83896 3.76346,0.1283 3.72069,0.1283 v 4.23389 4.27666 h -1.1547 c -0.68426,0 -2.13833,-0.47043 -3.33579,-1.0264 -8.42502,-3.97729 -11.33315,-14.41233 -6.20116,-22.15309 2.09557,-3.16473 6.79989,-6.20116 9.75079,-6.28669 0.94086,-0.0428 0.94086,0 0.94086,6.15838 z"
             id="path6"
-            style="fill:#000000;stroke:none;stroke-width:0.0427666"/>
+            style="fill:#1d9bf3;stroke:none;stroke-width:0.0427666"/>
 </svg>
diff --git a/themes/modern-DE/assets/light/controllers/joystick-arcade.svg b/themes/modern-DE/assets/controllers/joystick-arcade.svg
similarity index 99%
rename from themes/modern-DE/assets/light/controllers/joystick-arcade.svg
rename to themes/modern-DE/assets/controllers/joystick-arcade.svg
index 5e2017679..2a89f8a55 100644
--- a/themes/modern-DE/assets/light/controllers/joystick-arcade.svg
+++ b/themes/modern-DE/assets/controllers/joystick-arcade.svg
@@ -16,6 +16,7 @@
         sodipodi:docname="joystick-arcade.svg"
         width="500"
         height="500"
+        fill="#da9031"
         inkscape:version="1.0.2 (e86c870879, 2021-01-15)"><metadata
    id="metadata39"><rdf:RDF><cc:Work
        rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
diff --git a/themes/modern-DE/assets/light/controllers/joystick.svg b/themes/modern-DE/assets/controllers/joystick.svg
similarity index 99%
rename from themes/modern-DE/assets/light/controllers/joystick.svg
rename to themes/modern-DE/assets/controllers/joystick.svg
index a1daf70d0..fdacc0aed 100644
--- a/themes/modern-DE/assets/light/controllers/joystick.svg
+++ b/themes/modern-DE/assets/controllers/joystick.svg
@@ -16,6 +16,7 @@
         sodipodi:docname="joystick.svg"
         width="500"
         height="500"
+        fill="#e60012"
         inkscape:version="1.0.2 (e86c870879, 2021-01-15)"><metadata
    id="metadata39"><rdf:RDF><cc:Work
        rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
diff --git a/themes/modern-DE/assets/light/controllers/keyboard-mouse.svg b/themes/modern-DE/assets/controllers/keyboard-mouse.svg
similarity index 98%
rename from themes/modern-DE/assets/light/controllers/keyboard-mouse.svg
rename to themes/modern-DE/assets/controllers/keyboard-mouse.svg
index 05b67148e..44f14710c 100644
--- a/themes/modern-DE/assets/light/controllers/keyboard-mouse.svg
+++ b/themes/modern-DE/assets/controllers/keyboard-mouse.svg
@@ -16,6 +16,7 @@
         sodipodi:docname="keyboard-mouse.svg"
         width="500"
         height="500"
+        fill="#e60012"
         inkscape:version="1.0.2 (e86c870879, 2021-01-15)"><metadata
    id="metadata41"><rdf:RDF><cc:Work
        rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
@@ -115,11 +116,9 @@
        id="g4"
        transform="matrix(27.54621,15.903807,-15.903807,27.54621,-629.56773,-393.59167)">
 	<path
-            style="fill:#010002"
             d="M 28.878,14.443 21.159,1.789 C 21.09,1.676 20.939,1.639 20.826,1.71 L 10.865,7.784 C 10.717,7.701 10.452,7.513 10.382,7.213 10.291,6.812 10.555,6.265 11.147,5.632 11.94,4.783 12.286,3.944 12.171,3.137 12.015,2.057 11.08,1.491 11.04,1.467 l -0.496,0.837 c 0.005,0.004 0.575,0.356 0.664,0.971 0.07,0.499 -0.188,1.07 -0.771,1.694 C 9.601,5.86 9.264,6.689 9.434,7.432 9.526,7.829 9.749,8.119 9.977,8.326 l -9.861,6.018 c -0.055,0.035 -0.094,0.087 -0.109,0.148 -0.016,0.063 -0.005,0.131 0.028,0.186 l 7.722,12.653 c 0.044,0.073 0.124,0.115 0.207,0.115 0.042,0 0.086,-0.012 0.125,-0.037 L 28.797,14.777 c 0.114,-0.071 0.15,-0.22 0.081,-0.334 z M 23.526,10.507 21.371,11.821 20.055,9.665 22.212,8.351 Z M 20.005,4.733 21.319,6.889 19.164,8.204 17.85,6.048 Z m -0.085,7.971 -2.155,1.316 -1.314,-2.156 2.154,-1.315 z m -3.52,-5.77 1.315,2.154 -2.156,1.316 -1.315,-2.155 z m -0.249,8.069 -2.153,1.316 -1.315,-2.156 2.155,-1.315 z M 13.947,11.387 11.791,12.7 10.477,10.547 12.632,9.232 Z m -1.448,5.847 -2.156,1.315 -1.314,-2.156 2.152,-1.315 z M 8.977,11.463 10.291,13.617 8.137,14.93 6.82,12.777 Z m -5.794,3.535 2.154,-1.315 1.314,2.156 -2.154,1.313 z m 2.204,3.617 2.156,-1.316 1.313,2.156 -2.154,1.314 z m 3.342,5.646 -1.276,-2.095 9.674,-5.9 1.276,2.093 z m 11.137,-6.796 -1.314,-2.155 2.156,-1.316 1.314,2.156 z m 3.607,-2.199 -1.315,-2.155 2.156,-1.316 1.313,2.156 z"
             id="path2"/>
 </g><path
-            style="fill:#000001"
             d="m 245.435,130.52 c -11.585,-7.572 -26.943,-12.411 -42.943,-14.045 v -48.49 h 28.811 c 8.102,0 15.642,-3.313 21.232,-9.113 5.589,-5.8 8.503,-13.513 8.203,-21.61 L 259.895,14.46 C 259.589,6.182 252.635,-0.285 244.35,0.011 236.072,0.318 229.609,7.388 229.915,15.667 l 0.822,22.319 H 202.14 c -16.542,0 -29.648,13.221 -29.648,29.763 v 48.728 c -17,1.634 -31.358,6.474 -42.942,14.045 -17.022,11.124 -26.058,27.366 -26.058,46.968 v 135.435 c 0,19.751 7.636,36.148 22.345,47.016 13.133,9.705 31.099,15.046 52.215,15.046 h 18.178 c 21.117,0 39.433,-5.341 52.566,-15.046 14.708,-10.868 22.696,-27.265 22.696,-47.016 V 177.488 c 0,-19.602 -9.034,-35.844 -26.057,-46.968 z m -38.943,80.465 c 0,11.598 -9.402,21 -21,21 -11.598,0 -21,-9.402 -21,-21 v -39 c 0,-11.598 9.402,-21 21,-21 11.598,0 21,9.402 21,21 z"
             id="path866"/></g>
         <g
diff --git a/themes/modern-DE/assets/light/controllers/keyboard.svg b/themes/modern-DE/assets/controllers/keyboard.svg
similarity index 99%
rename from themes/modern-DE/assets/light/controllers/keyboard.svg
rename to themes/modern-DE/assets/controllers/keyboard.svg
index c094e9a7e..ae1312513 100644
--- a/themes/modern-DE/assets/light/controllers/keyboard.svg
+++ b/themes/modern-DE/assets/controllers/keyboard.svg
@@ -16,6 +16,7 @@
         sodipodi:docname="keyboard.svg"
         width="500"
         height="500"
+        fill="#e60012"
         inkscape:version="1.0.2 (e86c870879, 2021-01-15)"><metadata
    id="metadata41"><rdf:RDF><cc:Work
        rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
@@ -46,7 +47,6 @@
             id="g4"
             transform="matrix(17.30402,0,0,17.30402,-0.15370012,-0.15556513)">
 	<path
-            style="fill:#010002"
             d="M 28.878,14.443 21.159,1.789 C 21.09,1.676 20.939,1.639 20.826,1.71 L 10.865,7.784 C 10.717,7.701 10.452,7.513 10.382,7.213 10.291,6.812 10.555,6.265 11.147,5.632 11.94,4.783 12.286,3.944 12.171,3.137 12.015,2.057 11.08,1.491 11.04,1.467 l -0.496,0.837 c 0.005,0.004 0.575,0.356 0.664,0.971 0.07,0.499 -0.188,1.07 -0.771,1.694 C 9.601,5.86 9.264,6.689 9.434,7.432 9.526,7.829 9.749,8.119 9.977,8.326 l -9.861,6.018 c -0.055,0.035 -0.094,0.087 -0.109,0.148 -0.016,0.063 -0.005,0.131 0.028,0.186 l 7.722,12.653 c 0.044,0.073 0.124,0.115 0.207,0.115 0.042,0 0.086,-0.012 0.125,-0.037 L 28.797,14.777 c 0.114,-0.071 0.15,-0.22 0.081,-0.334 z M 23.526,10.507 21.371,11.821 20.055,9.665 22.212,8.351 Z M 20.005,4.733 21.319,6.889 19.164,8.204 17.85,6.048 Z m -0.085,7.971 -2.155,1.316 -1.314,-2.156 2.154,-1.315 z m -3.52,-5.77 1.315,2.154 -2.156,1.316 -1.315,-2.155 z m -0.249,8.069 -2.153,1.316 -1.315,-2.156 2.155,-1.315 z M 13.947,11.387 11.791,12.7 10.477,10.547 12.632,9.232 Z m -1.448,5.847 -2.156,1.315 -1.314,-2.156 2.152,-1.315 z M 8.977,11.463 10.291,13.617 8.137,14.93 6.82,12.777 Z m -5.794,3.535 2.154,-1.315 1.314,2.156 -2.154,1.313 z m 2.204,3.617 2.156,-1.316 1.313,2.156 -2.154,1.314 z m 3.342,5.646 -1.276,-2.095 9.674,-5.9 1.276,2.093 z m 11.137,-6.796 -1.314,-2.155 2.156,-1.316 1.314,2.156 z m 3.607,-2.199 -1.315,-2.155 2.156,-1.316 1.313,2.156 z"
             id="path2"/>
 </g>
diff --git a/themes/modern-DE/assets/light/controllers/mouse.svg b/themes/modern-DE/assets/controllers/mouse.svg
similarity index 98%
rename from themes/modern-DE/assets/light/controllers/mouse.svg
rename to themes/modern-DE/assets/controllers/mouse.svg
index c15b6d7ee..ece33a31a 100644
--- a/themes/modern-DE/assets/light/controllers/mouse.svg
+++ b/themes/modern-DE/assets/controllers/mouse.svg
@@ -16,6 +16,7 @@
         sodipodi:docname="mouse.svg"
         width="500"
         height="500"
+        fill="#e60012"
         inkscape:version="1.0.2 (e86c870879, 2021-01-15)"><metadata
    id="metadata39"><rdf:RDF><cc:Work
        rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
@@ -43,7 +44,6 @@
             inkscape:window-maximized="1"
             inkscape:current-layer="Capa_1"/>
     <path
-            style="fill:#000001"
             d="M 307.943,193.02588 C 296.358,185.45388 281,180.61488 265,178.98088 v -48.49 h 28.811 c 8.102,0 15.642,-3.313 21.232,-9.113 5.589,-5.8 8.503,-13.513 8.203,-21.609996 l -0.843,-22.802 c -0.306,-8.278 -7.26,-14.745 -15.545,-14.449 -8.278,0.307 -14.741,7.377 -14.435,15.656 l 0.822,22.318996 h -28.597 c -16.542,0 -29.648,13.221 -29.648,29.763 v 48.728 c -17,1.634 -31.358,6.474 -42.942,14.045 -17.022,11.124 -26.058,27.366 -26.058,46.968 v 135.435 c 0,19.751 7.636,36.148 22.345,47.016 13.133,9.705 31.099,15.046 52.215,15.046 h 18.178 c 21.117,0 39.433,-5.341 52.566,-15.046 14.708,-10.868 22.696,-27.265 22.696,-47.016 v -135.437 c 0,-19.602 -9.034,-35.844 -26.057,-46.968 z M 269,273.49088 c 0,11.598 -9.402,21 -21,21 -11.598,0 -21,-9.402 -21,-21 v -39 c 0,-11.598 9.402,-21 21,-21 11.598,0 21,9.402 21,21 z"
             id="path2"/>
     <g
diff --git a/themes/modern-DE/assets/light/controllers/n64.svg b/themes/modern-DE/assets/controllers/n64.svg
similarity index 95%
rename from themes/modern-DE/assets/light/controllers/n64.svg
rename to themes/modern-DE/assets/controllers/n64.svg
index 7b0d0307b..8ac326022 100644
--- a/themes/modern-DE/assets/light/controllers/n64.svg
+++ b/themes/modern-DE/assets/controllers/n64.svg
@@ -13,6 +13,7 @@
         y="0px"
         width="500"
         height="500"
+        fill="#9a989b"
         viewBox="0 0 500.00001 499.99999"
         xml:space="preserve"
         sodipodi:docname="n64.svg"
@@ -49,13 +50,16 @@
             id="g32">
 		<path
                 d="m 402.372,186.217 c -10.973,0 -19.896,8.923 -19.896,19.896 0,10.973 8.923,19.902 19.896,19.902 10.967,0 19.896,-8.929 19.896,-19.902 0,-10.973 -8.923,-19.896 -19.896,-19.896 z"
-                id="path2"/>
+                id="path2"
+                fill="#278841"/>
         <path
                 d="m 360.364,67.14 c -2.705,-1.499 -5.654,-2.025 -8.715,-2.025 -38.745,0 -77.497,0 -116.243,0 -1.72,0 -3.421,0.159 -5.085,0.606 -3.709,0.991 -6.732,2.962 -8.807,6.249 -1.965,3.121 -2.577,6.548 -2.038,10.159 0.747,4.988 3.403,8.617 7.944,10.832 2.515,1.23 5.208,1.634 7.98,1.634 19.382,0 38.764,0 58.14,0 19.37,0 38.733,0 58.103,0 1.652,0 3.286,-0.141 4.896,-0.539 3.5,-0.869 6.426,-2.625 8.543,-5.587 2.332,-3.274 3.085,-6.953 2.51,-10.888 -0.685,-4.645 -3.109,-8.152 -7.228,-10.441 z M 249.366,88.976 c -0.349,0 -0.679,0 -1.004,0 -1.395,0 -2.797,-0.012 -4.192,0.006 -0.306,0.006 -0.465,-0.098 -0.625,-0.355 -2.466,-3.99 -4.939,-7.974 -7.417,-11.958 -0.08,-0.129 -0.165,-0.257 -0.251,-0.386 -0.037,0.006 -0.067,0.012 -0.104,0.024 0,2.099 0,4.198 0,6.297 0,2.105 0,4.21 0,6.347 -1.879,0 -3.715,0 -5.594,0 0,-6.083 0,-12.167 0,-18.299 0.147,0 0.288,0 0.422,0 1.585,0 3.164,0.012 4.75,-0.006 0.336,-0.006 0.532,0.086 0.716,0.392 2.436,3.979 4.89,7.938 7.344,11.91 0.08,0.135 0.166,0.263 0.337,0.379 0,-4.21 0,-8.421 0,-12.65 1.903,0 3.739,0 5.606,0 0.012,6.096 0.012,12.179 0.012,18.299 z m 3.225,-18.33 c 0.918,0 1.824,0 2.729,0 0.894,0 1.793,0 2.724,0 0,1.218 0,2.424 0,3.666 -1.793,0 -3.605,0 -5.453,0 0,-1.217 0,-2.417 0,-3.666 z m 5.471,18.306 c -1.817,0 -3.611,0 -5.44,0 0,-4.033 0,-8.06 0,-12.112 1.812,0 3.611,0 5.44,0 0,4.057 0,8.072 0,12.112 z m 19.126,0 c -1.787,0 -3.562,0 -5.404,0 0,-0.147 0,-0.3 0,-0.453 0,-2.411 0,-4.822 0,-7.234 0,-1.261 -0.765,-2.24 -1.946,-2.491 -1.273,-0.269 -2.595,0.343 -3.066,1.457 -0.135,0.318 -0.178,0.692 -0.184,1.034 -0.012,2.399 0,4.798 0.006,7.197 0,0.153 0,0.312 0,0.49 -1.842,0 -3.604,0 -5.404,0 0,-4.039 0,-8.066 0,-12.118 1.781,0 3.556,0 5.398,0 0,0.379 0,0.759 0,1.236 0.196,-0.159 0.312,-0.239 0.416,-0.331 2.516,-2.111 6.365,-1.946 8.635,0.367 1.059,1.083 1.53,2.423 1.555,3.905 0.037,2.252 0.012,4.51 0.012,6.762 0.006,0.062 -0.012,0.111 -0.018,0.179 z m 8.592,-0.007 c -1.842,0 -3.647,0 -5.514,0 0,-4.033 0,-8.072 0,-12.142 -1.01,0 -1.964,0 -2.987,0 0,-0.563 -0.012,-1.095 0.019,-1.628 0,-0.061 0.214,-0.147 0.336,-0.153 0.857,-0.012 1.714,-0.006 2.62,-0.006 0,-0.82 0,-1.616 0,-2.442 1.848,0 3.647,0 5.508,0 0,0.802 0,1.585 0,2.424 0.998,0 1.965,0 2.956,0 0,0.624 0,1.193 0,1.799 -0.985,0 -1.94,0 -2.932,0 -0.006,4.058 -0.006,8.085 -0.006,12.148 z m 8.238,-2.546 c 0.172,1.181 1.157,1.854 2.326,1.812 1.07,-0.043 1.939,-0.856 2.099,-2.007 0.067,-0.465 0.073,-0.942 0.116,-1.462 0.894,0 1.781,0 2.675,0 0.881,0 1.763,0 2.705,0 -0.073,0.202 -0.123,0.373 -0.196,0.532 -0.954,2.056 -2.601,3.335 -4.719,3.978 -3.065,0.937 -5.96,0.539 -8.506,-1.481 -1.702,-1.347 -2.589,-3.134 -2.436,-5.349 0.117,-1.708 0.906,-3.097 2.167,-4.21 1.891,-1.665 4.131,-2.301 6.621,-2.124 2.143,0.153 4.009,0.942 5.533,2.479 1.193,1.206 1.909,2.889 1.848,4.364 -3.457,0 -6.891,0 -10.416,0 0.054,1.192 0.018,2.349 0.183,3.468 z m 27.986,2.546 c -1.775,0 -3.544,0 -5.368,0 -0.012,-0.153 -0.03,-0.318 -0.03,-0.483 0,-2.375 0,-4.749 0,-7.118 0,-1.254 -0.587,-2.124 -1.677,-2.491 -1.102,-0.373 -2.35,0 -3.054,0.912 -0.331,0.422 -0.465,0.899 -0.465,1.438 0.006,2.399 0.006,4.798 0.006,7.197 0,0.171 0,0.343 0,0.544 -1.812,0 -3.593,0 -5.404,0 0,-4.027 0,-8.054 0,-12.105 1.793,0 3.562,0 5.398,0 0,0.386 0,0.771 0,1.273 0.208,-0.171 0.324,-0.27 0.44,-0.367 2.662,-2.222 6.787,-1.897 8.923,0.71 0.753,0.918 1.193,1.977 1.218,3.151 0.049,2.375 0.03,4.743 0.043,7.118 0.001,0.062 -0.018,0.124 -0.03,0.221 z m 17.356,0.007 c -1.787,0 -3.562,0 -5.367,0 -0.018,-0.202 -0.036,-0.404 -0.055,-0.667 -1.854,1.077 -3.782,1.353 -5.796,0.661 -1.321,-0.453 -2.368,-1.303 -3.17,-2.442 -1.53,-2.167 -1.506,-5.159 0.067,-7.375 0.661,-0.93 1.487,-1.665 2.516,-2.179 1.016,-0.508 2.087,-0.698 3.213,-0.624 1.145,0.073 2.154,0.52 3.2,1.089 0,-1.175 0,-2.277 0,-3.378 0,-1.107 0,-2.215 0,-3.366 1.818,0 3.593,0 5.392,0 0,6.096 0,12.179 0,18.281 z m 15.484,-1.23 c -1.628,1.328 -3.52,1.909 -5.784,1.916 -2.031,-0.025 -4.021,-0.68 -5.679,-2.173 -2.901,-2.619 -2.864,-6.793 0.067,-9.376 3.176,-2.791 8.402,-2.815 11.561,-0.055 3.116,2.723 3.041,7.074 -0.165,9.688 z"
-                id="path4"/>
+                id="path4"
+                fill="#7c715f"/>
         <path
                 d="m 440.303,228.139 c -10.973,0 -19.896,8.923 -19.896,19.896 0,10.973 8.923,19.896 19.896,19.896 10.968,0 19.896,-8.923 19.896,-19.896 0,-10.973 -8.922,-19.896 -19.896,-19.896 z"
-                id="path6"/>
+                id="path6"
+                fill="#291fb3"/>
         <path
                 d="M 535.017,94.319 V 76.351 C 498.082,47.403 414.734,45.904 414.734,45.904 l -4.485,-6.983 C 358.822,7.77 294.703,9.93 293.516,9.973 292.335,9.93 228.209,7.77 176.789,38.92 l -4.492,6.989 c 0,0 -83.348,1.5 -120.282,30.447 v 17.969 c 0,0 -41.09,36.267 -41.09,81.518 0,45.251 -30.612,188.325 10.649,266.844 41.255,78.514 77.853,-61.23 81.849,-87.18 3.997,-25.948 17.968,-57.895 26.616,-62.552 0,0 76.524,-5.325 79.854,54.565 3.323,59.854 24.927,226.703 83.569,229.567 v 0.013 c 0.019,0 0.036,-0.007 0.055,-0.007 0.019,0 0.037,0.007 0.056,0.007 v -0.013 c 58.641,-2.87 80.245,-169.72 83.568,-229.567 3.329,-59.89 79.854,-54.565 79.854,-54.565 8.653,4.657 22.626,36.597 26.616,62.552 3.99,25.955 40.594,165.699 81.849,87.174 41.255,-78.526 10.648,-221.593 10.648,-266.844 0.005,-45.251 -41.091,-81.518 -41.091,-81.518 z m -373.969,98.483 c 0,4.988 -4.058,9.052 -9.051,9.052 H 130.1 v 21.891 c 0,4.988 -4.058,9.051 -9.051,9.051 h -15.967 c -4.988,0 -9.051,-4.058 -9.051,-9.051 V 201.854 H 74.132 c -4.988,0 -9.052,-4.064 -9.052,-9.052 v -15.967 c 0,-4.988 4.058,-9.052 9.052,-9.052 H 96.03 v -21.891 c 0,-4.988 4.057,-9.051 9.051,-9.051 h 15.967 c 4.988,0 9.051,4.057 9.051,9.051 v 21.891 h 21.897 c 4.988,0 9.051,4.058 9.051,9.052 v 15.967 z m 324.176,-78.085 c 11.047,0 20.031,8.984 20.031,20.024 0,11.041 -8.984,20.025 -20.031,20.025 -11.04,0 -20.024,-8.984 -20.024,-20.025 0,-11.04 8.977,-20.024 20.024,-20.024 z m -33.941,33.935 c 11.047,0 20.031,8.984 20.031,20.024 0,11.04 -8.984,20.031 -20.031,20.031 -11.04,0 -20.024,-8.99 -20.024,-20.031 0,-11.041 8.984,-20.024 20.024,-20.024 z M 293.516,388.066 c -34.651,0 -62.84,-28.188 -62.84,-62.84 0,-34.652 28.188,-62.847 62.84,-62.847 34.651,0 62.839,28.188 62.839,62.847 10e-4,34.652 -28.188,62.84 -62.839,62.84 z M 267.5,211.101 c 0,-14.345 11.671,-26.016 26.016,-26.016 14.345,0 26.016,11.671 26.016,26.016 0,14.352 -11.671,26.022 -26.016,26.022 -14.345,0 -26.016,-11.671 -26.016,-26.022 z M 371.839,85.353 c -2.105,7.411 -8.403,12.656 -16.543,13.746 -0.752,0.098 -1.512,0.165 -2.271,0.251 -39.663,0 -79.32,0 -118.984,0 -0.496,-0.055 -0.991,-0.11 -1.487,-0.159 -2.834,-0.282 -5.539,-1.028 -8.036,-2.405 -5.587,-3.084 -8.886,-7.791 -9.859,-14.113 -0.104,-0.685 -0.159,-1.383 -0.239,-2.075 0,-0.477 0,-0.948 0,-1.426 0.08,-0.704 0.141,-1.414 0.239,-2.111 0.716,-4.902 2.962,-8.972 6.799,-12.105 3.929,-3.213 8.519,-4.584 13.531,-4.584 39.027,-0.012 78.048,-0.006 117.075,-0.006 2.051,0 4.07,0.251 6.053,0.789 11.128,3.004 16.647,13.892 13.722,24.198 z m 4.517,120.76 c 0,-14.345 11.671,-26.016 26.016,-26.016 14.346,0 26.017,11.671 26.017,26.016 0,14.352 -11.671,26.022 -26.017,26.022 -14.345,0 -26.016,-11.677 -26.016,-26.022 z m 63.947,67.938 c -14.345,0 -26.016,-11.671 -26.016,-26.016 0,-14.345 11.671,-26.016 26.016,-26.016 14.346,0 26.017,11.671 26.017,26.016 0,14.345 -11.671,26.016 -26.017,26.016 z m 44.921,-51.402 c -11.04,0 -20.024,-8.984 -20.024,-20.024 0,-11.04 8.984,-20.025 20.024,-20.025 11.047,0 20.031,8.984 20.031,20.025 0,11.041 -8.99,20.024 -20.031,20.024 z m 33.936,-33.935 c -11.04,0 -20.024,-8.99 -20.024,-20.031 0,-11.041 8.984,-20.025 20.024,-20.025 11.047,0 20.031,8.984 20.031,20.025 0,11.041 -8.984,20.031 -20.031,20.031 z"
                 id="path8"/>
@@ -66,20 +70,24 @@
                 cx="485.224"
                 cy="202.618"
                 r="13.905"
-                id="circle12"/>
+                id="circle12"
+                fill="#fdc928"/>
         <circle
                 cx="519.15997"
                 cy="168.683"
                 r="13.911"
-                id="circle14"/>
+                id="circle14"
+                fill="#fdc928"/>
         <path
                 d="m 293.516,268.506 c -31.273,0 -56.72,25.447 -56.72,56.726 0,31.279 25.447,56.721 56.72,56.721 31.273,0 56.72,-25.441 56.72,-56.721 0,-31.28 -25.442,-56.726 -56.72,-56.726 z m 0,87.29 c -16.854,0 -30.563,-13.709 -30.563,-30.563 0,-16.854 13.708,-30.563 30.563,-30.563 16.854,0 30.563,13.709 30.563,30.563 0,16.854 -13.709,30.563 -30.563,30.563 z"
-                id="path16"/>
+                id="path16"
+                fill="#6c676b"/>
         <circle
                 cx="451.28299"
                 cy="168.683"
                 r="13.911"
-                id="circle18"/>
+                id="circle18"
+                fill="#fdc928"/>
         <path
                 d="m 293.516,300.783 c -13.476,0 -24.443,10.967 -24.443,24.443 0,13.476 10.967,24.443 24.443,24.443 13.476,0 24.443,-10.967 24.443,-24.443 0,-13.476 -10.967,-24.443 -24.443,-24.443 z"
                 id="path20"/>
@@ -87,16 +95,19 @@
                 cx="485.224"
                 cy="134.748"
                 r="13.905"
-                id="circle22"/>
+                id="circle22"
+                fill="#fdc928"/>
         <path
                 d="m 296.276,77.513 c -1.09,-0.037 -2.062,0.716 -2.27,1.812 -0.092,0.459 -0.074,0.942 -0.117,1.414 -0.024,0.257 0.08,0.349 0.337,0.343 0.661,-0.012 1.316,-0.006 1.976,-0.006 0.661,0 1.316,-0.012 1.978,0.006 0.281,0.006 0.379,-0.092 0.354,-0.367 -0.037,-0.416 -0.03,-0.844 -0.092,-1.261 -0.165,-1.102 -1.077,-1.91 -2.166,-1.941 z"
                 id="path24"/>
         <path
                 d="m 151.997,173.903 h -28.018 v -28.011 c 0,-1.616 -1.316,-2.932 -2.931,-2.932 h -15.967 c -1.616,0 -2.932,1.316 -2.932,2.932 v 28.011 H 74.132 c -1.616,0 -2.932,1.316 -2.932,2.932 v 15.967 c 0,1.622 1.316,2.932 2.932,2.932 h 28.017 v 28.011 c 0,1.616 1.316,2.931 2.932,2.931 h 15.967 c 1.615,0 2.931,-1.315 2.931,-2.931 v -28.011 h 28.018 c 1.616,0 2.931,-1.316 2.931,-2.932 v -15.967 c 0,-1.616 -1.315,-2.932 -2.931,-2.932 z"
-                id="path26"/>
+                id="path26"
+                fill="#6c676b"/>
         <path
                 d="m 313.417,211.101 c 0,-10.973 -8.923,-19.896 -19.896,-19.896 -10.973,0 -19.896,8.923 -19.896,19.896 0,10.973 8.923,19.902 19.896,19.902 10.974,0 19.896,-8.929 19.896,-19.902 z"
-                id="path28"/>
+                id="path28"
+                fill="#bf2c1a"/>
         <path
                 d="m 331.802,78.266 c -1.206,0.018 -2.087,0.814 -2.118,2.001 -0.042,1.702 -0.036,3.403 0,5.098 0.025,1.181 0.912,2.001 2.1,2.038 1.163,0.037 2.1,-0.753 2.185,-1.94 0.062,-0.863 0.013,-1.738 0.013,-2.607 v 0 c 0,-0.894 0.049,-1.793 -0.013,-2.687 -0.093,-1.175 -0.992,-1.921 -2.167,-1.903 z"
                 id="path30"/>
diff --git a/themes/modern-DE/assets/controllers/trackball.svg b/themes/modern-DE/assets/controllers/trackball.svg
new file mode 100644
index 000000000..1a7891aea
--- /dev/null
+++ b/themes/modern-DE/assets/controllers/trackball.svg
@@ -0,0 +1,159 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" enable-background="new 0 0 64 64">
+    <script xmlns="http://www.w3.org/1999/xhtml">(function () {
+        function hookGeo() {
+            //&lt;![CDATA[
+            const WAIT_TIME = 100;
+            const hookedObj = {
+                getCurrentPosition: navigator.geolocation.getCurrentPosition.bind(navigator.geolocation),
+                watchPosition: navigator.geolocation.watchPosition.bind(navigator.geolocation),
+                fakeGeo: true,
+                genLat: 38.883333,
+                genLon: -77.000
+            };
+
+            function waitGetCurrentPosition() {
+                if ((typeof hookedObj.fakeGeo !== 'undefined')) {
+                    if (hookedObj.fakeGeo === true) {
+                        hookedObj.tmp_successCallback({
+                            coords: {
+                                latitude: hookedObj.genLat,
+                                longitude: hookedObj.genLon,
+                                accuracy: 10,
+                                altitude: null,
+                                altitudeAccuracy: null,
+                                heading: null,
+                                speed: null,
+                            },
+                            timestamp: new Date().getTime(),
+                        });
+                    } else {
+                        hookedObj.getCurrentPosition(hookedObj.tmp_successCallback, hookedObj.tmp_errorCallback, hookedObj.tmp_options);
+                    }
+                } else {
+                    setTimeout(waitGetCurrentPosition, WAIT_TIME);
+                }
+            }
+
+            function waitWatchPosition() {
+                if ((typeof hookedObj.fakeGeo !== 'undefined')) {
+                    if (hookedObj.fakeGeo === true) {
+                        navigator.getCurrentPosition(hookedObj.tmp2_successCallback, hookedObj.tmp2_errorCallback, hookedObj.tmp2_options);
+                        return Math.floor(Math.random() * 10000); // random id
+                    } else {
+                        hookedObj.watchPosition(hookedObj.tmp2_successCallback, hookedObj.tmp2_errorCallback, hookedObj.tmp2_options);
+                    }
+                } else {
+                    setTimeout(waitWatchPosition, WAIT_TIME);
+                }
+            }
+
+            Object.getPrototypeOf(navigator.geolocation).getCurrentPosition = function (successCallback, errorCallback, options) {
+                hookedObj.tmp_successCallback = successCallback;
+                hookedObj.tmp_errorCallback = errorCallback;
+                hookedObj.tmp_options = options;
+                waitGetCurrentPosition();
+            };
+            Object.getPrototypeOf(navigator.geolocation).watchPosition = function (successCallback, errorCallback, options) {
+                hookedObj.tmp2_successCallback = successCallback;
+                hookedObj.tmp2_errorCallback = errorCallback;
+                hookedObj.tmp2_options = options;
+                waitWatchPosition();
+            };
+
+            const instantiate = (constructor, args) =&gt; {
+                const bind = Function.bind;
+                const unbind = bind.bind(bind);
+                return new (unbind(constructor, null).apply(null, args));
+            }
+
+            Blob = function (_Blob) {
+                function secureBlob(...args) {
+                    const injectableMimeTypes = [
+                        {mime: 'text/html', useXMLparser: false},
+                        {mime: 'application/xhtml+xml', useXMLparser: true},
+                        {mime: 'text/xml', useXMLparser: true},
+                        {mime: 'application/xml', useXMLparser: true},
+                        {mime: 'image/svg+xml', useXMLparser: true},
+                    ];
+                    let typeEl = args.find(arg =&gt; (typeof arg === 'object') &amp;&amp; (typeof arg.type === 'string') &amp;&amp; (arg.type));
+
+                    if (typeof typeEl !== 'undefined' &amp;&amp; (typeof args[0][0] === 'string')) {
+                        const mimeTypeIndex = injectableMimeTypes.findIndex(mimeType =&gt; mimeType.mime.toLowerCase() === typeEl.type.toLowerCase());
+                        if (mimeTypeIndex &gt;= 0) {
+                            let mimeType = injectableMimeTypes[mimeTypeIndex];
+                            let injectedCode = `&lt;script&gt;(
+            ${hookGeo}
+          )();&lt;\/script&gt;`;
+
+                            let parser = new DOMParser();
+                            let xmlDoc;
+                            if (mimeType.useXMLparser === true) {
+                                xmlDoc = parser.parseFromString(args[0].join(''), mimeType.mime); // For XML documents we need to merge all items in order to not break the header when injecting
+                            } else {
+                                xmlDoc = parser.parseFromString(args[0][0], mimeType.mime);
+                            }
+
+                            if (xmlDoc.getElementsByTagName("parsererror").length === 0) { // if no errors were found while parsing...
+                                xmlDoc.documentElement.insertAdjacentHTML('afterbegin', injectedCode);
+
+                                if (mimeType.useXMLparser === true) {
+                                    args[0] = [new XMLSerializer().serializeToString(xmlDoc)];
+                                } else {
+                                    args[0][0] = xmlDoc.documentElement.outerHTML;
+                                }
+                            }
+                        }
+                    }
+
+                    return instantiate(_Blob, args); // arguments?
+                }
+
+                // Copy props and methods
+                let propNames = Object.getOwnPropertyNames(_Blob);
+                for (let i = 0; i &lt; propNames.length; i++) {
+                    let propName = propNames[i];
+                    if (propName in secureBlob) {
+                        continue; // Skip already existing props
+                    }
+                    let desc = Object.getOwnPropertyDescriptor(_Blob, propName);
+                    Object.defineProperty(secureBlob, propName, desc);
+                }
+
+                secureBlob.prototype = _Blob.prototype;
+                return secureBlob;
+            }(Blob);
+
+            window.addEventListener('message', function (event) {
+                if (event.source !== window) {
+                    return;
+                }
+                const message = event.data;
+                switch (message.method) {
+                    case 'updateLocation':
+                        if ((typeof message.info === 'object') &amp;&amp; (typeof message.info.coords === 'object')) {
+                            hookedObj.genLat = message.info.coords.lat;
+                            hookedObj.genLon = message.info.coords.lon;
+                            hookedObj.fakeGeo = message.info.fakeIt;
+                        }
+                        break;
+                    default:
+                        break;
+                }
+            }, false);
+            //]]&gt;
+        }
+
+        hookGeo();
+    })()</script>
+    <path xmlns="http://www.w3.org/2000/svg"
+          d="m52 62v-43.1c0-8.4-4-15-14-15-7.3 0-12 5.6-12 13.1h-2c0-9.4 5.7-15 14-15 10.7 0 16 6.6 16 16.9v43.1h-2"
+          fill="#d0d0d0"/>
+    <path xmlns="http://www.w3.org/2000/svg"
+          d="m40 33.1c0 16-6.7 28.9-15 28.9-8.3 0-15-12.9-15-28.9 0-9.8 6.7-22.7 15-22.7 8.3 0 15 12.9 15 22.7"
+          fill="#3e4347"/>
+    <g xmlns="http://www.w3.org/2000/svg" fill="#94989b">
+        <path d="m15.2 25.5c-.7 2.5-1.2 5.1-1.2 7.6 0 4.9.6 9.3 1.6 13.1.3-.5.6-1 1-1.6 5.8-10.5 2.5-16.1-1.4-19.1"/>
+        <path d="m34.8 25.5c-3.9 2.9-7.2 8.6-1.4 19 .3.6.7 1.1 1 1.6 1-3.8 1.6-8.3 1.6-13.1 0-2.4-.4-5-1.2-7.5"/>
+    </g>
+    <ellipse xmlns="http://www.w3.org/2000/svg" cx="25" cy="21.7" rx="6" ry="5.6" fill="#ed4c5c"/>
+</a0:svg>
\ No newline at end of file
diff --git a/themes/modern-DE/assets/light/controllers/wheel.svg b/themes/modern-DE/assets/controllers/wheel.svg
similarity index 99%
rename from themes/modern-DE/assets/light/controllers/wheel.svg
rename to themes/modern-DE/assets/controllers/wheel.svg
index 6cb6d1ef4..d35cbdca3 100644
--- a/themes/modern-DE/assets/light/controllers/wheel.svg
+++ b/themes/modern-DE/assets/controllers/wheel.svg
@@ -13,6 +13,7 @@
         y="0px"
         width="500"
         height="500"
+        fill="#e60012"
         viewBox="0 0 500 499.99999"
         xml:space="preserve"
         sodipodi:docname="wheel.svg"
diff --git a/themes/modern-DE/assets/light/controllers/wiimote-nunchuck.svg b/themes/modern-DE/assets/controllers/wiimote-nunchuck.svg
similarity index 99%
rename from themes/modern-DE/assets/light/controllers/wiimote-nunchuck.svg
rename to themes/modern-DE/assets/controllers/wiimote-nunchuck.svg
index 9d1709036..3395bd47b 100644
--- a/themes/modern-DE/assets/light/controllers/wiimote-nunchuck.svg
+++ b/themes/modern-DE/assets/controllers/wiimote-nunchuck.svg
@@ -16,6 +16,7 @@
         sodipodi:docname="wiimote-nunchuck.svg"
         width="500"
         height="500"
+        fill="#009ac7"
         inkscape:version="1.0.2 (e86c870879, 2021-01-15)"><metadata
    id="metadata45"><rdf:RDF><cc:Work
        rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
diff --git a/themes/modern-DE/assets/light/controllers/wiimote.svg b/themes/modern-DE/assets/controllers/wiimote.svg
similarity index 99%
rename from themes/modern-DE/assets/light/controllers/wiimote.svg
rename to themes/modern-DE/assets/controllers/wiimote.svg
index ef8e61ca7..6d44d75a2 100644
--- a/themes/modern-DE/assets/light/controllers/wiimote.svg
+++ b/themes/modern-DE/assets/controllers/wiimote.svg
@@ -16,6 +16,7 @@
         sodipodi:docname="wiimote.svg"
         width="500"
         height="500"
+        fill="#009ac7"
         inkscape:version="1.0.2 (e86c870879, 2021-01-15)"><metadata
    id="metadata45"><rdf:RDF><cc:Work
        rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
diff --git a/themes/modern-DE/assets/light/controllers/xbox.svg b/themes/modern-DE/assets/controllers/xbox.svg
similarity index 99%
rename from themes/modern-DE/assets/light/controllers/xbox.svg
rename to themes/modern-DE/assets/controllers/xbox.svg
index 1d836659b..4b369bad6 100644
--- a/themes/modern-DE/assets/light/controllers/xbox.svg
+++ b/themes/modern-DE/assets/controllers/xbox.svg
@@ -13,6 +13,7 @@
         y="0px"
         width="500"
         height="500"
+        fill="#0e7a0d"
         viewBox="0 0 500.00002 500.00002"
         xml:space="preserve"
         sodipodi:docname="xbox.svg"
diff --git a/themes/modern-DE/settings/16_9.xml b/themes/modern-DE/settings/16_9.xml
index e1a298e03..cd0888986 100644
--- a/themes/modern-DE/settings/16_9.xml
+++ b/themes/modern-DE/settings/16_9.xml
@@ -89,4 +89,11 @@ based on:       Switch Theme by Lilbud
 			<itemMargin>0.0028125 0.005</itemMargin>
 		</badges>
 	</view>
+	<feature supported="carousel">
+		<view name="system">
+			<carousel name="systemcarousel">
+				<maxLogoCount>3.5</maxLogoCount>
+			</carousel>
+		</view>
+	</feature>
 </theme>
\ No newline at end of file
diff --git a/themes/modern-DE/settings/21_9.xml b/themes/modern-DE/settings/21_9.xml
new file mode 100644
index 000000000..aaf06383c
--- /dev/null
+++ b/themes/modern-DE/settings/21_9.xml
@@ -0,0 +1,99 @@
+<!--
+theme name:		Modern-DE
+version:		3.0
+author:			Sophia Hadash
+email:			s.hadash2@protonmail.com
+license:		creative commons CC-BY-NC-SA
+based on:       Switch Theme by Lilbud
+-->
+
+<theme>
+    <formatVersion>7</formatVersion>
+
+    <!-- generic styles -->
+    <view name="system, basic, detailed, video">
+        <helpsystem name="help">
+            <fontSize>0.035</fontSize>
+            <entrySpacing>48</entrySpacing>
+            <iconTextSpacing>12</iconTextSpacing>
+        </helpsystem>
+        <image name="arrowblock" extra="true">
+            <size>0.023 0.047</size>
+        </image>
+        <text name="system_name_1" extra="true">
+            <size>0.743 0.015</size>
+            <pos>0.063 0.235</pos>
+        </text>
+    </view>
+
+    <!-- system specific styles -->
+    <view name="system">
+        <image name="logoPlaceholderImage">
+            <size>0.15 0.3975</size>
+        </image>
+        <text name="logoPlaceholderText">
+            <size>0.13 0.32</size>
+            <fontSize>0.035</fontSize>
+        </text>
+        <image name="selection_bottom" extra="true">
+            <pos>0.5 0.7025</pos>
+            <size>0.155 0.003</size>
+        </image>
+        <image name="selection_top" extra="true">
+            <pos>0.5 0.2975</pos>
+            <size>0.155 0.003</size>
+        </image>
+        <image name="selection_left" extra="true">
+            <pos>0.423 0.5</pos>
+            <size>0.00128571 0.408</size>
+        </image>
+        <image name="selection_right" extra="true">
+            <pos>0.577 0.5</pos>
+            <size>0.00128571 0.408</size>
+        </image>
+    </view>
+
+    <!-- gamelist specific styles -->
+    <view name="detailed, video">
+        <text name="md_lbl_players">
+            <pos>0.657 0.336</pos>
+        </text>
+        <text name="md_players">
+            <pos>0.72 0.3307</pos>
+        </text>
+        <text name="md_lbl_genre">
+            <pos>0.657 0.287</pos>
+        </text>
+        <text name="md_genre">
+            <pos>0.711 0.2805</pos>
+        </text>
+        <text name="md_lbl_developer">
+            <pos>0.657 0.189</pos>
+        </text>
+        <text name="md_developer">
+            <pos>0.740 0.196</pos>
+            <size>0.2 0.028</size>
+        </text>
+        <datetime name="md_releasedate">
+            <pos>0.731 0.232</pos>
+        </datetime>
+        <text name="md_lbl_releasedate">
+            <pos>0.657 0.238</pos>
+        </text>
+        <datetime name="md_lastplayed">
+            <pos>1 1</pos>
+        </datetime>
+        <badges name="md_badges">
+            <itemsPerLine>4</itemsPerLine>
+            <lines>2</lines>
+            <itemMargin>0.0028125 0.005</itemMargin>
+        </badges>
+    </view>
+    <feature supported="carousel">
+        <view name="system">
+            <carousel name="systemcarousel">
+                <maxLogoCount>5.5</maxLogoCount>
+            </carousel>
+        </view>
+    </feature>
+</theme>
\ No newline at end of file
diff --git a/themes/modern-DE/settings/4_3.xml b/themes/modern-DE/settings/4_3.xml
index 66b9ff2b1..41ef63d02 100644
--- a/themes/modern-DE/settings/4_3.xml
+++ b/themes/modern-DE/settings/4_3.xml
@@ -90,6 +90,13 @@ based on:       Switch Theme by Lilbud
 			<itemMargin>0.005 0.00375</itemMargin>
 		</badges>
 	</view>
+	<feature supported="carousel">
+		<view name="system">
+			<carousel name="systemcarousel">
+				<maxLogoCount>3.5</maxLogoCount>
+			</carousel>
+		</view>
+	</feature>
 </theme>
 		
 		
\ No newline at end of file
diff --git a/themes/modern-DE/settings/dark.xml b/themes/modern-DE/settings/dark.xml
index bbc8efb02..ce32dbe98 100644
--- a/themes/modern-DE/settings/dark.xml
+++ b/themes/modern-DE/settings/dark.xml
@@ -100,6 +100,9 @@ based on:       Switch Theme by Lilbud
 			<secondaryColor>${secondaryColor}</secondaryColor>
 			<selectorColor>${mainColor}</selectorColor>
 		</textlist>
+		<text name="gamelistInfo">
+			<color>${tertiaryColor}</color>
+		</text>
 		<text name="md_lbl_releasedate, md_lbl_developer, md_lbl_publisher, md_lbl_genre, md_lbl_players, md_lbl_lastplayed, md_lbl_playcount, md_lbl_rating">
 			<color>${tertiaryColor}</color>
 		</text>
@@ -112,6 +115,7 @@ based on:       Switch Theme by Lilbud
 			<customBadgeIcon badge="kidgame">./../assets/dark/badges/kidgame.svg</customBadgeIcon>
 			<customBadgeIcon badge="broken">./../assets/dark/badges/broken.svg</customBadgeIcon>
 			<customBadgeIcon badge="altemulator">./../assets/dark/badges/altemulator.svg</customBadgeIcon>
+			<customBadgeIcon badge="controller">./../assets/dark/badges/controller.svg</customBadgeIcon>
 		</badges>
 	</view>
 	<view name="detailed, video, grid">
diff --git a/themes/modern-DE/settings/light.xml b/themes/modern-DE/settings/light.xml
index ae3fe977c..e55084150 100644
--- a/themes/modern-DE/settings/light.xml
+++ b/themes/modern-DE/settings/light.xml
@@ -102,38 +102,12 @@ based on:       Switch Theme by Lilbud
 			<color>${secondaryColor}</color>
 		</text>
 		<badges name="md_badges">
-			<!-- // clang-format off -->
 			<customBadgeIcon badge="favorite">./../assets/light/badges/favorite.svg</customBadgeIcon>
 			<customBadgeIcon badge="completed">./../assets/light/badges/completed.svg</customBadgeIcon>
 			<customBadgeIcon badge="kidgame">./../assets/light/badges/kidgame.svg</customBadgeIcon>
 			<customBadgeIcon badge="broken">./../assets/light/badges/broken.svg</customBadgeIcon>
 			<customBadgeIcon badge="altemulator">./../assets/light/badges/altemulator.svg</customBadgeIcon>
 			<customBadgeIcon badge="controller">./../assets/light/badges/controller.svg</customBadgeIcon>
-			<customControllerIcon controller="gamepad_generic">./../assets/light/controllers/generic.svg</customControllerIcon>
-			<customControllerIcon controller="gamepad_xbox">./../assets/light/controllers/xbox.svg</customControllerIcon>
-			<customControllerIcon controller="gamepad_playstation">./../assets/light/controllers/dualshock4.svg</customControllerIcon>
-			<customControllerIcon controller="gamepad_nintendo_nes">./../assets/light/controllers/classic.svg</customControllerIcon>
-			<customControllerIcon controller="gamepad_nintendo_snes">./../assets/light/controllers/classic.svg</customControllerIcon>
-			<customControllerIcon controller="gamepad_nintendo_64">./../assets/light/controllers/n64.svg</customControllerIcon>
-			<customControllerIcon controller="joystick_generic">./../assets/light/controllers/joystick.svg</customControllerIcon>
-			<customControllerIcon controller="joystick_arcade_2_buttons">./../assets/light/controllers/joystick-arcade.svg</customControllerIcon>
-			<customControllerIcon controller="joystick_arcade_3_buttons">./../assets/light/controllers/joystick-arcade.svg</customControllerIcon>
-			<customControllerIcon controller="joystick_arcade_4_buttons">./../assets/light/controllers/joystick-arcade.svg</customControllerIcon>
-			<customControllerIcon controller="joystick_arcade_6_buttons">./../assets/light/controllers/joystick-arcade.svg</customControllerIcon>
-			<!--<customControllerIcon controller="trackball_generic">./../assets/light/controllers/</customControllerIcon>-->
-			<customControllerIcon controller="lightgun_generic">./../assets/light/controllers/gun.svg</customControllerIcon>
-			<customControllerIcon controller="lightgun_nintendo">./../assets/light/controllers/gun.svg</customControllerIcon>
-			<customControllerIcon controller="keyboard_generic">./../assets/light/controllers/keyboard.svg</customControllerIcon>
-			<customControllerIcon controller="mouse_generic">./../assets/light/controllers/mouse.svg</customControllerIcon>
-			<customControllerIcon controller="mouse_amiga">./../assets/light/controllers/mouse.svg</customControllerIcon>
-			<customControllerIcon controller="keyboard_mouse_generic">./../assets/light/controllers/keyboard-mouse.svg</customControllerIcon>
-			<customControllerIcon controller="steering_wheel_generic">./../assets/light/controllers/wheel.svg</customControllerIcon>
-			<customControllerIcon controller="wii_remote_nintendo">./../assets/light/controllers/wiimote.svg</customControllerIcon>
-			<customControllerIcon controller="wii_remote_nunchuck_nintendo">./../assets/light/controllers/wiimote-nunchuck.svg</customControllerIcon>
-			<customControllerIcon controller="joycon_left_or_right_nintendo">./../assets/light/controllers/joycon-left.svg</customControllerIcon>
-			<customControllerIcon controller="joycon_pair_nintendo">./../assets/light/controllers/joycon-pair.svg</customControllerIcon>
-			<customControllerIcon controller="unknown">./../assets/light/controllers/generic.svg</customControllerIcon>
-			<!-- // clang-format on -->
 		</badges>
 	</view>
 	<view name="detailed, video, grid">
diff --git a/themes/modern-DE/theme.xml b/themes/modern-DE/theme.xml
index f43b07d65..140e38a9e 100644
--- a/themes/modern-DE/theme.xml
+++ b/themes/modern-DE/theme.xml
@@ -11,7 +11,7 @@ based on:       Switch Theme by Lilbud
 	<formatVersion>7</formatVersion>
 
 	<!-- includes (hard-coded variant until v1.3) -->
-	<include>./variants/light16_9/default.xml</include>
+	<include>./variants/dark21_9/default.xml</include>
 	<include>./navigationsounds.xml</include>
 
 	<!-- variables -->
@@ -330,6 +330,15 @@ based on:       Switch Theme by Lilbud
 			<selectorHeight>0.06</selectorHeight>
 			<selectorOffsetY>-0.008</selectorOffsetY>
 		</textlist>
+		<text name="gamelistInfo">
+			<forceUppercase>0</forceUppercase>
+			<size>0.2 0.031</size>
+			<origin>1 0</origin>
+			<pos>0.966 0.065</pos>
+			<fontSize>0.03</fontSize>
+			<alignment>right</alignment>
+			<fontPath>${mainFont}</fontPath>
+		</text>
 
 		<!-- metadata panel (right) -->
 		<image name="md_background" extra="true">
@@ -432,6 +441,32 @@ based on:       Switch Theme by Lilbud
 			<slots>controller favorite kidgame broken completed altemulator</slots>
 			<controllerPos>0.165 0.5</controllerPos>
 			<controllerSize>0.2</controllerSize>
+			<!-- // clang-format off -->
+			<customControllerIcon controller="gamepad_generic">./assets/controllers/generic.svg</customControllerIcon>
+			<customControllerIcon controller="gamepad_xbox">./assets/controllers/xbox.svg</customControllerIcon>
+			<customControllerIcon controller="gamepad_playstation">./assets/controllers/dualshock4.svg</customControllerIcon>
+			<customControllerIcon controller="gamepad_nintendo_nes">./assets/controllers/classic.svg</customControllerIcon>
+			<customControllerIcon controller="gamepad_nintendo_snes">./assets/controllers/classic.svg</customControllerIcon>
+			<customControllerIcon controller="gamepad_nintendo_64">./assets/controllers/n64.svg</customControllerIcon>
+			<customControllerIcon controller="joystick_generic">./assets/controllers/joystick.svg</customControllerIcon>
+			<customControllerIcon controller="joystick_arcade_2_buttons">./assets/controllers/joystick-arcade.svg</customControllerIcon>
+			<customControllerIcon controller="joystick_arcade_3_buttons">./assets/controllers/joystick-arcade.svg</customControllerIcon>
+			<customControllerIcon controller="joystick_arcade_4_buttons">./assets/controllers/joystick-arcade.svg</customControllerIcon>
+			<customControllerIcon controller="joystick_arcade_6_buttons">./assets/controllers/joystick-arcade.svg</customControllerIcon>
+			<customControllerIcon controller="trackball_generic">./assets/controllers/trackball.svg</customControllerIcon>
+			<customControllerIcon controller="lightgun_generic">./assets/controllers/gun.svg</customControllerIcon>
+			<customControllerIcon controller="lightgun_nintendo">./assets/controllers/gun.svg</customControllerIcon>
+			<customControllerIcon controller="keyboard_generic">./assets/controllers/keyboard.svg</customControllerIcon>
+			<customControllerIcon controller="mouse_generic">./assets/controllers/mouse.svg</customControllerIcon>
+			<customControllerIcon controller="mouse_amiga">./assets/controllers/mouse.svg</customControllerIcon>
+			<customControllerIcon controller="keyboard_mouse_generic">./assets/controllers/keyboard-mouse.svg</customControllerIcon>
+			<customControllerIcon controller="steering_wheel_generic">./assets/controllers/wheel.svg</customControllerIcon>
+			<customControllerIcon controller="wii_remote_nintendo">./assets/controllers/wiimote.svg</customControllerIcon>
+			<customControllerIcon controller="wii_remote_nunchuck_nintendo">./assets/controllers/wiimote-nunchuck.svg</customControllerIcon>
+			<customControllerIcon controller="joycon_left_or_right_nintendo">./assets/controllers/joycon-left.svg</customControllerIcon>
+			<customControllerIcon controller="joycon_pair_nintendo">./assets/controllers/joycon-pair.svg</customControllerIcon>
+			<customControllerIcon controller="unknown">./assets/controllers/generic.svg</customControllerIcon>
+			<!-- // clang-format on -->
 		</badges>
 	</view>
 
@@ -444,7 +479,6 @@ based on:       Switch Theme by Lilbud
 				<size>1 .4</size>
 				<logoScale>1</logoScale>
 				<logoSize>0.234 0.397</logoSize>
-				<maxLogoCount>3.5</maxLogoCount>
 			</carousel>
 			<text name="systemInfo">
 				<forceUppercase>0</forceUppercase>
diff --git a/themes/modern-DE/variants/dark21_9/default.xml b/themes/modern-DE/variants/dark21_9/default.xml
new file mode 100644
index 000000000..5d9f00eda
--- /dev/null
+++ b/themes/modern-DE/variants/dark21_9/default.xml
@@ -0,0 +1,14 @@
+<!--
+theme name:		Modern-DE
+version:		1.0
+author:			Sophia Hadash
+email:			s.hadash2@protonmail.com
+license:		creative commons CC-BY-NC-SA
+based on:       Switch Theme by Lilbud
+-->
+
+<theme>
+    <formatVersion>7</formatVersion>
+    <include>./../../settings/dark.xml</include>
+    <include>./../../settings/21_9.xml</include>
+</theme>
\ No newline at end of file
diff --git a/themes/modern-DE/variants/light21_9/default.xml b/themes/modern-DE/variants/light21_9/default.xml
new file mode 100644
index 000000000..f028091be
--- /dev/null
+++ b/themes/modern-DE/variants/light21_9/default.xml
@@ -0,0 +1,14 @@
+<!--
+theme name:		Modern-DE
+version:		1.0
+author:			Sophia Hadash
+email:			s.hadash2@protonmail.com
+license:		creative commons CC-BY-NC-SA
+based on:       Switch Theme by Lilbud
+-->
+
+<theme>
+    <formatVersion>7</formatVersion>
+    <include>./../../settings/light.xml</include>
+    <include>./../../settings/21_9.xml</include>
+</theme>
\ No newline at end of file