diff --git a/application/settings/GeneralSettings.qml b/application/settings/GeneralSettings.qml
index 71662c9..ddd4776 100644
--- a/application/settings/GeneralSettings.qml
+++ b/application/settings/GeneralSettings.qml
@@ -5,6 +5,11 @@ import com.vicr123.Contemporary
 import Contemporary
 
 Item {
+    LayerCalculator {
+        id: layer2
+        layer: 2
+    }
+
     Grandstand {
         id: grandstand
         anchors.top: parent.top
@@ -14,7 +19,7 @@ Item {
         innerTopMargin: SafeZone.top
 
         text: qsTr("General")
-        color: Contemporary.calculateLayer(2).value
+        color: layer2.color
     }
 
 
diff --git a/application/settings/RootProfileSettings.qml b/application/settings/RootProfileSettings.qml
index 1e48358..67a823a 100644
--- a/application/settings/RootProfileSettings.qml
+++ b/application/settings/RootProfileSettings.qml
@@ -9,6 +9,16 @@ Item {
 
     signal openProfileSettings(string profile);
 
+    LayerCalculator {
+        id: layer1
+        layer: 1
+    }
+
+    LayerCalculator {
+        id: layer2
+        layer: 2
+    }
+
     Grandstand {
         id: grandstand
         anchors.top: parent.top
@@ -18,7 +28,7 @@ Item {
         innerTopMargin: SafeZone.top
 
         text: qsTr("Profiles")
-        color: Contemporary.calculateLayer(2).value
+        color: layer2.color
         z: 10
     }
 
@@ -54,7 +64,7 @@ Item {
                 implicitWidth: 600
                 implicitHeight: childrenRect.height + 9 + 9
 
-                color: Contemporary.calculateLayer(1).value
+                color: layer1.color
 
                 ColumnLayout {
                     anchors.top: parent.top
diff --git a/application/settings/SingleProfileSettings.qml b/application/settings/SingleProfileSettings.qml
index 17d988c..33c7244 100644
--- a/application/settings/SingleProfileSettings.qml
+++ b/application/settings/SingleProfileSettings.qml
@@ -12,6 +12,11 @@ Item {
     required property string profileUuid;
     readonly property var stackView: StackView.view
 
+    LayerCalculator {
+        id: layer2
+        layer: 2
+    }
+
     TerminalProfile {
         id: profile
         zoom: 1
@@ -35,7 +40,7 @@ Item {
         innerTopMargin: SafeZone.top
 
         text: profile.profileName
-        color: Contemporary.calculateLayer(2).value
+        color: layer2.color
         backButtonVisible: true
 
         onBackButtonClicked: root.stackView.pop()
diff --git a/application/translations/en_US.ts b/application/translations/en_US.ts
index 8fb49ee..ce77e8f 100644
--- a/application/translations/en_US.ts
+++ b/application/translations/en_US.ts
@@ -4,20 +4,20 @@
 <context>
     <name>GeneralSettings</name>
     <message>
-        <location filename="../settings/GeneralSettings.qml" line="16"/>
-        <location filename="../../../build-theterminal-Desktop_ARM-Debug/application/com/vicr123/theterminal/settings/GeneralSettings.qml" line="16"/>
+        <location filename="../settings/GeneralSettings.qml" line="21"/>
+        <location filename="../../../build-theterminal-Desktop_ARM-Debug/application/com/vicr123/theterminal/settings/GeneralSettings.qml" line="21"/>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settings/GeneralSettings.qml" line="41"/>
-        <location filename="../../../build-theterminal-Desktop_ARM-Debug/application/com/vicr123/theterminal/settings/GeneralSettings.qml" line="41"/>
+        <location filename="../settings/GeneralSettings.qml" line="46"/>
+        <location filename="../../../build-theterminal-Desktop_ARM-Debug/application/com/vicr123/theterminal/settings/GeneralSettings.qml" line="46"/>
         <source>Startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settings/GeneralSettings.qml" line="51"/>
-        <location filename="../../../build-theterminal-Desktop_ARM-Debug/application/com/vicr123/theterminal/settings/GeneralSettings.qml" line="51"/>
+        <location filename="../settings/GeneralSettings.qml" line="56"/>
+        <location filename="../../../build-theterminal-Desktop_ARM-Debug/application/com/vicr123/theterminal/settings/GeneralSettings.qml" line="56"/>
         <source>Default Profile</source>
         <translation type="unfinished"></translation>
     </message>
@@ -140,14 +140,14 @@
 <context>
     <name>RootProfileSettings</name>
     <message>
-        <location filename="../settings/RootProfileSettings.qml" line="20"/>
-        <location filename="../../../build-theterminal-Desktop_ARM-Debug/application/com/vicr123/theterminal/settings/RootProfileSettings.qml" line="20"/>
+        <location filename="../settings/RootProfileSettings.qml" line="30"/>
+        <location filename="../../../build-theterminal-Desktop_ARM-Debug/application/com/vicr123/theterminal/settings/RootProfileSettings.qml" line="30"/>
         <source>Profiles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settings/RootProfileSettings.qml" line="77"/>
-        <location filename="../../../build-theterminal-Desktop_ARM-Debug/application/com/vicr123/theterminal/settings/RootProfileSettings.qml" line="77"/>
+        <location filename="../settings/RootProfileSettings.qml" line="87"/>
+        <location filename="../../../build-theterminal-Desktop_ARM-Debug/application/com/vicr123/theterminal/settings/RootProfileSettings.qml" line="87"/>
         <source>Edit Profile</source>
         <translation type="unfinished"></translation>
     </message>
@@ -176,38 +176,38 @@
 <context>
     <name>SingleProfileSettings</name>
     <message>
-        <location filename="../settings/SingleProfileSettings.qml" line="64"/>
-        <location filename="../../../build-theterminal-Desktop_ARM-Debug/application/com/vicr123/theterminal/settings/SingleProfileSettings.qml" line="64"/>
+        <location filename="../settings/SingleProfileSettings.qml" line="69"/>
+        <location filename="../../../build-theterminal-Desktop_ARM-Debug/application/com/vicr123/theterminal/settings/SingleProfileSettings.qml" line="69"/>
         <source>Shell</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settings/SingleProfileSettings.qml" line="71"/>
-        <location filename="../../../build-theterminal-Desktop_ARM-Debug/application/com/vicr123/theterminal/settings/SingleProfileSettings.qml" line="71"/>
+        <location filename="../settings/SingleProfileSettings.qml" line="76"/>
+        <location filename="../../../build-theterminal-Desktop_ARM-Debug/application/com/vicr123/theterminal/settings/SingleProfileSettings.qml" line="76"/>
         <source>Set the shell that is used when you start a terminal with this profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settings/SingleProfileSettings.qml" line="90"/>
-        <location filename="../../../build-theterminal-Desktop_ARM-Debug/application/com/vicr123/theterminal/settings/SingleProfileSettings.qml" line="90"/>
+        <location filename="../settings/SingleProfileSettings.qml" line="95"/>
+        <location filename="../../../build-theterminal-Desktop_ARM-Debug/application/com/vicr123/theterminal/settings/SingleProfileSettings.qml" line="95"/>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settings/SingleProfileSettings.qml" line="99"/>
-        <location filename="../../../build-theterminal-Desktop_ARM-Debug/application/com/vicr123/theterminal/settings/SingleProfileSettings.qml" line="99"/>
+        <location filename="../settings/SingleProfileSettings.qml" line="104"/>
+        <location filename="../../../build-theterminal-Desktop_ARM-Debug/application/com/vicr123/theterminal/settings/SingleProfileSettings.qml" line="104"/>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settings/SingleProfileSettings.qml" line="138"/>
-        <location filename="../../../build-theterminal-Desktop_ARM-Debug/application/com/vicr123/theterminal/settings/SingleProfileSettings.qml" line="138"/>
+        <location filename="../settings/SingleProfileSettings.qml" line="143"/>
+        <location filename="../../../build-theterminal-Desktop_ARM-Debug/application/com/vicr123/theterminal/settings/SingleProfileSettings.qml" line="143"/>
         <source>Colours</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settings/SingleProfileSettings.qml" line="147"/>
-        <location filename="../../../build-theterminal-Desktop_ARM-Debug/application/com/vicr123/theterminal/settings/SingleProfileSettings.qml" line="147"/>
+        <location filename="../settings/SingleProfileSettings.qml" line="152"/>
+        <location filename="../../../build-theterminal-Desktop_ARM-Debug/application/com/vicr123/theterminal/settings/SingleProfileSettings.qml" line="152"/>
         <source>Theme</source>
         <translation type="unfinished"></translation>
     </message>