From f6a4d5c3fa0fb76ada017a057d0a04b85fe21c1a Mon Sep 17 00:00:00 2001
From: Dan Ballard <dan@mindstab.net>
Date: Mon, 6 Dec 2021 17:40:10 -0800
Subject: [PATCH] removing unused theme definitions

---
 lib/main.dart                     |    3 +-
 lib/main_test.dart                |    2 +-
 lib/opaque.dart                   | 1455 -----------------------------
 lib/settings.dart                 |    3 +-
 lib/themes/cwtch.dart             |  275 ++++++
 lib/themes/opaque.dart            |  226 +++++
 lib/views/addeditprofileview.dart |    2 +-
 lib/widgets/profileimage.dart     |    2 +-
 regenerate_opaque_theme.sh        |   50 -
 test/buttontextfield_test.dart    |    2 +-
 test/cwtchlabel_test.dart         |    2 +-
 test/profileimage_test.dart       |    2 +-
 test/textfield_test.dart          |    2 +-
 13 files changed, 512 insertions(+), 1514 deletions(-)
 delete mode 100644 lib/opaque.dart
 create mode 100644 lib/themes/cwtch.dart
 create mode 100644 lib/themes/opaque.dart
 delete mode 100755 regenerate_opaque_theme.sh

diff --git a/lib/main.dart b/lib/main.dart
index 9ab2ad4b..64557091 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -1,6 +1,7 @@
 import 'dart:convert';
 import 'package:cwtch/config.dart';
 import 'package:cwtch/notification_manager.dart';
+import 'package:cwtch/themes/cwtch.dart';
 import 'package:cwtch/views/messageview.dart';
 import 'package:cwtch/widgets/rightshiftfixer.dart';
 import 'package:flutter/foundation.dart';
@@ -21,7 +22,7 @@ import 'models/servers.dart';
 import 'views/profilemgrview.dart';
 import 'views/splashView.dart';
 import 'dart:io' show Platform, exit;
-import 'opaque.dart';
+import 'themes/opaque.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
 var globalSettings = Settings(Locale("en", ''), OpaqueDark());
diff --git a/lib/main_test.dart b/lib/main_test.dart
index a2551891..07f02c72 100644
--- a/lib/main_test.dart
+++ b/lib/main_test.dart
@@ -5,7 +5,7 @@ import 'package:cwtch/errorHandler.dart';
 import 'package:cwtch/settings.dart';
 import 'licenses.dart';
 import 'main.dart';
-import 'opaque.dart';
+import 'themes/opaque.dart';
 
 import 'dart:convert';
 import 'dart:io';
