diff --git a/lib/main_test.dart b/lib/main_test.dart
index 07f02c72..6ba3edd8 100644
--- a/lib/main_test.dart
+++ b/lib/main_test.dart
@@ -14,7 +14,7 @@ import 'dart:typed_data';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:glob/glob.dart';
 
-var globalSettings = Settings(Locale("en", ''), OpaqueDark());
+var globalSettings = Settings(Locale("en", ''), CwtchDark());
 var globalErrorHandler = ErrorHandler();
 
 void main() {
diff --git a/lib/themes/opaque.dart b/lib/themes/opaque.dart
index 7f63902e..8218934c 100644
--- a/lib/themes/opaque.dart
+++ b/lib/themes/opaque.dart
@@ -133,7 +133,7 @@ ThemeData mkThemeData(Settings opaque) {
         actionsIconTheme: IconThemeData(
           color: opaque.current().mainTextColor,
         )),
-    //bottomNavigationBarTheme: BottomNavigationBarThemeData(type: BottomNavigationBarType.fixed, backgroundColor: opaque.current().backgroundHilightElementColor()),  // Can't determine current use
+    //bottomNavigationBarTheme: BottomNavigationBarThemeData(type: BottomNavigationBarType.fixed, backgroundColor: opaque.current().backgroundHilightElementColor),  // Can't determine current use
     textButtonTheme: TextButtonThemeData(
       style: ButtonStyle(
           backgroundColor: MaterialStateProperty.all(opaque.current().defaultButtonColor),
diff --git a/lib/views/addeditservers.dart b/lib/views/addeditservers.dart
index e73ec0e4..1138dcdb 100644
--- a/lib/views/addeditservers.dart
+++ b/lib/views/addeditservers.dart
@@ -105,7 +105,7 @@ class _AddEditServerViewState extends State<AddEditServerView> {
                                 ),
                                 CwtchTextField(
                                   controller: ctrlrDesc,
-                                  labelText: AppLocalizations.of(context)!.fieldDescriptionLabel,
+                                  hintText: AppLocalizations.of(context)!.fieldDescriptionLabel,
                                   autofocus: false,
                                 )
                               ]),
diff --git a/lib/views/globalsettingsview.dart b/lib/views/globalsettingsview.dart
index 0156e32f..3cdd04a5 100644
--- a/lib/views/globalsettingsview.dart
+++ b/lib/views/globalsettingsview.dart
@@ -245,7 +245,7 @@ class _GlobalSettingsViewState extends State<GlobalSettingsView> {
                                 secondary: Icon(Icons.attach_file, color: settings.current().mainTextColor),
                               ),
                               SwitchListTile(
-                                title: Text(AppLocalizations.of(context)!.enableExperimentClickableLinks, style: TextStyle(color: settings.current().mainTextColor())),
+                                title: Text(AppLocalizations.of(context)!.enableExperimentClickableLinks, style: TextStyle(color: settings.current().mainTextColor)),
                                 subtitle: Text(AppLocalizations.of(context)!.experimentClickableLinksDescription),
                                 value: settings.isExperimentEnabled(ClickableLinksExperiment),
                                 onChanged: (bool value) {
diff --git a/lib/views/profileserversview.dart b/lib/views/profileserversview.dart
index 7ac06520..99040880 100644
--- a/lib/views/profileserversview.dart
+++ b/lib/views/profileserversview.dart
@@ -65,7 +65,7 @@ class _ProfileServersView extends State<ProfileServersView> {
 
             final importCard = Card( child: ListTile(
               title: Text(AppLocalizations.of(context)!.importLocalServerLabel),
-              leading:  Icon(CwtchIcons.add_circle_24px , color: Provider.of<Settings>(context).current().mainTextColor()),
+              leading:  Icon(CwtchIcons.add_circle_24px , color: Provider.of<Settings>(context).current().mainTextColor),
               trailing: DropdownButton(
                   onChanged: (String? importServer) {
                     if (importServer!.isNotEmpty) {
diff --git a/lib/views/remoteserverview.dart b/lib/views/remoteserverview.dart
index bc940807..1245f7e8 100644
--- a/lib/views/remoteserverview.dart
+++ b/lib/views/remoteserverview.dart
@@ -130,7 +130,7 @@ class _RemoteServerViewState extends State<RemoteServerView> {
           children: [
             Text(
               group.nickname,
-              style: Provider.of<FlwtchState>(context).biggerFont.apply(color: Provider.of<Settings>(context).theme.portraitOnlineBorderColor()),
+              style: Provider.of<FlwtchState>(context).biggerFont.apply(color: Provider.of<Settings>(context).theme.portraitOnlineBorderColor),
               softWrap: true,
               overflow: TextOverflow.ellipsis,
             ),
@@ -141,7 +141,7 @@ class _RemoteServerViewState extends State<RemoteServerView> {
                       group.onion,
                       softWrap: true,
                       overflow: TextOverflow.ellipsis,
-                      style: TextStyle(color: Provider.of<Settings>(context).theme.portraitOnlineBorderColor()),
+                      style: TextStyle(color: Provider.of<Settings>(context).theme.portraitOnlineBorderColor),
                     )))
           ])
     );
diff --git a/lib/widgets/buttontextfield.dart b/lib/widgets/buttontextfield.dart
index 4c3ad2d2..dddb7840 100644
--- a/lib/widgets/buttontextfield.dart
+++ b/lib/widgets/buttontextfield.dart
@@ -41,7 +41,7 @@ class _CwtchButtonTextFieldState extends State<CwtchButtonTextField> {
         enableIMEPersonalizedLearning: false,
         decoration: InputDecoration(
             labelText: widget.labelText,
-            labelStyle: TextStyle(color: theme.current().mainTextColor(), backgroundColor: theme.current().textfieldBackgroundColor()),
+            labelStyle: TextStyle(color: theme.current().mainTextColor, backgroundColor: theme.current().textfieldBackgroundColor),
             suffixIcon: IconButton(
               onPressed: widget.onPressed,
               icon: widget.icon,
diff --git a/lib/widgets/remoteserverrow.dart b/lib/widgets/remoteserverrow.dart
index 339a170d..bd4a8fb8 100644
--- a/lib/widgets/remoteserverrow.dart
+++ b/lib/widgets/remoteserverrow.dart
@@ -36,7 +36,7 @@ class _RemoteServerRowState extends State<RemoteServerRow> {
                     Padding(
                         padding: const EdgeInsets.all(6.0), //border size
                         child: Icon(CwtchIcons.dns_24px,
-                            color: running ? Provider.of<Settings>(context).theme.portraitOnlineBorderColor() : Provider.of<Settings>(context).theme.portraitOfflineBorderColor(),
+                            color: running ? Provider.of<Settings>(context).theme.portraitOnlineBorderColor : Provider.of<Settings>(context).theme.portraitOfflineBorderColor,
                             size: 64)
 
                     ),
@@ -46,7 +46,7 @@ class _RemoteServerRowState extends State<RemoteServerRow> {
                             Text(
                               description,
                               semanticsLabel: description,
-                              style: Provider.of<FlwtchState>(context).biggerFont.apply(color: running ? Provider.of<Settings>(context).theme.portraitOnlineBorderColor() : Provider.of<Settings>(context).theme.portraitOfflineBorderColor()),
+                              style: Provider.of<FlwtchState>(context).biggerFont.apply(color: running ? Provider.of<Settings>(context).theme.portraitOnlineBorderColor : Provider.of<Settings>(context).theme.portraitOfflineBorderColor),
                               softWrap: true,
                               overflow: TextOverflow.ellipsis,
                             ),
@@ -57,7 +57,7 @@ class _RemoteServerRowState extends State<RemoteServerRow> {
                                       server.onion,
                                       softWrap: true,
                                       overflow: TextOverflow.ellipsis,
-                                      style: TextStyle(color: running ? Provider.of<Settings>(context).theme.portraitOnlineBorderColor() : Provider.of<Settings>(context).theme.portraitOfflineBorderColor()),
+                                      style: TextStyle(color: running ? Provider.of<Settings>(context).theme.portraitOnlineBorderColor : Provider.of<Settings>(context).theme.portraitOfflineBorderColor),
                                     )))
                           ],
                         )),
diff --git a/test/buttontextfield_test.dart b/test/buttontextfield_test.dart
index 55361c2e..95c2d65a 100644
--- a/test/buttontextfield_test.dart
+++ b/test/buttontextfield_test.dart
@@ -5,6 +5,7 @@
 // gestures. You can also use WidgetTester to find child widgets in the widget
 // tree, read text, and verify that the values of widget properties are correct.
 
+import 'package:cwtch/themes/cwtch.dart';
 import 'package:flutter/material.dart';
 import 'package:cwtch/themes/opaque.dart';
 import 'package:cwtch/settings.dart';
@@ -14,8 +15,8 @@ import 'package:provider/provider.dart';
 
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
-var settingsEnglishDark = Settings(Locale("en", ''), OpaqueDark());
-var settingsEnglishLight = Settings(Locale("en", ''), OpaqueLight());
+var settingsEnglishDark = Settings(Locale("en", ''), CwtchDark());
+var settingsEnglishLight = Settings(Locale("en", ''), CwtchLight());
 ChangeNotifierProvider<Settings> getSettingsEnglishDark() => ChangeNotifierProvider.value(value: settingsEnglishDark);
 
 void main() {
diff --git a/test/cwtchlabel_test.dart b/test/cwtchlabel_test.dart
index 7ac0bd19..63ad75b7 100644
--- a/test/cwtchlabel_test.dart
+++ b/test/cwtchlabel_test.dart
@@ -5,6 +5,7 @@
 // gestures. You can also use WidgetTester to find child widgets in the widget
 // tree, read text, and verify that the values of widget properties are correct.
 
+import 'package:cwtch/themes/cwtch.dart';
 import 'package:flutter/material.dart';
 import 'package:cwtch/themes/opaque.dart';
 import 'package:cwtch/settings.dart';
@@ -14,8 +15,8 @@ import 'package:provider/provider.dart';
 
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
-var settingsEnglishDark = Settings(Locale("en", ''), OpaqueDark());
-var settingsEnglishLight = Settings(Locale("en", ''), OpaqueLight());
+var settingsEnglishDark = Settings(Locale("en", ''), CwtchDark());
+var settingsEnglishLight = Settings(Locale("en", ''), CwtchLight());
 ChangeNotifierProvider<Settings> getSettingsEnglishDark() => ChangeNotifierProvider.value(value: settingsEnglishDark);
 
 void main() {
diff --git a/test/profileimage_test.dart b/test/profileimage_test.dart
index dc99213d..239aa5aa 100644
--- a/test/profileimage_test.dart
+++ b/test/profileimage_test.dart
@@ -5,6 +5,7 @@
 // gestures. You can also use WidgetTester to find child widgets in the widget
 // tree, read text, and verify that the values of widget properties are correct.
 
+import 'package:cwtch/themes/cwtch.dart';
 import 'package:flutter/material.dart';
 import 'package:cwtch/themes/opaque.dart';
 import 'package:cwtch/settings.dart';
@@ -14,8 +15,8 @@ import 'package:provider/provider.dart';
 
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
-var settingsEnglishDark = Settings(Locale("en", ''), OpaqueDark());
-var settingsEnglishLight = Settings(Locale("en", ''), OpaqueLight());
+var settingsEnglishDark = Settings(Locale("en", ''), CwtchDark());
+var settingsEnglishLight = Settings(Locale("en", ''), CwtchLight());
 ChangeNotifierProvider<Settings> getSettingsEnglishDark() => ChangeNotifierProvider.value(value: settingsEnglishDark);
 
 String file(String slug) {
diff --git a/test/textfield_basic.png b/test/textfield_basic.png
index 693afb1c..b17efd07 100644
Binary files a/test/textfield_basic.png and b/test/textfield_basic.png differ
diff --git a/test/textfield_form_42.png b/test/textfield_form_42.png
index 3d925698..abb2c137 100644
Binary files a/test/textfield_form_42.png and b/test/textfield_form_42.png differ
diff --git a/test/textfield_form_alpha.png b/test/textfield_form_alpha.png
index ef0f1d8c..531bb36a 100644
Binary files a/test/textfield_form_alpha.png and b/test/textfield_form_alpha.png differ
diff --git a/test/textfield_form_final.png b/test/textfield_form_final.png
index 2ad30d6e..d9087d17 100644
Binary files a/test/textfield_form_final.png and b/test/textfield_form_final.png differ
diff --git a/test/textfield_form_init.png b/test/textfield_form_init.png
index ed39bf8b..5c23672c 100644
Binary files a/test/textfield_form_init.png and b/test/textfield_form_init.png differ
diff --git a/test/textfield_test.dart b/test/textfield_test.dart
index a133cb1e..27ea0f3e 100644
--- a/test/textfield_test.dart
+++ b/test/textfield_test.dart
@@ -7,6 +7,7 @@
 
 import 'package:flutter/material.dart';
 import 'package:cwtch/themes/opaque.dart';
+import 'package:cwtch/themes/cwtch.dart';
 import 'package:cwtch/settings.dart';
 import 'package:cwtch/widgets/textfield.dart';
 import 'package:flutter_test/flutter_test.dart';
@@ -14,8 +15,8 @@ import 'package:provider/provider.dart';
 
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
-var settingsEnglishDark = Settings(Locale("en", ''), OpaqueDark());
-var settingsEnglishLight = Settings(Locale("en", ''), OpaqueLight());
+var settingsEnglishDark = Settings(Locale("en", ''), CwtchDark());
+var settingsEnglishLight = Settings(Locale("en", ''), CwtchLight());
 ChangeNotifierProvider<Settings> getSettingsEnglishDark() => ChangeNotifierProvider.value(value: settingsEnglishDark);
 
 String file(String slug) {