diff --git a/BrickController2/BrickController2.Android/BrickController2.Android.csproj b/BrickController2/BrickController2.Android/BrickController2.Android.csproj
index decbb114..60f3c3f5 100644
--- a/BrickController2/BrickController2.Android/BrickController2.Android.csproj
+++ b/BrickController2/BrickController2.Android/BrickController2.Android.csproj
@@ -20,12 +20,7 @@
 		<PublishReadyToRun>false</PublishReadyToRun>
 	</PropertyGroup>
 
-	<ItemGroup>
-		<None Remove="Resources\mipmap-hdpi\ic_launcher.png" />
-		<None Remove="Resources\mipmap-mdpi\ic_launcher.png" />
-		<None Remove="Resources\mipmap-xhdpi\ic_launcher.png" />
-		<None Remove="Resources\mipmap-xxhdpi\ic_launcher.png" />
-		<None Remove="Resources\mipmap-xxxhdpi\ic_launcher.png" />
+  <ItemGroup>
 		<None Remove="Resources\values-night\colors.xml" />
 		<None Remove="Resources\values-night\styles.xml" />
 		<None Remove="Resources\values\colors.xml" />
@@ -47,15 +42,8 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<AndroidResource Include="Resources\mipmap-hdpi\ic_launcher.png" />
-		<AndroidResource Include="Resources\mipmap-mdpi\ic_launcher.png" />
-		<AndroidResource Include="Resources\mipmap-xhdpi\ic_launcher.png" />
-		<AndroidResource Include="Resources\mipmap-xxhdpi\ic_launcher.png" />
-		<AndroidResource Include="Resources\mipmap-xxxhdpi\ic_launcher.png" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<MauiSplashScreen Include="Resources\splash.svg" BaseSize="128,128" Color="#990000" />
+		<MauiSplashScreen Include="Resources\splash.svg" BaseSize="128,128" Color="#1976D2" />
+		<MauiIcon Include="Resources\appicon.svg" BaseSize="64,64" ForegroundScale="0.65" />
 	</ItemGroup>
 
