diff --git a/resources/ui/gtk3.ui b/resources/ui/gtk3.ui
index b45ec41..6aede43 100644
--- a/resources/ui/gtk3.ui
+++ b/resources/ui/gtk3.ui
@@ -2,6 +2,23 @@
 <interface domain="desktop-cube">
   <requires lib="gtk" version="3.0" />
 
+  <object class="GtkListStore" id="animation-mode-list">
+    <columns>
+      <column type="gchararray" />
+      <column type="gchararray" />
+    </columns>
+    <data>
+      <row>
+        <col id="0">Fire</col>
+        <col id="1">fire</col>
+      </row>
+      <row>
+        <col id="0">Matrix</col>
+        <col id="1">matrix</col>
+      </row>
+    </data>
+  </object>
+
   <object class="GtkAdjustment" id="destroy-animation-time">
     <property name="upper">10000</property>
     <property name="lower">500</property>
@@ -23,6 +40,20 @@
     <property name="page-increment">0.1</property>
   </object>
 
+  <object class="GtkAdjustment" id="matrix-scale">
+    <property name="upper">50</property>
+    <property name="lower">5</property>
+    <property name="step-increment">1</property>
+    <property name="page-increment">5</property>
+  </object>
+
+  <object class="GtkAdjustment" id="matrix-randomness">
+    <property name="upper">1</property>
+    <property name="lower">0</property>
+    <property name="step-increment">0.01</property>
+    <property name="page-increment">0.1</property>
+  </object>
+
   <object class="GtkScrolledWindow" id="settings-widget">
     <property name="hscrollbar-policy">never</property>
     <property name="min-content-height">200</property>
@@ -57,6 +88,48 @@
                   <object class="GtkListBox">
                     <property name="selection-mode">none</property>
 
+                    <child>
+                      <object class="GtkListBoxRow">
+                        <property name="activatable">0</property>
+                        <child>
+                          <object class="GtkBox">
+                            <child>
+                              <object class="GtkLabel">
+                                <property name="label" translatable="yes">Close Window Animation</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="GtkComboBox" id="close-animation">
+                                <property name="valign">center</property>
+                                <property name="model">animation-mode-list</property>
+                                <property name="id_column">1</property>
+                                <property name="active_id">fire</property>
+                                <child>
+                                  <object class="GtkCellRendererText" />
+                                  <attributes>
+                                    <attribute name="text">0</attribute>
+                                  </attributes>
+                                </child>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkButton" id="reset-close-animation">
+                                <property name="icon-name">edit-clear-symbolic</property>
+                                <property name="tooltip-text">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>
@@ -171,7 +244,7 @@
                             <property name="spacing">8</property>
                             <child>
                               <object class="GtkLabel">
-                                <property name="label" translatable="yes">Flame Scale</property>
+                                <property name="label" translatable="yes">Scale</property>
                                 <property name="xalign">0</property>
                                 <property name="halign">start</property>
                                 <property name="valign">center</property>
@@ -220,7 +293,7 @@
                             <property name="spacing">8</property>
                             <child>
                               <object class="GtkLabel">
-                                <property name="label" translatable="yes">Flame Movement Speed</property>
+                                <property name="label" translatable="yes">Speed</property>
                                 <property name="xalign">0</property>
                                 <property name="halign">start</property>
                                 <property name="valign">center</property>
@@ -270,7 +343,7 @@
                             <property name="spacing">8</property>
                             <child>
                               <object class="GtkLabel">
-                                <property name="label" translatable="yes">Fire Gradient</property>
+                                <property name="label" translatable="yes">Gradient</property>
                                 <property name="xalign">0</property>
                                 <property name="halign">start</property>
                                 <property name="valign">center</property>
@@ -332,6 +405,226 @@
               </object>
             </child>
 
