From ec669a79c00d5dec48c8c61ba5eac224ed3f5b05 Mon Sep 17 00:00:00 2001
From: Leon Styhre <leon@leonstyhre.com>
Date: Fri, 5 Feb 2021 17:27:55 +0100
Subject: [PATCH] Changed the system name for Thomson MO/TO from 'thomson' to
 'moto' to follow the RetroPie naming convention.

---
 USERGUIDE.md                                  |   4 +-
 es-app/src/PlatformId.cpp                     |   2 +-
 es-app/src/PlatformId.h                       |   2 +-
 es-app/src/scrapers/ScreenScraper.cpp         |   2 +-
 resources/templates/es_systems.cfg_macos      |  18 +-
 resources/templates/es_systems.cfg_unix       |  18 +-
 .../templates/es_systems.cfg_unix_flatpak     |  18 +-
 resources/templates/es_systems.cfg_windows    |  18 +-
 themes/rbsimple-DE/MISSING.md                 |   2 +-
 .../rbsimple-DE/{thomson => moto}/colors.xml  |   0
 .../{thomson => moto}/images/console.svg      |   0
 .../{thomson => moto}/images/consolegame.svg  |   0
 .../{thomson => moto}/images/controller.svg   |   0
 themes/rbsimple-DE/moto/images/logo.svg       | 179 ++++++++++++++++++
 themes/rbsimple-DE/moto/images/logo2.svg      | 179 ++++++++++++++++++
 .../{thomson => moto}/systeminfo.xml          |   2 +-
 .../rbsimple-DE/{thomson => moto}/theme.xml   |   0
 17 files changed, 401 insertions(+), 43 deletions(-)
 rename themes/rbsimple-DE/{thomson => moto}/colors.xml (100%)
 rename themes/rbsimple-DE/{thomson => moto}/images/console.svg (100%)
 rename themes/rbsimple-DE/{thomson => moto}/images/consolegame.svg (100%)
 rename themes/rbsimple-DE/{thomson => moto}/images/controller.svg (100%)
 create mode 100644 themes/rbsimple-DE/moto/images/logo.svg
 create mode 100644 themes/rbsimple-DE/moto/images/logo2.svg
 rename themes/rbsimple-DE/{thomson => moto}/systeminfo.xml (76%)
 rename themes/rbsimple-DE/{thomson => moto}/theme.xml (100%)

diff --git a/USERGUIDE.md b/USERGUIDE.md
index d1c5601ab..8b25fe767 100644
--- a/USERGUIDE.md
+++ b/USERGUIDE.md
@@ -1034,7 +1034,7 @@ Displays the framerate and VRAM statistics as an overlay. You normally never nee
 
 **Enable menu in kid mode**
 
-Enabling or disabling the menu when the UI mode is set to Kid.
+Enabling or disabling the menu when the UI mode is set to Kid. Mostly intended for testing purposes as it's normally not recommended to enable the menu in this restricted mode.
 
 **Show quit menu (reboot and power off entries)** _(Unix and Windows only)_
 
@@ -1473,6 +1473,7 @@ Consider the table below a work in progress as it's obvioulsy not fully populate
 | megadrive             | Sega Mega Drive                                | RetroArch (Genesis Plus GX)       | Single archive or ROM file in root folder |
 | mess                  | Multi Emulator Super System                    |                                   |                                      |
 | moonlight             | Moonlight game streaming                       |                                   |                                      |
+| moto                  | Thomson MO/TO series                           |                                   |                                      |
 | msx                   | MSX                                            |                                   |                                      |
 | msx1                  | MSX1                                           |                                   |                                      |
 | msx2                  | MSX2                                           |                                   |                                      |
@@ -1516,7 +1517,6 @@ Consider the table below a work in progress as it's obvioulsy not fully populate
 | stratagus             | Stratagus game engine                          |                                   |                                      |
 | sufami                | Bandai SuFami Turbo                            |                                   |                                      |
 | supergrafx            | NEC SuperGrafx                                 |                                   |                                      |
-| thomson               | Thomson TO/MO series                           |                                   |                                      |
 | tg16                  | NEC TurboGrafx-16                              |                                   |                                      |
 | tg-cd                 | NEC TurboGrafx-CD                              |                                   |                                      |
 | ti99                  | Texas Instruments TI-99                        |                                   |                                      |
diff --git a/es-app/src/PlatformId.cpp b/es-app/src/PlatformId.cpp
index d66bfd027..ddc18a9c6 100644
--- a/es-app/src/PlatformId.cpp
+++ b/es-app/src/PlatformId.cpp
@@ -106,6 +106,7 @@ namespace PlatformIds
         "lutro",
         "mess",
         "moonlight",
+        "moto",
         "oric",
         "pcfx",
         "residualvm",
@@ -116,7 +117,6 @@ namespace PlatformIds
         "zmachine",
         "ti99",
         "naomi",
-        "thomson",
         "uzebox",
         "spectravideo",
         "palm",
diff --git a/es-app/src/PlatformId.h b/es-app/src/PlatformId.h
index f9ed9f8de..f51db0b5c 100644
--- a/es-app/src/PlatformId.h
+++ b/es-app/src/PlatformId.h
@@ -106,6 +106,7 @@ namespace PlatformIds
         LUTRO,
         MESS,
         MOONLIGHT,
+        THOMSON_MOTO,
         ORIC,
         PCFX,
         RESIDUALVM,
@@ -116,7 +117,6 @@ namespace PlatformIds
         ZMACHINE,
         TI99,
         SEGA_NAOMI,
-        THOMSON_TO_MO,
         UZEBOX,
         SPECTRAVIDEO,
         PALM_OS,