diff --git a/lib/opaque.dart b/lib/opaque.dart
deleted file mode 100644
index fc984217..00000000
--- a/lib/opaque.dart
+++ /dev/null
@@ -1,1455 +0,0 @@
-// THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT BY HAND AS CHANGES WILL BE OVERRIDDEN.
-// TO EDIT THE THEME, SEE https://git.openprivacy.ca/openprivacy/opaque/
-// FOR HOW THIS FILE IS GENERATED, SEE ../regenerate_opaque_theme.sh
-
-import 'dart:ui';
-import 'dart:core';
-
-import 'package:flutter/material.dart';
-import 'package:cwtch/settings.dart';
-
-abstract class OpaqueThemeType {
-  static final Color red = Color(0xFFFF0000);
-
-  String identifier() {
-    return "dummy";
-  }
-
-  Color backgroundMainColor() {
-    return red;
-  }
-
-  Color backgroundPaneColor() {
-    return red;
-  }
-
-  Color backgroundHilightElementColor() {
-    return red;
-  }
-
-  Color dividerColor() {
-    return red;
-  }
-
-  Color mainTextColor() {
-    return red;
-  }
-
-  Color altTextColor() {
-    return red;
-  }
-
-  Color hilightElementTextColor() {
-    return red;
-  }
-
-  Color defaultButtonColor() {
-    return red;
-  }
-
-  Color defaultButtonActiveColor() {
-    return red;
-  }
-
-  Color defaultButtonTextColor() {
-    return red;
-  }
-
-  Color defaultButtonDisabledColor() {
-    return red;
-  }
-
-  Color defaultButtonDisabledTextColor() {
-    return red;
-  }
-
-  Color altButtonColor() {
-    return red;
-  }
-
-  Color altButtonTextColor() {
-    return red;
-  }
-
-  Color altButtonDisabledColor() {
-    return red;
-  }
-
-  Color altButtonDisabledTextColor() {
-    return red;
-  }
-
-  Color textfieldBackgroundColor() {
-    return red;
-  }
-
-  Color textfieldBorderColor() {
-    return red;
-  }
-
-  Color textfieldTextColor() {
-    return red;
-  }
-
-  Color textfieldErrorColor() {
-    return red;
-  }
-
-  Color textfieldButtonColor() {
-    return red;
-  }
-
-  Color textfieldButtonTextColor() {
-    return red;
-  }
-
-  Color scrollbarDefaultColor() {
-    return red;
-  }
-
-  Color scrollbarActiveColor() {
-    return red;
-  }
-
-  Color portraitOnlineBorderColor() {
-    return red;
-  }
-
-  Color portraitOnlineBackgroundColor() {
-    return red;
-  }
-
-  Color portraitOnlineTextColor() {
-    return red;
-  }
-
-  Color portraitConnectingBorderColor() {
-    return red;
-  }
-
-  Color portraitConnectingBackgroundColor() {
-    return red;
-  }
-
-  Color portraitConnectingTextColor() {
-    return red;
-  }
-
-  Color portraitOfflineBorderColor() {
-    return red;
-  }
-
-  Color portraitOfflineBackgroundColor() {
-    return red;
-  }
-
-  Color portraitOfflineTextColor() {
-    return red;
-  }
-
-  Color portraitBlockedBorderColor() {
-    return red;
-  }
-
-  Color portraitBlockedBackgroundColor() {
-    return red;
-  }
-
-  Color portraitBlockedTextColor() {
-    return red;
-  }
-
-  Color portraitOnlineBadgeColor() {
-    return red;
-  }
-
-  Color portraitOfflineBadgeColor() {
-    return red;
-  }
-
-  Color portraitContactBadgeColor() {
-    return red;
-  }
-
-  Color portraitContactBadgeTextColor() {
-    return red;
-  }
-
-  Color portraitProfileBadgeColor() {
-    return red;
-  }
-
-  Color portraitProfileBadgeTextColor() {
-    return red;
-  }
-
-  Color portraitOverlayOfflineColor() {
-    return red;
-  }
-
-  Color dropShadowColor() {
-    return red;
-  }
-
-  Color dropShadowPaneColor() {
-    return red;
-  }
-
-  Color toggleColor() {
-    return red;
-  }
-
-  Color toggleOnColor() {
-    return red;
-  }
-
-  Color toggleOffColor() {
-    return red;
-  }
-
-  Color sliderButtonColor() {
-    return red;
-  }
-
-  Color sliderBarLeftColor() {
-    return red;
-  }
-
-  Color sliderBarRightColor() {
-    return red;
-  }
-
-  Color boxCheckedColor() {
-    return red;
-  }
-
-  Color toolbarIconColor() {
-    return red;
-  }
-
-  Color toolbarMainColor() {
-    return red;
-  }
-
-  Color toolbarAltColor() {
-    return red;
-  }
-
-  Color statusbarDisconnectedInternetColor() {
-    return red;
-  }
-
-  Color statusbarDisconnectedInternetFontColor() {
-    return red;
-  }
-
-  Color statusbarDisconnectedTorFontColor() {
-    return red;
-  }
-
-  Color statusbarDisconnectedTorColor() {
-    return red;
-  }
-
-  Color statusbarConnectingColor() {
-    return red;
-  }
-
-  Color statusbarConnectingFontColor() {
-    return red;
-  }
-
-  Color statusbarOnlineColor() {
-    return red;
-  }
-
-  Color statusbarOnlineFontColor() {
-    return red;
-  }
-
-  Color chatOverlayWarningTextColor() {
-    return red;
-  }
-
-  Color messageFromMeBackgroundColor() {
-    return red;
-  }
-
-  Color messageFromMeTextColor() {
-    return red;
-  }
-
-  Color messageFromOtherBackgroundColor() {
-    return red;
-  }
-
-  Color messageFromOtherTextColor() {
-    return red;
-  }
-
-  Color messageStatusNormalColor() {
-    return red;
-  }
-
-  Color messageStatusBlockedColor() {
-    return red;
-  }
-
-  Color messageStatusBlockedTextColor() {
-    return red;
-  }
-
-  Color messageStatusAlertColor() {
-    return red;
-  }
-
-  Color messageStatusAlertTextColor() {
-    return red;
-  }
-
-  // ... more to come
-
-  // Sizes
-
-  double contactOnionTextSize() {
-    return 18;
-  }
-}
-
-class OpaqueDark extends OpaqueThemeType {
-  static final Color darkGreyPurple = Color(0xFF281831);
-  static final Color deepPurple = Color(0xFF422850);
-  static final Color mauvePurple = Color(0xFF8E64A5);
-  static final Color purple = Color(0xFFDFB9DE);
-  static final Color whitePurple = Color(0xFFE3DFE4);
-  static final Color softPurple = Color(0xFFFDF3FC);
-  static final Color pink = Color(0xFFE85DA1);
-  static final Color hotPink = Color(0xFFD01972);
-  static final Color lightGrey = Color(0xFF9E9E9E);
-  static final Color softGreen = Color(0xFFA0FFB0);
-  static final Color softRed = Color(0xFFFFA0B0);
-
-  String identifier() {
-    return "dark";
-  }
-
-  Color backgroundMainColor() {
-    return darkGreyPurple;
-  }
-
-  Color backgroundPaneColor() {
-    return darkGreyPurple;
-  }
-
-  Color backgroundHilightElementColor() {
-    return deepPurple;
-  }
-
-  Color dividerColor() {
-    return deepPurple;
-  }
-
-  Color mainTextColor() {
-    return whitePurple;
-  }
-
-  Color altTextColor() {
-    return mauvePurple;
-  }
-
-  Color hilightElementTextColor() {
-    return purple;
-  }
-
-  Color defaultButtonColor() {
-    return hotPink;
-  }
-
-  Color defaultButtonActiveColor() {
-    return pink;
-  }
-
-  Color defaultButtonTextColor() {
-    return whitePurple;
-  }
-
-  Color defaultButtonDisabledColor() {
-    return lightGrey;
-  }
-
-  Color defaultButtonDisabledTextColor() {
-    return darkGreyPurple;
-  }
-
-  Color altButtonColor() {
-    return darkGreyPurple;
-  }
-
-  Color altButtonTextColor() {
-    return purple;
-  }
-
-  Color altButtonDisabledColor() {
-    return darkGreyPurple;
-  }
-
-  Color altButtonDisabledTextColor() {
-    return purple;
-  }
-
-  Color textfieldBackgroundColor() {
-    return deepPurple;
-  }
-
-  Color textfieldBorderColor() {
-    return deepPurple;
-  }
-
-  Color textfieldTextColor() {
-    return purple;
-  }
-
-  Color textfieldErrorColor() {
-    return hotPink;
-  }
-
-  Color textfieldButtonColor() {
-    return purple;
-  }
-
-  Color textfieldButtonTextColor() {
-    return darkGreyPurple;
-  }
-
-  Color scrollbarDefaultColor() {
-    return purple;
-  }
-
-  Color scrollbarActiveColor() {
-    return hotPink;
-  }
-
-  Color portraitOnlineBorderColor() {
-    return whitePurple;
-  }
-
-  Color portraitOnlineBackgroundColor() {
-    return whitePurple;
-  }
-
-  Color portraitOnlineTextColor() {
-    return whitePurple;
-  }
-
-  Color portraitConnectingBorderColor() {
-    return purple;
-  } //mauvePurple
-
-  Color portraitConnectingBackgroundColor() {
-    return purple;
-  } //darkGreyPurple
-
-  Color portraitConnectingTextColor() {
-    return purple;
-  }
-
-  Color portraitOfflineBorderColor() {
-    return purple;
-  }
-
-  Color portraitOfflineBackgroundColor() {
-    return purple;
-  }
-
-  Color portraitOfflineTextColor() {
-    return purple;
-  }
-
-  Color portraitBlockedBorderColor() {
-    return lightGrey;
-  }
-
-  Color portraitBlockedBackgroundColor() {
-    return lightGrey;
-  }
-
-  Color portraitBlockedTextColor() {
-    return lightGrey;
-  }
-
-  Color portraitOnlineBadgeColor() {
-    return softGreen;
-  }
-
-  Color portraitOfflineBadgeColor() {
-    return softRed;
-  }
-
-  Color portraitContactBadgeColor() {
-    return hotPink;
-  }
-
-  Color portraitContactBadgeTextColor() {
-    return whitePurple;
-  }
-
-  Color portraitProfileBadgeColor() {
-    return mauvePurple;
-  }
-
-  Color portraitProfileBadgeTextColor() {
-    return darkGreyPurple;
-  }
-
-  Color portraitOverlayOfflineColor() {
-    return mauvePurple;
-  }
-
-  Color dropShadowColor() {
-    return mauvePurple;
-  }
-
-  Color dropShadowPaneColor() {
-    return darkGreyPurple;
-  }
-
-  Color toggleColor() {
-    return darkGreyPurple;
-  }
-
-  Color toggleOnColor() {
-    return whitePurple;
-  }
-
-  Color toggleOffColor() {
-    return deepPurple;
-  }
-
-  Color sliderButtonColor() {
-    return whitePurple;
-  }
-
-  Color sliderBarLeftColor() {
-    return mauvePurple;
-  }
-
-  Color sliderBarRightColor() {
-    return mauvePurple;
-  }
-
-  Color boxCheckedColor() {
-    return hotPink;
-  }
-
-  Color toolbarIconColor() {
-    return whitePurple;
-  }
-
-  Color toolbarMainColor() {
-    return darkGreyPurple;
-  }
-
-  Color toolbarAltColor() {
-    return deepPurple;
-  }
-
-  Color statusbarDisconnectedInternetColor() {
-    return whitePurple;
-  }
-
-  Color statusbarDisconnectedInternetFontColor() {
-    return deepPurple;
-  }
-
-  Color statusbarDisconnectedTorColor() {
-    return darkGreyPurple;
-  }
-
-  Color statusbarDisconnectedTorFontColor() {
-    return whitePurple;
-  }
-
-  Color statusbarConnectingColor() {
-    return deepPurple;
-  }
-
-  Color statusbarConnectingFontColor() {
-    return whitePurple;
-  }
-
-  Color statusbarOnlineColor() {
-    return mauvePurple;
-  }
-
-  Color statusbarOnlineFontColor() {
-    return whitePurple;
-  }
-
-  Color chatOverlayWarningTextColor() {
-    return purple;
-  }
-
-  Color messageFromMeBackgroundColor() {
-    return mauvePurple;
-  }
-
-  Color messageFromMeTextColor() {
-    return whitePurple;
-  }
-
-  Color messageFromOtherBackgroundColor() {
-    return deepPurple;
-  }
-
-  Color messageFromOtherTextColor() {
-    return whitePurple;
-  }
-
-  Color messageStatusNormalColor() {
-    return deepPurple;
-  }
-
-  Color messageStatusBlockedColor() {
-    return lightGrey;
-  }
-
-  Color messageStatusBlockedTextColor() {
-    return whitePurple;
-  }
-
-  Color messageStatusAlertColor() {
-    return mauvePurple;
-  }
-
-  Color messageStatusAlertTextColor() {
-    return whitePurple;
-  }
-}
-
-class OpaqueLight extends OpaqueThemeType {
-  static final Color whitePurple = Color(0xFFFFFDFF);
-  static final Color softPurple = Color(0xFFFDF3FC);
-  static final Color purple = Color(0xFFDFB9DE);
-  static final Color brightPurple = Color(0xFFD1B0E0);
-  static final Color darkPurple = Color(0xFF350052);
-  static final Color greyPurple = Color(0xFF775F84);
-  static final Color pink = Color(0xFFE85DA1);
-  static final Color hotPink = Color(0xFFD01972);
-  static final Color lightGrey = Color(0xFFB3B6B3);
-  static final Color softGreen = Color(0xFFA0FFB0);
-  static final Color softRed = Color(0xFFFFA0B0);
-
-  String identifier() {
-    return "light";
-  }
-
-  Color backgroundMainColor() {
-    return whitePurple;
-  }
-
-  Color backgroundPaneColor() {
-    return softPurple;
-  }
-
-  Color backgroundHilightElementColor() {
-    return softPurple;
-  }
-
-  Color dividerColor() {
-    return purple;
-  }
-
-  Color mainTextColor() {
-    return darkPurple;
-  }
-
-  Color altTextColor() {
-    return purple;
-  }
-
-  Color hilightElementTextColor() {
-    return darkPurple;
-  }
-
-  Color defaultButtonColor() {
-    return hotPink;
-  }
-
-  Color defaultButtonActiveColor() {
-    return pink;
-  }
-
-  Color defaultButtonTextColor() {
-    return whitePurple;
-  }
-
-  Color defaultButtonDisabledColor() {
-    return lightGrey;
-  }
-
-  Color defaultButtonDisabledTextColor() {
-    return whitePurple;
-  }
-
-  Color altButtonColor() {
-    return whitePurple;
-  }
-
-  Color altButtonTextColor() {
-    return purple;
-  }
-
-  Color altButtonDisabledColor() {
-    return softPurple;
-  }
-
-  Color altButtonDisabledTextColor() {
-    return purple;
-  }
-
-  Color textfieldBackgroundColor() {
-    return purple;
-  }
-
-  Color textfieldBorderColor() {
-    return purple;
-  }
-
-  Color textfieldTextColor() {
-    return purple;
-  }
-
-  Color textfieldErrorColor() {
-    return hotPink;
-  }
-
-  Color textfieldButtonColor() {
-    return hotPink;
-  }
-
-  Color textfieldButtonTextColor() {
-    return whitePurple;
-  }
-
-  Color scrollbarDefaultColor() {
-    return darkPurple;
-  }
-
-  Color scrollbarActiveColor() {
-    return hotPink;
-  }
-
-  Color portraitOnlineBorderColor() {
-    return greyPurple;
-  }
-
-  Color portraitOnlineBackgroundColor() {
-    return greyPurple;
-  }
-
-  Color portraitOnlineTextColor() {
-    return darkPurple;
-  }
-
-  Color portraitConnectingBorderColor() {
-    return greyPurple;
-  }
-
-  Color portraitConnectingBackgroundColor() {
-    return greyPurple;
-  }
-
-  Color portraitConnectingTextColor() {
-    return greyPurple;
-  }
-
-  Color portraitOfflineBorderColor() {
-    return greyPurple;
-  } //purple
-
-  Color portraitOfflineBackgroundColor() {
-    return greyPurple;
-  } //purple
-
-  Color portraitOfflineTextColor() {
-    return greyPurple;
-  } //purple
-
-  Color portraitBlockedBorderColor() {
-    return lightGrey;
-  }
-
-  Color portraitBlockedBackgroundColor() {
-    return lightGrey;
-  }
-
-  Color portraitBlockedTextColor() {
-    return lightGrey;
-  }
-
-  Color portraitOnlineBadgeColor() {
-    return softGreen;
-  }
-
-  Color portraitOfflineBadgeColor() {
-    return softRed;
-  }
-
-  Color portraitContactBadgeColor() {
-    return hotPink;
-  }
-
-  Color portraitContactBadgeTextColor() {
-    return whitePurple;
-  }
-
-  Color portraitProfileBadgeColor() {
-    return brightPurple;
-  }
-
-  Color portraitProfileBadgeTextColor() {
-    return whitePurple;
-  }
-
-  Color portraitOverlayOfflineColor() {
-    return whitePurple;
-  }
-
-  Color dropShadowColor() {
-    return purple;
-  }
-
-  Color dropShadowPaneColor() {
-    return purple;
-  }
-
-  Color toggleColor() {
-    return whitePurple;
-  }
-
-  Color toggleOnColor() {
-    return hotPink;
-  }
-
-  Color toggleOffColor() {
-    return purple;
-  }
-
-  Color sliderButtonColor() {
-    return pink;
-  }
-
-  Color sliderBarLeftColor() {
-    return purple;
-  }
-
-  Color sliderBarRightColor() {
-    return purple;
-  }
-
-  Color boxCheckedColor() {
-    return darkPurple;
-  }
-
-  Color toolbarIconColor() {
-    return darkPurple;
-  }
-
-  Color toolbarMainColor() {
-    return whitePurple;
-  }
-
-  Color toolbarAltColor() {
-    return softPurple;
-  }
-
-  Color statusbarDisconnectedInternetColor() {
-    return softPurple;
-  }
-
-  Color statusbarDisconnectedInternetFontColor() {
-    return darkPurple;
-  }
-
-  Color statusbarDisconnectedTorColor() {
-    return purple;
-  }
-
-  Color statusbarDisconnectedTorFontColor() {
-    return darkPurple;
-  }
-
-  Color statusbarConnectingColor() {
-    return greyPurple;
-  }
-
-  Color statusbarConnectingFontColor() {
-    return whitePurple;
-  }
-
-  Color statusbarOnlineColor() {
-    return darkPurple;
-  }
-
-  Color statusbarOnlineFontColor() {
-    return whitePurple;
-  }
-
-  Color chatOverlayWarningTextColor() {
-    return purple;
-  }
-
-  Color messageFromMeBackgroundColor() {
-    return brightPurple;
-  }
-
-  Color messageFromMeTextColor() {
-    return mainTextColor();
-  }
-
-  Color messageFromOtherBackgroundColor() {
-    return purple;
-  }
-
-  Color messageFromOtherTextColor() {
-    return darkPurple;
-  }
-
-  Color messageStatusNormalColor() {
-    return purple;
-  }
-
-  Color messageStatusBlockedColor() {
-    return lightGrey;
-  }
-
-  Color messageStatusBlockedTextColor() {
-    return whitePurple;
-  }
-
-  Color messageStatusAlertColor() {
-    return hotPink;
-  }
-
-  Color messageStatusAlertTextColor() {
-    return whitePurple;
-  }
-}
-
-ThemeData mkThemeData(Settings opaque) {
-  return ThemeData(
-    visualDensity: VisualDensity.adaptivePlatformDensity,
-    primarySwatch: Colors.red,
-    primaryIconTheme: IconThemeData(
-      color: opaque.current().mainTextColor(),
-    ),
-    primaryColor: opaque.current().backgroundMainColor(),
-    canvasColor: opaque.current().backgroundPaneColor(),
-    backgroundColor: opaque.current().backgroundMainColor(),
-    highlightColor: opaque.current().hilightElementTextColor(),
-    iconTheme: IconThemeData(
-      color: opaque.current().toolbarIconColor(),
-    ),
-    cardColor: opaque.current().backgroundMainColor(),
-    appBarTheme: AppBarTheme(
-        backgroundColor: opaque.current().backgroundPaneColor(),
-        iconTheme: IconThemeData(
-          color: opaque.current().mainTextColor(),
-        ),
-        titleTextStyle: TextStyle(
-          color: opaque.current().mainTextColor(),
-        ),
-        actionsIconTheme: IconThemeData(
-          color: opaque.current().mainTextColor(),
-        )),
-    bottomNavigationBarTheme: BottomNavigationBarThemeData(type: BottomNavigationBarType.fixed, backgroundColor: opaque.current().backgroundHilightElementColor()),
-    textButtonTheme: TextButtonThemeData(
-      style: ButtonStyle(
-          backgroundColor: MaterialStateProperty.all(opaque.current().defaultButtonColor()),
-          foregroundColor: MaterialStateProperty.all(opaque.current().defaultButtonTextColor()),
-          overlayColor: MaterialStateProperty.all(opaque.current().defaultButtonActiveColor()),
-          padding: MaterialStateProperty.all(EdgeInsets.all(20))),
-    ),
-    elevatedButtonTheme: ElevatedButtonThemeData(
-      style: ButtonStyle(
-        backgroundColor: MaterialStateProperty.resolveWith((states) => states.contains(MaterialState.disabled) ? opaque.current().defaultButtonDisabledColor() : opaque.current().defaultButtonColor()),
-        foregroundColor: MaterialStateProperty.all(opaque.current().defaultButtonTextColor()),
-        overlayColor: MaterialStateProperty.resolveWith((states) => (states.contains(MaterialState.pressed) && states.contains(MaterialState.hovered))
-            ? opaque.current().defaultButtonActiveColor()
-            : states.contains(MaterialState.disabled)
-                ? opaque.current().defaultButtonDisabledColor()
-                : null),
-        enableFeedback: true,
-        splashFactory: InkRipple.splashFactory,
-        padding: MaterialStateProperty.all(EdgeInsets.all(20)),
-        shape: MaterialStateProperty.all(RoundedRectangleBorder(
-          borderRadius: BorderRadius.circular(18.0),
-        )),
-      ),
-    ),
-    scrollbarTheme: ScrollbarThemeData(
-        isAlwaysShown: false, thumbColor: MaterialStateProperty.all(opaque.current().scrollbarActiveColor()), trackColor: MaterialStateProperty.all(opaque.current().scrollbarDefaultColor())),
-    tabBarTheme: TabBarTheme(indicator: UnderlineTabIndicator(borderSide: BorderSide(color: opaque.current().defaultButtonActiveColor()))),
-    dialogTheme: DialogTheme(
-        backgroundColor: opaque.current().backgroundPaneColor(),
-        titleTextStyle: TextStyle(color: opaque.current().mainTextColor()),
-        contentTextStyle: TextStyle(color: opaque.current().mainTextColor())),
-    textTheme: TextTheme(
-        headline1: TextStyle(color: opaque.current().mainTextColor()),
-        headline2: TextStyle(color: opaque.current().mainTextColor()),
-        headline3: TextStyle(color: opaque.current().mainTextColor()),
-        headline4: TextStyle(color: opaque.current().mainTextColor()),
-        headline5: TextStyle(color: opaque.current().mainTextColor()),
-        headline6: TextStyle(color: opaque.current().mainTextColor()),
-        bodyText1: TextStyle(color: opaque.current().mainTextColor()),
-        bodyText2: TextStyle(color: opaque.current().mainTextColor()),
-        subtitle1: TextStyle(color: opaque.current().mainTextColor()),
-        subtitle2: TextStyle(color: opaque.current().mainTextColor()),
-        caption: TextStyle(color: opaque.current().mainTextColor()),
-        button: TextStyle(color: opaque.current().mainTextColor()),
-        overline: TextStyle(color: opaque.current().mainTextColor())),
-    switchTheme: SwitchThemeData(
-      overlayColor: MaterialStateProperty.all(opaque.current().defaultButtonActiveColor()),
-      thumbColor: MaterialStateProperty.all(opaque.current().mainTextColor()),
-      trackColor: MaterialStateProperty.all(opaque.current().dropShadowColor()),
-    ),
-    floatingActionButtonTheme: FloatingActionButtonThemeData(
-        backgroundColor: opaque.current().defaultButtonColor(),
-        hoverColor: opaque.current().defaultButtonActiveColor(),
-        enableFeedback: true,
-        splashColor: opaque.current().defaultButtonActiveColor()),
-    textSelectionTheme: TextSelectionThemeData(
-        cursorColor: opaque.current().defaultButtonActiveColor(), selectionColor: opaque.current().defaultButtonActiveColor(), selectionHandleColor: opaque.current().defaultButtonActiveColor()),
-  );
-}
-
-/*
-
-OpaqueThemeType _current = CwtchDark();
-
-void setDark() {
-  _current = CwtchDark();
-}
-
-void setLight() {
-  _current = CwtchLight();
-}
-
-OpaqueThemeType current() {
-  if (_current == null) {
-    setDark();
-  }
-  return _current;
-}
-
-class Opaque extends OpaqueThemeType {
-  Color backgroundMainColor() {
-    return current().backgroundMainColor();
-  }
-
-  Color backgroundPaneColor() {
-    return current().backgroundPaneColor();
-  }
-
-  Color backgroundHilightElementColor() {
-    return current().backgroundHilightElementColor();
-  }
-
-  Color dividerColor() {
-    return current().dividerColor();
-  }
-
-  Color mainTextColor() {
-    return current().mainTextColor();
-  }
-
-  Color altTextColor() {
-    return current().altTextColor();
-  }
-
-  Color hilightElementTextColor() {
-    return current().hilightElementTextColor();
-  }
-
-  Color defaultButtonColor() {
-    return current().defaultButtonColor();
-  }
-
-  Color defaultButtonActiveColor() {
-    return current().defaultButtonActiveColor();
-  }
-
-  Color defaultButtonTextColor() {
-    return current().defaultButtonTextColor();
-  }
-
-  Color defaultButtonDisabledColor() {
-    return current().defaultButtonDisabledColor();
-  }
-
-  Color defaultButtonDisabledTextColor() {
-    return current().defaultButtonDisabledTextColor();
-  }
-
-  Color altButtonColor() {
-    return current().altButtonColor();
-  }
-
-  Color altButtonTextColor() {
-    return current().altButtonTextColor();
-  }
-
-  Color altButtonDisabledColor() {
-    return current().altButtonDisabledColor();
-  }
-
-  Color altButtonDisabledTextColor() {
-    return current().altButtonDisabledTextColor();
-  }
-
-  Color textfieldBackgroundColor() {
-    return current().textfieldBackgroundColor();
-  }
-
-  Color textfieldBorderColor() {
-    return current().textfieldBorderColor();
-  }
-
-  Color textfieldTextColor() {
-    return current().textfieldTextColor();
-  }
-
-  Color textfieldErrorColor() {
-    return current().textfieldErrorColor();
-  }
-
-  Color textfieldButtonColor() {
-    return current().textfieldButtonColor();
-  }
-
-  Color textfieldButtonTextColor() {
-    return current().textfieldButtonTextColor();
-  }
-
-  Color dropShadowColor() {
-    return current().dropShadowColor();
-  }
-
-  Color dropShadowPaneColor() {
-    return current().dropShadowPaneColor();
-  }
-
-  Color portraitOnlineBorderColor() {
-    return current().portraitOnlineBorderColor();
-  }
-
-  Color portraitOnlineBackgroundColor() {
-    return current().portraitOnlineBackgroundColor();
-  }
-
-  Color portraitOnlineTextColor() {
-    return current().portraitOnlineTextColor();
-  }
-
-  Color portraitConnectingBorderColor() {
-    return current().portraitConnectingBorderColor();
-  }
-
-  Color portraitConnectingBackgroundColor() {
-    return current().portraitConnectingBackgroundColor();
-  }
-
-  Color portraitConnectingTextColor() {
-    return current().portraitConnectingTextColor();
-  }
-
-  Color portraitOfflineBorderColor() {
-    return current().portraitOfflineBorderColor();
-  }
-
-  Color portraitOfflineBackgroundColor() {
-    return current().portraitOfflineBackgroundColor();
-  }
-
-  Color portraitOfflineTextColor() {
-    return current().portraitOfflineTextColor();
-  }
-
-  Color portraitBlockedBorderColor() {
-    return current().portraitBlockedBorderColor();
-  }
-
-  Color portraitBlockedBackgroundColor() {
-    return current().portraitBlockedBackgroundColor();
-  }
-
-  Color portraitBlockedTextColor() {
-    return current().portraitBlockedTextColor();
-  }
-
-  Color portraitOnlineBadgeColor() {
-    return current().portraitOnlineBadgeColor();
-  }
-
-  Color portraitOfflineBadgeColor() {
-    return current().portraitOfflineBadgeColor();
-  }
-
-  Color portraitContactBadgeColor() {
-    return current().portraitContactBadgeColor();
-  }
-
-  Color portraitContactBadgeTextColor() {
-    return current().portraitContactBadgeTextColor();
-  }
-
-  Color portraitProfileBadgeColor() {
-    return current().portraitProfileBadgeColor();
-  }
-
-  Color portraitProfileBadgeTextColor() {
-    return current().portraitProfileBadgeTextColor();
-  }
-
-  Color portraitOverlayOfflineColor() {
-    return current().portraitOverlayOfflineColor();
-  }
-
-  Color toggleColor() {
-    return current().toggleColor();
-  }
-
-  Color toggleOffColor() {
-    return current().toggleOffColor();
-  }
-
-  Color toggleOnColor() {
-    return current().toggleOnColor();
-  }
-
-  Color sliderButtonColor() {
-    return current().sliderButtonColor();
-  }
-
-  Color sliderBarLeftColor() {
-    return current().sliderBarLeftColor();
-  }
-
-  Color sliderBarRightColor() {
-    return current().sliderBarRightColor();
-  }
-
-  Color boxCheckedColor() {
-    return current().boxCheckedColor();
-  }
-
-  Color toolbarIconColor() {
-    return current().toolbarIconColor();
-  }
-
-  Color toolbarMainColor() {
-    return current().toolbarMainColor();
-  }
-
-  Color toolbarAltColor() {
-    return current().toolbarAltColor();
-  }
-
-  Color statusbarDisconnectedInternetColor() {
-    return current().statusbarDisconnectedInternetColor();
-  }
-
-  Color statusbarDisconnectedInternetFontColor() {
-    return current().statusbarDisconnectedInternetFontColor();
-  }
-
-  Color statusbarDisconnectedTorFontColor() {
-    return current().statusbarDisconnectedTorFontColor();
-  }
-
-  Color statusbarDisconnectedTorColor() {
-    return current().statusbarDisconnectedTorColor();
-  }
-
-  Color statusbarConnectingColor() {
-    return current().statusbarConnectingColor();
-  }
-
-  Color statusbarConnectingFontColor() {
-    return current().statusbarConnectingFontColor();
-  }
-
-  Color statusbarOnlineColor() {
-    return current().statusbarOnlineColor();
-  }
-
-  Color statusbarOnlineFontColor() {
-    return current().statusbarOnlineFontColor();
-  }
-
-  Color chatOverlayWarningTextColor() {
-    return current().chatOverlayWarningTextColor();
-  }
-
-  Color messageFromMeBackgroundColor() {
-    return current().messageFromMeBackgroundColor();
-  }
-
-  Color messageFromMeTextColor() {
-    return current().messageFromMeTextColor();
-  }
-
-  Color messageFromOtherBackgroundColor() {
-    return current().messageFromOtherBackgroundColor();
-  }
-
-  Color messageFromOtherTextColor() {
-    return current().messageFromOtherTextColor();
-  }
-
-  Color messageStatusNormalColor() {
-    return current().messageStatusNormalColor();
-  }
-
-  Color messageStatusBlockedColor() {
-    return current().messageStatusBlockedColor();
-  }
-
-  Color messageStatusBlockedTextColor() {
-    return current().messageStatusBlockedTextColor();
-  }
-
-  Color messageStatusAlertColor() {
-    return current().messageStatusAlertColor();
-  }
-
-  Color messageStatusAlertTextColor() {
-    return current().messageStatusAlertTextColor();
-  }
-
-  Color scrollbarDefaultColor() {
-    return current().scrollbarDefaultColor();
-  }
-
-  Color scrollbarActiveColor() {
-    return current().scrollbarActiveColor();
-  }
-
-  var sidePaneMinSizeBase = [200, 400, 600];
-  int sidePaneMinSize() {
-    return sidePaneMinSizeBase[p[scale]] + 200 /*for debugging*/;
-  }
-
-  var chatPaneMinSizeBase = [300, 400, 500];
-  int chatPaneMinSize() {
-    return chatPaneMinSizeBase[p[scale]];
-  }
-
-  int doublePaneMinSize() {
-    return sidePaneMinSize() + chatPaneMinSize();
-  }
-
-  static late OpaqueThemeType _current;
-  //static final OpaqueThemeType dark = CwtchDark();
-  //static final OpaqueThemeType light = CwtchLight();
-
-
-  int scale = 2;
-  static final String gcdOS = "linux";
-
-  var p = [0, 1, 1, 1, 2];
-  var t = [0, 0, 1, 2, 2];
-
-  var paddingMinimalBase = [1, 4, 6];
-  int paddingMinimal() {
-    return paddingMinimalBase[p[scale]];
-  }
-
-  var paddingSmallBase = [3, 10, 15];
-  int paddingSmall() {
-    return paddingSmallBase[p[scale]];
-  }
-
-  var paddingStandardBase = [8, 20, 30];
-  int paddingStandard() {
-    return paddingStandardBase[p[scale]];
-  }
-
-  var paddingLargeBase = [10, 30, 40];
-  int paddingLarge() {
-    return paddingLargeBase[p[scale]];
-  }
-
-  var paddingClickTargetBase = gcdOS == "android" ? [10, 40, 100] : [3, 10, 15];
-  int paddingClickTarget() {
-    return paddingClickTargetBase[p[scale]];
-  }
-
-  var textSmallPtBase = [8, 12, 16];
-  int textSmallPt() {
-    return textSmallPtBase[t[scale]];
-  }
-
-  var textMediumPtBase = [10, 16, 24];
-  int textMediumPt() {
-    return textMediumPtBase[t[scale]];
-  }
-
-  var textLargePtBase = [16, 24, 32];
-  int textLargePt() {
-    return textLargePtBase[t[scale]];
-  }
-
-  var textSubHeaderPtBase = [12, 18, 26];
-  int textSubHeaderPt() {
-    return textHeaderPtBase[t[scale]];
-  }
-
-  var textHeaderPtBase = [16, 24, 32];
-  int textHeaderPt() {
-    return textHeaderPtBase[t[scale]];
-  }
-
-  var uiIconSizeSBase = [8, 16, 24];
-  int uiIconSizeS() {
-    return uiIconSizeSBase[p[scale]];
-  }
-
-  var uiIconSizeMBase = [24, 32, 48];
-  int uiIconSizeM() {
-    return uiIconSizeMBase[p[scale]];
-  }
-
-  var uiIconSizeLBase = [32, 48, 60];
-  int uiIconSizeL() {
-    return uiIconSizeLBase[p[scale]];
-  }
-
-  var uiEmojiSizeBase = [24, 32, 48];
-  int uiEmojiSize() {
-    return uiEmojiSizeBase[p[scale]];
-  }
-
-  var contactPortraitSizeBase = [60, 72, 84];
-  int contactPortraitSize() {
-    return contactPortraitSizeBase[p[scale]];
-  }
-
-  int badgeTextSize() {
-    return 12;
-  }
-
-  int statusTextSize() {
-    return 12;
-  }
-
-  int chatSize() {
-    return textMediumPt();
-  }
-
-  int tabSize() {
-    return textMediumPt();
-  }
-}
-
-*/
diff --git a/lib/settings.dart b/lib/settings.dart
index 7397ce39..a9579723 100644
--- a/lib/settings.dart
+++ b/lib/settings.dart
@@ -2,10 +2,11 @@ import 'dart:collection';
 import 'dart:ui';
 import 'dart:core';
 
