diff --git a/App.axaml b/App.axaml
index b45157b..b96cb4a 100644
--- a/App.axaml
+++ b/App.axaml
@@ -7,4 +7,20 @@
     <Application.Styles>
         <FluentTheme />
     </Application.Styles>
+    <Application.Resources>
+    <ResourceDictionary>
+      <ResourceDictionary.ThemeDictionaries>
+        <ResourceDictionary x:Key="Light">
+          <SolidColorBrush x:Key='BackgroundBrush'>#F0F0F0</SolidColorBrush>
+          <SolidColorBrush x:Key='ForegroundBrush'>#000</SolidColorBrush>
+          <SolidColorBrush x:Key='DimBrush'>#888</SolidColorBrush>
+        </ResourceDictionary>
+        <ResourceDictionary x:Key="Dark">
+          <SolidColorBrush x:Key='BackgroundBrush'>#111</SolidColorBrush>
+          <SolidColorBrush x:Key='ForegroundBrush'>#EEE</SolidColorBrush>
+          <SolidColorBrush x:Key='DimBrush'>#777</SolidColorBrush>
+        </ResourceDictionary>
+      </ResourceDictionary.ThemeDictionaries>
+    </ResourceDictionary>  
+  </Application.Resources>
 </Application>
\ No newline at end of file
diff --git a/BinkControl.axaml b/BinkControl.axaml
index 3d2efa1..c028881 100644
--- a/BinkControl.axaml
+++ b/BinkControl.axaml
@@ -5,22 +5,6 @@
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              xmlns:local="using:kawwa"
              x:Class="kawwa.BinkControl">
-  <UserControl.Resources>
-    <ResourceDictionary>
-      <ResourceDictionary.ThemeDictionaries>
-        <ResourceDictionary x:Key="Light">
-          <SolidColorBrush x:Key='BackgroundBrush'>#F0F0F0</SolidColorBrush>
-          <SolidColorBrush x:Key='ForegroundBrush'>#000</SolidColorBrush>
-          <SolidColorBrush x:Key='DimBrush'>#888</SolidColorBrush>
-        </ResourceDictionary>
-        <ResourceDictionary x:Key="Dark">
-          <SolidColorBrush x:Key='BackgroundBrush'>#111</SolidColorBrush>
-          <SolidColorBrush x:Key='ForegroundBrush'>#EEE</SolidColorBrush>
-          <SolidColorBrush x:Key='DimBrush'>#777</SolidColorBrush>
-        </ResourceDictionary>
-      </ResourceDictionary.ThemeDictionaries>
-    </ResourceDictionary>  
-  </UserControl.Resources>
   <Grid>
     <!-- 
       <Grid.RowDefinitions>
diff --git a/SshSetup.axaml b/SshSetup.axaml
index 4ccd34e..1c8ca10 100644
--- a/SshSetup.axaml
+++ b/SshSetup.axaml
@@ -9,12 +9,13 @@
       <StackPanel 
         Width="600" 
         Margin="20,20,20,20" 
-        Background="#141414" 
+        Background="{DynamicResource BackgroundBrush}"
         HorizontalAlignment="Center" 
         VerticalAlignment="Center">
       <TextBlock
         FontSize="28"
         HorizontalAlignment="Center"
+        Foreground="{DynamicResource ForegroundBrush}"
         Margin="15">
         ~ kawwa client ~
       </TextBlock>
@@ -22,6 +23,7 @@
         HorizontalAlignment="Center"
         Width="500"
         TextWrapping="Wrap"
+        Foreground="{DynamicResource ForegroundBrush}"
         Margin="0,0,0,15">
         Click the button below to copy a new ssh public key to your clipboard. 
         In a tilde.town shell, edit the file <Bold>~/.ssh/authorized_keys</Bold>
@@ -33,6 +35,8 @@
         Content="Copy key to clipboard"
         Click="OnCopyButton"
         HorizontalAlignment="Center"
+        Foreground="{DynamicResource ForegroundBrush}"
+        Background="{DynamicResource BackgroundBrush}"
         Margin="0,0,0,10" />
       <TextBox
         x:Name="userTextBox"
@@ -40,12 +44,15 @@
         Width="150"
         Margin="0,0,0,10"
         Watermark="Username..." 
+        Foreground="{DynamicResource ForegroundBrush}"
         TextChanged="OnUserTextChanged" />
       <Button 
         x:Name="connectButton"
         Margin="0,0,0,10"
         HorizontalAlignment="Center"
         Content="Connect"
+        Foreground="{DynamicResource ForegroundBrush}"
+        Background="{DynamicResource BackgroundBrush}"
         Click="OnConnectButton"/>
     </StackPanel> 
   </Grid>