+            <child>
+              <object class="GtkBox">
+                <property name="margin-top">30</property>
+                <property name="margin-bottom">10</property>
+                <child>
+                  <object class="GtkLabel">
+                    <property name="label">Matrix Options</property>
+                    <property name="xalign">0</property>
+                    <property name="hexpand">1</property>
+                    <style>
+                      <class name="title-4" />
+                    </style>
+                  </object>
+                </child>
+              </object>
+            </child>
+
+            <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">
+                            <property name="spacing">8</property>
+                            <child>
+                              <object class="GtkLabel">
+                                <property name="label" translatable="yes">Scale</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="GtkScale">
+                                <property name="halign">end</property>
+                                <property name="valign">center</property>
+                                <property name="draw-value">1</property>
+                                <property name="digits">0</property>
+                                <property name="value-pos">left</property>
+                                <property name="width-request">300</property>
+                                <property name="adjustment">matrix-scale</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkButton" id="reset-matrix-scale">
+                                <child>
+                                  <object class="GtkImage">
+                                    <property name="icon-name">edit-clear-symbolic</property>
+                                    <property name="icon-size">1</property>
+                                  </object>
+                                </child>
+                                <property name="tooltip-text">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">Randomness</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="GtkScale">
+                                <property name="halign">end</property>
+                                <property name="valign">center</property>
+                                <property name="draw-value">1</property>
+                                <property name="digits">2</property>
+                                <property name="value-pos">left</property>
+                                <property name="width-request">300</property>
+                                <property name="adjustment">matrix-randomness</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkButton" id="reset-matrix-randomness">
+                                <child>
+                                  <object class="GtkImage">
+                                    <property name="icon-name">edit-clear-symbolic</property>
+                                    <property name="icon-size">1</property>
+                                  </object>
+                                </child>
+                                <property name="tooltip-text">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">Trail Color</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="GtkColorButton" id="matrix-trail-color">
+                                <property name="use_alpha">1</property>
+                                <property name="show_editor">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkButton" id="reset-matrix-trail-color">
+                                <child>
+                                  <object class="GtkImage">
+                                    <property name="icon-name">edit-clear-symbolic</property>
+                                    <property name="icon-size">1</property>
+                                  </object>
+                                </child>
+                                <property name="tooltip-text">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">Tip Color</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="GtkColorButton" id="matrix-tip-color">
+                                <property name="use_alpha">1</property>
+                                <property name="show_editor">1</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkButton" id="reset-matrix-tip-color">
+                                <child>
+                                  <object class="GtkImage">
+                                    <property name="icon-name">edit-clear-symbolic</property>
+                                    <property name="icon-size">1</property>
+                                  </object>
+                                </child>
+                                <property name="tooltip-text">Reset to Default Value</property>
+                                <style>
+                                  <class name="flat" />
+                                </style>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+
+
+                  </object>
+                </child>
+              </object>
+            </child>
+
           </object>
         </child>
       </object>
diff --git a/resources/ui/gtk4.ui b/resources/ui/gtk4.ui
index 0073722..cc4d4b5 100644
--- a/resources/ui/gtk4.ui
+++ b/resources/ui/gtk4.ui
@@ -193,7 +193,7 @@
                           <object class="GtkBox">
                             <child>
                               <object class="GtkLabel">
-                                <property name="label" translatable="yes">Flame Scale</property>
+                                <property name="label" translatable="yes">Scale</property>
                                 <property name="xalign">0</property>
                                 <property name="halign">start</property>
                                 <property name="valign">center</property>
@@ -239,7 +239,7 @@
                           <object class="GtkBox">
                             <child>
                               <object class="GtkLabel">
-                                <property name="label" translatable="yes">Flame Movement Speed</property>
+                                <property name="label" translatable="yes">Speed</property>
                                 <property name="xalign">0</property>
                                 <property name="halign">start</property>
                                 <property name="valign">center</property>
@@ -285,7 +285,7 @@
                           <object class="GtkBox">
                             <child>
                               <object class="GtkLabel">
-                                <property name="label" translatable="yes">Fire Gradient</property>
+                                <property name="label" translatable="yes">Gradient</property>
                                 <property name="xalign">0</property>
                                 <property name="halign">start</property>
                                 <property name="valign">center</property>
@@ -376,7 +376,7 @@
                           <object class="GtkBox">
                             <child>
                               <object class="GtkLabel">
-                                <property name="label" translatable="yes">Matrix Scale</property>
+                                <property name="label" translatable="yes">Scale</property>
                                 <property name="xalign">0</property>
                                 <property name="halign">start</property>
                                 <property name="valign">center</property>
@@ -396,7 +396,7 @@
                                     <property name="upper">50</property>
                                     <property name="lower">5</property>
                                     <property name="step-increment">1</property>
-                                    <property name="page-increment">4</property>
+                                    <property name="page-increment">5</property>
                                   </object>
                                 </property>
                               </object>
@@ -422,7 +422,7 @@
                           <object class="GtkBox">
                             <child>
                               <object class="GtkLabel">
-                                <property name="label" translatable="yes">Matrix Randomness</property>
+                                <property name="label" translatable="yes">Randomness</property>
                                 <property name="xalign">0</property>
                                 <property name="halign">start</property>
                                 <property name="valign">center</property>
@@ -482,7 +482,7 @@
                               </object>
                             </child>
                             <child>
-                              <object class="GtkButton" id="reset-matrix-trail-colors">
+                              <object class="GtkButton" id="reset-matrix-trail-color">
                                 <property name="icon-name">edit-clear-symbolic</property>
                                 <property name="tooltip-text">Reset to Default Value</property>
                                 <style>
@@ -516,7 +516,7 @@
                               </object>
                             </child>
                             <child>
-                              <object class="GtkButton" id="reset-matrix-tip-colors">
+                              <object class="GtkButton" id="reset-matrix-tip-color">
                                 <property name="icon-name">edit-clear-symbolic</property>
                                 <property name="tooltip-text">Reset to Default Value</property>
                                 <style>