-</Project>
\ No newline at end of file
+</Project>
diff --git a/BrickController2/BrickController2.Android/MainActivity.cs b/BrickController2/BrickController2.Android/MainActivity.cs
index e95e65ea..35913636 100644
--- a/BrickController2/BrickController2.Android/MainActivity.cs
+++ b/BrickController2/BrickController2.Android/MainActivity.cs
@@ -16,7 +16,7 @@ namespace BrickController2.Droid
 {
     [Activity(
         Label = "BrickController2",
-        Icon = "@mipmap/ic_launcher",
+        Icon = "@mipmap/appicon",
         Theme = "@style/MainTheme",
         MainLauncher = true,
         ConfigurationChanges = 
diff --git a/BrickController2/BrickController2.Android/Properties/AndroidManifest.xml b/BrickController2/BrickController2.Android/Properties/AndroidManifest.xml
index 1fba04c1..739cf0a3 100644
--- a/BrickController2/BrickController2.Android/Properties/AndroidManifest.xml
+++ b/BrickController2/BrickController2.Android/Properties/AndroidManifest.xml
@@ -14,5 +14,5 @@
 	<uses-permission android:name="android.permission.BLUETOOTH_ADVERTISE" />
 	<uses-feature android:name="android.hardware.bluetooth" android:required="true" />
 	<uses-feature android:name="android.hardware.bluetooth_le" android:required="true" />
-	<application android:label="BrickController2.Android" android:icon="@mipmap/ic_launcher"></application>
+	<application android:label="BrickController2.Android" android:icon="@mipmap/appicon"></application>
 </manifest>
\ No newline at end of file
diff --git a/BrickController2/BrickController2.Android/Resources/appicon.svg b/BrickController2/BrickController2.Android/Resources/appicon.svg
new file mode 100644
index 00000000..c0e4d433
--- /dev/null
+++ b/BrickController2/BrickController2.Android/Resources/appicon.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="28mm" height="28mm" viewBox="0 0 28 28"><circle cx="14" cy="14" r="14" style="fill:#fff;stroke-width:.0909555;paint-order:stroke fill markers"/><path d="M11.5 4c-1.17.02-1.5 1.02-1.5 2-2.84.08-2.94.3-2.94 3.45h4.74c1.3 0 3.57.3 4.53 2.26.88 1.69.62 3.84-.68 4.83.9.62 1.48 1.49 1.48 3.13 0 1.83-.84 3.7-2.9 4.33h5.24c1.1 0 1.47-1.34 1.47-3V8c0-1.95-1.4-2-2.93-2 .07-1.02-.39-1.91-1.5-2z" style="fill:#2196f3;fill-opacity:1;stroke-width:.0364399;paint-order:stroke fill markers"/><path d="M11.53 17.73a.86.86 0 0 0-.85.85.86.86 0 0 0 .85.86.86.86 0 0 0 .86-.86.86.86 0 0 0-.86-.85z" style="fill:#2196f3;fill-opacity:1;stroke:none;stroke-width:.106928;paint-order:stroke fill markers"/><path d="M13.24 19.44a.86.86 0 0 0-.85.85.86.86 0 0 0 .85.86.86.86 0 0 0 .86-.86.86.86 0 0 0-.86-.85z" style="fill:#fc0;fill-opacity:1;stroke:none;stroke-width:.106928;paint-order:stroke fill markers"/><path d="M9.82 19.44a.86.86 0 0 0-.85.85.86.86 0 0 0 .85.86.86.86 0 0 0 .86-.86.86.86 0 0 0-.86-.85z" style="fill:green;fill-opacity:1;stroke:none;stroke-width:.106928;paint-order:stroke fill markers"/><path d="M11.53 21.15a.86.86 0 0 0-.85.86.86.86 0 0 0 .85.85.86.86 0 0 0 .86-.85.86.86 0 0 0-.86-.86z" style="fill:red;stroke:none;stroke-width:.106928;paint-order:stroke fill markers"/><path d="M11.53 11.17c-.46 0-.8.19-.8.4v.92l.8.8.8-.8v-.92c0-.22-.35-.4-.8-.4zm-2 1.6c-.22 0-.4.35-.4.81 0 .44.17.8.4.8h.92l.8-.8-.8-.8zm3.09 0-.8.81.8.8h.92c.22 0 .4-.36.4-.8 0-.45-.18-.8-.4-.8zm-1.09 1.1-.8.8v.92c0 .22.36.4.8.4.45 0 .8-.18.8-.4v-.92z" style="fill:#1a1a1a;stroke:#000;stroke-width:0;paint-order:stroke fill markers"/><path d="M11.53 21.15a.86.86 0 0 0-.85.86.86.86 0 0 0 .85.85.86.86 0 0 0 .86-.85.86.86 0 0 0-.86-.86z" style="fill:red;fill-opacity:1;stroke:none;stroke-width:.106928;paint-order:stroke fill markers"/></svg>
\ No newline at end of file
diff --git a/BrickController2/BrickController2.Android/Resources/mipmap-hdpi/ic_launcher.png b/BrickController2/BrickController2.Android/Resources/mipmap-hdpi/ic_launcher.png
deleted file mode 100644
index 3623924d..00000000
Binary files a/BrickController2/BrickController2.Android/Resources/mipmap-hdpi/ic_launcher.png and /dev/null differ
diff --git a/BrickController2/BrickController2.Android/Resources/mipmap-mdpi/ic_launcher.png b/BrickController2/BrickController2.Android/Resources/mipmap-mdpi/ic_launcher.png
deleted file mode 100644
index b00cbb33..00000000
Binary files a/BrickController2/BrickController2.Android/Resources/mipmap-mdpi/ic_launcher.png and /dev/null differ
diff --git a/BrickController2/BrickController2.Android/Resources/mipmap-xhdpi/ic_launcher.png b/BrickController2/BrickController2.Android/Resources/mipmap-xhdpi/ic_launcher.png
deleted file mode 100644
index 389fe931..00000000
Binary files a/BrickController2/BrickController2.Android/Resources/mipmap-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/BrickController2/BrickController2.Android/Resources/mipmap-xxhdpi/ic_launcher.png b/BrickController2/BrickController2.Android/Resources/mipmap-xxhdpi/ic_launcher.png
deleted file mode 100644
index 0627a9ad..00000000
Binary files a/BrickController2/BrickController2.Android/Resources/mipmap-xxhdpi/ic_launcher.png and /dev/null differ
diff --git a/BrickController2/BrickController2.Android/Resources/mipmap-xxxhdpi/ic_launcher.png b/BrickController2/BrickController2.Android/Resources/mipmap-xxxhdpi/ic_launcher.png
deleted file mode 100644
index eb21fb49..00000000
Binary files a/BrickController2/BrickController2.Android/Resources/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ
diff --git a/BrickController2/BrickController2.Android/Resources/splash.svg b/BrickController2/BrickController2.Android/Resources/splash.svg
index a7f8a773..40d73258 100644
--- a/BrickController2/BrickController2.Android/Resources/splash.svg
+++ b/BrickController2/BrickController2.Android/Resources/splash.svg
@@ -1,90 +1 @@
-<?xml version="1.0"?>
-<svg width="1024" height="1024" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" clip-rule="evenodd" fill-rule="evenodd" xml:space="preserve">
- <defs>
-  <linearGradient id="q" x1="0.13" x2="1.07" xlink:href="#f" y1="0.3" y2="0.79"/>
-  <linearGradient id="o">
-   <stop offset="0" stop-color="#111"/>
-   <stop offset="1" stop-color="#9d9d9d"/>
-  </linearGradient>
-  <linearGradient id="b">
-   <stop offset="0" stop-color="#1a1a1a"/>
-   <stop offset="0.63" stop-color="#666"/>
-  </linearGradient>
-  <linearGradient id="j">
-   <stop offset="0.04" stop-color="#818181"/>
-   <stop offset="1" stop-color="#323232"/>
-  </linearGradient>
-  <linearGradient id="i">
-   <stop offset="0.14" stop-color="#1a80c7"/>
-   <stop offset="1" stop-color="#09334f"/>
-  </linearGradient>
-  <linearGradient id="h">
-   <stop offset="0.15" stop-color="#c97f1e"/>
-   <stop offset="1" stop-color="#4d300c"/>
-  </linearGradient>
-  <linearGradient id="g">
-   <stop offset="0.16" stop-color="#5c5c5c"/>
-   <stop offset="1" stop-color="#2e2e2e"/>
-  </linearGradient>
-  <linearGradient id="k">
-   <stop offset="0.09" stop-color="#0f0"/>
-   <stop offset="1" stop-color="#004d00"/>
-  </linearGradient>
-  <linearGradient id="l">
-   <stop offset="0.02" stop-color="#ff1a1a"/>
-   <stop offset="1" stop-color="#380000"/>
-  </linearGradient>
-  <linearGradient id="r" x1="0.5" x2="0.5" xlink:href="#b" y1="1" y2="0"/>
-  <linearGradient id="f">
-   <stop offset="0" stop-color="#666"/>
-   <stop offset="0.63" stop-color="#1a1a1a"/>
-  </linearGradient>
-  <linearGradient id="n">
-   <stop offset="0" stop-color="#a1a1a1"/>
-   <stop offset="1" stop-color="#404040"/>
-  </linearGradient>
-  <linearGradient id="C" x1="0.15" x2="0.86" xlink:href="#n" y1="0.14" y2="0.85"/>
-  <linearGradient id="m">
-   <stop offset="0" stop-color="#a3a3a3"/>
-   <stop offset="0.88" stop-color="#3e3e3e"/>
-  </linearGradient>
-  <linearGradient id="B" x1="0.15" x2="0.84" xlink:href="#m" y1="0.15" y2="0.84"/>
-  <linearGradient id="D" x1="0.5" x2="0.5" xlink:href="#o" y1="1" y2="0"/>
-  <radialGradient cx="294.45" cy="382.65" fx="294.45" fy="382.65" gradientTransform="matrix(.92958 0 0 .92958 72.85 69.574)" gradientUnits="userSpaceOnUse" id="u" r="25.82" xlink:href="#g"/>
-  <radialGradient cx="694.41" cy="340.39" fx="694.41" fy="340.39" gradientTransform="matrix(.92958 0 0 .92958 48.898 23.969)" gradientUnits="userSpaceOnUse" id="z" r="25.82" xlink:href="#h"/>
-  <radialGradient cx="739.08" cy="385.93" fx="739.08" fy="385.93" gradientTransform="matrix(.92958 0 0 .92958 52.043 27.176)" gradientUnits="userSpaceOnUse" id="y" r="25.82" xlink:href="#l"/>
-  <radialGradient cx="694.41" cy="430.56" fx="694.41" fy="430.56" gradientTransform="matrix(.92958 0 0 .92958 48.898 30.318)" gradientUnits="userSpaceOnUse" id="x" r="25.82" xlink:href="#k"/>
-  <radialGradient cx="646.3" cy="385.93" fx="646.3" fy="385.93" gradientTransform="matrix(.92958 0 0 .92958 45.51 27.176)" gradientUnits="userSpaceOnUse" id="A" r="25.82" xlink:href="#i"/>
-  <radialGradient cx="415.11" cy="507.52" fx="415.11" fy="507.52" gradientTransform="translate(231.673 29.76) scale(.94318)" gradientUnits="userSpaceOnUse" id="p" r="44" xlink:href="#j"/>
-  <radialGradient cx="294.45" cy="382.65" fx="294.45" fy="382.65" gradientTransform="matrix(.92958 0 0 .92958 121.515 28.945)" gradientUnits="userSpaceOnUse" id="v" r="25.82" xlink:href="#g"/>
-  <radialGradient cx="294.45" cy="382.65" fx="294.45" fy="382.65" gradientTransform="matrix(.92958 0 0 .92958 72.85 -14.598)" gradientUnits="userSpaceOnUse" id="w" r="25.82" xlink:href="#g"/>
-  <radialGradient cx="294.45" cy="382.65" fx="294.45" fy="382.65" gradientTransform="matrix(.92958 0 0 .92958 20.734 26.945)" gradientUnits="userSpaceOnUse" id="s" r="25.82" xlink:href="#g"/>
-  <radialGradient cx="415.11" cy="507.52" fx="415.11" fy="507.52" gradientTransform="translate(23.586 28.837) scale(.94318)" gradientUnits="userSpaceOnUse" id="t" r="44" xlink:href="#j"/>
- </defs>
- <g class="layer">
-  <title>Layer 1</title>
-  <ellipse cx="518.41" cy="501.95" fill="#ffffff" id="svg_23" rx="418.5" ry="407.5" stroke="#bc6d6d" stroke-width="0"/>
-  <path d="m359.18,283.69c-3.99,-0.46 -8.12,-0.61 -12.13,-0.61l-0.08,0c-42.17,0.03 -80.3,25.12 -97.01,63.85c-65.44,86.16 -97.46,168.65 -101.54,233.21c-2.06,32.56 2.97,60.72 15.25,82.35c12.28,21.63 32.29,36.35 57.41,40.62c48.2,8.19 83.85,-12.57 107.43,-44.03c20.26,-27.03 32.93,-61.62 42.08,-94.48a72.49,72.49 0 0 0 110.9,-28.09l48.67,-0.71l26.05,0.35c11.21,27.11 37.65,44.79 66.98,44.79a72.49,72.49 0 0 0 44.91,-15.59c9.15,32.89 21.83,67.53 42.11,94.58c23.58,31.46 59.22,52.22 107.43,44.03c25.11,-4.26 45.13,-18.99 57.4,-40.62c12.28,-21.62 17.32,-49.79 15.26,-82.35c-4.12,-65.14 -41.34,-155.08 -107.97,-242.07l0.02,0.15c-18.38,-34.46 -54.25,-55.99 -93.3,-55.99l-0.08,0c-12.16,0.01 -15.04,1.24 -17.08,1.14l-23.32,0.34c-96.7,0.18 -192.71,0.04 -289.39,-0.86" fill="#000" id="svg_1"/>
-  <path d="m623.19,450.85c-31.8,0 -57.59,25.79 -57.59,57.6c0,31.81 25.78,57.59 57.59,57.59c31.81,0 57.6,-25.78 57.6,-57.59c0,-31.81 -25.79,-57.6 -57.6,-57.6zm0.01,12.91c24.68,0 44.68,20.01 44.68,44.69c0,24.68 -20,44.68 -44.68,44.68c-24.68,0 -44.69,-20 -44.69,-44.68c0,-24.68 20.01,-44.69 44.69,-44.69zm-208.09,-13.96c-31.81,0 -57.6,25.78 -57.6,57.59c0,31.81 25.79,57.6 57.6,57.6c31.81,0 57.59,-25.79 57.59,-57.6c0,-31.81 -25.78,-57.59 -57.59,-57.59zm0,12.91c24.68,0 44.69,20 44.69,44.68c0,24.68 -20.01,44.69 -44.69,44.69c-24.68,0 -44.68,-20.01 -44.68,-44.69s20,-44.68 44.68,-44.68z" fill="#666" id="svg_2"/>
-  <path d="m344.02,493.23a72.49,72.49 0 0 0 -0.13,0.64a72.49,72.49 0 0 1 0.13,-0.64zm349.52,-2.3a72.49,72.49 0 0 1 0.1,0.44a72.49,72.49 0 0 0 -0.1,-0.44zm-348.89,-0.56a72.49,72.49 0 0 0 -0.33,1.39a72.49,72.49 0 0 1 0.33,-1.39zm0.31,-1.26a72.49,72.49 0 0 0 -0.14,0.56a72.49,72.49 0 0 1 0.14,-0.56z" fill="#d45500" id="svg_3"/>
-  <path d="m344.02,493.23zm349.52,-2.3zm-348.89,-0.56zm0.31,-1.26zm348.01,-0.32zm-345.59,-7.23z" id="svg_4"/>
-  <circle cx="623.2" cy="508.45" fill="url(#p)" fill-rule="evenodd" id="svg_5" r="41.5" stroke-linecap="round" stroke-linejoin="round" stroke-width="0.58"/>
-  <path d="m415.11,467.67c21.94,0 39.72,17.79 39.72,39.72c0,21.94 -17.78,39.72 -39.72,39.72c-21.94,0 -39.72,-17.78 -39.72,-39.72c0,-21.94 17.78,-39.72 39.72,-39.72z" fill="#999" id="svg_6"/>
-  <path d="m438.35,438.73zm166.41,-0.39zm-168.46,-0.27zm-3.41,-0.95a71.61,71.61 0 0 1 1.35,0.35a70.84,70.84 0 0 1 -1.35,-0.35zm178.08,-0.12zm-180.2,-0.39zm-2.02,-0.41zm-1.29,-0.24zm-2.19,-0.34z" id="svg_7"/>
-  <path d="m794.78,388.57c49.37,72.98 73.35,141.27 76.66,193.61c1.89,29.92 -2.97,54.46 -12.83,71.83c-9.86,17.38 -24.23,27.94 -44.14,31.32c-41.84,7.11 -68.38,-9.04 -89.14,-36.73c-19.97,-26.65 -32.9,-64.39 -42.04,-99.61a72.49,72.49 0 0 0 12.39,-40.54a72.49,72.49 0 0 0 -1.37,-14.03a105.73,105.73 0 0 0 100.47,-105.6a105.73,105.73 0 0 0 0,-0.25z" fill="url(#q)" id="svg_8"/>
-  <path d="m241.35,391.57a105.73,105.73 0 0 0 102.42,102.93a72.49,72.49 0 0 0 -1.15,12.89a72.49,72.49 0 0 0 12.73,41.04c-9.13,35.14 -22.05,72.75 -41.97,99.32c-20.75,27.69 -47.3,43.84 -89.14,36.73c-19.9,-3.38 -34.27,-13.95 -44.14,-31.32c-9.86,-17.37 -14.72,-41.91 -12.82,-71.83c3.25,-51.41 26.44,-118.23 74.07,-189.76z" fill="url(#r)" id="svg_9"/>
-  <circle cx="294.45" cy="382.65" fill="url(#s)" fill-rule="evenodd" id="svg_10" r="24" stroke-linecap="round" stroke-linejoin="round" stroke-width="0.34"/>
-  <circle cx="415.11" cy="507.52" fill="url(#t)" fill-rule="evenodd" id="svg_11" r="41.5" stroke-linecap="round" stroke-linejoin="round" stroke-width="0.58"/>
-  <path d="m344.02,493.23a72.49,72.49 0 0 0 -0.13,0.64a72.49,72.49 0 0 1 0.13,-0.64zm349.52,-2.3a72.49,72.49 0 0 1 0.1,0.44a72.49,72.49 0 0 0 -0.1,-0.44zm-348.89,-0.56a72.49,72.49 0 0 0 -0.33,1.39a72.49,72.49 0 0 1 0.33,-1.39zm0.31,-1.26a72.49,72.49 0 0 0 -0.14,0.56a72.49,72.49 0 0 1 0.14,-0.56z" fill="#d45500" id="svg_12"/>
-  <circle cx="346.56" cy="425.28" fill="url(#u)" fill-rule="evenodd" id="svg_13" r="24" stroke-linecap="round" stroke-linejoin="round" stroke-width="0.34"/>
-  <circle cx="395.23" cy="384.65" fill="url(#v)" fill-rule="evenodd" id="svg_14" r="24" stroke-linecap="round" stroke-linejoin="round" stroke-width="0.34"/>
-  <circle cx="346.56" cy="341.11" fill="url(#w)" fill-rule="evenodd" id="svg_15" r="24" stroke-linecap="round" stroke-linejoin="round" stroke-width="0.34"/>
-  <circle cx="694.41" cy="430.56" fill="url(#x)" fill-rule="evenodd" id="svg_16" r="24" stroke-linecap="round" stroke-linejoin="round" stroke-width="0.34"/>
-  <circle cx="739.08" cy="385.93" fill="url(#y)" fill-rule="evenodd" id="svg_17" r="24" stroke-linecap="round" stroke-linejoin="round" stroke-width="0.34"/>
-  <circle cx="694.41" cy="340.39" fill="url(#z)" fill-rule="evenodd" id="svg_18" r="24" stroke-linecap="round" stroke-linejoin="round" stroke-width="0.34"/>
-  <circle cx="646.3" cy="385.93" fill="url(#A)" fill-rule="evenodd" id="svg_19" r="24" stroke-linecap="round" stroke-linejoin="round" stroke-width="0.34"/>
-  <path d="m347.05,298.05c-50.13,0 -90.78,40.64 -90.78,90.77c0,50.13 40.64,90.77 90.78,90.77c0.37,0 0.74,0 1.12,-0.01c11.23,-27.04 37.63,-44.66 66.91,-44.68l0.03,0a72.49,72.49 0 0 1 9.75,0.66a90.77,90.77 0 0 0 12.96,-46.74c0,-50.13 -40.64,-90.77 -90.77,-90.77zm-0.49,16.11c14.81,0 26.82,12.01 26.82,26.82c0,14.8 -12.01,26.81 -26.82,26.81c-14.81,0 -26.81,-12.01 -26.81,-26.81c0,-14.81 12,-26.82 26.81,-26.82zm-52.11,41.55c14.81,0 26.81,12 26.81,26.81c0,14.81 -12.01,26.81 -26.81,26.81c-14.81,0 -26.81,-12 -26.81,-26.81c0,-14.81 12,-26.81 26.8,-26.81l0.01,0zm100.78,2c14.81,0 26.81,12 26.81,26.81c0,14.81 -12.01,26.81 -26.81,26.81c-14.81,0 -26.81,-12 -26.81,-26.81c0,-14.81 12,-26.81 26.81,-26.81zm-48.67,40.63c14.81,0 26.82,12 26.82,26.81c0,14.81 -12.01,26.81 -26.82,26.81c-14.81,0 -26.81,-12 -26.81,-26.81c0,-14.81 12,-26.81 26.81,-26.81z" fill="url(#B)" id="svg_20"/>
-  <path d="m689.05,298.05c-50.14,0 -90.78,40.64 -90.78,90.77a90.77,90.77 0 0 0 13.74,48.01a72.52,72.52 0 0 1 11.15,-0.87l0.03,0c28.98,0 55.17,17.25 66.61,43.88l-0.11,-0.25c49.88,-0.36 90.13,-40.89 90.13,-90.77c0,-50.13 -40.64,-90.77 -90.77,-90.77zm5.36,15.39c14.81,0 26.81,12.01 26.81,26.82c0,14.8 -12,26.81 -26.81,26.81c-14.81,0 -26.81,-12.01 -26.81,-26.81c0,-14.81 12,-26.82 26.81,-26.82zm-48.11,45.55c14.8,0 26.81,12 26.81,26.81c0,14.81 -12.01,26.81 -26.81,26.81c-14.81,0 -26.81,-12 -26.81,-26.81c-0.01,-14.81 12,-26.81 26.81,-26.81zm92.78,0c14.81,0 26.81,12 26.81,26.81c0,14.81 -12.01,26.81 -26.81,26.81c-14.81,0 -26.81,-12 -26.81,-26.81c0,-14.81 12,-26.81 26.81,-26.81zm-44.67,44.63c14.81,0 26.81,12 26.81,26.81c0,14.8 -12,26.81 -26.81,26.81c-14.81,0 -26.81,-12 -26.81,-26.81c0,-14.81 12,-26.81 26.81,-26.81z" fill="url(#C)" id="svg_21"/>
-  <path d="m628.9,301.86a105.73,105.73 0 0 0 -31.9,139c-27.9,10.81 -46.29,37.66 -46.29,67.59c0,3.55 0.26,7.11 0.78,10.62l-21.34,-0.28l-43.56,0.64a72.49,72.49 0 0 0 1.01,-12.04c0,-30.55 -19.16,-57.83 -47.9,-68.19a73.48,73.48 0 0 0 0.26,0.09a105.73,105.73 0 0 0 -32.71,-137.4l114.62,1.54l107.03,-1.57z" fill="url(#D)" id="svg_22"/>
- </g>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="180mm" height="180mm" viewBox="0 0 180 180"><path fill="#fff" d="M18.86 54.8h142.28c5.54 0 10 4.46 10 10v50.4c0 5.54-4.46 10-10 10H18.86c-5.54 0-10-4.46-10-10V64.8c0-5.54 4.46-10 10-10z" paint-order="stroke fill markers" style="fill:#fff"/><path d="M95.98 109.83c.8 0 1.44.25 1.91.77.47.5.7 1.2.7 2.09.02.17.02.6-.3.6H94.4c0 .43.1.9.45 1.25.71.67 1.8.36 2 .27.21-.1.4-.24.57-.42.26-.24.61-.18.92-.07.06.06.09.13.08.22-.08.56-.85 1.38-2.44 1.38-1.26 0-1.9-.75-2.19-1.25a4.13 4.13 0 0 1-.4-2.36c.12-1.2.92-2.48 2.6-2.48zm1.6 2.52c0-1.1-.79-1.55-1.6-1.55-.8 0-1.56.52-1.58 1.51v.04zm5.88.85c-1.1-.23-1.65-.79-1.65-1.68 0-.4.16-1.07.98-1.45a3.4 3.4 0 0 1 2.42-.04c.34.14.6.3.77.51.18.2.27.4.27.59-.09.34-.38.28-.68.28a.4.4 0 0 1-.34-.16c-.44-.57-1.6-.54-2.07-.26-.35.21-.64.93.31 1.2.87.24 1.83.3 2.53.92.28.3.42.66.42 1.08 0 .9-.82 1.36-1.12 1.5a3.5 3.5 0 0 1-2.48.02c-.11-.05-1.12-.5-1.12-1.14 0-.15.15-.28.3-.28.2-.01.4 0 .6.02.04.02.1.06.14.12.25.35.69.52 1.32.52.71 0 1.33-.32 1.33-.76-.04-.53-.49-.68-1.93-.99zm7.8 0c-1.1-.23-1.64-.79-1.64-1.68 0-.4.16-1.07.98-1.45a3.4 3.4 0 0 1 2.42-.04c.84.34 1.03.86 1.03 1.1 0 .14-.11.28-.3.28-1.07.07-.55-.61-1.94-.61-.21 0-1.16.04-1.16.72 0 .27.08.51.63.67.87.24 1.82.3 2.53.92.47.5.59 1.3.12 1.93-.57.8-1.63.88-2.07.88-1.5 0-2.35-.83-2.35-1.35 0-.31.38-.32.89-.26.2.06.28.64 1.46.64.72 0 1.34-.32 1.34-.76-.04-.53-.5-.68-1.93-.99zm8.71-3.37c1.62 0 2.61 1.09 2.61 2.86.02.17.02.6-.3.6h-3.89c0 1.07.66 1.66 1.58 1.66.44 0 .96-.04 1.44-.56.12-.12.19-.16.36-.16.22-.02.38 0 .56.1.23.21-.05.95-1.08 1.38a3.4 3.4 0 0 1-1.28.21c-1.26 0-1.9-.75-2.19-1.25a3.3 3.3 0 0 1-.4-1.32 6.12 6.12 0 0 1 0-1.04c.1-.9.52-1.7 1.3-2.15.37-.22.8-.33 1.3-.33zm1.6 2.52v-.04c0-.91-.64-1.51-1.6-1.51-.8 0-1.56.52-1.58 1.51v.04zm9.69 3.16a.3.3 0 0 1-.3.3h-.43a.3.3 0 0 1-.3-.3v-2.98c0-1.32-.77-1.73-1.58-1.73-1.4 0-1.58 1.14-1.58 1.73v2.98a.3.3 0 0 1-.3.3h-.42a.3.3 0 0 1-.3-.3v-5.26c0-.17.13-.3.3-.3h.41c.36.06.3.36.3.65.52-.67 1.33-.77 1.76-.77 1.36 0 2.44.9 2.44 2.53zm4.73-1.67c0 .87.44 1 .95 1h.6c.17 0 .3.14.3.3v.37a.3.3 0 0 1-.3.3c-.76.02-1.52.04-2.12-.5-.3-.33-.45-.83-.45-1.47v-2.93h-.84a.3.3 0 0 1-.3-.3v-.36c0-.17.13-.3.3-.3h.84v-1.85c0-.17.13-.3.3-.3h.42c.16 0 .3.13.3.3v1.84h1.44c.16 0 .3.14.3.3v.37a.3.3 0 0 1-.3.3h-1.44zm6.75-5.1a.3.3 0 0 1-.3.31h-.65a.3.3 0 0 1-.3-.3v-.65c0-.17.13-.3.3-.3h.64c.17 0 .3.13.3.3zm-.65 6.77a.3.3 0 0 1-.3.3h-.42a.3.3 0 0 1-.3-.3v-5.26c0-.17.13-.3.3-.3h.42c.17 0 .3.13.3.3zm6.75-3.41v-.15c0-.37-.13-.65-.37-.85-.24-.2-.56-.3-.95-.3-.3 0-.54.05-.71.16-.17.1-.33.25-.48.45-.17.2-.45.16-.7.16-.15 0-.32-.12-.3-.3.08-.78 1.13-1.44 2.19-1.44 1.25 0 2.35.7 2.35 2.23v3.45a.3.3 0 0 1-.3.3h-.43a.3.3 0 0 1-.3-.3v-.47c-.28.64-1.33.89-1.94.89-1.1 0-1.97-.61-1.97-1.6 0-.56.21-1 .63-1.32.43-.32.99-.54 1.69-.65zm0 .9c-.85.2-2.71.08-2.88 1.22 0 .19.09.36.26.5.37.33 1.45.37 2.11-.23.34-.3.5-.71.5-1.2zm5.27 2.5a.3.3 0 0 1-.3.31h-.43a.3.3 0 0 1-.3-.3v-7.4a.3.3 0 0 1 .3-.31h.42c.17 0 .3.13.3.3zm5.2-2.3c-1.1-.23-1.66-.79-1.66-1.68 0-.97.83-1.7 2.2-1.7.36 0 1.41.07 1.97.72.23.25.38.6.18.79a.31.31 0 0 1-.21.08c-.28.02-.5.02-.71-.16-.24-.3-.65-.45-1.24-.45-.2 0-1.16.04-1.16.72.07.79 1.16.8 1.75.94.56.12 1.83.43 1.83 1.73 0 .3-.1.6-.3.85-.56.8-1.62.89-2.06.89-1.47 0-2.36-.8-2.36-1.36 0-.15.15-.28.3-.28h.41c.22 0 .28.06.33.14.25.35.69.52 1.32.52.71 0 1.33-.32 1.33-.76 0-.54-.55-.7-1.93-.99zm-139.44 1.75c.75 0 1.26-.29 1.52-.88.13-.32.4-.3.71-.3.16 0 .3.13.3.28 0 .26-.1.53-.3.83-.67.96-1.85 1.05-2.23 1.05-1.57 0-2.57-1.05-2.64-2.6-.05-.5-.18-3.5 2.64-3.5 1.73 0 2.5 1.23 2.54 1.85a.3.3 0 0 1-.1.22c-.05.05-.62.3-.92-.22-.26-.59-.77-.88-1.52-.88-.88 0-1.78.64-1.62 2.47.15 1.56 1.27 1.68 1.62 1.68zm10.56-2.06c0 2.23-1.27 3.04-2.7 3.04-1.83 0-2.56-1.24-2.68-2.52-.08-.91 0-2.12.8-2.9a2.58 2.58 0 0 1 1.88-.68c.79 0 1.42.23 1.89.69.61.6.8 1.38.8 2.37zm-2.7-2.09c-1.6 0-1.74 1.51-1.65 2.55.05.57.33 1.6 1.65 1.6 1.37 0 1.67-1.1 1.67-2.06 0-1.07-.34-2.09-1.67-2.09zm10.89 4.7a.3.3 0 0 1-.3.31h-.42a.3.3 0 0 1-.3-.3v-2.98c0-1.32-.78-1.73-1.59-1.73-1.4 0-1.58 1.14-1.58 1.73v2.98a.3.3 0 0 1-.3.3h-.42a.3.3 0 0 1-.3-.3v-5.26c0-.17.13-.3.3-.3h.42c.35.06.3.36.3.65.5-.67 1.32-.77 1.75-.77 1.36 0 2.44.9 2.44 2.53zm4.73-1.66c0 .32.07.57.2.74.35.34.9.26 1.35.26.17 0 .3.14.3.3v.37a.3.3 0 0 1-.3.3c-.76.02-1.52.04-2.12-.5-.3-.33-.45-.83-.45-1.47v-2.93h-.84a.3.3 0 0 1-.3-.3v-.36c0-.17.13-.3.3-.3h.84v-1.85c0-.17.13-.3.3-.3h.42c.17 0 .3.13.3.3v1.84h1.44c.17 0 .3.14.3.3v.37a.3.3 0 0 1-.3.3h-1.44zm7.74-3.8c.14.17.2.87-.21.87-.58 0-1.16-.05-1.63.34-.22.22-.32.54-.32.96v3.3a.3.3 0 0 1-.3.3h-.43a.3.3 0 0 1-.3-.3v-5.26c0-.17.14-.3.3-.3h.42c.35.06.3.36.3.65.35-.52.8-.66 1.37-.66.29 0 .55-.04.8.1zm7.21 2.85c0 1.05-.25 1.8-.82 2.36-.93.91-2.81.91-3.76 0-.64-.63-.8-1.5-.8-2.36a3.1 3.1 0 0 1 .8-2.37 2.9 2.9 0 0 1 3.77 0c.62.6.81 1.38.81 2.37zm-1.53-1.65c-.55-.6-1.77-.6-2.34 0-.42.46-.48 1.06-.48 1.65-.03.6.1 1.15.48 1.62.57.6 1.79.6 2.34 0 .31-.33.5-.78.5-1.62 0-.8-.15-1.28-.5-1.65zm5.54 4.27a.3.3 0 0 1-.31.3h-.42a.3.3 0 0 1-.3-.3v-7.4a.3.3 0 0 1 .3-.31H62c.17 0 .3.13.3.3zm4.28 0a.3.3 0 0 1-.3.3h-.42a.3.3 0 0 1-.3-.3v-7.4a.3.3 0 0 1 .3-.31h.41a.3.3 0 0 1 .31.3zm5.57-5.68c1.62 0 2.6 1.09 2.6 2.86.03.17.03.6-.3.6h-3.88c0 .43.1.9.45 1.25.71.67 1.8.36 2 .27.21-.1.4-.24.56-.42.2-.2.45-.16.7-.16.19 0 .32.14.3.3-.08.59-.85 1.4-2.43 1.4-1.26 0-1.9-.76-2.19-1.26-.54-.96-.6-2.6 0-3.62.3-.5.94-1.22 2.2-1.22zm1.6 2.52v-.04c0-.91-.64-1.51-1.6-1.51-.8 0-1.56.52-1.58 1.51v.04zm6.92-2.4a.3.3 0 0 1 .21.08c.14.18.14.65 0 .8a.27.27 0 0 1-.21.08c-1.34-.1-1.9.18-1.95 1.3v3.3a.3.3 0 0 1-.3.3H78a.3.3 0 0 1-.3-.3v-5.26c0-.17.14-.3.3-.3h.42c.17 0 .3.13.3.3v.35c.35-.52.8-.66 1.37-.66z" style="font-size:11.2889px;line-height:.45;font-family:Rubik;-inkscape-font-specification:Rubik;text-align:center;letter-spacing:-.0661458px;text-anchor:middle;stroke-width:.264583"/><path d="M139.28 93.55v9.9c0 .23-.07.43-.19.62h8.6c-2.88-3.44-5.62-7.01-8.41-10.52zm5.82-29.48c-2.36.04-3 2.04-3 4-5.39.11-5.9.61-5.9 6.9h1.93c.63 0 1.15.5 1.15 1.14v8.93l7.45-9.15c.66-.83 1.06-.93 1.69-.93h6.6c.62 0 1.2.75.8 1.4l-10.45 12.78 11.18 14.06c.13.17.2.54.03.87h4.45c2.22 0 2.94-2.68 2.94-6v-26c0-3.9-2.8-4-5.87-4 .16-2.04-.77-3.83-3-4z" style="fill:purple;fill-opacity:1;stroke-width:.0728798;paint-order:stroke fill markers"/><path d="M85.01 64.07c-2.36.04-3 2.04-3 4-3.26.1-5.9.19-5.9 4v24.9c.23-.14.85-.1 2.3-.1.74.01 1.05.95 1 1.8h-3.3v1h19.55c1.11 0 1.97.9 2 2 .03.83.08 1.6-.04 2.4h3.32c2.22 0 2.94-2.68 2.94-6v-26c0-3.9-2.8-4-5.87-4 .16-2.04-.77-3.83-3-4zm-1.35 9.9a7 7 0 1 1 0 14 7 7 0 0 1 0-14zm-2 14.7a7.6 7.6 0 0 0 4 0v10h-4zm7.04 8.2h4c1 .15 1.05.95 1 1.8h-6c0-.8-.04-1.72 1-1.8z" style="fill:red;fill-opacity:1;stroke-width:.0728798;paint-order:stroke fill markers"/><path d="M83.03 75.52a5.5 5.5 0 0 0-4.86 5.41c0 .66 1 .66 1 0a4.5 4.5 0 0 1 4-4.43c.67 0 .66-1.08-.14-.98z" style="fill:red;fill-opacity:1;stroke-width:.0876748;paint-order:stroke fill markers"/><path d="M48.61 94.4v9.05c0 .23-.06.43-.18.62h9.18c-1.86-3.12-3.43-6.45-5.1-9.68zm0-12.88v6.27h4.79c5.69 0 5.69-6.27 0-6.27z" style="fill:#fc0;fill-opacity:1;stroke-width:.0728798;paint-order:stroke fill markers"/><path d="M54.97 64.07c-2.36.04-3 2.04-3 4-5.58.11-5.9.61-5.9 6.9h7.33c4.72 0 11.93 1.35 11.93 9.69 0 4.09-1.68 6.91-5.03 8.46l5.24 10.08c.1.18.22.5.03.87h5.33c2.21 0 2.94-2.68 2.94-6v-26c0-3.9-2.8-4-5.87-4 .15-2.04-.77-3.83-3-4z" style="fill:#fc0;fill-opacity:1;stroke-width:.0728798;paint-order:stroke fill markers"/><path d="M24.92 64.07c-2.36.04-3 2.04-3 4-5.68.15-5.9.61-5.9 6.9h9.49c2.62 0 7.14.6 9.06 4.52 1.76 3.37 1.24 7.67-1.36 9.65 1.8 1.24 2.97 2.98 2.97 6.27 0 3.66-1.69 7.4-5.8 8.66h10.47c2.22 0 2.94-2.68 2.94-6v-26c0-3.9-2.8-4-5.87-4 .16-2.04-.77-3.83-3-4z" style="fill:#2196f3;fill-opacity:1;stroke-width:.0728798;paint-order:stroke fill markers"/><path d="M24.98 91.52a1.71 1.71 0 0 0-1.71 1.71 1.71 1.71 0 0 0 1.7 1.71 1.71 1.71 0 0 0 1.72-1.7 1.71 1.71 0 0 0-1.71-1.72z" style="fill:#2196f3;fill-opacity:1;stroke:none;stroke-width:.213857;paint-order:stroke fill markers"/><path d="M28.4 94.94a1.71 1.71 0 0 0-1.71 1.71 1.71 1.71 0 0 0 1.7 1.72 1.71 1.71 0 0 0 1.72-1.72 1.71 1.71 0 0 0-1.71-1.7z" style="fill:#fc0;fill-opacity:1;stroke:none;stroke-width:.213857;paint-order:stroke fill markers"/><path d="M21.55 94.94a1.71 1.71 0 0 0-1.7 1.71 1.71 1.71 0 0 0 1.7 1.72 1.71 1.71 0 0 0 1.71-1.72 1.71 1.71 0 0 0-1.7-1.7z" style="fill:green;fill-opacity:1;stroke:none;stroke-width:.213857;paint-order:stroke fill markers"/><path d="M24.98 98.37a1.71 1.71 0 0 0-1.71 1.7 1.71 1.71 0 0 0 1.7 1.72 1.71 1.71 0 0 0 1.72-1.71 1.71 1.71 0 0 0-1.71-1.71z" style="fill:red;stroke:none;stroke-width:.213857;paint-order:stroke fill markers"/><path d="M24.98 78.4c-.93 0-1.61.38-1.61.81v1.84l1.6 1.6 1.61-1.6v-1.84c0-.45-.71-.8-1.6-.8zm-4.02 3.22c-.43 0-.8.68-.8 1.6 0 .9.35 1.61.8 1.61h1.84l1.6-1.6-1.6-1.61zm6.19 0-1.6 1.6 1.6 1.61h1.84c.45 0 .8-.71.8-1.6 0-.9-.35-1.61-.8-1.61zm-2.17 2.17-1.61 1.61v1.84c0 .45.72.8 1.6.8.9 0 1.61-.35 1.61-.8V85.4z" style="fill:#1a1a1a;stroke:#000;stroke-width:0;paint-order:stroke fill markers"/><path d="M24.98 98.37a1.71 1.71 0 0 0-1.71 1.7 1.71 1.71 0 0 0 1.7 1.72 1.71 1.71 0 0 0 1.72-1.71 1.71 1.71 0 0 0-1.71-1.71z" style="fill:red;fill-opacity:1;stroke:none;stroke-width:.213857;paint-order:stroke fill markers"/><path d="M85.83 112.74a1 1 0 0 0 1 1 1 1 0 0 0 1-1 1 1 0 0 0-1-1 1 1 0 0 0-1 1z" style="fill:purple;fill-opacity:1;stroke:none;stroke-width:.125;paint-order:stroke fill markers"/><path d="M115.06 64.07c-2.36.04-3 2.04-3 4-7.02.04-5.97 2.5-5.97 9.12 3.16-2.35 5.97-2.65 8.56-2.65 1.95 0 7.94.41 11.39 5.2 1.8 2.42 2.55 6.14.89 6.14h-5.55c-1.89 0-.8-1.68-3.05-3.6-1.43-1.22-5.8-1.55-7.62.39-2.53 3.31-1.97 12.05 0 14.22 1.82 1.94 6.19 1.6 7.62.38 2.33-1.98 1.12-3.6 3.05-3.6h5.55c1.62 0 .96 3.67-.9 6.18a12.48 12.48 0 0 1-5.82 4.22H131c2.21 0 2.94-2.68 2.94-6v-26c0-3.9-2.8-4-5.87-4 .15-2.04-.77-3.83-3-4z" style="fill:green;fill-opacity:1;stroke-width:.0728798;paint-order:stroke fill markers"/></svg>
\ No newline at end of file
diff --git a/BrickController2/BrickController2.Android/Resources/values-night/colors.xml b/BrickController2/BrickController2.Android/Resources/values-night/colors.xml
index 0aec82af..233ff676 100644
--- a/BrickController2/BrickController2.Android/Resources/values-night/colors.xml
+++ b/BrickController2/BrickController2.Android/Resources/values-night/colors.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 	<color name="launcher_background">#000000</color>
-	<color name="colorPrimary">#CC0000</color>
-	<color name="colorPrimaryDark">#990000</color>
-	<color name="colorAccent">#FF4081</color>
+	<color name="colorPrimary">#2196F3</color>
+	<color name="colorPrimaryDark">#1976D2</color>
+	<color name="colorAccent">#00BCD4</color>
 </resources>
\ No newline at end of file
diff --git a/BrickController2/BrickController2.Android/Resources/values/colors.xml b/BrickController2/BrickController2.Android/Resources/values/colors.xml
index 3f26669b..699d66ff 100644
--- a/BrickController2/BrickController2.Android/Resources/values/colors.xml
+++ b/BrickController2/BrickController2.Android/Resources/values/colors.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 	<color name="launcher_background">#ffffff</color>
-	<color name="colorPrimary">#CC0000</color>
-	<color name="colorPrimaryDark">#990000</color>
-	<color name="colorAccent">#FF4081</color>
+	<color name="colorPrimary">#2196F3</color>
+	<color name="colorPrimaryDark">#1976D2</color>
+	<color name="colorAccent">#00BCD4</color>
 </resources>
diff --git a/BrickController2/BrickController2/App.xaml b/BrickController2/BrickController2/App.xaml
index 5535d9df..381fa2ee 100644
--- a/BrickController2/BrickController2/App.xaml
+++ b/BrickController2/BrickController2/App.xaml
@@ -9,7 +9,11 @@
         <ResourceDictionary Source="UI/Themes/LightTheme.xaml"/>
 
         <!-- Global targets -->
-        
+        <Style TargetType="NavigationPage">
+            <Setter Property="BarBackgroundColor" Value="{DynamicResource NavigationBarColor}"/>
+            <Setter Property="BarTextColor" Value="{DynamicResource NavigationBarItemColor}"/>
+        </Style>
+
         <Style TargetType="Label">
             <Setter Property="TextColor" Value="{DynamicResource PrimaryTextColor}"/>
         </Style>
diff --git a/BrickController2/BrickController2/App.xaml.cs b/BrickController2/BrickController2/App.xaml.cs
index a1c4456f..b216573a 100644
--- a/BrickController2/BrickController2/App.xaml.cs
+++ b/BrickController2/BrickController2/App.xaml.cs
@@ -14,7 +14,7 @@
 [assembly: XamlCompilation(XamlCompilationOptions.Skip)]
 namespace BrickController2
 {
-	public partial class App : Application
+    public partial class App : Application
 	{
         private readonly ViewModelFactory _viewModelFactory;
         private readonly PageFactory _pageFactory;
@@ -75,8 +75,6 @@ private NavigationPage GetMainPage(CreationListPageViewModel? viewModel = defaul
             var vm = viewModel ?? _viewModelFactory(typeof(CreationListPageViewModel), null);
             var page = _pageFactory(typeof(CreationListPage), vm);
             var navigationPage = _navigationPageFactory(page);
-            navigationPage.BarBackgroundColor = Colors.Red;
-            navigationPage.BarTextColor = Colors.White;
             return navigationPage;
         }
 
diff --git a/BrickController2/BrickController2/UI/Themes/DarkTheme.xaml b/BrickController2/BrickController2/UI/Themes/DarkTheme.xaml
index 636a34ec..f5bf5492 100644
--- a/BrickController2/BrickController2/UI/Themes/DarkTheme.xaml
+++ b/BrickController2/BrickController2/UI/Themes/DarkTheme.xaml
@@ -16,31 +16,31 @@
     <Color x:Key="NegativeColor">DarkRed</Color>
     
     <Color x:Key="PageBackgroundColor">Black</Color>
-    <Color x:Key="NavigationBarColor">DarkRed</Color>
+    <Color x:Key="NavigationBarColor">#1976D2</Color>
     <Color x:Key="NavigationBarItemColor">White</Color>
     <Color x:Key="HeaderBackgroundColor">#303030</Color>
     <Color x:Key="HeaderItemColor">White</Color>
-    <Color x:Key="DividerColor">#303030</Color>
+    <Color x:Key="DividerColor">#BDBDBD</Color>
     <Color x:Key="FooterBackgroudColor">#303030</Color>
     <Color x:Key="DialogBackgroundColor">#202020</Color>
     <Color x:Key="DialogBorderColor">Gray</Color>
-    <Color x:Key="DeleteSwipeItemBackgroundColor">Red</Color>
-    <Color x:Key="SwipeItemBackgroundColor">Green</Color>
+    <Color x:Key="DeleteSwipeItemBackgroundColor">#00BCD4</Color>
+    <Color x:Key="SwipeItemBackgroundColor">#1976D2</Color>
     <Color x:Key="CollectionViewHeaderBackgroundColor">#202020</Color>
     <Color x:Key="CollectionViewSelectedItemBackgroundColor">#404040</Color>
-    <Color x:Key="SwitchOnColor">Green</Color>
-    <Color x:Key="SwitchThumbColor">LightGreen</Color>
+    <Color x:Key="SwitchOnColor">#2196F3</Color>
+    <Color x:Key="SwitchThumbColor">#BBDEFB</Color>
     <Color x:Key="SwitchThumbColorOff">#606060</Color>
     <Color x:Key="SliderMinimumTrackColor">#606060</Color>
     <Color x:Key="SliderMaximumTrackColor">#606060</Color>
     <Color x:Key="SliderThumbColor">LightGray</Color>
     <Color x:Key="ButtonBackgroundColor">#606060</Color>
     <Color x:Key="ButtonTextColor">White</Color>
-    <Color x:Key="CheckBoxCheckedColor">LightGreen</Color>
-    <Color x:Key="RadioButtonSelectedColor">Red</Color>
-    <Color x:Key="ProgressColor">Green</Color>
+    <Color x:Key="CheckBoxCheckedColor">#BBDEFB</Color>
+    <Color x:Key="RadioButtonSelectedColor">#2196F3</Color>
+    <Color x:Key="ProgressColor">#2196F3</Color>
     <Color x:Key="PickerTextColor">LightBlue</Color>
-    <Color x:Key="FloatingButtonColor">Red</Color>
-    <Color x:Key="InlineButtonColor">Green</Color>
+    <Color x:Key="FloatingButtonColor">#2196F3</Color>
+    <Color x:Key="InlineButtonColor">#2196F3</Color>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/BrickController2/BrickController2/UI/Themes/LightTheme.xaml b/BrickController2/BrickController2/UI/Themes/LightTheme.xaml
index 767008aa..8fb99aeb 100644
--- a/BrickController2/BrickController2/UI/Themes/LightTheme.xaml
+++ b/BrickController2/BrickController2/UI/Themes/LightTheme.xaml
@@ -16,7 +16,7 @@
     <Color x:Key="NegativeColor">LightPink</Color>
 
     <Color x:Key="PageBackgroundColor">White</Color>
-    <Color x:Key="NavigationBarColor">Red</Color>
+    <Color x:Key="NavigationBarColor">#1976D2</Color>
     <Color x:Key="NavigationBarItemColor">White</Color>
     <Color x:Key="HeaderBackgroundColor">LightGray</Color>
     <Color x:Key="HeaderItemColor">Black</Color>
@@ -24,23 +24,23 @@
     <Color x:Key="FooterBackgroudColor">#e0e0e0</Color>
     <Color x:Key="DialogBackgroundColor">White</Color>
     <Color x:Key="DialogBorderColor">White</Color>
-    <Color x:Key="DeleteSwipeItemBackgroundColor">LightPink</Color>
-    <Color x:Key="SwipeItemBackgroundColor">LightGreen</Color>
+    <Color x:Key="DeleteSwipeItemBackgroundColor">#00BCD4</Color>
+    <Color x:Key="SwipeItemBackgroundColor">#BBDEFB</Color>
     <Color x:Key="CollectionViewHeaderBackgroundColor">#f0f0f0</Color>
     <Color x:Key="CollectionViewSelectedItemBackgroundColor">Gray</Color>
-    <Color x:Key="SwitchOnColor">LightGreen</Color>
-    <Color x:Key="SwitchThumbColor">DarkGreen</Color>
+    <Color x:Key="SwitchOnColor">#BBDEFB</Color>
+    <Color x:Key="SwitchThumbColor">#1976D2</Color>
     <Color x:Key="SwitchThumbColorOff">Gray</Color>
     <Color x:Key="SliderMinimumTrackColor">#c0c0c0</Color>
     <Color x:Key="SliderMaximumTrackColor">#c0c0c0</Color>
     <Color x:Key="SliderThumbColor">#303030</Color>
     <Color x:Key="ButtonBackgroundColor">LightGray</Color>
     <Color x:Key="ButtonTextColor">Black</Color>
-    <Color x:Key="CheckBoxCheckedColor">Green</Color>
-    <Color x:Key="RadioButtonSelectedColor">Red</Color>
-    <Color x:Key="ProgressColor">DarkGreen</Color>
+    <Color x:Key="CheckBoxCheckedColor">#2196F3</Color>
+    <Color x:Key="RadioButtonSelectedColor">#2196F3</Color>
+    <Color x:Key="ProgressColor">#1976D2</Color>
     <Color x:Key="PickerTextColor">DarkBlue</Color>
-    <Color x:Key="FloatingButtonColor">Red</Color>
-    <Color x:Key="InlineButtonColor">Green</Color>
+    <Color x:Key="FloatingButtonColor">#2196F3</Color>
+    <Color x:Key="InlineButtonColor">#2196F3</Color>
 
 </ResourceDictionary>
\ No newline at end of file