diff --git a/app/pages/themes-vm.ts b/app/pages/themes-vm.ts
index 3c50dad..ea9b5f8 100644
--- a/app/pages/themes-vm.ts
+++ b/app/pages/themes-vm.ts
@@ -9,7 +9,7 @@ export class ThemesModel extends Observable {
 
   constructor() {
     super();
-    this.set('btnText', 'Default');
+    this.set('btnText', 'Nina');
   }
 
   public switchTheme() {
@@ -18,11 +18,12 @@ export class ThemesModel extends Observable {
     let appPath = knownFolders.currentApp().path + '/';
     
     if (this._toggled) {
+      this.set('btnText', 'Default');
+      themes.applyTheme(`${appPath}theme-nina.css`);
+      
+    } else {
       this.set('btnText', 'Nina');
       themes.applyTheme(`${appPath}app.css`);
-    } else {
-      this.set('btnText', 'Default');
-      themes.applyTheme(`${appPath}nina-theme.css`);
     }
 
   }
diff --git a/app/pages/themes.xml b/app/pages/themes.xml
index 2495a61..f364b6b 100644
--- a/app/pages/themes.xml
+++ b/app/pages/themes.xml
@@ -8,7 +8,7 @@
     </ActionBar>
   </Page.actionBar>
   <StackLayout>
-    <Button text="{{ 'Change Theme (' + btnText + ')'}}" tap="{{ switchTheme }}" />
+    <Button text="{{ 'Change Theme to ' + btnText}}" tap="{{ switchTheme }}" />
     <Label text="TO DO :)" textWrap="true" />
   </StackLayout>
 </Page>
\ No newline at end of file