🔧 Port effect profiles to GNOME Shell 3.38

docs/how-to-create-new-effects.md

@@ -311,10 +311,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
             <child>
               <object class="GtkListBoxRow">
-                <property name="margin-start">10</property>
-                <property name="margin-end">10</property>
-                <property name="margin-top">10</property>
-                <property name="margin-bottom">10</property>
                 <property name="activatable">0</property>
                 <child>
                   <object class="GtkBox">
@@ -359,10 +355,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
             <child>
               <object class="GtkListBoxRow">
-                <property name="margin-start">10</property>
-                <property name="margin-end">10</property>
-                <property name="margin-top">10</property>
-                <property name="margin-bottom">10</property>
                 <property name="activatable">0</property>
                 <child>
                   <object class="GtkBox">

prefs.js

@@ -73,11 +73,12 @@ var PreferencesDialog = class PreferencesDialog {
 
     // Load the CSS file for the settings dialog.
     const styleProvider = Gtk.CssProvider.new();
-    styleProvider.load_from_resource('/css/gtk.css');
+    if (utils.isGTK4() && !utils.isADW()) {
-    if (utils.isGTK4()) {
+      styleProvider.load_from_resource('/css/gtk4.css');
       Gtk.StyleContext.add_provider_for_display(Gdk.Display.get_default(), styleProvider,
       Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
     } else {
+      styleProvider.load_from_resource('/css/gtk3.css');
       Gtk.StyleContext.add_provider_for_screen(Gdk.Screen.get_default(), styleProvider,
                                                Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
     }
@@ -183,14 +184,14 @@ var PreferencesDialog = class PreferencesDialog {
           if (r == row) {
             if (r._revealer.get_reveal_child()) {
               r._revealer.set_reveal_child(false);
-              r._arrow.remove_css_class("revealed");
+              r._arrow.get_style_context().remove_class("revealed");
             } else {
               r._revealer.set_reveal_child(true);
-              r._arrow.add_css_class("revealed");
+              r._arrow.get_style_context().add_class("revealed");
             }
           } else {
             r._revealer.set_reveal_child(false);
-            r._arrow.remove_css_class("revealed");
+            r._arrow.get_style_context().remove_class("revealed");
           }
         }
         );
@@ -211,9 +212,9 @@ var PreferencesDialog = class PreferencesDialog {
         }
 
         // The preview button.
-        const previewButton = Gtk.Button.new_from_icon_name('bmw-preview-symbolic');
+        const previewButton = Gtk.Button.new_from_icon_name('bmw-preview-symbolic', 1);
-        previewButton.add_css_class('circular');
+        previewButton.get_style_context().add_class('circular');
-        previewButton.add_css_class('flat');
+        previewButton.get_style_context().add_class('flat');
         previewButton.set_tooltip_text(_('Preview this effect'));
         previewButton.set_valign(Gtk.Align.CENTER);
         previewButton.connect('clicked', () => {
@@ -269,10 +270,16 @@ var PreferencesDialog = class PreferencesDialog {
 
         } else {
 
-          const row = new Gtk.ListBoxRow({css_classes:["effect-row"]});
+          const row = new Gtk.ListBoxRow();
+          row.get_style_context().add_class("effect-row");
+          
           const container = new Gtk.Box({orientation:Gtk.Orientation.VERTICAL});
-          const header =  new Gtk.Box({css_classes:["effect-row-header"], spacing:12});
+
-          const label = new Gtk.Label({label:effect.getLabel(), css_classes:["heading"], hexpand:true, halign: Gtk.Align.START});
+          const header =  new Gtk.Box({ spacing:12});
+          header.get_style_context().add_class("effect-row-header");
+          
+          const label = new Gtk.Label({label:effect.getLabel(), hexpand:true, halign: Gtk.Align.START});
+          label.get_style_context().add_class("heading");
 
           this.gtkBoxAppend(header, button);
           this.gtkBoxAppend(header, label);
@@ -281,7 +288,8 @@ var PreferencesDialog = class PreferencesDialog {
           
           if (hasPrefs) {
             const revealer = this._builder.get_object(`${effect.getNick()}-prefs`);
-            const arrow = new Gtk.Image({css_classes:["revealer-arrow"], icon_name:"go-down-symbolic"});
+            const arrow = new Gtk.Image({icon_name:"go-down-symbolic"});
+            arrow.get_style_context().add_class("revealer-arrow");
             this.gtkBoxAppend(header, arrow);
             this.gtkBoxAppend(container, revealer);
             row._revealer = revealer;
@@ -293,9 +301,14 @@ var PreferencesDialog = class PreferencesDialog {
             row.set_activatable(false);
           }
 
+            if (utils.isGTK4()) {
               row.set_child(container);
-
               group.append(row);
+            } else {
+              row.add(container);
+              group.add(row);
+            }
+
 
         }
 
@@ -343,9 +356,12 @@ var PreferencesDialog = class PreferencesDialog {
 
           flap.set_content(scrolledWindow);
 
-        } else {
+        } else if (utils.isGTK4()) {
           window.get_titlebar().pack_start(menu);
           window.get_titlebar().set_title_widget(this._builder.get_object('profile-button'));
+        } else {
+          window.get_titlebar().pack_start(menu);
+          window.get_titlebar().set_custom_title(this._builder.get_object('profile-button'));
         }
 
         const addURIAction = (name, uri) => {
@@ -508,7 +524,10 @@ var PreferencesDialog = class PreferencesDialog {
           });
         }
 
+        if (utils.isGTK4()) {
           deleteProfileDialog.set_hide_on_close(true);
+        }
+
         deleteProfileDialog.set_transient_for(window);
 
         deleteProfileDialog.connect('response', (dialog, response) => {

resources/css/gtk3.css

@@ -0,0 +1,33 @@
+/*
+SPDX-FileCopyrightText: Simon Schneegans <code@simonschneegans.de>
+SPDX-License-Identifier: CC0-1.0
+*/
+
+row {
+    padding: 8px;
+}
+
+.effect-row {
+    padding: 0;
+}
+
+.effect-row-header,
+.effect-row list {
+    padding: 8px;
+    border: 0 solid @borders;
+    border-bottom-width: 1px;
+}
+
+.revealer-arrow {
+    margin-right: 6px;
+}
+
+/* .revealer-arrow.revealed {} */
+
+/* row {
+    padding: 10px;
+}
+
+.effect-row {
+    padding: 0px;
+} */

resources/css/gtk4.css

@@ -3,10 +3,6 @@ SPDX-FileCopyrightText: Simon Schneegans <code@simonschneegans.de>
 SPDX-License-Identifier: CC0-1.0
 */
 
-.pill-button {
-    border-radius: 9999px;
-}
-
 /* These are only used if not using libadwaita */
 
 .effect-row {

resources/ui/gtk3/apparition.ui

@@ -42,24 +42,14 @@ SPDX-License-Identifier: GPL-3.0-or-later
     <property name="page-increment">0.1</property>
   </object>
 
-  <object class="GtkBox" id="apparition-prefs">
+  <object class="GtkRevealer" id="apparition-prefs">
-    <property name="orientation">vertical</property>
 
-    <child>
-      <object class="GtkFrame">
     <child>
       <object class="GtkListBox">
         <property name="selection-mode">none</property>
-            <style>
-              <class name="rich-list" />
-            </style>
 
         <child>
           <object class="GtkListBoxRow">
-                <property name="margin-start">10</property>
-                <property name="margin-end">10</property>
-                <property name="margin-top">10</property>
-                <property name="margin-bottom">10</property>
             <property name="activatable">0</property>
             <child>
               <object class="GtkBox">
@@ -105,10 +95,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
         <child>
           <object class="GtkListBoxRow">
-                <property name="margin-start">10</property>
-                <property name="margin-end">10</property>
-                <property name="margin-top">10</property>
-                <property name="margin-bottom">10</property>
             <property name="activatable">0</property>
             <child>
               <object class="GtkBox">
@@ -154,10 +140,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
         <child>
           <object class="GtkListBoxRow">
-                <property name="margin-start">10</property>
-                <property name="margin-end">10</property>
-                <property name="margin-top">10</property>
-                <property name="margin-bottom">10</property>
             <property name="activatable">0</property>
             <child>
               <object class="GtkBox">
@@ -203,10 +185,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
         <child>
           <object class="GtkListBoxRow">
-                <property name="margin-start">10</property>
-                <property name="margin-end">10</property>
-                <property name="margin-top">10</property>
-                <property name="margin-bottom">10</property>
             <property name="activatable">0</property>
             <child>
               <object class="GtkBox">
@@ -252,10 +230,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
         <child>
           <object class="GtkListBoxRow">
-                <property name="margin-start">10</property>
-                <property name="margin-end">10</property>
-                <property name="margin-top">10</property>
-                <property name="margin-bottom">10</property>
             <property name="activatable">0</property>
             <child>
               <object class="GtkBox">
@@ -301,9 +275,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
       </object>
     </child>
-      </object>
-    </child>
-
 
   </object>
 

resources/ui/gtk3/doom.ui

@@ -35,24 +35,14 @@ SPDX-License-Identifier: GPL-3.0-or-later
     <property name="page-increment">10</property>
   </object>
 
-  <object class="GtkBox" id="doom-prefs">
+  <object class="GtkRevealer" id="doom-prefs">
-    <property name="orientation">vertical</property>
 
-    <child>
-      <object class="GtkFrame">
     <child>
       <object class="GtkListBox">
         <property name="selection-mode">none</property>
-            <style>
-              <class name="rich-list" />
-            </style>
 
         <child>
           <object class="GtkListBoxRow">
-                <property name="margin-start">10</property>
-                <property name="margin-end">10</property>
-                <property name="margin-top">10</property>
-                <property name="margin-bottom">10</property>
             <property name="activatable">0</property>
             <child>
               <object class="GtkBox">
@@ -98,10 +88,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
         <child>
           <object class="GtkListBoxRow">
-                <property name="margin-start">10</property>
-                <property name="margin-end">10</property>
-                <property name="margin-top">10</property>
-                <property name="margin-bottom">10</property>
             <property name="activatable">0</property>
             <child>
               <object class="GtkBox">
@@ -147,10 +133,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
         <child>
           <object class="GtkListBoxRow">
-                <property name="margin-start">10</property>
-                <property name="margin-end">10</property>
-                <property name="margin-top">10</property>
-                <property name="margin-bottom">10</property>
             <property name="activatable">0</property>
             <child>
               <object class="GtkBox">
@@ -196,10 +178,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
         <child>
           <object class="GtkListBoxRow">
-                <property name="margin-start">10</property>
-                <property name="margin-end">10</property>
-                <property name="margin-top">10</property>
-                <property name="margin-bottom">10</property>
             <property name="activatable">0</property>
             <child>
               <object class="GtkBox">
@@ -245,9 +223,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
       </object>
     </child>
-      </object>
-    </child>
-
 
   </object>
 

resources/ui/gtk3/effectPage.ui

@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-SPDX-FileCopyrightText: Simon Schneegans <code@simonschneegans.de>
-SPDX-License-Identifier: GPL-3.0-or-later
--->
-
-<interface domain="burn-my-windows">
-  <requires lib="gtk" version="3.0" />
-
-  <template class="BurnMyWindowsEffectPage" parent="GtkBox">
-    <property name="orientation">vertical</property>
-    <property name="hexpand">1</property>
-    <property name="spacing">10</property>
-
-    <child>
-      <object class="GtkBox">
-        <child>
-          <object class="GtkLabel" id="label">
-            <property name="xalign">0</property>
-            <property name="hexpand">1</property>
-            <style>
-              <class name="large-title" />
-            </style>
-          </object>
-        </child>
-        <child>
-          <object class="GtkButton" id="button">
-            <property name="valign">center</property>
-            <child>
-              <object class="GtkBox">
-                <property name="margin_start">8</property>
-                <property name="margin_end">8</property>
-                <property name="spacing">6</property>
-                <child>
-                  <object class="GtkImage">
-                    <property name="icon_name">media-playback-start-symbolic</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="halign">start</property>
-                    <property name="label" translatable="yes">Preview this effect</property>
-                  </object>
-                </child>
-              </object>
-            </child>
-            <style>
-              <class name="pill-button" />
-              <class name="flat" />
-            </style>
-          </object>
-        </child>
-      </object>
-    </child>
-
-  </template>
-
-</interface>

resources/ui/gtk3/energize-a.ui

@@ -21,24 +21,14 @@ SPDX-License-Identifier: GPL-3.0-or-later
     <property name="page-increment">0.1</property>
   </object>
 
-  <object class="GtkBox" id="energize-a-prefs">
+  <object class="GtkRevealer" id="energize-a-prefs">
-    <property name="orientation">vertical</property>
 
-    <child>
-      <object class="GtkFrame">
     <child>
       <object class="GtkListBox">
         <property name="selection-mode">none</property>
-            <style>
-              <class name="rich-list" />
-            </style>
 
         <child>
           <object class="GtkListBoxRow">
-                <property name="margin-start">10</property>
-                <property name="margin-end">10</property>
-                <property name="margin-top">10</property>
-                <property name="margin-bottom">10</property>
             <property name="activatable">0</property>
             <child>
               <object class="GtkBox">
@@ -84,10 +74,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
         <child>
           <object class="GtkListBoxRow">
-                <property name="margin-start">10</property>
-                <property name="margin-end">10</property>
-                <property name="margin-top">10</property>
-                <property name="margin-bottom">10</property>
             <property name="activatable">0</property>
             <child>
               <object class="GtkBox">
@@ -133,10 +119,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
         <child>
           <object class="GtkListBoxRow">
-                <property name="margin-start">10</property>
-                <property name="margin-end">10</property>
-                <property name="margin-top">10</property>
-                <property name="margin-bottom">10</property>
             <property name="activatable">0</property>
             <child>
               <object class="GtkBox">
@@ -153,6 +135,9 @@ SPDX-License-Identifier: GPL-3.0-or-later
                   <object class="GtkColorButton" id="energize-a-color">
                     <property name="use_alpha">0</property>
                     <property name="show_editor">1</property>
+                    <property name="margin-start">8</property>
+                    <property name="margin-end">8</property>
+                    <property name="width-request">250</property>
                   </object>
                 </child>
                 <child>
@@ -176,9 +161,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
       </object>
     </child>
-      </object>
-    </child>
-
 
   </object>
 

resources/ui/gtk3/energize-b.ui

@@ -21,24 +21,14 @@ SPDX-License-Identifier: GPL-3.0-or-later
     <property name="page-increment">0.1</property>
   </object>
 
-  <object class="GtkBox" id="energize-b-prefs">
+  <object class="GtkRevealer" id="energize-b-prefs">
-    <property name="orientation">vertical</property>
 
-    <child>
-      <object class="GtkFrame">
     <child>
       <object class="GtkListBox">
         <property name="selection-mode">none</property>
-            <style>
-              <class name="rich-list" />
-            </style>
 
         <child>
           <object class="GtkListBoxRow">
-                <property name="margin-start">10</property>
-                <property name="margin-end">10</property>
-                <property name="margin-top">10</property>
-                <property name="margin-bottom">10</property>
             <property name="activatable">0</property>
             <child>
               <object class="GtkBox">
@@ -84,10 +74,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
         <child>
           <object class="GtkListBoxRow">
-                <property name="margin-start">10</property>
-                <property name="margin-end">10</property>
-                <property name="margin-top">10</property>
-                <property name="margin-bottom">10</property>
             <property name="activatable">0</property>
             <child>
               <object class="GtkBox">
@@ -133,10 +119,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
         <child>
           <object class="GtkListBoxRow">
-                <property name="margin-start">10</property>
-                <property name="margin-end">10</property>
-                <property name="margin-top">10</property>
-                <property name="margin-bottom">10</property>
             <property name="activatable">0</property>
             <child>
               <object class="GtkBox">
@@ -153,6 +135,9 @@ SPDX-License-Identifier: GPL-3.0-or-later
                   <object class="GtkColorButton" id="energize-b-color">
                     <property name="use_alpha">0</property>
                     <property name="show_editor">1</property>
+                    <property name="margin-start">8</property>
+                    <property name="margin-end">8</property>
+                    <property name="width-request">250</property>
                   </object>
                 </child>
                 <child>
@@ -176,8 +161,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
       </object>
     </child>
-      </object>
-    </child>
 
 
   </object>

resources/ui/gtk3/fire.ui

@@ -28,25 +28,14 @@ SPDX-License-Identifier: GPL-3.0-or-later
     <property name="page-increment">0.1</property>
   </object>
 
-  <object class="GtkBox" id="fire-prefs">
+  <object class="GtkRevealer" id="fire-prefs">
-    <property name="orientation">vertical</property>
 
-    <child>
-      <object class="GtkFrame">
-        <property name="margin-bottom">20</property>
     <child>
       <object class="GtkListBox">
         <property name="selection-mode">none</property>
-            <style>
-              <class name="rich-list" />
-            </style>
 
         <child>
           <object class="GtkListBoxRow">
-                <property name="margin-start">10</property>
-                <property name="margin-end">10</property>
-                <property name="margin-top">10</property>
-                <property name="margin-bottom">10</property>
             <property name="activatable">0</property>
             <child>
               <object class="GtkBox">
@@ -86,10 +75,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
         <child>
           <object class="GtkListBoxRow">
-                <property name="margin-start">10</property>
-                <property name="margin-end">10</property>
-                <property name="margin-top">10</property>
-                <property name="margin-bottom">10</property>
             <property name="activatable">0</property>
             <child>
               <object class="GtkBox">
@@ -135,10 +120,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
         <child>
           <object class="GtkListBoxRow">
-                <property name="margin-start">10</property>
-                <property name="margin-end">10</property>
-                <property name="margin-top">10</property>
-                <property name="margin-bottom">10</property>
             <property name="activatable">0</property>
             <child>
               <object class="GtkBox">
@@ -183,10 +164,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
         <child>
           <object class="GtkListBoxRow">
-                <property name="margin-start">10</property>
-                <property name="margin-end">10</property>
-                <property name="margin-top">10</property>
-                <property name="margin-bottom">10</property>
             <property name="activatable">0</property>
             <child>
               <object class="GtkBox">
@@ -231,10 +208,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
         <child>
           <object class="GtkListBoxRow">
-                <property name="margin-start">10</property>
-                <property name="margin-end">10</property>
-                <property name="margin-top">10</property>
-                <property name="margin-bottom">10</property>
             <property name="activatable">0</property>
             <child>
               <object class="GtkBox">
@@ -270,6 +243,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
                   <object class="GtkSwitch" id="flame-3d-noise">
                     <property name="halign">end</property>
                     <property name="valign">center</property>
+                    <property name="margin-end">8</property>
                   </object>
                 </child>
                 <child>
@@ -293,10 +267,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
         <child>
           <object class="GtkListBoxRow">
-                <property name="margin-start">10</property>
-                <property name="margin-end">10</property>
-                <property name="margin-top">10</property>
-                <property name="margin-bottom">10</property>
             <property name="activatable">0</property>
             <child>
               <object class="GtkBox">
@@ -361,8 +331,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
       </object>
     </child>
-      </object>
+
-    </child>
   </object>
 
 </interface>

resources/ui/gtk3/glide.ui

@@ -42,24 +42,14 @@ SPDX-License-Identifier: GPL-3.0-or-later
     <property name="page-increment">0.1</property>
   </object>
 
-  <object class="GtkBox" id="glide-prefs">
+  <object class="GtkRevealer" id="glide-prefs">
-    <property name="orientation">vertical</property>
 
-    <child>
-      <object class="GtkFrame">
     <child>
       <object class="GtkListBox">
         <property name="selection-mode">none</property>
-            <style>
-              <class name="rich-list" />
-            </style>
 
         <child>
           <object class="GtkListBoxRow">
-                <property name="margin-start">10</property>
-                <property name="margin-end">10</property>
-                <property name="margin-top">10</property>
-                <property name="margin-bottom">10</property>
             <property name="activatable">0</property>
             <child>
               <object class="GtkBox">
@@ -105,10 +95,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
         <child>
           <object class="GtkListBoxRow">
-                <property name="margin-start">10</property>
-                <property name="margin-end">10</property>
-                <property name="margin-top">10</property>
-                <property name="margin-bottom">10</property>
             <property name="activatable">0</property>
             <child>
               <object class="GtkBox">
@@ -154,10 +140,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
         <child>
           <object class="GtkListBoxRow">
-                <property name="margin-start">10</property>
-                <property name="margin-end">10</property>
-                <property name="margin-top">10</property>
-                <property name="margin-bottom">10</property>
             <property name="activatable">0</property>
             <child>
               <object class="GtkBox">
@@ -203,10 +185,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
         <child>
           <object class="GtkListBoxRow">
-                <property name="margin-start">10</property>
-                <property name="margin-end">10</property>
-                <property name="margin-top">10</property>
-                <property name="margin-bottom">10</property>
             <property name="activatable">0</property>
             <child>
               <object class="GtkBox">
@@ -252,10 +230,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
         <child>
           <object class="GtkListBoxRow">
-                <property name="margin-start">10</property>
-                <property name="margin-end">10</property>
-                <property name="margin-top">10</property>
-                <property name="margin-bottom">10</property>
             <property name="activatable">0</property>
             <child>
               <object class="GtkBox">
@@ -301,9 +275,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
       </object>
     </child>
-      </object>
-    </child>
-
 
   </object>
 

resources/ui/gtk3/glitch.ui

@@ -35,24 +35,14 @@ SPDX-License-Identifier: GPL-3.0-or-later
     <property name="page-increment">0.1</property>
   </object>
 
-  <object class="GtkBox" id="glitch-prefs">
+  <object class="GtkRevealer" id="glitch-prefs">
-    <property name="orientation">vertical</property>
 
-    <child>
-      <object class="GtkFrame">
     <child>
       <object class="GtkListBox">
         <property name="selection-mode">none</property>
-            <style>
-              <class name="rich-list" />
-            </style>
 
         <child>
           <object class="GtkListBoxRow">
-                <property name="margin-start">10</property>
-                <property name="margin-end">10</property>
-                <property name="margin-top">10</property>
-                <property name="margin-bottom">10</property>
             <property name="activatable">0</property>
             <child>
               <object class="GtkBox">
@@ -98,10 +88,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
         <child>
           <object class="GtkListBoxRow">
-                <property name="margin-start">10</property>
-                <property name="margin-end">10</property>
-                <property name="margin-top">10</property>
-                <property name="margin-bottom">10</property>
             <property name="activatable">0</property>
             <child>
               <object class="GtkBox">
@@ -147,10 +133,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
         <child>
           <object class="GtkListBoxRow">
-                <property name="margin-start">10</property>
-                <property name="margin-end">10</property>
-                <property name="margin-top">10</property>
-                <property name="margin-bottom">10</property>
             <property name="activatable">0</property>
             <child>
               <object class="GtkBox">
@@ -196,10 +178,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
         <child>
           <object class="GtkListBoxRow">
-                <property name="margin-start">10</property>
-                <property name="margin-end">10</property>
-                <property name="margin-top">10</property>
-                <property name="margin-bottom">10</property>
             <property name="activatable">0</property>
             <child>
               <object class="GtkBox">
@@ -245,10 +223,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
         <child>
           <object class="GtkListBoxRow">
-                <property name="margin-start">10</property>
-                <property name="margin-end">10</property>
-                <property name="margin-top">10</property>
-                <property name="margin-bottom">10</property>
             <property name="activatable">0</property>
             <child>
               <object class="GtkBox">
@@ -265,6 +239,9 @@ SPDX-License-Identifier: GPL-3.0-or-later
                   <object class="GtkColorButton" id="glitch-color">
                     <property name="use_alpha">1</property>
                     <property name="show_editor">1</property>
+                    <property name="margin-start">8</property>
+                    <property name="margin-end">8</property>
+                    <property name="width-request">250</property>
                   </object>
                 </child>
                 <child>
@@ -288,9 +265,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
       </object>
     </child>
-      </object>
-    </child>
-
 
   </object>
 

resources/ui/gtk3/hexagon.ui

@@ -28,24 +28,14 @@ SPDX-License-Identifier: GPL-3.0-or-later
     <property name="page-increment">1</property>
   </object>
 
-  <object class="GtkBox" id="hexagon-prefs">
+  <object class="GtkRevealer" id="hexagon-prefs">
-    <property name="orientation">vertical</property>
 
-    <child>
-      <object class="GtkFrame">
     <child>
       <object class="GtkListBox">
         <property name="selection-mode">none</property>
-            <style>
-              <class name="rich-list" />
-            </style>
 
         <child>
           <object class="GtkListBoxRow">
-                <property name="margin-start">10</property>
-                <property name="margin-end">10</property>
-                <property name="margin-top">10</property>
-                <property name="margin-bottom">10</property>
             <property name="activatable">0</property>
             <child>
               <object class="GtkBox">
@@ -91,10 +81,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
         <child>
           <object class="GtkListBoxRow">
-                <property name="margin-start">10</property>
-                <property name="margin-end">10</property>
-                <property name="margin-top">10</property>
-                <property name="margin-bottom">10</property>
             <property name="activatable">0</property>
             <child>
               <object class="GtkBox">
@@ -140,10 +126,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
         <child>
           <object class="GtkListBoxRow">
-                <property name="margin-start">10</property>
-                <property name="margin-end">10</property>
-                <property name="margin-top">10</property>
-                <property name="margin-bottom">10</property>
             <property name="activatable">0</property>
             <child>
               <object class="GtkBox">
@@ -189,10 +171,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
         <child>
           <object class="GtkListBoxRow">
-                <property name="margin-start">10</property>
-                <property name="margin-end">10</property>
-                <property name="margin-top">10</property>
-                <property name="margin-bottom">10</property>
             <property name="activatable">0</property>
             <child>
               <object class="GtkBox">
@@ -209,6 +187,9 @@ SPDX-License-Identifier: GPL-3.0-or-later
                   <object class="GtkColorButton" id="hexagon-line-color">
                     <property name="use_alpha">1</property>
                     <property name="show_editor">1</property>
+                    <property name="margin-start">8</property>
+                    <property name="margin-end">8</property>
+                    <property name="width-request">250</property>
                   </object>
                 </child>
                 <child>
@@ -232,10 +213,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
         <child>
           <object class="GtkListBoxRow">
-                <property name="margin-start">10</property>
-                <property name="margin-end">10</property>
-                <property name="margin-top">10</property>
-                <property name="margin-bottom">10</property>
             <property name="activatable">0</property>
             <child>
               <object class="GtkBox">
@@ -252,6 +229,9 @@ SPDX-License-Identifier: GPL-3.0-or-later
                   <object class="GtkColorButton" id="hexagon-glow-color">
                     <property name="use_alpha">1</property>
                     <property name="show_editor">1</property>
+                    <property name="margin-start">8</property>
+                    <property name="margin-end">8</property>
+                    <property name="width-request">250</property>
                   </object>
                 </child>
                 <child>
@@ -275,10 +255,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
         <child>
           <object class="GtkListBoxRow">
-                <property name="margin-start">10</property>
-                <property name="margin-end">10</property>
-                <property name="margin-top">10</property>
-                <property name="margin-bottom">10</property>
             <property name="activatable">0</property>
             <child>
               <object class="GtkBox">
@@ -314,6 +290,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
                   <object class="GtkSwitch" id="hexagon-additive-blending">
                     <property name="halign">end</property>
                     <property name="valign">center</property>
+                    <property name="margin-end">8</property>
                   </object>
                 </child>
                 <child>
@@ -337,9 +314,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
       </object>
     </child>
-      </object>
-    </child>
-
 
   </object>
 

resources/ui/gtk3/incinerate.ui

@@ -28,24 +28,14 @@ SPDX-License-Identifier: GPL-3.0-or-later
     <property name="page-increment">0.1</property>
   </object>
 
-  <object class="GtkBox" id="incinerate-prefs">
+  <object class="GtkRevealer" id="incinerate-prefs">
-    <property name="orientation">vertical</property>
 
-    <child>
-      <object class="GtkFrame">
     <child>
       <object class="GtkListBox">
         <property name="selection-mode">none</property>
-            <style>
-              <class name="rich-list" />
-            </style>
 
         <child>
           <object class="GtkListBoxRow">
-                <property name="margin-start">10</property>
-                <property name="margin-end">10</property>
-                <property name="margin-top">10</property>
-                <property name="margin-bottom">10</property>
             <property name="activatable">0</property>
             <child>
               <object class="GtkBox">
@@ -91,10 +81,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
         <child>
           <object class="GtkListBoxRow">
-                <property name="margin-start">10</property>
-                <property name="margin-end">10</property>
-                <property name="margin-top">10</property>
-                <property name="margin-bottom">10</property>
             <property name="activatable">0</property>
             <child>
               <object class="GtkBox">
@@ -140,10 +126,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
         <child>
           <object class="GtkListBoxRow">
-                <property name="margin-start">10</property>
-                <property name="margin-end">10</property>
-                <property name="margin-top">10</property>
-                <property name="margin-bottom">10</property>
             <property name="activatable">0</property>
             <child>
               <object class="GtkBox">
@@ -189,10 +171,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
         <child>
           <object class="GtkListBoxRow">
-                <property name="margin-start">10</property>
-                <property name="margin-end">10</property>
-                <property name="margin-top">10</property>
-                <property name="margin-bottom">10</property>
             <property name="activatable">0</property>
             <child>
               <object class="GtkBox">
@@ -228,6 +206,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
                   <object class="GtkSwitch" id="incinerate-use-pointer">
                     <property name="halign">end</property>
                     <property name="valign">center</property>
+                    <property name="margin-end">8</property>
                   </object>
                 </child>
                 <child>
@@ -251,10 +230,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
         <child>
           <object class="GtkListBoxRow">
-                <property name="margin-start">10</property>
-                <property name="margin-end">10</property>
-                <property name="margin-top">10</property>
-                <property name="margin-bottom">10</property>
             <property name="activatable">0</property>
             <child>
               <object class="GtkBox">
@@ -271,6 +246,9 @@ SPDX-License-Identifier: GPL-3.0-or-later
                   <object class="GtkColorButton" id="incinerate-color">
                     <property name="use_alpha">0</property>
                     <property name="show_editor">1</property>
+                    <property name="margin-start">8</property>
+                    <property name="margin-end">8</property>
+                    <property name="width-request">250</property>
                   </object>
                 </child>
                 <child>
@@ -294,9 +272,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
       </object>
     </child>
-      </object>
-    </child>
-
 
   </object>
 

resources/ui/gtk3/pixel-wheel.ui

@@ -28,24 +28,14 @@ SPDX-License-Identifier: GPL-3.0-or-later
     <property name="page-increment">10</property>
   </object>
 
-  <object class="GtkBox" id="pixel-wheel-prefs">
+  <object class="GtkRevealer" id="pixel-wheel-prefs">
-    <property name="orientation">vertical</property>
 
-    <child>
-      <object class="GtkFrame">
     <child>
       <object class="GtkListBox">
         <property name="selection-mode">none</property>
-            <style>
-              <class name="rich-list" />
-            </style>
 
         <child>
           <object class="GtkListBoxRow">
-                <property name="margin-start">10</property>
-                <property name="margin-end">10</property>
-                <property name="margin-top">10</property>
-                <property name="margin-bottom">10</property>
             <property name="activatable">0</property>
             <child>
               <object class="GtkBox">
@@ -91,10 +81,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
         <child>
           <object class="GtkListBoxRow">
-                <property name="margin-start">10</property>
-                <property name="margin-end">10</property>
-                <property name="margin-top">10</property>
-                <property name="margin-bottom">10</property>
             <property name="activatable">0</property>
             <child>
               <object class="GtkBox">
@@ -140,10 +126,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
         <child>
           <object class="GtkListBoxRow">
-                <property name="margin-start">10</property>
-                <property name="margin-end">10</property>
-                <property name="margin-top">10</property>
-                <property name="margin-bottom">10</property>
             <property name="activatable">0</property>
             <child>
               <object class="GtkBox">
@@ -189,9 +171,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
       </object>
     </child>
-      </object>
-    </child>
-
 
   </object>
 

resources/ui/gtk3/pixel-wipe.ui

@@ -28,24 +28,14 @@ SPDX-License-Identifier: GPL-3.0-or-later
     <property name="page-increment">10</property>
   </object>
 
-  <object class="GtkBox" id="pixel-wipe-prefs">
+  <object class="GtkRevealer" id="pixel-wipe-prefs">
-    <property name="orientation">vertical</property>
 
-    <child>
-      <object class="GtkFrame">
     <child>
       <object class="GtkListBox">
         <property name="selection-mode">none</property>
-            <style>
-              <class name="rich-list" />
-            </style>
 
         <child>
           <object class="GtkListBoxRow">
-                <property name="margin-start">10</property>
-                <property name="margin-end">10</property>
-                <property name="margin-top">10</property>
-                <property name="margin-bottom">10</property>
             <property name="activatable">0</property>
             <child>
               <object class="GtkBox">
@@ -91,10 +81,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
         <child>
           <object class="GtkListBoxRow">
-                <property name="margin-start">10</property>
-                <property name="margin-end">10</property>
-                <property name="margin-top">10</property>
-                <property name="margin-bottom">10</property>
             <property name="activatable">0</property>
             <child>
               <object class="GtkBox">
@@ -140,9 +126,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
       </object>
     </child>
-      </object>
-    </child>
-
 
   </object>
 

resources/ui/gtk3/pixelate.ui

@@ -28,24 +28,14 @@ SPDX-License-Identifier: GPL-3.0-or-later
     <property name="page-increment">10</property>
   </object>
 
-  <object class="GtkBox" id="pixelate-prefs">
+  <object class="GtkRevealer" id="pixelate-prefs">
-    <property name="orientation">vertical</property>
 
-    <child>
-      <object class="GtkFrame">
     <child>
       <object class="GtkListBox">
         <property name="selection-mode">none</property>
-            <style>
-              <class name="rich-list" />
-            </style>
 
         <child>
           <object class="GtkListBoxRow">
-                <property name="margin-start">10</property>
-                <property name="margin-end">10</property>
-                <property name="margin-top">10</property>
-                <property name="margin-bottom">10</property>
             <property name="activatable">0</property>
             <child>
               <object class="GtkBox">
@@ -91,10 +81,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
         <child>
           <object class="GtkListBoxRow">
-                <property name="margin-start">10</property>
-                <property name="margin-end">10</property>
-                <property name="margin-top">10</property>
-                <property name="margin-bottom">10</property>
             <property name="activatable">0</property>
             <child>
               <object class="GtkBox">
@@ -140,10 +126,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
         <child>
           <object class="GtkListBoxRow">
-                <property name="margin-start">10</property>
-                <property name="margin-end">10</property>
-                <property name="margin-top">10</property>
-                <property name="margin-bottom">10</property>
             <property name="activatable">0</property>
             <child>
               <object class="GtkBox">
@@ -189,9 +171,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
       </object>
     </child>
-      </object>
-    </child>
-
 
   </object>
 

resources/ui/gtk3/portal.ui

@@ -35,24 +35,14 @@ SPDX-License-Identifier: GPL-3.0-or-later
     <property name="page-increment">10</property>
   </object>
 
-  <object class="GtkBox" id="portal-prefs">
+  <object class="GtkRevealer" id="portal-prefs">
-    <property name="orientation">vertical</property>
 
-    <child>
-      <object class="GtkFrame">
     <child>
       <object class="GtkListBox">
         <property name="selection-mode">none</property>
-            <style>
-              <class name="rich-list" />
-            </style>
 
         <child>
           <object class="GtkListBoxRow">
-                <property name="margin-start">10</property>
-                <property name="margin-end">10</property>
-                <property name="margin-top">10</property>
-                <property name="margin-bottom">10</property>
             <property name="activatable">0</property>
             <child>
               <object class="GtkBox">
@@ -78,8 +68,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
                   </object>
                 </child>
                 <child>
-                      <object class="GtkButton"
+                  <object class="GtkButton" id="reset-portal-animation-time">
-                        id="reset-portal-animation-time">
                     <child>
                       <object class="GtkImage">
                         <property name="icon-name">edit-clear-symbolic</property>
@@ -99,10 +88,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
         <child>
           <object class="GtkListBoxRow">
-                <property name="margin-start">10</property>
-                <property name="margin-end">10</property>
-                <property name="margin-top">10</property>
-                <property name="margin-bottom">10</property>
             <property name="activatable">0</property>
             <child>
               <object class="GtkBox">
@@ -128,8 +113,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
                   </object>
                 </child>
                 <child>
-                      <object class="GtkButton"
+                  <object class="GtkButton" id="reset-portal-rotation-speed">
-                        id="reset-portal-rotation-speed">
                     <child>
                       <object class="GtkImage">
                         <property name="icon-name">edit-clear-symbolic</property>
@@ -149,10 +133,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
         <child>
           <object class="GtkListBoxRow">
-                <property name="margin-start">10</property>
-                <property name="margin-end">10</property>
-                <property name="margin-top">10</property>
-                <property name="margin-bottom">10</property>
             <property name="activatable">0</property>
             <child>
               <object class="GtkBox">
@@ -178,8 +158,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
                   </object>
                 </child>
                 <child>
-                      <object class="GtkButton"
+                  <object class="GtkButton" id="reset-portal-whirling">
-                        id="reset-portal-whirling">
                     <child>
                       <object class="GtkImage">
                         <property name="icon-name">edit-clear-symbolic</property>
@@ -199,10 +178,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
         <child>
           <object class="GtkListBoxRow">
-                <property name="margin-start">10</property>
-                <property name="margin-end">10</property>
-                <property name="margin-top">10</property>
-                <property name="margin-bottom">10</property>
             <property name="activatable">0</property>
             <child>
               <object class="GtkBox">
@@ -228,8 +203,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
                   </object>
                 </child>
                 <child>
-                      <object class="GtkButton"
+                  <object class="GtkButton" id="reset-portal-details">
-                        id="reset-portal-details">
                     <child>
                       <object class="GtkImage">
                         <property name="icon-name">edit-clear-symbolic</property>
@@ -249,10 +223,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
         <child>
           <object class="GtkListBoxRow">
-                <property name="margin-start">10</property>
-                <property name="margin-end">10</property>
-                <property name="margin-top">10</property>
-                <property name="margin-bottom">10</property>
             <property name="activatable">0</property>
             <child>
               <object class="GtkBox">
@@ -269,6 +239,9 @@ SPDX-License-Identifier: GPL-3.0-or-later
                   <object class="GtkColorButton" id="portal-color">
                     <property name="use_alpha">0</property>
                     <property name="show_editor">1</property>
+                    <property name="margin-start">8</property>
+                    <property name="margin-end">8</property>
+                    <property name="width-request">250</property>
                   </object>
                 </child>
                 <child>
@@ -292,9 +265,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
       </object>
     </child>
-      </object>
-    </child>
-
 
   </object>
 

resources/ui/gtk3/prefs.ui

@@ -8,8 +8,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
 <interface domain="burn-my-windows">
   <requires lib="gtk" version="3.0" />
 
-  <menu id="enabled-effects-menu"></menu>
+  <!-- This will be added to the header bar. -->
-
   <object class="GtkMenuButton" id="menu-button">
     <property name="menu-model">main-menu</property>
     <property name="visible">1</property>
@@ -22,61 +21,358 @@ SPDX-License-Identifier: GPL-3.0-or-later
     </child>
   </object>
 
-  <object class="GtkBox" id="general-prefs">
+  <!-- This will be added to the header bar. -->
-    <property name="orientation">vertical</property>
+  <object class="GtkBox" id="profile-button">
-    <property name="margin-top">30</property>
+    <property name="halign">center</property>
-    <property name="margin-bottom">30</property>
+    <property name="visible">1</property>
-
     <child>
-      <object class="GtkImage">
+      <object class="GtkMenuButton" id="choose-profile-button">
-        <property name="valign">center</property>
+        <property name="menu-model">profile-menu</property>
-        <property name="icon-name">burn-my-windows-symbolic</property>
+        <property name="visible">1</property>
-        <property name="pixel_size">128</property>
       </object>
     </child>
+    <child>
+      <object class="GtkToggleButton" id="edit-profile-button">
+        <property name="valign">center</property>
+        <property name="visible">1</property>
+        <child>
+          <object class="GtkImage">
+            <property name="icon-name">bmw-edit-profile-symbolic</property>
+            <property name="visible">1</property>
+            <property name="icon-size">1</property>
+          </object>
+        </child>
+      </object>
+    </child>
+    <style>
+      <class name="linked" />
+    </style>
+  </object>
+
+  <object class="GtkStack" id="general-prefs">
+    <property name="transition-type">over-down-up</property>
+
+    <child>
+      <object class="GtkScrolledWindow" id="effect-editor">
+        <property name="hscrollbar-policy">never</property>
+        <child>
+
+          <object class="GtkBox">
+            <property name="orientation">vertical</property>
+            <property name="margin-top">20</property>
+            <property name="margin-bottom">20</property>
+            <property name="margin-start">20</property>
+            <property name="margin-end">20</property>
+            <property name="spacing">5</property>
 
             <child>
               <object class="GtkLabel">
-        <property name="label" translatable="yes">Welcome to Burn-My-Windows!</property>
+                <property name="label" translatable="yes">Effect Settings</property>
-        <property name="margin-top">8</property>
+                <property name="halign">start</property>
-        <property name="margin-bottom">6</property>
                 <style>
-          <class name="large-title" />
+                  <class name="heading" />
                 </style>
               </object>
             </child>
 
             <child>
               <object class="GtkLabel">
-        <property name="label" translatable="yes">If you like this extension, recommend it to your friends :)</property>
+                <property name="label" translatable="yes">If multiple are selected, one is chosen randomly.</property>
-        <property name="margin-bottom">36</property>
+                <property name="halign">start</property>
               </object>
             </child>
 
-
             <child>
               <object class="GtkFrame">
+                <child>
+                  <object class="GtkListBox" id="effects-group">
+                    <property name="selection-mode">none</property>
+                  </object>
+                </child>
+              </object>
+            </child>
+
+          </object>
+
+        </child>
+
+      </object>
+    </child>
+
+    <child>
+      <object class="GtkBox" id="profile-editor">
+        <property name="orientation">vertical</property>
+        <property name="margin-top">20</property>
+        <property name="margin-bottom">20</property>
+        <property name="margin-start">20</property>
+        <property name="margin-end">20</property>
+        <property name="spacing">5</property>
+        <style>
+          <class name="background" />
+        </style>
+
+        <child>
+          <object class="GtkLabel">
+            <property name="label" translatable="yes">Effect Profile Constraints</property>
+            <property name="halign">start</property>
+            <style>
+              <class name="heading" />
+            </style>
+          </object>
+        </child>
+
+        <child>
+          <object class="GtkLabel">
+            <property name="label" translatable="yes">Define when the current effect settings should be used.</property>
+            <property name="halign">start</property>
+          </object>
+        </child>
+
+        <child>
+          <object class="GtkFrame">
+            <property name="margin-top">5</property>
+            <property name="margin-bottom">15</property>
             <child>
               <object class="GtkListBox">
                 <property name="selection-mode">none</property>
+                <!-- <property name="show-separators">1</property> -->
+                <style>
+                  <class name="rich-list" />
+                </style>
+
+                <child>
+                  <object class="GtkListBoxRow">
+                    <property name="activatable">0</property>
+                    <child>
+                      <object class="GtkBox">
+                        <child>
+                          <object class="GtkLabel">
+                            <property name="label" translatable="yes">Application Name</property>
+                            <property name="xalign">0</property>
+                            <property name="halign">start</property>
+                            <property name="valign">center</property>
+                            <property name="hexpand">1</property>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkBox">
+
+                            <property name="valign">center</property>
+                            <style>
+                              <class name="linked" />
+                            </style>
+
+                            <child>
+                              <object class="GtkEntry" id="profile-app">
+                                <property name="width-request">200</property>
+                              </object>
+                            </child>
+
+                            <child>
+                              <object class="GtkButton" id="profile-choose-app-button">
+                                <property name="valign">center</property>
+                                <child>
+                                  <object class="GtkImage">
+                                    <property name="icon-name">bmw-select-app-symbolic</property>
+                                    <property name="icon-size">1</property>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+
+                <child>
+                  <object class="GtkListBoxRow">
+                    <property name="activatable">0</property>
+                    <child>
+                      <object class="GtkBox">
+                        <child>
+                          <object class="GtkLabel">
+                            <property name="label" translatable="yes">Animation Type</property>
+                            <property name="xalign">0</property>
+                            <property name="halign">start</property>
+                            <property name="valign">center</property>
+                            <property name="hexpand">1</property>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkComboBoxText" id="profile-animation-type">
+                            <property name="width-request">200</property>
+                            <items>
+                              <item translatable="yes">Any</item>
+                              <item translatable="yes">Opening Windows</item>
+                              <item translatable="yes">Closing Windows</item>
+                            </items>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+
+                <child>
+                  <object class="GtkListBoxRow">
+                    <property name="activatable">0</property>
+                    <child>
+                      <object class="GtkBox">
+                        <child>
+                          <object class="GtkLabel">
+                            <property name="label" translatable="yes">Window Type</property>
+                            <property name="xalign">0</property>
+                            <property name="halign">start</property>
+                            <property name="valign">center</property>
+                            <property name="hexpand">1</property>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkComboBoxText" id="profile-window-type">
+                            <property name="width-request">200</property>
+                            <items>
+                              <item translatable="yes">Any</item>
+                              <item translatable="yes">Normal Windows</item>
+                              <item translatable="yes">Dialog Windows</item>
+                            </items>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+
+                <child>
+                  <object class="GtkListBoxRow">
+                    <property name="activatable">0</property>
+                    <child>
+                      <object class="GtkBox">
+                        <child>
+                          <object class="GtkLabel">
+                            <property name="label" translatable="yes">Color Scheme</property>
+                            <property name="xalign">0</property>
+                            <property name="halign">start</property>
+                            <property name="valign">center</property>
+                            <property name="hexpand">1</property>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkComboBoxText" id="profile-color-scheme">
+                            <property name="width-request">200</property>
+                            <items>
+                              <item translatable="yes">Any</item>
+                              <item translatable="yes">Default Color Scheme</item>
+                              <item translatable="yes">Dark Color Scheme</item>
+                            </items>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+
+                <child>
+                  <object class="GtkListBoxRow">
+                    <property name="activatable">0</property>
+                    <child>
+                      <object class="GtkBox">
+                        <child>
+                          <object class="GtkLabel">
+                            <property name="label" translatable="yes">Power Mode</property>
+                            <property name="xalign">0</property>
+                            <property name="halign">start</property>
+                            <property name="valign">center</property>
+                            <property name="hexpand">1</property>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkComboBoxText" id="profile-power-mode">
+                            <property name="width-request">200</property>
+                            <items>
+                              <item translatable="yes">Any</item>
+                              <item translatable="yes">On Battery</item>
+                              <item translatable="yes">Plugged In</item>
+                            </items>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+
+                <child>
+                  <object class="GtkListBoxRow">
+                    <property name="activatable">0</property>
+                    <child>
+                      <object class="GtkBox">
+                        <child>
+                          <object class="GtkLabel">
+                            <property name="label" translatable="yes">Power Profile</property>
+                            <property name="xalign">0</property>
+                            <property name="halign">start</property>
+                            <property name="valign">center</property>
+                            <property name="hexpand">1</property>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkComboBoxText" id="profile-power-profile">
+                            <property name="width-request">200</property>
+                            <items>
+                              <item translatable="yes">Any</item>
+                              <item translatable="yes">Power-Saver Mode</item>
+                              <item translatable="yes">Balanced Mode</item>
+                              <item translatable="yes">Performance Mode</item>
+                              <item translatable="yes">Power Saver or Balanced</item>
+                              <item translatable="yes">Balanced or Performance</item>
+                            </items>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+
+              </object>
+            </child>
+          </object>
+        </child>
+
+        <child>
+          <object class="GtkLabel">
+            <property name="label" translatable="yes">Advanced Profile Options</property>
+            <property name="halign">start</property>
+            <style>
+              <class name="heading" />
+            </style>
+          </object>
+        </child>
+
+        <child>
+          <object class="GtkFrame">
+            <property name="margin-top">5</property>
+            <property name="margin-bottom">15</property>
+            <child>
+              <object class="GtkListBox">
+                <property name="selection-mode">none</property>
+                <!-- <property name="show-separators">1</property> -->
+                <style>
+                  <class name="rich-list" />
+                </style>
 
                 <child>
                   <object class="GtkListBoxRow">
-                <property name="margin-start">10</property>
-                <property name="margin-end">10</property>
-                <property name="margin-top">10</property>
-                <property name="margin-bottom">10</property>
                     <property name="activatable">0</property>
                     <child>
                       <object class="GtkBox">
-                    <property name="spacing">8</property>
                         <child>
                           <object class="GtkBox">
                             <property name="orientation">vertical</property>
                             <property name="spacing">3</property>
                             <child>
                               <object class="GtkLabel">
-                            <property name="label" translatable="yes">Enabled Effects</property>
+                                <property name="label" translatable="yes">High Priority</property>
                                 <property name="xalign">0</property>
                                 <property name="halign">start</property>
                                 <property name="valign">center</property>
@@ -85,11 +381,12 @@ SPDX-License-Identifier: GPL-3.0-or-later
                             </child>
                             <child>
                               <object class="GtkLabel">
-                            <property name="label" translatable="yes">If multiple are selected, one is chosen randomly.</property>
+                                <property name="label" translatable="yes">Force using this profile even if it has less constraints than another matching profile.</property>
                                 <property name="xalign">0</property>
                                 <property name="halign">start</property>
                                 <property name="valign">center</property>
                                 <property name="hexpand">1</property>
+                                <property name="ellipsize">end</property>
                                 <style>
                                   <class name="dim-label" />
                                   <class name="caption" />
@@ -99,24 +396,8 @@ SPDX-License-Identifier: GPL-3.0-or-later
                           </object>
                         </child>
                         <child>
-                      <object class="GtkMenuButton" id="enabled-effects-button">
+                          <object class="GtkSwitch" id="profile-high-priority">
-                        <property name="menu-model">enabled-effects-menu</property>
+                            <property name="valign">center</property>
-                        <child>
-                          <object class="GtkBox">
-                            <property name="spacing">8</property>
-                            <child>
-                              <object class="GtkLabel">
-                                <property name="label" translatable="yes">Choose Effects</property>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkImage">
-                                <property name="icon-name">pan-down-symbolic</property>
-                                <property name="icon-size">1</property>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
                           </object>
                         </child>
                       </object>
@@ -124,142 +405,22 @@ SPDX-License-Identifier: GPL-3.0-or-later
                   </object>
                 </child>
 
+              </object>
+            </child>
+          </object>
+        </child>
+
         <child>
-              <object class="GtkListBoxRow">
+          <object class="GtkButton">
-                <property name="margin-start">10</property>
+            <property name="action-name">prefs.profile-delete</property>
-                <property name="margin-end">10</property>
+            <property name="label" translatable="yes">Delete this Profile...</property>
-                <property name="margin-top">10</property>
-                <property name="margin-bottom">10</property>
-                <property name="activatable">0</property>
-                <child>
-                  <object class="GtkBox">
-                    <property name="spacing">8</property>
-                    <child>
-                      <object class="GtkLabel">
-                        <property name="label" translatable="yes">Also Add Effects to Dialogs</property>
-                        <property name="xalign">0</property>
             <property name="halign">start</property>
-                        <property name="valign">center</property>
-                        <property name="hexpand">1</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkSwitch" id="destroy-dialogs">
-                        <property name="halign">end</property>
-                        <property name="valign">center</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkButton" id="reset-destroy-dialogs">
-                        <child>
-                          <object class="GtkImage">
-                            <property name="icon-name">edit-clear-symbolic</property>
-                            <property name="icon-size">1</property>
-                          </object>
-                        </child>
-                        <property name="tooltip-text" translatable="yes">Reset to Default Value</property>
-                        <style>
-                          <class name="flat" />
-                        </style>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-              </object>
-            </child>
-
-            <child>
-              <object class="GtkListBoxRow">
-                <property name="margin-start">10</property>
-                <property name="margin-end">10</property>
-                <property name="margin-top">10</property>
-                <property name="margin-bottom">10</property>
-                <property name="activatable">0</property>
-                <child>
-                  <object class="GtkBox">
-                    <property name="spacing">8</property>
-                    <child>
-                      <object class="GtkLabel">
-                        <property name="label" translatable="yes">Disable on Battery Power</property>
-                        <property name="xalign">0</property>
-                        <property name="halign">start</property>
-                        <property name="valign">center</property>
-                        <property name="hexpand">1</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkSwitch" id="disable-on-battery">
-                        <property name="halign">end</property>
-                        <property name="valign">center</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkButton" id="reset-disable-on-battery">
-                        <child>
-                          <object class="GtkImage">
-                            <property name="icon-name">edit-clear-symbolic</property>
-                            <property name="icon-size">1</property>
-                          </object>
-                        </child>
-                        <property name="tooltip-text" translatable="yes">Reset to Default Value</property>
-                        <style>
-                          <class name="flat" />
-                        </style>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-              </object>
-            </child>
-
-            <child>
-              <object class="GtkListBoxRow" id="disable-on-power-save-row">
-                <property name="margin-start">10</property>
-                <property name="margin-end">10</property>
-                <property name="margin-top">10</property>
-                <property name="margin-bottom">10</property>
-                <property name="activatable">0</property>
-                <child>
-                  <object class="GtkBox">
-                    <property name="spacing">8</property>
-                    <child>
-                      <object class="GtkLabel">
-                        <property name="label" translatable="yes">Disable in Power-Save Mode</property>
-                        <property name="xalign">0</property>
-                        <property name="halign">start</property>
-                        <property name="valign">center</property>
-                        <property name="hexpand">1</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkSwitch" id="disable-on-power-save">
-                        <property name="halign">end</property>
-                        <property name="valign">center</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkButton" id="reset-disable-on-power-save">
-                        <child>
-                          <object class="GtkImage">
-                            <property name="icon-name">edit-clear-symbolic</property>
-                            <property name="icon-size">1</property>
-                          </object>
-                        </child>
-                        <property name="tooltip-text" translatable="yes">Reset to Default Value</property>
-                        <style>
-                          <class name="flat" />
-                        </style>
-                      </object>
-                    </child>
-                  </object>
-                </child>
           </object>
         </child>
 
       </object>
     </child>
-      </object>
+
-    </child>
   </object>
 
 </interface>

resources/ui/gtk3/tv-glitch.ui

@@ -35,24 +35,14 @@ SPDX-License-Identifier: GPL-3.0-or-later
     <property name="page-increment">0.1</property>
   </object>
 
-  <object class="GtkBox" id="tv-glitch-prefs">
+  <object class="GtkRevealer" id="tv-glitch-prefs">
-    <property name="orientation">vertical</property>
 
-    <child>
-      <object class="GtkFrame">
     <child>
       <object class="GtkListBox">
         <property name="selection-mode">none</property>
-            <style>
-              <class name="rich-list" />
-            </style>
 
         <child>
           <object class="GtkListBoxRow">
-                <property name="margin-start">10</property>
-                <property name="margin-end">10</property>
-                <property name="margin-top">10</property>
-                <property name="margin-bottom">10</property>
             <property name="activatable">0</property>
             <child>
               <object class="GtkBox">
@@ -98,10 +88,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
         <child>
           <object class="GtkListBoxRow">
-                <property name="margin-start">10</property>
-                <property name="margin-end">10</property>
-                <property name="margin-top">10</property>
-                <property name="margin-bottom">10</property>
             <property name="activatable">0</property>
             <child>
               <object class="GtkBox">
@@ -147,10 +133,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
         <child>
           <object class="GtkListBoxRow">
-                <property name="margin-start">10</property>
-                <property name="margin-end">10</property>
-                <property name="margin-top">10</property>
-                <property name="margin-bottom">10</property>
             <property name="activatable">0</property>
             <child>
               <object class="GtkBox">
@@ -196,10 +178,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
         <child>
           <object class="GtkListBoxRow">
-                <property name="margin-start">10</property>
-                <property name="margin-end">10</property>
-                <property name="margin-top">10</property>
-                <property name="margin-bottom">10</property>
             <property name="activatable">0</property>
             <child>
               <object class="GtkBox">
@@ -245,10 +223,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
         <child>
           <object class="GtkListBoxRow">
-                <property name="margin-start">10</property>
-                <property name="margin-end">10</property>
-                <property name="margin-top">10</property>
-                <property name="margin-bottom">10</property>
             <property name="activatable">0</property>
             <child>
               <object class="GtkBox">
@@ -265,6 +239,9 @@ SPDX-License-Identifier: GPL-3.0-or-later
                   <object class="GtkColorButton" id="tv-glitch-color">
                     <property name="use_alpha">1</property>
                     <property name="show_editor">1</property>
+                    <property name="margin-start">8</property>
+                    <property name="margin-end">8</property>
+                    <property name="width-request">250</property>
                   </object>
                 </child>
                 <child>
@@ -288,9 +265,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
       </object>
     </child>
-      </object>
-    </child>
-
 
   </object>
 

resources/ui/gtk3/tv.ui

@@ -14,24 +14,14 @@ SPDX-License-Identifier: GPL-3.0-or-later
     <property name="page-increment">100</property>
   </object>
 
-  <object class="GtkBox" id="tv-prefs">
+  <object class="GtkRevealer" id="tv-prefs">
-    <property name="orientation">vertical</property>
 
-    <child>
-      <object class="GtkFrame">
     <child>
       <object class="GtkListBox">
         <property name="selection-mode">none</property>
-            <style>
-              <class name="rich-list" />
-            </style>
 
         <child>
           <object class="GtkListBoxRow">
-                <property name="margin-start">10</property>
-                <property name="margin-end">10</property>
-                <property name="margin-top">10</property>
-                <property name="margin-bottom">10</property>
             <property name="activatable">0</property>
             <child>
               <object class="GtkBox">
@@ -77,10 +67,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
         <child>
           <object class="GtkListBoxRow">
-                <property name="margin-start">10</property>
-                <property name="margin-end">10</property>
-                <property name="margin-top">10</property>
-                <property name="margin-bottom">10</property>
             <property name="activatable">0</property>
             <child>
               <object class="GtkBox">
@@ -97,6 +83,9 @@ SPDX-License-Identifier: GPL-3.0-or-later
                   <object class="GtkColorButton" id="tv-effect-color">
                     <property name="use_alpha">1</property>
                     <property name="show_editor">1</property>
+                    <property name="margin-start">8</property>
+                    <property name="margin-end">8</property>
+                    <property name="width-request">250</property>
                   </object>
                 </child>
                 <child>
@@ -120,9 +109,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
       </object>
     </child>
-      </object>
-    </child>
-
 
   </object>
 

resources/ui/gtk3/wisps.ui

@@ -21,24 +21,14 @@ SPDX-License-Identifier: GPL-3.0-or-later
     <property name="page-increment">0.1</property>
   </object>
 
-  <object class="GtkBox" id="wisps-prefs">
+  <object class="GtkRevealer" id="wisps-prefs">
-    <property name="orientation">vertical</property>
 
-    <child>
-      <object class="GtkFrame">
     <child>
       <object class="GtkListBox">
         <property name="selection-mode">none</property>
-            <style>
-              <class name="rich-list" />
-            </style>
 
         <child>
           <object class="GtkListBoxRow">
-                <property name="margin-start">10</property>
-                <property name="margin-end">10</property>
-                <property name="margin-top">10</property>
-                <property name="margin-bottom">10</property>
             <property name="activatable">0</property>
             <child>
               <object class="GtkBox">
@@ -84,10 +74,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
         <child>
           <object class="GtkListBoxRow">
-                <property name="margin-start">10</property>
-                <property name="margin-end">10</property>
-                <property name="margin-top">10</property>
-                <property name="margin-bottom">10</property>
             <property name="activatable">0</property>
             <child>
               <object class="GtkBox">
@@ -133,10 +119,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
         <child>
           <object class="GtkListBoxRow">
-                <property name="margin-start">10</property>
-                <property name="margin-end">10</property>
-                <property name="margin-top">10</property>
-                <property name="margin-bottom">10</property>
             <property name="activatable">0</property>
             <child>
               <object class="GtkBox">
@@ -153,6 +135,9 @@ SPDX-License-Identifier: GPL-3.0-or-later
                   <object class="GtkColorButton" id="wisps-color">
                     <property name="use_alpha">0</property>
                     <property name="show_editor">1</property>
+                    <property name="margin-start">8</property>
+                    <property name="margin-end">8</property>
+                    <property name="width-request">250</property>
                   </object>
                 </child>
                 <child>
@@ -176,9 +161,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
       </object>
     </child>
-      </object>
-    </child>
-
 
   </object>