diff --git a/.vscode/launch.json b/.vscode/launch.json
index 10bcb1f..3ecf885 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -8,6 +8,7 @@
             "name": "espanso_gui (debug mode)",
             "request": "launch",
             "type": "dart",
+            "flutterMode": "debug"
         },
         {
             "name": "espanso_gui (profile mode)",
diff --git a/lib/ui/views/espanso/espanso_view.dart b/lib/ui/views/espanso/espanso_view.dart
index 956bd65..780876a 100644
--- a/lib/ui/views/espanso/espanso_view.dart
+++ b/lib/ui/views/espanso/espanso_view.dart
@@ -22,18 +22,6 @@ class EspansoView extends StackedView<EspansoViewModel> {
     final double tableWidth = max(screenSize * (2 / 3), minWidth * (2 / 3));
     final double spacingWidth = max(screenSize * (1 / 6), minWidth * (1 / 6));
 
-    /*
-    final List<Widget> titles = viewModel.titles
-        .map((e) => Padding(
-              padding: const EdgeInsets.all(8.0),
-              child: Tab(
-                child:
-                    Text(e, style: Theme.of(context).textTheme.headlineSmall),
-              ),
-            ))
-        .toList();
-        */
-
     final List<Widget> widgets =
         viewModel.categories.map((e) => MatchesTable2(file: e)).toList();
     return Scaffold(
diff --git a/lib/ui/widgets/matches_table2/matches_table2.dart b/lib/ui/widgets/matches_table2/matches_table2.dart
index a632455..c58c672 100644
--- a/lib/ui/widgets/matches_table2/matches_table2.dart
+++ b/lib/ui/widgets/matches_table2/matches_table2.dart
@@ -40,41 +40,6 @@ class MatchesTable2 extends StackedView<MatchesTable2Model> {
       }).toList();
     }
 
-    /*
-    List<Widget> _getRows() {
-      return [
-        MatchesTable2MenuRow(
-          rowHeight: rowHeight,
-          cellPadding: cellPadding,
-          borderColor: offColor,
-          borderWidth: borderWidth,
-          textStyle: textStyle?.copyWith(fontWeight: FontWeight.bold),
-        ),
-        MatchesTable2Row(
-          offWidth: borderWidth,
-          rowHeight: rowHeight,
-          onColor: onColor,
-          offColor: offColor,
-          textStyle: textStyle,
-        ),
-        MatchesTable2Row(
-          offWidth: borderWidth,
-          rowHeight: rowHeight,
-          onColor: onColor,
-          offColor: offColor,
-          textStyle: textStyle,
-        )
-      ];
-      [].map(
-        (e) {
-          return const Row(
-            children: [],
-          );
-        },
-      ).toList();
-    }
-    */
-
     return ListView(
       children: [
         MatchesTable2MenuRow(
diff --git a/lib/ui/widgets/matches_table2/menu_row/matches_table2_menu_row.dart b/lib/ui/widgets/matches_table2/menu_row/matches_table2_menu_row.dart
index 726a7ea..c36f218 100644
--- a/lib/ui/widgets/matches_table2/menu_row/matches_table2_menu_row.dart
+++ b/lib/ui/widgets/matches_table2/menu_row/matches_table2_menu_row.dart
@@ -32,7 +32,6 @@ class MatchesTable2MenuRow extends StackedView<MatchesTable2MenuRowModel> {
         height: rowHeight,
         padding: EdgeInsets.symmetric(horizontal: cellPadding, vertical: 0),
         decoration: BoxDecoration(
-            color: Colors.yellow,
             border: Border.all(width: borderWidth, color: borderColor)),
         child: Text(
           text,
diff --git a/lib/ui/widgets/matches_table2/row/fields/checkbox_field/checkbox_field/checkbox_field.dart b/lib/ui/widgets/matches_table2/row/fields/checkbox_field/checkbox_field/checkbox_field.dart
index 4d45c0a..462abfa 100644
--- a/lib/ui/widgets/matches_table2/row/fields/checkbox_field/checkbox_field/checkbox_field.dart
+++ b/lib/ui/widgets/matches_table2/row/fields/checkbox_field/checkbox_field/checkbox_field.dart
@@ -59,7 +59,6 @@ class CheckboxField extends StackedView<CheckboxFieldModel> {
           height: rowHeight,
           alignment: Alignment.center,
           decoration: BoxDecoration(
-              color: Colors.yellow,
               border: Border.all(
                   width: viewModel.showFocus ? onWidth : offWidth,
                   color: viewModel.showFocus ? onColor : offColor)),
diff --git a/lib/ui/widgets/matches_table2/row/fields/label_field/label_field/label_field.dart b/lib/ui/widgets/matches_table2/row/fields/label_field/label_field/label_field.dart
index 6f19c96..524932f 100644
--- a/lib/ui/widgets/matches_table2/row/fields/label_field/label_field/label_field.dart
+++ b/lib/ui/widgets/matches_table2/row/fields/label_field/label_field/label_field.dart
@@ -87,7 +87,6 @@ class LabelField extends StackedView<LabelFieldModel> {
             height: rowHeight,
             padding: EdgeInsets.symmetric(horizontal: cellPadding, vertical: 0),
             decoration: BoxDecoration(
-                color: Colors.yellow,
                 border: Border.all(
                     width: viewModel.showFocus ? viewModel.onWidth : offWidth,
                     color: viewModel.showFocus ? onColor : offColor)),
diff --git a/lib/ui/widgets/matches_table2/row/fields/replace_field/replace_field.dart b/lib/ui/widgets/matches_table2/row/fields/replace_field/replace_field.dart
index 52888c6..ceac886 100644
--- a/lib/ui/widgets/matches_table2/row/fields/replace_field/replace_field.dart
+++ b/lib/ui/widgets/matches_table2/row/fields/replace_field/replace_field.dart
@@ -93,7 +93,6 @@ class ReplaceField extends StackedView<ReplaceFieldModel> {
           height: rowHeight,
           padding: EdgeInsets.symmetric(horizontal: cellPadding, vertical: 0),
           decoration: BoxDecoration(
-              color: Colors.yellow,
               border: Border.all(
                   width: viewModel.showFocus ? onWidth : offWidth,
                   color: viewModel.showFocus ? onColor : offColor)),
diff --git a/lib/ui/widgets/matches_table2/row/fields/trigger_field/trigger_field.dart b/lib/ui/widgets/matches_table2/row/fields/trigger_field/trigger_field.dart
index 2cbe63f..7a922f5 100644
--- a/lib/ui/widgets/matches_table2/row/fields/trigger_field/trigger_field.dart
+++ b/lib/ui/widgets/matches_table2/row/fields/trigger_field/trigger_field.dart
@@ -117,7 +117,6 @@ class TriggerField extends StackedView<TriggerFieldModel> {
           height: rowHeight,
           padding: EdgeInsets.symmetric(horizontal: cellPadding, vertical: 0),
           decoration: BoxDecoration(
-              color: Colors.yellow,
               border: Border.all(
                   width: viewModel.showFocus ? onWidth : offWidth,
                   color: viewModel.showFocus ? onColor : offColor)),