+import 'package:cwtch/themes/cwtch.dart';
 import 'package:flutter/material.dart';
 import 'package:package_info_plus/package_info_plus.dart';
 
-import 'opaque.dart';
+import 'themes/opaque.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
 const TapirGroupsExperiment = "tapir-groups-experiment";
diff --git a/lib/themes/cwtch.dart b/lib/themes/cwtch.dart
new file mode 100644
index 00000000..df718ba1
--- /dev/null
+++ b/lib/themes/cwtch.dart
@@ -0,0 +1,275 @@
+import 'dart:ui';
+import 'dart:core';
+
+import 'package:flutter/material.dart';
+
+import 'opaque.dart';
+
+class OpaqueDark extends OpaqueThemeType {
+  static final Color darkGreyPurple = Color(0xFF281831);
+  static final Color deepPurple = Color(0xFF422850);
+  static final Color mauvePurple = Color(0xFF8E64A5);
+  static final Color purple = Color(0xFFDFB9DE);
+  static final Color whitePurple = Color(0xFFE3DFE4);
+  static final Color softPurple = Color(0xFFFDF3FC);
+  static final Color pink = Color(0xFFE85DA1);
+  static final Color hotPink = Color(0xFFD01972);
+  static final Color lightGrey = Color(0xFF9E9E9E);
+  static final Color softGreen = Color(0xFFA0FFB0);
+  static final Color softRed = Color(0xFFFFA0B0);
+
+  String identifier() {
+    return "dark";
+  }
+
+  Color backgroundMainColor() {
+    return darkGreyPurple;
+  }
+
+  Color backgroundPaneColor() {
+    return darkGreyPurple;
+  }
+
+  Color backgroundHilightElementColor() {
+    return deepPurple;
+  }
+
+  Color mainTextColor() {
+    return whitePurple;
+  }
+
+  Color altTextColor() {
+    return mauvePurple;
+  }
+
+  Color hilightElementTextColor() {
+    return purple;
+  }
+
+  Color defaultButtonColor() {
+    return hotPink;
+  }
+
+  Color defaultButtonActiveColor() {
+    return pink;
+  }
+
+  Color defaultButtonTextColor() {
+    return whitePurple;
+  }
+
+  Color defaultButtonDisabledTextColor() {
+    return darkGreyPurple;
+  }
+
+  Color textfieldBackgroundColor() {
+    return deepPurple;
+  }
+
+  Color textfieldBorderColor() {
+    return deepPurple;
+  }
+
+  Color textfieldErrorColor() {
+    return hotPink;
+  }
+
+  Color scrollbarDefaultColor() {
+    return purple;
+  }
+
+  Color scrollbarActiveColor() {
+    return hotPink;
+  }
+
+  Color portraitOnlineBorderColor() {
+    return whitePurple;
+  }
+
+  Color portraitOfflineBorderColor() {
+    return purple;
+  }
+
+  Color portraitBlockedBorderColor() {
+    return lightGrey;
+  }
+
+  Color portraitBlockedTextColor() {
+    return lightGrey;
+  }
+
+  Color portraitContactBadgeColor() {
+    return hotPink;
+  }
+
+  Color portraitContactBadgeTextColor() {
+    return whitePurple;
+  }
+
+  Color portraitProfileBadgeColor() {
+    return mauvePurple;
+  }
+
+  Color portraitProfileBadgeTextColor() {
+    return darkGreyPurple;
+  }
+
+  Color dropShadowColor() {
+    return mauvePurple;
+  }
+
+  Color toolbarIconColor() {
+    return whitePurple;
+  }
+
+  Color messageFromMeBackgroundColor() {
+    return mauvePurple;
+  }
+
+  Color messageFromMeTextColor() {
+    return whitePurple;
+  }
+
+  Color messageFromOtherBackgroundColor() {
+    return deepPurple;
+  }
+
+  Color messageFromOtherTextColor() {
+    return whitePurple;
+  }
+}
+
+class OpaqueLight extends OpaqueThemeType {
+  static final Color whitePurple = Color(0xFFFFFDFF);
+  static final Color softPurple = Color(0xFFFDF3FC);
+  static final Color purple = Color(0xFFDFB9DE);
+  static final Color brightPurple = Color(0xFFD1B0E0);
+  static final Color darkPurple = Color(0xFF350052);
+  static final Color greyPurple = Color(0xFF775F84);
+  static final Color pink = Color(0xFFE85DA1);
+  static final Color hotPink = Color(0xFFD01972);
+  static final Color lightGrey = Color(0xFFB3B6B3);
+  static final Color softGreen = Color(0xFFA0FFB0);
+  static final Color softRed = Color(0xFFFFA0B0);
+
+  String identifier() {
+    return "light";
+  }
+
+  Color backgroundMainColor() {
+    return whitePurple;
+  }
+
+  Color backgroundPaneColor() {
+    return softPurple;
+  }
+
+  Color backgroundHilightElementColor() {
+    return softPurple;
+  }
+
+  Color mainTextColor() {
+    return darkPurple;
+  }
+
+  Color altTextColor() {
+    return purple;
+  }
+
+  Color hilightElementTextColor() {
+    return darkPurple;
+  }
+
+  Color defaultButtonColor() {
+    return hotPink;
+  }
+
+  Color defaultButtonActiveColor() {
+    return pink;
+  }
+
+  Color defaultButtonTextColor() {
+    return whitePurple;
+  }
+
+  Color defaultButtonDisabledColor() {
+    return lightGrey;
+  }
+
+  Color textfieldBackgroundColor() {
+    return purple;
+  }
+
+  Color textfieldBorderColor() {
+    return purple;
+  }
+
+  Color textfieldErrorColor() {
+    return hotPink;
+  }
+
+  Color scrollbarDefaultColor() {
+    return darkPurple;
+  }
+
+  Color scrollbarActiveColor() {
+    return hotPink;
+  }
+
+  Color portraitOnlineBorderColor() {
+    return greyPurple;
+  }
+
+  Color portraitOfflineBorderColor() {
+    return greyPurple;
+  }
+
+
+  Color portraitBlockedBorderColor() {
+    return lightGrey;
+  }
+
+  Color portraitBlockedTextColor() {
+    return lightGrey;
+  }
+
+  Color portraitContactBadgeColor() {
+    return hotPink;
+  }
+
+  Color portraitContactBadgeTextColor() {
+    return whitePurple;
+  }
+
+  Color portraitProfileBadgeColor() {
+    return brightPurple;
+  }
+
+  Color portraitProfileBadgeTextColor() {
+    return whitePurple;
+  }
+
+  Color dropShadowColor() {
+    return purple;
+  }
+
+  Color toolbarIconColor() {
+    return darkPurple;
+  }
+
+  Color messageFromMeBackgroundColor() {
+    return brightPurple;
+  }
+
+  Color messageFromMeTextColor() {
+    return mainTextColor();
+  }
+
+  Color messageFromOtherBackgroundColor() {
+    return purple;
+  }
+
+  Color messageFromOtherTextColor() {
+    return darkPurple;
+  }
+}
\ No newline at end of file
diff --git a/lib/themes/opaque.dart b/lib/themes/opaque.dart
new file mode 100644
index 00000000..a117f41e
--- /dev/null
+++ b/lib/themes/opaque.dart
@@ -0,0 +1,226 @@
+import 'dart:ui';
+import 'dart:core';
+
+import 'package:flutter/material.dart';
+import 'package:cwtch/settings.dart';
+
+abstract class OpaqueThemeType {
+  static final Color red = Color(0xFFFF0000);
+
+  String identifier() {
+    return "dummy";
+  }
+
+  Color backgroundMainColor() {
+    return red;
+  }
+
+  Color backgroundPaneColor() {
+    return red;
+  }
+
+  Color backgroundHilightElementColor() {
+    return red;
+  }
+
+  Color mainTextColor() {
+    return red;
+  }
+
+  Color altTextColor() {
+    return red;
+  }
+
+  Color hilightElementTextColor() {
+    return red;
+  }
+
+  Color defaultButtonColor() {
+    return red;
+  }
+
+  Color defaultButtonActiveColor() {
+    return red;
+  }
+
+  Color defaultButtonTextColor() {
+    return red;
+  }
+
+  Color defaultButtonDisabledColor() {
+    return red;
+  }
+
+  Color textfieldBackgroundColor() {
+    return red;
+  }
+
+  Color textfieldBorderColor() {
+    return red;
+  }
+
+  Color textfieldErrorColor() {
+    return red;
+  }
+
+  Color scrollbarDefaultColor() {
+    return red;
+  }
+
+  Color scrollbarActiveColor() {
+    return red;
+  }
+
+  Color portraitOnlineBorderColor() {
+    return red;
+  }
+
+  Color portraitOfflineBorderColor() {
+    return red;
+  }
+
+  Color portraitBlockedBorderColor() {
+    return red;
+  }
+
+  Color portraitBlockedTextColor() {
+    return red;
+  }
+
+  Color portraitContactBadgeColor() {
+    return red;
+  }
+
+  Color portraitContactBadgeTextColor() {
+    return red;
+  }
+
+  Color portraitProfileBadgeColor() {
+    return red;
+  }
+
+  Color portraitProfileBadgeTextColor() {
+    return red;
+  }
+
+  Color dropShadowColor() {
+    return red;
+  }
+
+  Color toolbarIconColor() {
+    return red;
+  }
+
+  Color messageFromMeBackgroundColor() {
+    return red;
+  }
+
+  Color messageFromMeTextColor() {
+    return red;
+  }
+
+  Color messageFromOtherBackgroundColor() {
+    return red;
+  }
+
+  Color messageFromOtherTextColor() {
+    return red;
+  }
+
+  // ... more to come
+
+  // Sizes
+
+  double contactOnionTextSize() {
+    return 18;
+  }
+}
+
+
+
+ThemeData mkThemeData(Settings opaque) {
+  return ThemeData(
+    visualDensity: VisualDensity.adaptivePlatformDensity,
+    primarySwatch: Colors.red,
+    primaryIconTheme: IconThemeData(
+      color: opaque.current().mainTextColor(),
+    ),
+    primaryColor: opaque.current().backgroundMainColor(),
+    canvasColor: opaque.current().backgroundPaneColor(),
+    backgroundColor: opaque.current().backgroundMainColor(),
+    highlightColor: opaque.current().hilightElementTextColor(),
+    iconTheme: IconThemeData(
+      color: opaque.current().toolbarIconColor(),
+    ),
+    cardColor: opaque.current().backgroundMainColor(),
+    appBarTheme: AppBarTheme(
+        backgroundColor: opaque.current().backgroundPaneColor(),
+        iconTheme: IconThemeData(
+          color: opaque.current().mainTextColor(),
+        ),
+        titleTextStyle: TextStyle(
+          color: opaque.current().mainTextColor(),
+        ),
+        actionsIconTheme: IconThemeData(
+          color: opaque.current().mainTextColor(),
+        )),
+    bottomNavigationBarTheme: BottomNavigationBarThemeData(type: BottomNavigationBarType.fixed, backgroundColor: opaque.current().backgroundHilightElementColor()),
+    textButtonTheme: TextButtonThemeData(
+      style: ButtonStyle(
+          backgroundColor: MaterialStateProperty.all(opaque.current().defaultButtonColor()),
+          foregroundColor: MaterialStateProperty.all(opaque.current().defaultButtonTextColor()),
+          overlayColor: MaterialStateProperty.all(opaque.current().defaultButtonActiveColor()),
+          padding: MaterialStateProperty.all(EdgeInsets.all(20))),
+    ),
+    elevatedButtonTheme: ElevatedButtonThemeData(
+      style: ButtonStyle(
+        backgroundColor: MaterialStateProperty.resolveWith((states) => states.contains(MaterialState.disabled) ? opaque.current().defaultButtonDisabledColor() : opaque.current().defaultButtonColor()),
+        foregroundColor: MaterialStateProperty.all(opaque.current().defaultButtonTextColor()),
+        overlayColor: MaterialStateProperty.resolveWith((states) => (states.contains(MaterialState.pressed) && states.contains(MaterialState.hovered))
+            ? opaque.current().defaultButtonActiveColor()
+            : states.contains(MaterialState.disabled)
+                ? opaque.current().defaultButtonDisabledColor()
+                : null),
+        enableFeedback: true,
+        splashFactory: InkRipple.splashFactory,
+        padding: MaterialStateProperty.all(EdgeInsets.all(20)),
+        shape: MaterialStateProperty.all(RoundedRectangleBorder(
+          borderRadius: BorderRadius.circular(18.0),
+        )),
+      ),
+    ),
+    scrollbarTheme: ScrollbarThemeData(
+        isAlwaysShown: false, thumbColor: MaterialStateProperty.all(opaque.current().scrollbarActiveColor()), trackColor: MaterialStateProperty.all(opaque.current().scrollbarDefaultColor())),
+    tabBarTheme: TabBarTheme(indicator: UnderlineTabIndicator(borderSide: BorderSide(color: opaque.current().defaultButtonActiveColor()))),
+    dialogTheme: DialogTheme(
+        backgroundColor: opaque.current().backgroundPaneColor(),
+        titleTextStyle: TextStyle(color: opaque.current().mainTextColor()),
+        contentTextStyle: TextStyle(color: opaque.current().mainTextColor())),
+    textTheme: TextTheme(
+        headline1: TextStyle(color: opaque.current().mainTextColor()),
+        headline2: TextStyle(color: opaque.current().mainTextColor()),
+        headline3: TextStyle(color: opaque.current().mainTextColor()),
+        headline4: TextStyle(color: opaque.current().mainTextColor()),
+        headline5: TextStyle(color: opaque.current().mainTextColor()),
+        headline6: TextStyle(color: opaque.current().mainTextColor()),
+        bodyText1: TextStyle(color: opaque.current().mainTextColor()),
+        bodyText2: TextStyle(color: opaque.current().mainTextColor()),
+        subtitle1: TextStyle(color: opaque.current().mainTextColor()),
+        subtitle2: TextStyle(color: opaque.current().mainTextColor()),
+        caption: TextStyle(color: opaque.current().mainTextColor()),
+        button: TextStyle(color: opaque.current().mainTextColor()),
+        overline: TextStyle(color: opaque.current().mainTextColor())),
+    switchTheme: SwitchThemeData(
+      overlayColor: MaterialStateProperty.all(opaque.current().defaultButtonActiveColor()),
+      thumbColor: MaterialStateProperty.all(opaque.current().mainTextColor()),
+      trackColor: MaterialStateProperty.all(opaque.current().dropShadowColor()),
+    ),
+    floatingActionButtonTheme: FloatingActionButtonThemeData(
+        backgroundColor: opaque.current().defaultButtonColor(),
+        hoverColor: opaque.current().defaultButtonActiveColor(),
+        enableFeedback: true,
+        splashColor: opaque.current().defaultButtonActiveColor()),
+    textSelectionTheme: TextSelectionThemeData(
+        cursorColor: opaque.current().defaultButtonActiveColor(), selectionColor: opaque.current().defaultButtonActiveColor(), selectionHandleColor: opaque.current().defaultButtonActiveColor()),
+  );
+}
diff --git a/lib/views/addeditprofileview.dart b/lib/views/addeditprofileview.dart
index 03084ca2..20a4cec5 100644
--- a/lib/views/addeditprofileview.dart
+++ b/lib/views/addeditprofileview.dart
@@ -16,7 +16,7 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import '../cwtch_icons_icons.dart';
 import '../errorHandler.dart';
 import '../main.dart';