diff --git a/es-app/src/scrapers/ScreenScraper.cpp b/es-app/src/scrapers/ScreenScraper.cpp
index 67d9ba18d..06185a48a 100644
--- a/es-app/src/scrapers/ScreenScraper.cpp
+++ b/es-app/src/scrapers/ScreenScraper.cpp
@@ -115,7 +115,7 @@ const std::map<PlatformId, unsigned short> screenscraper_platformid_map {
     { TRS80_COLOR_COMPUTER, 144 },
     { TANDY, 144 },
     { SEGA_NAOMI, 56 },
-    { THOMSON_TO_MO, 141 },
+    { THOMSON_MOTO, 141 },
     { UZEBOX, 216 },
     { SPECTRAVIDEO, 218 },
     { PALM_OS, 219 }
diff --git a/resources/templates/es_systems.cfg_macos b/resources/templates/es_systems.cfg_macos
index 69212c02a..7f7f6df5b 100644
--- a/resources/templates/es_systems.cfg_macos
+++ b/resources/templates/es_systems.cfg_macos
@@ -559,6 +559,15 @@
     <platform>moonlight</platform>
     <theme>moonlight</theme>
   </system>
+  <system>
+    <name>moto</name>
+    <fullname>Thomson MO/TO series</fullname>
+    <path>%ROMPATH%/moto</path>
+    <extension>.fd .FD .sap .SAP .k7 .K7 .m7 .M7 .m5 .M5 .rom .ROM .7z .7Z .zip .ZIP</extension>
+    <command>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %EMUPATH%/../Resources/cores/theodore_libretro.dylib %ROM%</command>
+    <platform>moto</platform>
+    <theme>moto</theme>
+  </system>
   <system>
     <name>msx</name>
     <fullname>MSX</fullname>
@@ -946,15 +955,6 @@
     <platform>supergrafx</platform>
     <theme>supergrafx</theme>
   </system>
-  <system>
-    <name>thomson</name>
-    <fullname>Thomson TO/MO series</fullname>
-    <path>%ROMPATH%/thomson</path>
-    <extension>.fd .FD .sap .SAP .k7 .K7 .m7 .M7 .m5 .M5 .rom .ROM .7z .7Z .zip .ZIP</extension>
-    <command>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %EMUPATH%/../Resources/cores/theodore_libretro.dylib %ROM%</command>
-    <platform>thomson</platform>
-    <theme>thomson</theme>
-  </system>
   <system>
     <name>tg16</name>
     <fullname>NEC TurboGrafx-16</fullname>
diff --git a/resources/templates/es_systems.cfg_unix b/resources/templates/es_systems.cfg_unix
index d85b8bd1d..9e8cc02ab 100644
--- a/resources/templates/es_systems.cfg_unix
+++ b/resources/templates/es_systems.cfg_unix
@@ -559,6 +559,15 @@
     <platform>moonlight</platform>
     <theme>moonlight</theme>
   </system>
+  <system>
+    <name>moto</name>
+    <fullname>Thomson MO/TO series</fullname>
+    <path>%ROMPATH%/moto</path>
+    <extension>.fd .FD .sap .SAP .k7 .K7 .m7 .M7 .m5 .M5 .rom .ROM .7z .7Z .zip .ZIP</extension>
+    <command>retroarch -L %COREPATH%/theodore_libretro.so %ROM%</command>
+    <platform>moto</platform>
+    <theme>moto</theme>
+  </system>
   <system>
     <name>msx</name>
     <fullname>MSX</fullname>
@@ -946,15 +955,6 @@
     <platform>supergrafx</platform>
     <theme>supergrafx</theme>
   </system>
-  <system>
-    <name>thomson</name>
-    <fullname>Thomson TO/MO series</fullname>
-    <path>%ROMPATH%/thomson</path>
-    <extension>.fd .FD .sap .SAP .k7 .K7 .m7 .M7 .m5 .M5 .rom .ROM .7z .7Z .zip .ZIP</extension>
-    <command>retroarch -L %COREPATH%/theodore_libretro.so %ROM%</command>
-    <platform>thomson</platform>
-    <theme>thomson</theme>
-  </system>
   <system>
     <name>tg16</name>
     <fullname>NEC TurboGrafx-16</fullname>
diff --git a/resources/templates/es_systems.cfg_unix_flatpak b/resources/templates/es_systems.cfg_unix_flatpak
index 2c62ae247..6c34502dc 100644
--- a/resources/templates/es_systems.cfg_unix_flatpak
+++ b/resources/templates/es_systems.cfg_unix_flatpak
@@ -559,6 +559,15 @@
     <platform>moonlight</platform>
     <theme>moonlight</theme>
   </system>
+  <system>
+    <name>moto</name>
+    <fullname>Thomson MO/TO series</fullname>
+    <path>%ROMPATH%/moto</path>
+    <extension>.fd .FD .sap .SAP .k7 .K7 .m7 .M7 .m5 .M5 .rom .ROM .7z .7Z .zip .ZIP</extension>
+    <command>flatpak run org.libretro.RetroArch -L %COREPATH%/theodore_libretro.so %ROM%</command>
+    <platform>moto</platform>
+    <theme>moto</theme>
+  </system>
   <system>
     <name>msx</name>
     <fullname>MSX</fullname>
@@ -946,15 +955,6 @@
     <platform>supergrafx</platform>
     <theme>supergrafx</theme>
   </system>
-  <system>
-    <name>thomson</name>
-    <fullname>Thomson TO/MO series</fullname>
-    <path>%ROMPATH%/thomson</path>
-    <extension>.fd .FD .sap .SAP .k7 .K7 .m7 .M7 .m5 .M5 .rom .ROM .7z .7Z .zip .ZIP</extension>
-    <command>flatpak run org.libretro.RetroArch -L %COREPATH%/theodore_libretro.so %ROM%</command>
-    <platform>thomson</platform>
-    <theme>thomson</theme>
-  </system>
   <system>
     <name>tg16</name>
     <fullname>NEC TurboGrafx-16</fullname>
diff --git a/resources/templates/es_systems.cfg_windows b/resources/templates/es_systems.cfg_windows
index 147b60767..d626a9b00 100644
--- a/resources/templates/es_systems.cfg_windows
+++ b/resources/templates/es_systems.cfg_windows
@@ -559,6 +559,15 @@
     <platform>moonlight</platform>
     <theme>moonlight</theme>
   </system>
+  <system>
+    <name>moto</name>
+    <fullname>Thomson MO/TO series</fullname>
+    <path>%ROMPATH%\moto</path>
+    <extension>.fd .FD .sap .SAP .k7 .K7 .m7 .M7 .m5 .M5 .rom .ROM .7z .7Z .zip .ZIP</extension>
+    <command>retroarch.exe -L %EMUPATH%\cores\theodore_libretro.dll %ROM%</command>
+    <platform>moto</platform>
+    <theme>moto</theme>
+  </system>
   <system>
     <name>msx</name>
     <fullname>MSX</fullname>
@@ -946,15 +955,6 @@
     <platform>supergrafx</platform>
     <theme>supergrafx</theme>
   </system>
-  <system>
-    <name>thomson</name>
-    <fullname>Thomson TO/MO series</fullname>
-    <path>%ROMPATH%\thomson</path>
-    <extension>.fd .FD .sap .SAP .k7 .K7 .m7 .M7 .m5 .M5 .rom .ROM .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L %EMUPATH%\cores\theodore_libretro.dll %ROM%</command>
-    <platform>thomson</platform>
-    <theme>thomson</theme>
-  </system>
   <system>
     <name>tg16</name>
     <fullname>NEC TurboGrafx-16</fullname>
diff --git a/themes/rbsimple-DE/MISSING.md b/themes/rbsimple-DE/MISSING.md
index f2cb76de3..972841899 100644
--- a/themes/rbsimple-DE/MISSING.md
+++ b/themes/rbsimple-DE/MISSING.md
@@ -39,6 +39,7 @@ None at the moment.
 * lutris: Lutris open gaming platform - system info, customized colors, consolegame.svg, console.svg, controller.svg, game.svg
 * macintosh: Apple Macintosh - system info, customized colors, consolegame.svg, console.svg, controller.svg, game.svg
 * mess: MESS (Multi Emulator Super System) - system info, customized colors, consolegame.svg, console.svg, controller.svg, game.svg
+* moto: Thomson MO/TO series - system info, customized colors, consolegame.svg, console.svg, controller.svg, game.svg
 * naomi: Sega NAOMI - system info, customized colors, logo.svg, consolegame.svg, console.svg, controller.svg, game.svg
 * neogeocd: Neo Geo CD - system info, customized colors, logo.svg, consolegame.svg, console.svg, controller.svg, game.svg
 * openbor: Open Beats of Rage (OpenBOR) game engine - system info, customized colors, logo.svg, consolegame.svg, console.svg, controller.svg, game.svg
@@ -59,7 +60,6 @@ None at the moment.
 * stratagus: Stratagus game engine - system info, customized colors, consolegame.svg, console.svg, controller.svg, game.svg
 * sufami: Bandai SuFami Turbo - system info, customized colors, logo.svg, consolegame.svg, console.svg, controller.svg, game.svg
 * x68000: Sharp X68000 - system info, customized colors, logo.svg, consolegame.svg, console.svg, controller.svg, game.svg
-* thomson: Thomson TO/MO series - system info, customized colors, consolegame.svg, console.svg, controller.svg, game.svg
 * trs-80: Tandy TRS 80 - system info, customized colors, consolegame.svg, console.svg, controller.svg, game.svg
 * uzebox: Uzebox - system info, customized colors, logo.svg, consolegame.svg, console.svg, controller.svg, game.svg
 * videopac: Magnavox Videopac (Odyssey 2) - update all info and graphics to differentiate European version from USA version
diff --git a/themes/rbsimple-DE/thomson/colors.xml b/themes/rbsimple-DE/moto/colors.xml
similarity index 100%
rename from themes/rbsimple-DE/thomson/colors.xml
rename to themes/rbsimple-DE/moto/colors.xml
diff --git a/themes/rbsimple-DE/thomson/images/console.svg b/themes/rbsimple-DE/moto/images/console.svg
similarity index 100%
rename from themes/rbsimple-DE/thomson/images/console.svg
rename to themes/rbsimple-DE/moto/images/console.svg
diff --git a/themes/rbsimple-DE/thomson/images/consolegame.svg b/themes/rbsimple-DE/moto/images/consolegame.svg
similarity index 100%
rename from themes/rbsimple-DE/thomson/images/consolegame.svg
rename to themes/rbsimple-DE/moto/images/consolegame.svg
diff --git a/themes/rbsimple-DE/thomson/images/controller.svg b/themes/rbsimple-DE/moto/images/controller.svg
similarity index 100%
rename from themes/rbsimple-DE/thomson/images/controller.svg
rename to themes/rbsimple-DE/moto/images/controller.svg
diff --git a/themes/rbsimple-DE/moto/images/logo.svg b/themes/rbsimple-DE/moto/images/logo.svg
new file mode 100644
index 000000000..a4ca6f282
--- /dev/null
+++ b/themes/rbsimple-DE/moto/images/logo.svg
@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="386.64349mm"
+   height="105.25655mm"
+   viewBox="0 0 386.64349 105.25655"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
+   sodipodi:docname="system.svg">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.7"
+     inkscape:cx="942.02313"
+     inkscape:cy="539.63474"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1594"
+     inkscape:window-height="942"
+     inkscape:window-x="131"
+     inkscape:window-y="12"
+     inkscape:window-maximized="0"
+     inkscape:snap-global="true"
+     inkscape:snap-nodes="false"
+     inkscape:snap-bbox="true"
+     inkscape:snap-bbox-midpoints="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:inline"
+     transform="translate(-101.9129,-192.29492)">
+    <path
+       inkscape:connector-curvature="0"
+       style="display:inline;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1.30421162;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
+       d="m 466.23323,193.23588 -19.32497,7.24603 v 7.38302 l 4.22128,-1.58254 v 8.00304 l 8.45426,3.17017 v -14.34169 l 6.64943,-2.49331 z"
+       id="path8969" />
+    <path
+       style="display:inline;fill:none;fill-opacity:1;stroke:#010002;stroke-width:1.30421162;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
+       d="m 467.52097,193.23588 19.32499,7.24601 v 7.38303 l -4.22131,-1.58255 v 0.006 l -8.45421,-3.16994 v -0.004 l -6.64947,-2.49337 z"
+       id="path9172"
+       inkscape:connector-curvature="0" />
+    <path
+       style="display:inline;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.77892429;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
+       d="m 467.25832,192.85684 0.93256,0.34957 v 7.38492 l -0.93256,-0.3498 z"
+       id="path8969-9-3"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       style="display:inline;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1.30421162;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
+       d="m 467.521,227.87716 19.32496,-7.24605 v -7.38302 l -4.2213,1.58254 v -8.00303 l -8.45422,-3.17016 v 14.34167 l -6.64944,2.49333 z"
+       id="path8969-3" />
+    <path
+       style="display:inline;fill:none;fill-opacity:1;stroke:#010002;stroke-width:1.30421162;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
+       d="m 466.23326,227.87716 -19.325,-7.24601 v -7.38305 l 4.22133,1.58255 v -0.006 l 8.4542,3.16992 v 0.004 l 6.64947,2.49337 z"
+       id="path9172-8"
+       inkscape:connector-curvature="0" />
+    <path
+       style="display:inline;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.77892429;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
+       d="m 466.4959,228.2562 -0.93255,-0.34957 v -7.38492 l 0.93255,0.34978 z"
+       id="path8969-9-3-6"
+       inkscape:connector-curvature="0" />
+    <g
+       aria-label="THOMSON"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:27.09069252px;line-height:1.25;font-family:'Microgramma D Extended';-inkscape-font-specification:'Microgramma D Extended, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.40636039"
+       id="text818"
+       transform="matrix(1.4720031,0,0,1.4720031,75.413633,-32.507086)">
+      <path
+         d="m 18.205362,154.28269 v 5.5265 h 9.655123 v 16.15689 h 6.924381 v -16.15689 h 9.655123 v -5.5265 z"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:32.50883102px;font-family:'Microgramma D Extended';-inkscape-font-specification:'Microgramma D Extended, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.40636039"
+         id="path854"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 45.011281,154.28269 v 21.68339 h 6.924381 v -7.83463 h 14.921554 v 7.83463 h 6.924381 v -21.68339 h -6.924381 v 7.76961 H 51.935662 v -7.76961 z"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:32.50883102px;font-family:'Microgramma D Extended';-inkscape-font-specification:'Microgramma D Extended, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.40636039"
+         id="path856"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 91.255602,153.9576 c -9.069964,0 -11.085511,0.22756 -12.743461,1.49541 -1.657951,1.26784 -2.145583,3.47844 -2.145583,9.52508 0,6.37174 0.455123,8.51732 2.145583,9.81767 1.65795,1.26785 3.673497,1.49541 12.808479,1.49541 8.97244,0 11.02049,-0.22756 12.67845,-1.49541 1.65795,-1.26784 2.14558,-3.44593 2.14558,-9.68763 0,-6.20919 -0.48763,-8.38728 -2.14558,-9.65512 -1.65796,-1.26785 -3.6735,-1.49541 -12.743468,-1.49541 z m 0,5.62403 c 6.046643,0 6.761837,0.0975 7.50954,0.97526 0.585159,0.7152 0.780217,1.95053 0.780217,5.16891 0,2.63321 -0.227567,3.57597 -0.97527,4.16113 -0.877738,0.65017 -1.95053,0.78021 -7.249469,0.78021 -5.461484,0 -6.501766,-0.0975 -7.379505,-0.78021 -0.780212,-0.61767 -0.975265,-1.49541 -0.975265,-4.19364 0,-2.76325 0.130036,-3.99859 0.520142,-4.74629 0.650176,-1.26784 1.267844,-1.36537 7.76961,-1.36537 z"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:32.50883102px;font-family:'Microgramma D Extended';-inkscape-font-specification:'Microgramma D Extended, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.40636039"
+         id="path858"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 108.75907,154.28269 v 21.68339 h 6.50177 l -0.16255,-16.22191 h 1.17032 l 8.15972,16.22191 h 5.49399 l 8.15972,-16.22191 h 1.1053 l -0.16255,16.22191 h 6.50177 v -21.68339 h -11.89823 l -6.46926,14.07632 -6.43675,-14.07632 z"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:32.50883102px;font-family:'Microgramma D Extended';-inkscape-font-specification:'Microgramma D Extended, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.40636039"
+         id="path860"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 147.78948,168.78163 v 1.04028 c 0,2.99081 0.48764,4.25866 1.98304,5.20141 1.52792,0.97527 4.16113,1.26785 10.89046,1.26785 6.46926,0 9.2,-0.16255 10.50035,-0.65018 2.24311,-0.84523 3.15336,-2.69823 3.15336,-6.46926 0,-3.02332 -0.55265,-4.48621 -2.04806,-5.46148 -1.39788,-0.87774 -2.79576,-1.04028 -9.9477,-1.26784 -4.58374,-0.13004 -6.37173,-0.22757 -6.95689,-0.39011 -0.68268,-0.16254 -0.97526,-0.58516 -0.97526,-1.39788 0,-1.59293 0.45512,-1.72297 6.04664,-1.72297 4.68127,0 5.49399,0.065 6.04664,0.39011 0.48763,0.29258 0.58516,0.58516 0.65018,1.78798 h 6.37173 c 0.0325,-0.42261 0.0325,-0.87773 0.0325,-1.00777 0,-2.5682 -0.52014,-3.93357 -1.8205,-4.81131 -1.52791,-1.04028 -3.80353,-1.33286 -10.11024,-1.33286 -5.20142,0 -8.19223,0.13004 -9.46007,0.39011 -2.99082,0.65017 -4.16113,2.50318 -4.16113,6.6318 0,4.7788 1.4954,6.14417 6.85936,6.30671 l 1.75548,0.065 3.51095,0.16254 5.20141,0.19506 c 2.11308,0.0325 2.60071,0.35759 2.60071,1.65795 0,1.91802 0,1.91802 -7.08693,1.91802 -4.64876,0 -5.36395,-0.065 -5.98162,-0.45513 -0.52014,-0.32508 -0.65018,-0.7477 -0.65018,-2.04805 z"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:32.50883102px;font-family:'Microgramma D Extended';-inkscape-font-specification:'Microgramma D Extended, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.40636039"
+         id="path862"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 191.06787,153.9576 c -9.06996,0 -11.08551,0.22756 -12.74346,1.49541 -1.65795,1.26784 -2.14558,3.47844 -2.14558,9.52508 0,6.37174 0.45512,8.51732 2.14558,9.81767 1.65795,1.26785 3.6735,1.49541 12.80848,1.49541 8.97244,0 11.02049,-0.22756 12.67844,-1.49541 1.65795,-1.26784 2.14559,-3.44593 2.14559,-9.68763 0,-6.20919 -0.48764,-8.38728 -2.14559,-9.65512 -1.65795,-1.26785 -3.6735,-1.49541 -12.74346,-1.49541 z m 0,5.62403 c 6.04664,0 6.76184,0.0975 7.50954,0.97526 0.58516,0.7152 0.78021,1.95053 0.78021,5.16891 0,2.63321 -0.22756,3.57597 -0.97526,4.16113 -0.87774,0.65017 -1.95053,0.78021 -7.24947,0.78021 -5.46149,0 -6.50177,-0.0975 -7.37951,-0.78021 -0.78021,-0.61767 -0.97526,-1.49541 -0.97526,-4.19364 0,-2.76325 0.13003,-3.99859 0.52014,-4.74629 0.65018,-1.26784 1.26784,-1.36537 7.76961,-1.36537 z"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:32.50883102px;font-family:'Microgramma D Extended';-inkscape-font-specification:'Microgramma D Extended, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.40636039"
+         id="path864"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 208.57134,154.28269 v 21.68339 h 6.72933 l -0.16254,-16.1894 h 0.71519 l 11.4106,16.1894 h 11.47562 v -21.68339 h -6.72933 l 0.16254,16.15689 h -0.68268 l -11.34558,-16.15689 z"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:32.50883102px;font-family:'Microgramma D Extended';-inkscape-font-specification:'Microgramma D Extended, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.40636039"
+         id="path866"
+         inkscape:connector-curvature="0" />
+    </g>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       x="151.56845"
+       y="228.20834"
+       id="text844"><tspan
+         sodipodi:role="line"
+         id="tspan842"
+         x="151.56845"
+         y="237.86385"
+         style="stroke-width:0.26458332" /></text>
+    <g
+       aria-label="MO / TO"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:38.74311829px;line-height:1.25;font-family:'Microgramma D Extended';-inkscape-font-specification:'Microgramma D Extended, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.58114672"
+       id="text818-1"
+       transform="matrix(1.4720031,0,0,1.4720031,75.413633,-32.507086)">
+      <path
+         d="m 30.852722,189.32375 v 31.00999 h 9.298348 l -0.232458,-23.19938 h 1.673702 l 11.669427,23.19938 h 7.857105 l 11.669427,-23.19938 h 1.580719 l -0.232459,23.19938 h 9.298348 V 189.32375 H 66.418904 l -9.251856,20.13092 -9.205365,-20.13092 z"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:46.49174118px;font-family:'Microgramma D Extended';-inkscape-font-specification:'Microgramma D Extended, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.26018751;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path869"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 108.42928,188.85883 c -12.971202,0 -15.853689,0.32544 -18.224768,2.13862 -2.371079,1.81318 -3.068455,4.97462 -3.068455,13.62208 0,9.11238 0.650884,12.18084 3.068455,14.04051 2.371079,1.81318 5.253566,2.13862 18.317748,2.13862 12.83172,0 15.7607,-0.32544 18.13178,-2.13862 2.37108,-1.81318 3.06846,-4.92813 3.06846,-13.85454 0,-8.87992 -0.69738,-11.99487 -3.06846,-13.80805 -2.37108,-1.81318 -5.25357,-2.13862 -18.22476,-2.13862 z m 0,8.04307 c 8.64746,0 9.67028,0.13948 10.73959,1.39475 0.83685,1.02282 1.1158,2.78951 1.1158,7.39219 0,3.76583 -0.32544,5.11409 -1.39475,5.95094 -1.25528,0.92984 -2.7895,1.11581 -10.36766,1.11581 -7.81061,0 -9.29835,-0.13948 -10.553628,-1.11581 -1.115801,-0.88334 -1.394752,-2.13862 -1.394752,-5.99743 0,-3.9518 0.185967,-5.71848 0.743868,-6.78779 0.929835,-1.81318 1.813178,-1.95266 11.111532,-1.95266 z"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:46.49174118px;font-family:'Microgramma D Extended';-inkscape-font-specification:'Microgramma D Extended, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.26018751;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path871"
+         inkscape:connector-curvature="0" />
+      <path
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:46.49174118px;font-family:'Microgramma D Extended';-inkscape-font-specification:'Microgramma D Extended, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.49874598;stroke-opacity:1"
+         d="m 163.28658,185.68282 -21.89649,38.2581 h 2.92281 l -0.0194,0.0338 h 5.04655 l 21.93627,-38.25765 h -2.9228 l 0.0199,-0.0343 z"
+         id="path873"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 182.9439,189.32375 v 7.90359 h 13.80804 v 23.1064 h 9.90274 v -23.1064 h 13.80805 v -7.90359 z"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:46.49174118px;font-family:'Microgramma D Extended';-inkscape-font-specification:'Microgramma D Extended, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.58114672;stroke-opacity:1"
+         id="path875"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 243.90912,188.85883 c -12.9712,0 -15.85369,0.32544 -18.22476,2.13862 -2.37108,1.81318 -3.06846,4.97462 -3.06846,13.62208 0,9.11238 0.65088,12.18084 3.06846,14.04051 2.37107,1.81318 5.25356,2.13862 18.31774,2.13862 12.83172,0 15.7607,-0.32544 18.13178,-2.13862 2.37108,-1.81318 3.06846,-4.92813 3.06846,-13.85454 0,-8.87992 -0.69738,-11.99487 -3.06846,-13.80805 -2.37108,-1.81318 -5.25357,-2.13862 -18.22476,-2.13862 z m 0,8.04307 c 8.64746,0 9.67028,0.13948 10.73959,1.39475 0.83685,1.02282 1.1158,2.78951 1.1158,7.39219 0,3.76583 -0.32544,5.11409 -1.39475,5.95094 -1.25528,0.92984 -2.78951,1.11581 -10.36766,1.11581 -7.81061,0 -9.29835,-0.13948 -10.55362,-1.11581 -1.11581,-0.88334 -1.39476,-2.13862 -1.39476,-5.99743 0,-3.9518 0.18597,-5.71848 0.74387,-6.78779 0.92984,-1.81318 1.81318,-1.95266 11.11153,-1.95266 z"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:46.49174118px;font-family:'Microgramma D Extended';-inkscape-font-specification:'Microgramma D Extended, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.58114672;stroke-opacity:1"
+         id="path877"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/rbsimple-DE/moto/images/logo2.svg b/themes/rbsimple-DE/moto/images/logo2.svg
new file mode 100644
index 000000000..5a4f44dd8
--- /dev/null
+++ b/themes/rbsimple-DE/moto/images/logo2.svg
@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="386.64349mm"
+   height="110.25655mm"
+   viewBox="0 0 386.64349 110.25655"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
+   sodipodi:docname="moto_dark_d.svg">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.24748738"
+     inkscape:cx="760.66953"
+     inkscape:cy="726.83755"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1581"
+     inkscape:window-height="874"
+     inkscape:window-x="290"
+     inkscape:window-y="50"
+     inkscape:window-maximized="0"
+     inkscape:snap-global="true"
+     inkscape:snap-nodes="false"
+     inkscape:snap-bbox="true"
+     inkscape:snap-bbox-midpoints="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:inline"
+     transform="translate(-101.9129,-187.29492)">
+    <path
+       inkscape:connector-curvature="0"
+       style="display:inline;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
+       d="m 466.23323,190.74004 -19.32497,7.24603 v 7.38302 l 4.22128,-1.58254 v 8.00304 l 8.45426,3.17017 v -14.34169 l 6.64943,-2.49331 z"
+       id="path8969" />
+    <path
+       style="display:inline;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
+       d="m 467.52097,190.74004 19.32499,7.24601 v 7.38303 l -4.22131,-1.58255 v 0.006 l -8.45421,-3.16994 v -0.004 l -6.64947,-2.49337 z"
+       id="path9172"
+       inkscape:connector-curvature="0" />
+    <path
+       style="display:inline;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.77892429;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
+       d="m 467.25832,190.361 0.93256,0.34957 v 7.38492 l -0.93256,-0.3498 z"
+       id="path8969-9-3"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       style="display:inline;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
+       d="m 467.521,225.38132 19.32496,-7.24605 v -7.38302 l -4.2213,1.58254 v -8.00303 l -8.45422,-3.17016 v 14.34167 l -6.64944,2.49333 z"
+       id="path8969-3" />
+    <path
+       style="display:inline;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
+       d="m 466.23326,225.38132 -19.325,-7.24601 v -7.38305 l 4.22133,1.58255 v -0.006 l 8.4542,3.16992 v 0.004 l 6.64947,2.49337 z"
+       id="path9172-8"
+       inkscape:connector-curvature="0" />
+    <path
+       style="display:inline;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.77892429;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
+       d="m 466.4959,225.76036 -0.93255,-0.34957 v -7.38492 l 0.93255,0.34978 z"
+       id="path8969-9-3-6"
+       inkscape:connector-curvature="0" />
+    <g
+       aria-label="THOMSON"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:27.09069252px;line-height:1.25;font-family:'Microgramma D Extended';-inkscape-font-specification:'Microgramma D Extended, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.40636039"
+       id="text818"
+       transform="matrix(1.4720031,0,0,1.4720031,75.413633,-35.002924)">
+      <path
+         d="m 18.205362,154.28269 v 5.5265 h 9.655123 v 16.15689 h 6.924381 v -16.15689 h 9.655123 v -5.5265 z"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:32.50883102px;font-family:'Microgramma D Extended';-inkscape-font-specification:'Microgramma D Extended, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.40636039"
+         id="path854"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 45.011281,154.28269 v 21.68339 h 6.924381 v -7.83463 h 14.921554 v 7.83463 h 6.924381 v -21.68339 h -6.924381 v 7.76961 H 51.935662 v -7.76961 z"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:32.50883102px;font-family:'Microgramma D Extended';-inkscape-font-specification:'Microgramma D Extended, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.40636039"
+         id="path856"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 91.255602,153.9576 c -9.069964,0 -11.085511,0.22756 -12.743461,1.49541 -1.657951,1.26784 -2.145583,3.47844 -2.145583,9.52508 0,6.37174 0.455123,8.51732 2.145583,9.81767 1.65795,1.26785 3.673497,1.49541 12.808479,1.49541 8.97244,0 11.02049,-0.22756 12.67845,-1.49541 1.65795,-1.26784 2.14558,-3.44593 2.14558,-9.68763 0,-6.20919 -0.48763,-8.38728 -2.14558,-9.65512 -1.65796,-1.26785 -3.6735,-1.49541 -12.743468,-1.49541 z m 0,5.62403 c 6.046643,0 6.761837,0.0975 7.50954,0.97526 0.585159,0.7152 0.780217,1.95053 0.780217,5.16891 0,2.63321 -0.227567,3.57597 -0.97527,4.16113 -0.877738,0.65017 -1.95053,0.78021 -7.249469,0.78021 -5.461484,0 -6.501766,-0.0975 -7.379505,-0.78021 -0.780212,-0.61767 -0.975265,-1.49541 -0.975265,-4.19364 0,-2.76325 0.130036,-3.99859 0.520142,-4.74629 0.650176,-1.26784 1.267844,-1.36537 7.76961,-1.36537 z"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:32.50883102px;font-family:'Microgramma D Extended';-inkscape-font-specification:'Microgramma D Extended, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.40636039"
+         id="path858"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 108.75907,154.28269 v 21.68339 h 6.50177 l -0.16255,-16.22191 h 1.17032 l 8.15972,16.22191 h 5.49399 l 8.15972,-16.22191 h 1.1053 l -0.16255,16.22191 h 6.50177 v -21.68339 h -11.89823 l -6.46926,14.07632 -6.43675,-14.07632 z"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:32.50883102px;font-family:'Microgramma D Extended';-inkscape-font-specification:'Microgramma D Extended, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.40636039"
+         id="path860"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 147.78948,168.78163 v 1.04028 c 0,2.99081 0.48764,4.25866 1.98304,5.20141 1.52792,0.97527 4.16113,1.26785 10.89046,1.26785 6.46926,0 9.2,-0.16255 10.50035,-0.65018 2.24311,-0.84523 3.15336,-2.69823 3.15336,-6.46926 0,-3.02332 -0.55265,-4.48621 -2.04806,-5.46148 -1.39788,-0.87774 -2.79576,-1.04028 -9.9477,-1.26784 -4.58374,-0.13004 -6.37173,-0.22757 -6.95689,-0.39011 -0.68268,-0.16254 -0.97526,-0.58516 -0.97526,-1.39788 0,-1.59293 0.45512,-1.72297 6.04664,-1.72297 4.68127,0 5.49399,0.065 6.04664,0.39011 0.48763,0.29258 0.58516,0.58516 0.65018,1.78798 h 6.37173 c 0.0325,-0.42261 0.0325,-0.87773 0.0325,-1.00777 0,-2.5682 -0.52014,-3.93357 -1.8205,-4.81131 -1.52791,-1.04028 -3.80353,-1.33286 -10.11024,-1.33286 -5.20142,0 -8.19223,0.13004 -9.46007,0.39011 -2.99082,0.65017 -4.16113,2.50318 -4.16113,6.6318 0,4.7788 1.4954,6.14417 6.85936,6.30671 l 1.75548,0.065 3.51095,0.16254 5.20141,0.19506 c 2.11308,0.0325 2.60071,0.35759 2.60071,1.65795 0,1.91802 0,1.91802 -7.08693,1.91802 -4.64876,0 -5.36395,-0.065 -5.98162,-0.45513 -0.52014,-0.32508 -0.65018,-0.7477 -0.65018,-2.04805 z"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:32.50883102px;font-family:'Microgramma D Extended';-inkscape-font-specification:'Microgramma D Extended, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.40636039"
+         id="path862"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 191.06787,153.9576 c -9.06996,0 -11.08551,0.22756 -12.74346,1.49541 -1.65795,1.26784 -2.14558,3.47844 -2.14558,9.52508 0,6.37174 0.45512,8.51732 2.14558,9.81767 1.65795,1.26785 3.6735,1.49541 12.80848,1.49541 8.97244,0 11.02049,-0.22756 12.67844,-1.49541 1.65795,-1.26784 2.14559,-3.44593 2.14559,-9.68763 0,-6.20919 -0.48764,-8.38728 -2.14559,-9.65512 -1.65795,-1.26785 -3.6735,-1.49541 -12.74346,-1.49541 z m 0,5.62403 c 6.04664,0 6.76184,0.0975 7.50954,0.97526 0.58516,0.7152 0.78021,1.95053 0.78021,5.16891 0,2.63321 -0.22756,3.57597 -0.97526,4.16113 -0.87774,0.65017 -1.95053,0.78021 -7.24947,0.78021 -5.46149,0 -6.50177,-0.0975 -7.37951,-0.78021 -0.78021,-0.61767 -0.97526,-1.49541 -0.97526,-4.19364 0,-2.76325 0.13003,-3.99859 0.52014,-4.74629 0.65018,-1.26784 1.26784,-1.36537 7.76961,-1.36537 z"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:32.50883102px;font-family:'Microgramma D Extended';-inkscape-font-specification:'Microgramma D Extended, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.40636039"
+         id="path864"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 208.57134,154.28269 v 21.68339 h 6.72933 l -0.16254,-16.1894 h 0.71519 l 11.4106,16.1894 h 11.47562 v -21.68339 h -6.72933 l 0.16254,16.15689 h -0.68268 l -11.34558,-16.15689 z"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:32.50883102px;font-family:'Microgramma D Extended';-inkscape-font-specification:'Microgramma D Extended, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.40636039"
+         id="path866"
+         inkscape:connector-curvature="0" />
+    </g>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       x="151.56845"
+       y="225.71251"
+       id="text844"><tspan
+         sodipodi:role="line"
+         id="tspan842"
+         x="151.56845"
+         y="235.36801"
+         style="stroke-width:0.26458332" /></text>
+    <g
+       aria-label="MO / TO"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:38.74311829px;line-height:1.25;font-family:'Microgramma D Extended';-inkscape-font-specification:'Microgramma D Extended, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.58114672"
+       id="text818-1"
+       transform="matrix(1.4720031,0,0,1.4720031,75.413633,-35.002924)">
+      <path
+         d="m 30.852722,189.32375 v 31.00999 h 9.298348 l -0.232458,-23.19938 h 1.673702 l 11.669427,23.19938 h 7.857105 l 11.669427,-23.19938 h 1.580719 l -0.232459,23.19938 h 9.298348 V 189.32375 H 66.418904 l -9.251856,20.13092 -9.205365,-20.13092 z"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:46.49174118px;font-family:'Microgramma D Extended';-inkscape-font-specification:'Microgramma D Extended, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.67934638;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path869"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 108.42928,188.85883 c -12.971202,0 -15.853689,0.32544 -18.224768,2.13862 -2.371079,1.81318 -3.068455,4.97462 -3.068455,13.62208 0,9.11238 0.650884,12.18084 3.068455,14.04051 2.371079,1.81318 5.253566,2.13862 18.317748,2.13862 12.83172,0 15.7607,-0.32544 18.13178,-2.13862 2.37108,-1.81318 3.06846,-4.92813 3.06846,-13.85454 0,-8.87992 -0.69738,-11.99487 -3.06846,-13.80805 -2.37108,-1.81318 -5.25357,-2.13862 -18.22476,-2.13862 z m 0,8.04307 c 8.64746,0 9.67028,0.13948 10.73959,1.39475 0.83685,1.02282 1.1158,2.78951 1.1158,7.39219 0,3.76583 -0.32544,5.11409 -1.39475,5.95094 -1.25528,0.92984 -2.7895,1.11581 -10.36766,1.11581 -7.81061,0 -9.29835,-0.13948 -10.553628,-1.11581 -1.115801,-0.88334 -1.394752,-2.13862 -1.394752,-5.99743 0,-3.9518 0.185967,-5.71848 0.743868,-6.78779 0.929835,-1.81318 1.813178,-1.95266 11.111532,-1.95266 z"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:46.49174118px;font-family:'Microgramma D Extended';-inkscape-font-specification:'Microgramma D Extended, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.67934638;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path871"
+         inkscape:connector-curvature="0" />
+      <path
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:46.49174118px;font-family:'Microgramma D Extended';-inkscape-font-specification:'Microgramma D Extended, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.67934638;stroke-opacity:1"
+         d="m 163.28658,185.68282 -21.89649,38.2581 h 2.92281 l -0.0194,0.0338 h 5.04655 l 21.93627,-38.25765 h -2.9228 l 0.0199,-0.0343 z"
+         id="path873"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 182.9439,189.32375 v 7.90359 h 13.80804 v 23.1064 h 9.90274 v -23.1064 h 13.80805 v -7.90359 z"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:46.49174118px;font-family:'Microgramma D Extended';-inkscape-font-specification:'Microgramma D Extended, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.67934638;stroke-opacity:1"
+         id="path875"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 243.90912,188.85883 c -12.9712,0 -15.85369,0.32544 -18.22476,2.13862 -2.37108,1.81318 -3.06846,4.97462 -3.06846,13.62208 0,9.11238 0.65088,12.18084 3.06846,14.04051 2.37107,1.81318 5.25356,2.13862 18.31774,2.13862 12.83172,0 15.7607,-0.32544 18.13178,-2.13862 2.37108,-1.81318 3.06846,-4.92813 3.06846,-13.85454 0,-8.87992 -0.69738,-11.99487 -3.06846,-13.80805 -2.37108,-1.81318 -5.25357,-2.13862 -18.22476,-2.13862 z m 0,8.04307 c 8.64746,0 9.67028,0.13948 10.73959,1.39475 0.83685,1.02282 1.1158,2.78951 1.1158,7.39219 0,3.76583 -0.32544,5.11409 -1.39475,5.95094 -1.25528,0.92984 -2.78951,1.11581 -10.36766,1.11581 -7.81061,0 -9.29835,-0.13948 -10.55362,-1.11581 -1.11581,-0.88334 -1.39476,-2.13862 -1.39476,-5.99743 0,-3.9518 0.18597,-5.71848 0.74387,-6.78779 0.92984,-1.81318 1.81318,-1.95266 11.11153,-1.95266 z"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:46.49174118px;font-family:'Microgramma D Extended';-inkscape-font-specification:'Microgramma D Extended, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.67934638;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path877"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>
diff --git a/themes/rbsimple-DE/thomson/systeminfo.xml b/themes/rbsimple-DE/moto/systeminfo.xml
similarity index 76%
rename from themes/rbsimple-DE/thomson/systeminfo.xml
rename to themes/rbsimple-DE/moto/systeminfo.xml
index edc417c4b..a2714f9c9 100644
--- a/themes/rbsimple-DE/thomson/systeminfo.xml
+++ b/themes/rbsimple-DE/moto/systeminfo.xml
@@ -3,7 +3,7 @@
 
     <view name="system">
         <text name="info1" extra="true">
-            <text>Thomson TO/MO series</text>
+            <text>Thomson MO/TO series</text>
         </text>
     </view>
 </theme>
diff --git a/themes/rbsimple-DE/thomson/theme.xml b/themes/rbsimple-DE/moto/theme.xml
similarity index 100%
rename from themes/rbsimple-DE/thomson/theme.xml
rename to themes/rbsimple-DE/moto/theme.xml