diff --git a/lib/main.dart b/lib/main.dart
index bf7d88c..742a4db 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -15,7 +15,7 @@ import 'dart:io' show Platform;
 import 'opaque.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
-var GlobalSettings = Settings(Locale("en", ''), Opaque.dark);
+var globalSettings = Settings(Locale("en", ''), Opaque.dark);
 
 
 void main() {
@@ -47,7 +47,7 @@ class FlwtchState extends State<Flwtch> {
     cwtchInit = false;
 
     profs = ProfileListState();
-    var cwtchNotifier = new CwtchNotifier(profs, GlobalSettings);
+    var cwtchNotifier = new CwtchNotifier(profs, globalSettings);
 
     if (Platform.isAndroid) {
       cwtch = CwtchGomobile(cwtchNotifier);
@@ -65,7 +65,7 @@ class FlwtchState extends State<Flwtch> {
   }
 
   ChangeNotifierProvider<Settings> getSettingsProvider() =>
-      ChangeNotifierProvider(create: (context) => GlobalSettings);
+      ChangeNotifierProvider(create: (context) => globalSettings);
   Provider<FlwtchState> getFlwtchStateProvider() =>
       Provider<FlwtchState>(create: (_) => this);
   ChangeNotifierProvider<ProfileListState> getProfileListProvider() =>
diff --git a/lib/widgets/buttontextfield.dart b/lib/widgets/buttontextfield.dart
index e50fa16..cc03b73 100644
--- a/lib/widgets/buttontextfield.dart
+++ b/lib/widgets/buttontextfield.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_app/settings.dart';
 import 'package:provider/provider.dart';
-import '../opaque.dart';
+
 
 // Provides a styled Text Field for use in Form Widgets.
 // Callers must provide a text controller, label helper text and a validator.
diff --git a/lib/widgets/cwtchlabel.dart b/lib/widgets/cwtchlabel.dart
index 6780198..a2e062d 100644
--- a/lib/widgets/cwtchlabel.dart
+++ b/lib/widgets/cwtchlabel.dart
@@ -1,7 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
-import '../opaque.dart';
 import '../settings.dart';
 
 // Provides a styled Label
diff --git a/lib/widgets/passwordfield.dart b/lib/widgets/passwordfield.dart
index 5853d1f..c7c6850 100644
--- a/lib/widgets/passwordfield.dart
+++ b/lib/widgets/passwordfield.dart
@@ -1,7 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
-import '../opaque.dart';
 import '../settings.dart';
 
 // Provides a styled Password Input Field for use in Form Widgets.
diff --git a/lib/widgets/profilerow.dart b/lib/widgets/profilerow.dart
index c2b444d..b6e2682 100644
--- a/lib/widgets/profilerow.dart
+++ b/lib/widgets/profilerow.dart
@@ -6,7 +6,6 @@ import 'package:provider/provider.dart';
 
 import '../main.dart';
 import '../model.dart';
-import '../opaque.dart';
 import '../settings.dart';
 
 class ProfileRow extends StatefulWidget {
diff --git a/lib/widgets/textfield.dart b/lib/widgets/textfield.dart
index f2a31b3..33a1a24 100644
--- a/lib/widgets/textfield.dart
+++ b/lib/widgets/textfield.dart
@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
-import '../opaque.dart';
 import '../settings.dart';
 
 // Provides a styled Text Field for use in Form Widgets.