-import '../opaque.dart';
+import '../themes/opaque.dart';
 import '../settings.dart';
 
 class AddEditProfileView extends StatefulWidget {
diff --git a/lib/widgets/profileimage.dart b/lib/widgets/profileimage.dart
index 1516f3e0..7593bc67 100644
--- a/lib/widgets/profileimage.dart
+++ b/lib/widgets/profileimage.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:cwtch/opaque.dart';
+import 'package:cwtch/themes/opaque.dart';
 import 'package:provider/provider.dart';
 
 import '../settings.dart';
diff --git a/regenerate_opaque_theme.sh b/regenerate_opaque_theme.sh
deleted file mode 100755
index e4ff06d7..00000000
--- a/regenerate_opaque_theme.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/bash
-
-themes="/home/erinn/go/src/git.openprivacy.ca/openprivacy/opaque/theme"
-outfile="./lib/opaque.dart"
-
-if [ -e "$outfile" ]; then
-  mv "$outfile" "${outfile}.bak"
-fi
-
-echo "// THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT BY HAND AS CHANGES WILL BE OVERRIDDEN." > "$outfile"
-echo "// TO EDIT THE THEME, SEE https://git.openprivacy.ca/openprivacy/opaque/" >> "$outfile"
-echo "// FOR HOW THIS FILE IS GENERATED, SEE ../regenerate_opaque_theme.sh" >> "$outfile"
-
-sed 's/import QtQuick 2\.0//g' "${themes}/ThemeType.qml"  | \
-  sed "s/QtObject ./import 'dart:ui\';\nimport 'dart:core';\nabstract class OpaqueThemeType {\n    static final Color red = Color(0xFFFF0000);/g" | \
-  sed 's/\(property color\|var\)/Color/g' | \
-  sed 's/\(:\| =\) ".*"/(){return red;}/g' >> "$outfile"
-
-echo -e "\n\n" >> "$outfile"
-
-sed 's/ThemeType/class CwtchDark extends OpaqueThemeType/g' "${themes}/CwtchDark.qml" | \
-  sed 's/readonly property color \(.*\): "#\(\w*\)"/static final Color \1 = Color(0xFF\2);/g' | \
-  sed 's/\(\w*\): \(\w*\)/Color \1() { return \2; }/g' >> "$outfile"
-
-echo -e "\n\n" >> "$outfile"
-
-sed 's/ThemeType/class CwtchLight extends OpaqueThemeType/g' "${themes}/CwtchLight.qml" | \
-  sed 's/readonly property color \(.*\): "#\(\w*\)"/static final Color \1 = Color(0xFF\2);/g' | \
-  sed 's/\(\w*\): \(\w*\)/Color \1() { return \2; }/g' >> "$outfile"
-
-echo -e "\n\n" >> "$outfile"
-
-sed 's/\(pragma Singleton\|import QtQuick 2\.0\)//g' "${themes}/Theme.qml" | \
-  sed 's|//.*$||g' | \
-  sed 's/theme\./current./g' | \
-  sed 's/property color/property Color/g' | \
-  sed 's/readonly property Color \(.*\): \([a-zA-Z0-9._]*\)/Color \1() { return \2(); }/g' | \
-  #to preserve int values: #static int \1() { return \2; }/g' | \
-  sed 's/readonly property int \(.*\): \(.*\)/int \1() { return \2; }/g' | \
-  sed 's/readonly property variant \([a-zA-Z0-9._]*\): \(.*\)$/var \1 = \2;/g' | \
-  sed 's/color/Color/g' | \
-  sed 's/: \(.+\)/ = \1;/g' | \
-  sed 's/property ThemeType \(\w*\): \(.*\)../static final OpaqueThemeType \1 = \2();/g' | \
-  sed 's/final OpaqueThemeType theme = .*$/Opaque current() { return dark; }/' | \
-  sed 's/^.*themeScaleNew.*$/int scale = 2;\n    static final String gcdOS = "linux";/g' | \
-  sed 's/gcd.os/gcdOS/g' | \
-  sed 's/return \([a-zA-Z]\+\) ;/return \1();/g' | \
-  sed 's/return \([a-zA-Z]\+\) + \([a-zA-Z]\+\);/return \1() + \2();/g' | \
-  sed 's/Item/class Opaque extends OpaqueThemeType/' | \
-  sed 's/current\./current()./g' >> "$outfile"
diff --git a/test/buttontextfield_test.dart b/test/buttontextfield_test.dart
index 2f750035..55361c2e 100644
--- a/test/buttontextfield_test.dart
+++ b/test/buttontextfield_test.dart
@@ -6,7 +6,7 @@
 // tree, read text, and verify that the values of widget properties are correct.
 
 import 'package:flutter/material.dart';
-import 'package:cwtch/opaque.dart';
+import 'package:cwtch/themes/opaque.dart';
 import 'package:cwtch/settings.dart';
 import 'package:cwtch/widgets/buttontextfield.dart';
 import 'package:flutter_test/flutter_test.dart';
diff --git a/test/cwtchlabel_test.dart b/test/cwtchlabel_test.dart
index d0d077a1..7ac0bd19 100644
--- a/test/cwtchlabel_test.dart
+++ b/test/cwtchlabel_test.dart
@@ -6,7 +6,7 @@
 // tree, read text, and verify that the values of widget properties are correct.
 
 import 'package:flutter/material.dart';
-import 'package:cwtch/opaque.dart';
+import 'package:cwtch/themes/opaque.dart';
 import 'package:cwtch/settings.dart';
 import 'package:cwtch/widgets/cwtchlabel.dart';
 import 'package:flutter_test/flutter_test.dart';
diff --git a/test/profileimage_test.dart b/test/profileimage_test.dart
index 9a841f9b..cf582241 100644
--- a/test/profileimage_test.dart
+++ b/test/profileimage_test.dart
@@ -6,7 +6,7 @@
 // tree, read text, and verify that the values of widget properties are correct.
 
 import 'package:flutter/material.dart';
-import 'package:cwtch/opaque.dart';
+import 'package:cwtch/themes/opaque.dart';
 import 'package:cwtch/settings.dart';
 import 'package:cwtch/widgets/profileimage.dart';
 import 'package:flutter_test/flutter_test.dart';
diff --git a/test/textfield_test.dart b/test/textfield_test.dart
index 9a0f0525..97d65844 100644
--- a/test/textfield_test.dart
+++ b/test/textfield_test.dart
@@ -6,7 +6,7 @@
 // tree, read text, and verify that the values of widget properties are correct.
 
 import 'package:flutter/material.dart';
-import 'package:cwtch/opaque.dart';
+import 'package:cwtch/themes/opaque.dart';
 import 'package:cwtch/settings.dart';
 import 'package:cwtch/widgets/textfield.dart';
 import 'package:flutter_test/flutter_test.dart';