diff --git a/lib/src/screens/dashboard/widgets/filter_widget.dart b/lib/src/screens/dashboard/widgets/filter_widget.dart
index 8719df562..10bda6798 100644
--- a/lib/src/screens/dashboard/widgets/filter_widget.dart
+++ b/lib/src/screens/dashboard/widgets/filter_widget.dart
@@ -28,16 +28,6 @@ class FilterWidget extends StatelessWidget {
           Column(
             mainAxisSize: MainAxisSize.min,
             children: <Widget>[
-              Text(
-                S.of(context).filters,
-                style: TextStyle(
-                  color: Colors.white,
-                  fontSize: 18,
-                  fontWeight: FontWeight.bold,
-                  fontFamily: 'Lato',
-                  decoration: TextDecoration.none,
-                ),
-              ),
               Padding(
                 padding: EdgeInsets.only(left: 24, right: 24, top: 24),
                 child: ClipRRect(
@@ -55,10 +45,8 @@ class FilterWidget extends StatelessWidget {
                             child: Text(
                               S.of(context).filters,
                               style: TextStyle(
-                                color: Theme.of(context)
-                                    .textTheme!
-                                    .bodyText1!
-                                    .decorationColor!,
+                                color: Theme.of(context).primaryTextTheme
+                                    .overline!.color!,
                                 fontSize: 16,
                                 fontFamily: 'Lato',
                                 decoration: TextDecoration.none,
@@ -182,7 +170,7 @@ class SectionDivider extends StatelessWidget {
   Widget build(BuildContext context) {
     return Container(
       height: 1,
-      color: Colors.red,//Fixme Theme.of(context).accentTextTheme.subhead.backgroundColor,
+      color: Theme.of(context).dividerColor,
     );
   }
 }
\ No newline at end of file
diff --git a/lib/src/widgets/rounded_checkbox.dart b/lib/src/widgets/rounded_checkbox.dart
index 6e5b08f1e..1bdfb267d 100644
--- a/lib/src/widgets/rounded_checkbox.dart
+++ b/lib/src/widgets/rounded_checkbox.dart
@@ -20,8 +20,8 @@ class RoundedCheckboxWidget extends StatelessWidget {
   Widget build(BuildContext context) {
 
     final baseGradient = LinearGradient(colors: [
-      Colors.red, //Fixme Theme.of(context).primaryTextTheme!.subtitle!.color!,
-      Colors.red //Fixme Theme.of(context).primaryTextTheme!.subtitle!.decorationColor!,
+      Theme.of(context).primaryTextTheme.subtitle1!.color!,
+      Theme.of(context).primaryTextTheme.subtitle1!.decorationColor!,
     ], begin: Alignment.centerLeft, end: Alignment.centerRight);
 
     final darkThemeGradient = LinearGradient(colors: [
@@ -32,11 +32,11 @@ class RoundedCheckboxWidget extends StatelessWidget {
     final gradient = darkTheme ? darkThemeGradient : baseGradient;
 
     final uncheckedColor = darkTheme
-        ? Colors.red //Fixme Theme.of(context).accentTextTheme.subhead.decorationColor
+        ? Theme.of(context).primaryTextTheme.subtitle1!.decorationColor!
         : Colors.white;
 
     final borderColor = darkTheme
-        ? Colors.red //Fixme Theme.of(context).accentTextTheme.subtitle.backgroundColor
+        ? Theme.of(context).accentTextTheme.subtitle2!.backgroundColor!
         : Colors.transparent;
 
     final checkedOuterBoxDecoration =
@@ -77,7 +77,7 @@ class RoundedCheckboxWidget extends StatelessWidget {
             child: Text(
               caption,
               style: TextStyle(
-                  color: Colors.red, //Fixme Theme.of(context).primaryTextTheme.title.color,
+                  color: Theme.of(context).primaryTextTheme.headline6!.color!,
                   fontSize: 18,
                   fontFamily: 'Lato',
                   fontWeight: FontWeight.w500,