diff --git a/prefs.js b/prefs.js
index 786ab93..eb67d49 100644
--- a/prefs.js
+++ b/prefs.js
@@ -1,42 +1,51 @@
-// Settings Menu for Simple-Tiling
+// ------------------------------------------------------ //
+// Extension Settings Menu for Simple Tiling - Version 2  //
+// © 2025 domoel – MIT                                    //
+// ------------------------------------------------------ //
 
+// ---------------------------------------------------- //
+// Global Imports                                       //
+// ---------------------------------------------------- //
 'use strict';
 
-const { Gtk, GObject } = imports.gi;
+const { Gtk, GObject, Gio } = imports.gi;
 const ExtensionUtils = imports.misc.extensionUtils;
 
-const COLUMN_ID = 0;       // z.B. 'swap-master-window'
-const COLUMN_DESC = 1;     // z.B. 'Master-Fenster tauschen'
-const COLUMN_KEY = 2;      // Der Key-Code (eine Zahl)
-const COLUMN_MODS = 3;     // Die Modifier-Maske (eine Zahl)
+const SCHEMA_NAME = 'org.gnome.shell.extensions.simple-tiling.domoel';
+
+// ---------------------------------------------------- //
+// Definition of Row Model                              //
+// ---------------------------------------------------- //
+const COLUMN_ID = 0;
+const COLUMN_DESC = 1;
+const COLUMN_KEY = 2;
+const COLUMN_MODS = 3;
 
 function init() {}
 
 function buildPrefsWidget() {
-    const settings = ExtensionUtils.getSettings('org.gnome.shell.extensions.simple-tiling.domoel');
-
+    const settings = ExtensionUtils.getSettings(SCHEMA_NAME);
+    
     const prefsWidget = new Gtk.Box({
         orientation: Gtk.Orientation.VERTICAL,
-        margin: 20,
-        spacing: 12,
-        visible: true
+        margin_top: 20,
+        margin_bottom: 20,
+        margin_start: 20,
+        margin_end: 20,
+        spacing: 18,
+        visible: true,
     });
-
-    const title = new Gtk.Label({
-        label: '<b>Tastenkürzel für Simple-Tiling</b>',
-        use_markup: true,
-        halign: Gtk.Align.START,
-        visible: true
-    });
-    prefsWidget.add(title);
-
+    
+    // ---------------------------------------------------- //
+    // Section for Keybindings                              //
+    // ---------------------------------------------------- //
+    const keysTitle = new Gtk.Label({ label: '<b>Tastenkürzel</b>', use_markup: true, halign: Gtk.Align.START, visible: true });
+    const keysFrame = new Gtk.Frame({ label_widget: keysTitle, shadow_type: Gtk.ShadowType.NONE, visible: true });
+    let keysBox = new Gtk.Box({ orientation: Gtk.Orientation.VERTICAL, margin: 12, spacing: 6, visible: true });
+    keysFrame.add(keysBox);
+    
     let store = new Gtk.ListStore();
-    store.set_column_types([
-        GObject.TYPE_STRING, // COLUMN_ID
-        GObject.TYPE_STRING, // COLUMN_DESC
-        GObject.TYPE_INT,    // COLUMN_KEY
-        GObject.TYPE_INT,    // COLUMN_MODS
-    ]);
+    store.set_column_types([ GObject.TYPE_STRING, GObject.TYPE_STRING, GObject.TYPE_INT, GObject.TYPE_INT ]);
 
     addKeybinding(store, settings, 'swap-master-window', 'Master-Fenster tauschen');
     addKeybinding(store, settings, 'swap-left-window', 'Fenster nach links tauschen');
@@ -44,12 +53,8 @@ function buildPrefsWidget() {
     addKeybinding(store, settings, 'swap-up-window', 'Fenster nach oben tauschen');
     addKeybinding(store, settings, 'swap-down-window', 'Fenster nach unten tauschen');
     
-    let treeView = new Gtk.TreeView({
-        model: store,
-        headers_visible: false,
-        hexpand: true,
-        visible: true
-    });
+    let treeView = new Gtk.TreeView({ model: store, headers_visible: false, hexpand: true, visible: true });
+    keysBox.add(treeView);
 
     let descRenderer = new Gtk.CellRendererText();
     let descColumn = new Gtk.TreeViewColumn({ expand: true });
@@ -57,24 +62,17 @@ function buildPrefsWidget() {
     descColumn.add_attribute(descRenderer, 'text', COLUMN_DESC);
     treeView.append_column(descColumn);
 
-    let accelRenderer = new Gtk.CellRendererAccel({
-        'accel-mode': Gtk.CellRendererAccelMode.GTK,
-        'editable': true
-    });
+    let accelRenderer = new Gtk.CellRendererAccel({ 'accel-mode': Gtk.CellRendererAccelMode.GTK, 'editable': true });
     let accelColumn = new Gtk.TreeViewColumn();
     accelColumn.pack_end(accelRenderer, false);
     accelColumn.add_attribute(accelRenderer, 'accel-key', COLUMN_KEY);
     accelColumn.add_attribute(accelRenderer, 'accel-mods', COLUMN_MODS);
     treeView.append_column(accelColumn);
     
-    prefsWidget.add(treeView);
-
     accelRenderer.connect('accel-edited', (renderer, path_string, key, mods, hw_code) => {
         let [ok, iter] = store.get_iter_from_string(path_string);
         if (!ok) return;
-
         store.set(iter, [COLUMN_KEY, COLUMN_MODS], [key, mods]);
-
         let id = store.get_value(iter, COLUMN_ID);
         let accelString = Gtk.accelerator_name(key, mods);
         settings.set_strv(id, [accelString]);
@@ -83,26 +81,56 @@ function buildPrefsWidget() {
     accelRenderer.connect('accel-cleared', (renderer, path_string) => {
         let [ok, iter] = store.get_iter_from_string(path_string);
         if (!ok) return;
-
         store.set(iter, [COLUMN_KEY, COLUMN_MODS], [0, 0]);
         let id = store.get_value(iter, COLUMN_ID);
         settings.set_strv(id, []);
     });
 
+    prefsWidget.add(keysFrame);
+    
+    
+    // ---------------------------------------------------- //
+    // Section for Window Gaps                              //
+    // ---------------------------------------------------- //
+    const gapsTitle = new Gtk.Label({ label: '<b>Fensterabstände (Gaps)</b>', use_markup: true, halign: Gtk.Align.START, visible: true });
+    const gapsFrame = new Gtk.Frame({ label_widget: gapsTitle, shadow_type: Gtk.ShadowType.NONE, visible: true });
+    const gapsGrid = new Gtk.Grid({ margin: 12, column_spacing: 12, row_spacing: 12, visible: true });
+    gapsFrame.add(gapsGrid);
+
+    addSpinButtonRow(gapsGrid, settings, "Innerer Abstand (zwischen Fenstern)", "inner-gap", 0);
+    addSpinButtonRow(gapsGrid, settings, "Äußerer Abstand (horizontal)", "outer-gap-horizontal", 1);
+    addSpinButtonRow(gapsGrid, settings, "Äußerer Abstand (vertikal)", "outer-gap-vertical", 2);
+
+    prefsWidget.add(gapsFrame);
+    
     return prefsWidget;
 }
 
 function addKeybinding(model, settings, id, description) {
     let [key, mods] = [0, 0];
-    
     const strv = settings.get_strv(id);
     if (strv && strv.length > 0 && strv[0]) {
         [key, mods] = Gtk.accelerator_parse(strv[0]);
     }
-
     let iter = model.append();
     model.set(iter, 
         [COLUMN_ID, COLUMN_DESC, COLUMN_KEY, COLUMN_MODS], 
         [id, description, key, mods]
     );
 }
+
+function addSpinButtonRow(grid, settings, description, key, position) {
+    const label = new Gtk.Label({ label: description, halign: Gtk.Align.START, visible: true });
+    grid.attach(label, 0, position, 1, 1);
+
+    const adjustment = new Gtk.Adjustment({ lower: 0, upper: 50, step_increment: 1 });
+    const spinButton = new Gtk.SpinButton({
+        adjustment: adjustment,
+        climb_rate: 1,
+        digits: 0,
+        halign: Gtk.Align.END,
+        visible: true,
+    });
+    settings.bind(key, spinButton, 'value', Gio.SettingsBindFlags.DEFAULT);
+    grid.attach(spinButton, 1, position, 1, 1);
+}