Update interim.js

added 

- make build-legacy-go   # Legacy-Ordner direkt nach ~/.local/…/extensions
- make build-modern-go   # Modern-Ordner direkt nach ~/.local/…/extensions

.gitignore

@@ -1,6 +0,0 @@
-# GNOME Shell Extension specific
-schemas/gschemas.compiled
-
-# Common temporary files
-*~
-*.swp

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2025 Dome
+Copyright (c) 2025 Domoel (https://github.com/Domoel/)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Makefile

@@ -0,0 +1,119 @@
+###############################################################################
+# Simple-Tiling – Makefile
+#
+#  make build            → Erzeugt alle drei Versionen als Archivdatei
+#  make build-legacy     → Erzeugt Legacy-ZIP (Shell 3.38)
+#  make build-interim    → Erzeugt Interim-ZIP (Shell 40-44)
+#  make build-modern     → Erzeugt Modern-ZIP (Shell 45+)
+#  make install-legacy   → Installiert Legacy Extension
+#  make install-interim  → Installiert Interim Extension
+#  make install-modern   → Installiert Modern Extension
+#  make clean            → Bereinigt das Ausgangsverzeichnis
+###############################################################################
+
+UUID     := simple-tiling@domoel
+VERSION  := 7.2
+EXTDIR   := $(HOME)/.local/share/gnome-shell/extensions
+
+COMMON_FILES   := prefs.js schemas exceptions.txt locale *.css README.md LICENSE
+LEGACY_PREFS   := prefs_legacy.js
+INTERIM_PREFS  := prefs_interim.js
+MODERN_PREFS   := prefs_modern.js
+
+###############################################################################
+# Helper: copies <file list> <dest>
+###############################################################################
+define copies
+    @for f in $(1) ; do \
+        if [ -e $$f ] ; then \
+            cp -r $$f $(2)/ ; \
+        fi ; \
+    done
+endef
+
+.PHONY: build build-legacy build-interim build-modern \
+        install-legacy install-interim install-modern clean
+
+build: build-legacy build-interim build-modern
+
+###############################################################################
+# Erzeugt Legacy-ZIP (Shell 3.38)
+###############################################################################
+build-legacy:
+	@echo "==> Building LEGACY zip (for GNOME 3.38)..."
+	@rm -rf build && mkdir -p build/$(UUID)
+	$(call copies,$(COMMON_FILES),build/$(UUID))
+	@glib-compile-schemas build/$(UUID)/schemas
+	@cp legacy.js       build/$(UUID)/extension.js
+	@cp $(LEGACY_PREFS)  build/$(UUID)/prefs.js
+	@sed -e "s/__UUID__/$(UUID)/g" \
+	     -e "s/__VERSION__/$(VERSION)/g" \
+	     metadata_legacy.json.in > build/$(UUID)/metadata.json
+	@cd build && zip -qr ../$(UUID)-legacy-v$(VERSION).zip .
+	@rm -rf build
+	@echo "✓  $(UUID)-legacy-v$(VERSION).zip created"
+
+###############################################################################
+# Erzeugt Interim-ZIP (Shell 40-44)
+###############################################################################
+build-interim:
+	@echo "==> Building INTERIM zip (for GNOME 40-44)..."
+	@rm -rf build && mkdir -p build/$(UUID)
+	$(call copies,$(COMMON_FILES),build/$(UUID))
+	@glib-compile-schemas build/$(UUID)/schemas
+	@cp interim.js       build/$(UUID)/extension.js
+	@cp $(INTERIM_PREFS) build/$(UUID)/prefs.js
+	@sed -e "s/__UUID__/$(UUID)/g" \
+	     -e "s/__VERSION__/$(VERSION)/g" \
+	     metadata_interim.json.in > build/$(UUID)/metadata.json
+	@cd build && zip -qr ../$(UUID)-interim-v$(VERSION).zip .
+	@rm -rf build
+	@echo "✓  $(UUID)-interim-v$(VERSION).zip created"
+
+###############################################################################
+# Erzeugt Modern-ZIP (Shell 45+)
+###############################################################################
+build-modern:
+	@echo "==> Building MODERN zip (for GNOME 45+)..."
+	@rm -rf build && mkdir -p build/$(UUID)
+	$(call copies,$(COMMON_FILES),build/$(UUID))
+	@glib-compile-schemas build/$(UUID)/schemas
+	@cp modern.js       build/$(UUID)/extension.js
+	@cp $(MODERN_PREFS)  build/$(UUID)/prefs.js
+	@sed -e "s/__UUID__/$(UUID)/g" \
+	     -e "s/__VERSION__/$(VERSION)/g" \
+	     metadata_modern.json.in > build/$(UUID)/metadata.json
+	@cd build && zip -qr ../$(UUID)-modern-v$(VERSION).zip .
+	@rm -rf build
+	@echo "✓  $(UUID)-modern-v$(VERSION).zip created"
+
+###############################################################################
+# Installiert die verschiedenen Versionen
+###############################################################################
+install-legacy: build-legacy
+	@echo "==> Installing LEGACY Extension..."
+	@rm -rf $(EXTDIR)/$(UUID)
+	@unzip -q $(UUID)-legacy-v$(VERSION).zip -d $(EXTDIR)
+	@rm -f $(UUID)-legacy-v$(VERSION).zip
+	@echo "✓  Legacy Extension installed to $(EXTDIR)/$(UUID). Restart GNOME Shell to apply."
+
+install-interim: build-interim
+	@echo "==> Installing INTERIM Extension..."
+	@rm -rf $(EXTDIR)/$(UUID)
+	@unzip -q $(UUID)-interim-v$(VERSION).zip -d $(EXTDIR)
+	@rm -f $(UUID)-interim-v$(VERSION).zip
+	@echo "✓  Interim Extension installed to $(EXTDIR)/$(UUID). Restart GNOME Shell to apply."
+
+install-modern: build-modern
+	@echo "==> Installing MODERN Extension..."
+	@rm -rf $(EXTDIR)/$(UUID)
+	@unzip -q $(UUID)-modern-v$(VERSION).zip -d $(EXTDIR)
+	@rm -f $(UUID)-modern-v$(VERSION).zip
+	@echo "✓  Modern Extension installed to $(EXTDIR)/$(UUID). Restart GNOME Shell to apply."
+
+###############################################################################
+# Bereinigt das Ausgangsverzeichnis
+###############################################################################
+clean:
+	@rm -f $(UUID)-*.zip
+	@echo "Build directory and ZIPs removed."

README.md

@@ -4,12 +4,11 @@ Simple Tiling
 </span>
 <h4 align="center">
 <span style="display:inline-flex; align-items:center; gap:12px;">
-A lightweight, opinionated, and automatic tiling window manager for GNOME Shell 3.38.
+A lightweight, opinionated, and automatic tiling window manager for GNOME Shell
 </span>
 <p>
 
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
-![GNOME Shell Version](https://img.shields.io/badge/GNOME%20Shell-3.38-blue)
 
 <img width="2560" height="1440" alt="Simple-Tiling-v6" src="https://github.com/user-attachments/assets/eb0f7cc3-6a5a-4036-8a1e-8f945c52e55c" />
 
@@ -17,7 +16,7 @@ A lightweight, opinionated, and automatic tiling window manager for GNOME Shell
 
 Simple Tiling is a GNOME Shell extension created for users who want a clean, predictable, and automatic tiling layout without the complexity of larger, more feature-heavy tiling extensions. It is designed to be simple to configure and intuitive to use, focusing on a core set of essential tiling features.
 
-This extension was built from the ground up to be stable and performant on **GNOME Shell 3.38**.
+This extension was built from the ground up to be stable and performant on **GNOME Shell 3.38**. However it is now also supporting modern gnome shells up to **version 48**.
 
 ## Features
 
@@ -30,16 +29,16 @@ This extension was built from the ground up to be stable and performant on **GNO
     * **Keyboard Shortcuts:** A full set of keyboard shortcuts allows you to swap the focused window with the master or with its nearest neighbor in any direction (left, right, up, down).
 * **Interactive Window Focus Switcher:** Change the current window focus with a set of customizable keyboard shortcuts in every direction (left, right, up, down).
 * **Simple Settings Panel:** A simple settings panel within the gnome extension manager menu to adjust key bindings, window gaps / margins and window behavior.
-* **External Exception List:** Use a simple `exceptions.txt` file to list applications (by their `WM_CLASS`) that should be ignored by the tiling manager.
+* **External Exception List:** Use a simple `exceptions.txt` file to list applications (by their `WM_CLASS` or `App ID`) that should be ignored by the tiling manager.
 * **Smart Pop-up Handling:** Windows on the exception list, as well as dialogs and other pop-ups, are automatically centered and kept "always on top" for a smooth workflow.
 * **Configurable Tiling Window Delays:** Easily configure the tiling window delays if you have race condition issues by editing variables directly in the `extension.js`.
 
 ## Requirements
 
-Please note that this extension has been developed for a very specific environment:
+Please note that this extension has been developed for a very specific environment. However, with the latest updates, I have ensured that modern Gnome Shells and Wayland are also supported.
 
-* **GNOME Shell Version:** **3.38**
-* **Session Type:** **X11** (Wayland is not supported).
+* **GNOME Shell Version:** **3.38 - 48**
+* **Session Type:** **X11** (Wayland is still in beta but should be fine!).
 * **Monitor Setup:** **Single monitor only.** Multi-monitor support is not yet implemented.
 
 ## Installation
@@ -50,17 +49,32 @@ Use the [GNOME Shell Extensions website](https://extensions.gnome.org/extension/
 
 #### Manual Installation
 
-1.  **Clone the repository** into your local extensions directory:
+The repository includes a Makefile that produces ready‑to‑install ZIP packages for the three supported Gnome‑Shell lines (a legacy build for Gnome-Shell 3.38, an interim build for Gnome-Shell 40 - 44 and a modern build for Gnome-Shell 45+).
+
+1. **Clone the Source**
    ```bash
    git clone https://github.com/Domoel/Simple-Tiling.git
+   cd Simple-Tiling
    ```
-2.  **Compile the GSettings schema.** This is a mandatory step for the keyboard shortcuts to work.
+
+2. **Install the package that matches your GNOME-Shell version**
+
+   Open the Terminal within the Simple-Tiling directory and run
    ```bash
-    cd ~/.local/share/gnome-shell/extensions/simple-tiling@domoel/
-    glib-compile-schemas schemas/
+   make install-legacy        # Installs Legacy Extension (Gnome-Shell 3.38)
+   make install-interim       # Installs Interim Extension (Gnome-Shell 40 - 44)
+   make install-modern        # Installs Modern Extension (Gnome-Shell 45+)
+   ```
+   **Note:** This command will directly install the extension in the choosen variant (legacy, interim or modern). If you want to manually create and upload the extension to your gnome extensions directory `(~/.local/share/gnome-shell/extensions)` you can just run `make build` to create all versions as .zip or `make build-legacy`, `make build-interim` or `make build-modern` to create them seperately as .zip. To enable them you need to unzip these archives and put them into your extensions directory.
+
+4.  **Reload the shell**
+    ```bash
+    Press Alt + F2, type  r , hit ↩   (works for X11 and Wayland)
+    ```
+5.  **Clean up (optional)**
+    ```bash
+    make clean        # perform this command in the downloaded folder to remove builds and generated ZIPs
     ```
-3.  **Restart GNOME Shell.** Press `Alt` + `F2`, type `r`, and press `Enter`.
-4.  **Enable the extension** using the GNOME Extensions app or GNOME Tweaks.
 
 ## Configuration
 
@@ -74,13 +88,13 @@ All keyboard shortcuts can be configured through the Settings panel of Simple Ti
 
 #### Ignoring Applications (`exceptions.txt`)
 
-To prevent an application from being tiled, you can add its `WM_CLASS` to the `exceptions.txt` file in the extension's directory.
+To prevent an application from being tiled, you can add its `WM_CLASS` (x11) or `App ID` (Wayland) to the `exceptions.txt` file in the extension's directory.
 
-* Each application's `WM_CLASS` should be on a new line.
+* Each application's `WM_CLASS` or `App ID` should be on a new line.
 * Lines starting with `#` are treated as comments and are ignored.
 * The check is case-insensitive.
 
-To find an application's `WM_CLASS`, open a terminal and run the command `xprop WM_CLASS`. Your cursor will turn into a crosshair. Click on the window of the application you want to exclude. 
+To find an application's `WM_CLASS`, open a terminal and run the command `xprop WM_CLASS`. Your cursor will turn into a crosshair. Click on the window of the application you want to exclude. To find the `App ID`, Press Alt + F2, type 'lg', and press Enter. In the Looking Glass window, click the "Windows" tab. Click on the desired window to see its details. Find the value for "app id" and add it to a new line below.
 
 An Example of an exceptions.txt can be found in the repo.
 
@@ -102,7 +116,6 @@ If you have race condition issues between mutter (Gnome WM) and the Simple Tilin
 
 This extension was built to solve a specific need. However, future enhancements could include:
 * Multi-monitor support.
-* Support for newer Gnome shells
 * Additional layout algorithms.
 * A more detailed settings panel to configure other options via a GUI.
 

exceptions.txt

@@ -1,13 +1,35 @@
 # --- Exception List for Tiling Windows ---
-# Each line contains the WM_CLASS of an application that should be ignored.
+# Each line contains an application identifier (WM_CLASS for X11, or App ID for Wayland)
+# that should be ignored by the tiling manager.
+# For best results, add both identifiers for an application if they differ.
 # Uppercase and lowercase letters are ignored.
 
-# Command to find WM_CLASS:
-# 1. Open Terminal
-# 2. Type ‘xprop WM_CLASS’ and press Enter.
-# 3. Click on the desired window with your mouse.
+# -----------------------------------------------------------
+# Finding the App ID (for Wayland & modern apps)
+# -----------------------------------------------------------
+# 1. Press Alt + F2, type 'lg', and press Enter.
+# 2. In the Looking Glass window, click the "Windows" tab.
+# 3. Click on the desired window to see its details.
+# 4. Find the value for "app id" and add it to a new line below.
 
+# -----------------------------------------------------------
+# Finding the WM_CLASS (for X11)
+# -----------------------------------------------------------
+# 1. Open a terminal.
+# 2. Type 'xprop WM_CLASS' and press Enter.
+# 3. Your cursor will turn into a crosshair. Click on the desired window.
+# 4. The terminal will output a line like: WM_CLASS(STRING) = "navigator", "Firefox".
+# 5. Add one of these values (e.g., "firefox") to a new line below.
+
+# --- Start of the Exception List ---
+
+ulauncher
+steam
+element
+totem
 extension-manager
+timeshift-gtk
 gnome-screenshot
 org.gnome.NautilusPreviewer
 org.gnome.Shell.Extensions
+evolution-alarm-notify

interim.js

@@ -0,0 +1,605 @@
+///////////////////////////////////////////////////////////////
+//      Simple‑Tiling – MODERN (GNOME Shell 40 - 44)         //
+//               © 2025 domoel – MIT                         //
+/////////////////////////////////////////////////////////////
+
+
+// ── GLOBAL IMPORTS ────────────────────────────────────────
+import { Extension } from "resource:///org/gnome/shell/extensions/js/extensions/extension.js";
+import * as Main from "resource:///org/gnome/shell/ui/main.js";
+import Meta from "gi://Meta";
+import Shell from "gi://Shell";
+import Gio from "gi://Gio";
+import GLib from "gi://GLib";
+
+// ── CONST ────────────────────────────────────────────
+const WM_SCHEMA          = 'org.gnome.desktop.wm.keybindings';
+
+const TILING_DELAY_MS    = 20;   // Change Tiling Window Delay
+const CENTERING_DELAY_MS = 5;    // Change Centered Window Delay
+
+const KEYBINDINGS = {
+    'swap-master-window': (self) => self._swapWithMaster(),
+    'swap-left-window':   (self) => self._swapInDirection('left'),
+    'swap-right-window':  (self) => self._swapInDirection('right'),
+    'swap-up-window':     (self) => self._swapInDirection('up'),
+    'swap-down-window':   (self) => self._swapInDirection('down'),
+    'focus-left':         (self) => self._focusInDirection('left'),
+    'focus-right':        (self) => self._focusInDirection('right'),
+    'focus-up':           (self) => self._focusInDirection('up'),
+    'focus-down':         (self) => self._focusInDirection('down'),
+};
+
+// ── HELPER‑FUNCTION ────────────────────────────────────────
+function getPointerXY() {
+    if (global.get_pointer) {
+        const [x, y] = global.get_pointer();
+        return [x, y];
+    }
+
+    const ev = Clutter.get_current_event();
+    if (ev) {
+        const coords = ev.get_coords();
+        if (Array.isArray(coords)) 
+            return coords;
+    }
+
+    const device = Clutter.get_default_backend()
+                          .get_default_seat()
+                          .get_pointer();
+    return device ? device.get_position() : [0, 0];
+}
+
+// ── INTERACTIONHANDLER ───────────────────────────────────
+class InteractionHandler {
+    constructor(tiler) {
+        this.tiler              = tiler;
+        this._settings          = this.tiler.settings;
+        this._wmSettings        = new Gio.Settings({ schema: WM_SCHEMA });
+
+        this._wmKeysToDisable   = [];
+        this._savedWmShortcuts  = {};
+        this._grabOpIds         = [];
+        this._settingsChangedId = null;
+    }
+
+    enable() {
+        this._prepareWmShortcuts();
+
+        if (this._wmKeysToDisable.length)
+            this._wmKeysToDisable.forEach(k =>
+                this._wmSettings.set_value(k, new GLib.Variant('as', [])));
+
+        this._bindAllShortcuts();
+        this._settingsChangedId =
+            this._settings.connect('changed', () => this._onSettingsChanged());
+
+        this._grabOpIds.push(
+            global.display.connect('grab-op-begin',
+                (_, __, win) => { if (this.tiler.windows.includes(win))
+                                      this.tiler.grabbedWindow = win; })
+        );
+        this._grabOpIds.push(
+            global.display.connect('grab-op-end', () => this._onGrabEnd())
+        );
+    }
+
+    disable() {
+        if (this._wmKeysToDisable.length)
+            this._wmKeysToDisable.forEach(k =>
+                this._wmSettings.set_value(k, this._savedWmShortcuts[k]));
+
+        this._unbindAllShortcuts();
+
+        if (this._settingsChangedId) {
+            this._settings.disconnect(this._settingsChangedId);
+            this._settingsChangedId = null;
+        }
+        this._grabOpIds.forEach(id => global.display.disconnect(id));
+        this._grabOpIds = [];
+    }
+
+    _bind(key, handler) {
+        global.display.add_keybinding(
+            key,
+            this._settings,
+            Meta.KeyBindingFlags.NONE,
+            (..._args) => handler(this)
+        );
+    }
+
+    _bindAllShortcuts()  { for (const [k,h] of Object.entries(KEYBINDINGS)) this._bind(k, h); }
+    _unbindAllShortcuts(){ for (const k in KEYBINDINGS) global.display.remove_keybinding(k); }
+
+    _onSettingsChanged() {
+        this._unbindAllShortcuts();
+        this._bindAllShortcuts();
+    }
+
+    _prepareWmShortcuts() {
+        const schema = this._wmSettings.settings_schema;
+        if (!schema) return;
+
+        const keys = [];
+
+        const add = key => { if (schema.has_key(key)) keys.push(key); };
+
+        if (schema.has_key('toggle-tiled-left'))
+            keys.push('toggle-tiled-left', 'toggle-tiled-right');
+        else {
+            add('tile-left');  add('tile-right');
+        }
+
+        if (schema.has_key('toggle-maximized'))
+            keys.push('toggle-maximized');
+        else {
+            add('maximize');   add('unmaximize');
+        }
+
+        if (keys.length) {
+            this._wmKeysToDisable = keys;
+            keys.forEach(k => this._savedWmShortcuts[k] =
+                             this._wmSettings.get_value(k));
+        }
+    }
+
+    _focusInDirection(direction) {
+        const src = global.display.get_focus_window();
+        if (!src || !this.tiler.windows.includes(src)) return;
+        const tgt = this._findTargetInDirection(src, direction);
+        if (tgt) tgt.activate(global.get_current_time());
+    }
+
+    _swapWithMaster() {
+        const w = this.tiler.windows;
+        if (w.length < 2) return;
+        const foc = global.display.get_focus_window();
+        if (!foc || !w.includes(foc)) return;
+        const idx = w.indexOf(foc);
+        if (idx > 0) [w[0], w[idx]] = [w[idx], w[0]];
+        else         [w[0], w[1]]   = [w[1], w[0]];
+        this.tiler.tileNow();
+        w[0]?.activate(global.get_current_time());
+    }
+
+    _swapInDirection(direction) {
+        const src = global.display.get_focus_window();
+        if (!src || !this.tiler.windows.includes(src)) return;
+        let tgt = null;
+        const idx = this.tiler.windows.indexOf(src);
+        if (idx === 0 && direction==='right' && this.tiler.windows.length>1)
+            tgt = this.tiler.windows[1];
+        else
+            tgt = this._findTargetInDirection(src, direction);
+        if (!tgt) return;
+        const tidx = this.tiler.windows.indexOf(tgt);
+        [this.tiler.windows[idx], this.tiler.windows[tidx]] =
+            [this.tiler.windows[tidx], this.tiler.windows[idx]];
+        this.tiler.tileNow();
+        src.activate(global.get_current_time());
+    }
+
+    _findTargetInDirection(src, dir) {
+        const sRect = src.get_frame_rect(), cand=[];
+        for (const win of this.tiler.windows) {
+            if (win===src) continue;
+            const r=win.get_frame_rect();
+            if (dir==='left' && r.x<sRect.x)  cand.push(win);
+            if (dir==='right'&& r.x>sRect.x)  cand.push(win);
+            if (dir==='up'   && r.y<sRect.y)  cand.push(win);
+            if (dir==='down' && r.y>sRect.y)  cand.push(win);
+        }
+        if (!cand.length) return null;
+        let best=null, min=Infinity;
+        for (const w of cand) {
+            const r=w.get_frame_rect();
+            const dev = (dir==='left'||dir==='right')
+                       ? Math.abs(sRect.y - r.y)
+                       : Math.abs(sRect.x - r.x);
+            if (dev<min){min=dev; best=w;}
+        }
+        return best;
+    }
+
+    _onGrabEnd() {
+        const grabbed = this.tiler.grabbedWindow;
+        if (!grabbed) return;
+        const tgt = this._findTargetUnderPointer(grabbed);
+        if (tgt) {
+            const a = this.tiler.windows.indexOf(grabbed);
+            const b = this.tiler.windows.indexOf(tgt);
+            [this.tiler.windows[a], this.tiler.windows[b]] =
+                [this.tiler.windows[b], this.tiler.windows[a]];
+        }
+        this.tiler.queueTile();
+        this.tiler.grabbedWindow = null;
+    }
+
+    _findTargetUnderPointer(exclude) {
+        const [x,y] = getPointerXY();
+        const wins = global.get_window_actors()
+                           .map(a=>a.meta_window)
+                           .filter(w=>w && w!==exclude &&
+                                      this.tiler.windows.includes(w) && (()=>{const f=w.get_frame_rect();
+                                           return x>=f.x && x<f.x+f.width &&
+                                                  y>=f.y && y<f.y+f.height;})());
+        if (wins.length) return wins[wins.length-1];
+
+        let best=null, max=0, sRect=exclude.get_frame_rect();
+        for (const w of this.tiler.windows) {
+            if (w===exclude) continue;
+            const r=w.get_frame_rect();
+            const ovX=Math.max(0, Math.min(sRect.x+sRect.width, r.x+r.width)-Math.max(sRect.x,r.x));
+            const ovY=Math.max(0, Math.min(sRect.y+sRect.height,r.y+r.height)-Math.max(sRect.y,r.y));
+            const area=ovX*ovY;
+            if (area>max){max=area; best=w;}
+        }
+        return best;
+    }
+}
+
+// ── TILER ────────────────────────────────────────────────
+class Tiler {
+    constructor(extension) {
+        this._extension       = extension;
+        this.settings         = this._extension.getSettings();
+
+        this.windows          = [];
+        this.grabbedWindow    = null;
+        this._signalIds       = new Map();
+        this._tileInProgress  = false;
+
+        this._innerGap        = this.settings.get_int('inner-gap');
+        this._outerGapVertical= this.settings.get_int('outer-gap-vertical');
+        this._outerGapHorizontal = this.settings.get_int('outer-gap-horizontal');
+
+        this._tilingDelay     = TILING_DELAY_MS;
+        this._centeringDelay  = CENTERING_DELAY_MS;
+
+        this._exceptions      = [];
+        this._interactionHandler = new InteractionHandler(this);
+
+        this._tileTimeoutId   = null;
+        this._centerTimeoutIds= [];
+    }
+
+    enable() {
+        this._loadExceptions();
+        this._workspaceManager = global.workspace_manager;
+
+        this._signalIds.set('workspace-changed', {
+            object: this._workspaceManager,
+            id: this._workspaceManager.connect('active-workspace-changed',
+                                               ()=>this._onActiveWorkspaceChanged())
+        });
+
+        this._connectToWorkspace();
+        this._interactionHandler.enable();
+
+        this._signalIds.set('settings-changed', {
+            object: this.settings,
+            id: this.settings.connect('changed', ()=>this._onSettingsChanged())
+        });
+    }
+
+    disable() {
+        if (this._tileTimeoutId) {
+            GLib.source_remove(this._tileTimeoutId);
+            this._tileTimeoutId = null;
+        }
+        this._centerTimeoutIds.forEach(id=>GLib.source_remove(id));
+        this._centerTimeoutIds = [];
+
+        this._interactionHandler.disable();
+        this._disconnectFromWorkspace();
+
+        for (const [,sig] of this._signalIds) {
+            try { sig.object.disconnect(sig.id); } catch {}
+        }
+        this._signalIds.clear();
+        this.windows = [];
+    }
+
+    _onSettingsChanged() {
+        this._innerGap          = this.settings.get_int('inner-gap');
+        this._outerGapVertical  = this.settings.get_int('outer-gap-vertical');
+        this._outerGapHorizontal= this.settings.get_int('outer-gap-horizontal');
+        this.queueTile();
+    }
+
+    _loadExceptions() {
+        const file = Gio.File.new_for_path(this._extension.path + '/exceptions.txt');
+        if (!file.query_exists(null)) { this._exceptions=[]; return; }
+
+        const [ok,data] = file.load_contents(null);
+        if (!ok) { this._exceptions=[]; return; }
+
+        const txt = new TextDecoder('utf-8').decode(data);
+        this._exceptions = txt.split('\n')
+                              .map(l=>l.trim())
+                              .filter(l=>l && !l.startsWith('#'))
+                              .map(l=>l.toLowerCase());
+    }
+
+    _isException(win) {
+        if (!win) return false;
+        const wmClass = (win.get_wm_class() || "").toLowerCase();
+        const appId = (win.get_gtk_application_id() || "").toLowerCase();
+        return this._exceptions.includes(wmClass) || this._exceptions.includes(appId);
+    }
+
+    _isTileable(win) {
+        return (
+            win &&
+            !win.minimized &&
+            !this._isException(win) &&
+            win.get_window_type() === Meta.WindowType.NORMAL
+        );
+    }
+
+    _centerWindow(win) {
+        const timeoutId = GLib.timeout_add(
+            GLib.PRIORITY_DEFAULT,
+            this._centeringDelay,
+            () => {
+                const index = this._centerTimeoutIds.indexOf(timeoutId);
+                if (index > -1) this._centerTimeoutIds.splice(index, 1);
+
+                if (!win || !win.get_display()) return GLib.SOURCE_REMOVE;
+                if (win.get_maximized())
+                    win.unmaximize(Meta.MaximizeFlags.BOTH);
+
+                const monitorIndex = win.get_monitor();
+                const workspace = this._workspaceManager.get_active_workspace();
+                const workArea = workspace.get_work_area_for_monitor(
+                    monitorIndex
+                );
+
+                const frame = win.get_frame_rect();
+                win.move_frame(
+                    true,
+                    workArea.x + Math.floor((workArea.width - frame.width) / 2),
+                    workArea.y +
+                        Math.floor((workArea.height - frame.height) / 2)
+                );
+
+                GLib.idle_add(GLib.PRIORITY_DEFAULT, () => {
+                    if (win.get_display()) {
+                        if (typeof win.set_keep_above === "function")
+                            win.set_keep_above(true);
+                        else if (typeof win.make_above === "function")
+                            win.make_above();
+                    }
+                    return GLib.SOURCE_REMOVE;
+                });
+                return GLib.SOURCE_REMOVE;
+            }
+        );
+        this._centerTimeoutIds.push(timeoutId);
+    }
+
+    _onWindowMinimizedStateChanged() {
+        this.queueTile();
+    }
+
+    _onWindowAdded(workspace, win) {
+        if (this.windows.includes(win)) return;
+        if (this._isException(win)) {
+            this._centerWindow(win);
+            return;
+        }
+        if (this._isTileable(win)) {
+            if (this.settings.get_string("new-window-behavior") === "master") {
+                this.windows.unshift(win);
+            } else {
+                this.windows.push(win);
+            }
+            const id = win.get_id();
+            this._signalIds.set(`unmanaged-${id}`, {
+                object: win,
+                id: win.connect("unmanaged", () =>
+                    this._onWindowRemoved(null, win)
+                ),
+            });
+            this._signalIds.set(`size-changed-${id}`, {
+                object: win,
+                id: win.connect("size-changed", () => {
+                    if (!this.grabbedWindow) this.queueTile();
+                }),
+            });
+            this._signalIds.set(`minimized-${id}`, {
+                object: win,
+                id: win.connect("notify::minimized", () =>
+                    this._onWindowMinimizedStateChanged()
+                ),
+            });
+            this.queueTile();
+        }
+    }
+
+    _onWindowRemoved(workspace, win) {
+        const index = this.windows.indexOf(win);
+        if (index > -1) this.windows.splice(index, 1);
+
+        ["unmanaged", "size-changed", "minimized"].forEach((prefix) => {
+            const key = `${prefix}-${win.get_id()}`;
+            if (this._signalIds.has(key)) {
+                const { object, id } = this._signalIds.get(key);
+                try {
+                    object.disconnect(id);
+                } catch (e) {}
+                this._signalIds.delete(key);
+            }
+        });
+        this.queueTile();
+    }
+
+    _onActiveWorkspaceChanged() {
+        this._disconnectFromWorkspace();
+        this._connectToWorkspace();
+    }
+
+    _connectToWorkspace() {
+        const workspace = this._workspaceManager.get_active_workspace();
+        workspace
+            .list_windows()
+            .forEach((win) => this._onWindowAdded(workspace, win));
+        this._signalIds.set("window-added", {
+            object: workspace,
+            id: workspace.connect("window-added", (ws, win) =>
+                this._onWindowAdded(ws, win)
+            ),
+        });
+        this._signalIds.set("window-removed", {
+            object: workspace,
+            id: workspace.connect("window-removed", (ws, win) =>
+                this._onWindowRemoved(ws, win)
+            ),
+        });
+        this.queueTile();
+    }
+
+    _disconnectFromWorkspace() {
+        this.windows.slice().forEach((win) => this._onWindowRemoved(null, win));
+        ["window-added", "window-removed"].forEach((key) => {
+            if (this._signalIds.has(key)) {
+                const { object, id } = this._signalIds.get(key);
+                try {
+                    object.disconnect(id);
+                } catch (e) {}
+                this._signalIds.delete(key);
+            }
+        });
+    }
+
+    queueTile() {
+        if (this._tileInProgress || this._tileTimeoutId) return;
+        this._tileInProgress = true;
+        this._tileTimeoutId = GLib.timeout_add(
+            GLib.PRIORITY_DEFAULT,
+            this._tilingDelay,
+            () => {
+                this._tileWindows();
+                this._tileInProgress = false;
+                this._tileTimeoutId = null;
+                return GLib.SOURCE_REMOVE;
+            }
+        );
+    }
+
+    tileNow() {
+        if (!this._tileInProgress) {
+            this._tileWindows();
+        }
+    }
+
+    _splitLayout(windows, area) {
+        if (windows.length === 0) return;
+        if (windows.length === 1) {
+            windows[0].move_resize_frame(
+                true,
+                area.x,
+                area.y,
+                area.width,
+                area.height
+            );
+            return;
+        }
+        const gap = Math.floor(this._innerGap / 2);
+        const primaryWindows = [windows[0]];
+        const secondaryWindows = windows.slice(1);
+        let primaryArea, secondaryArea;
+        if (area.width > area.height) {
+            const primaryWidth = Math.floor(area.width / 2) - gap;
+            primaryArea = {
+                x: area.x,
+                y: area.y,
+                width: primaryWidth,
+                height: area.height,
+            };
+            secondaryArea = {
+                x: area.x + primaryWidth + this._innerGap,
+                y: area.y,
+                width: area.width - primaryWidth - this._innerGap,
+                height: area.height,
+            };
+        } else {
+            const primaryHeight = Math.floor(area.height / 2) - gap;
+            primaryArea = {
+                x: area.x,
+                y: area.y,
+                width: area.width,
+                height: primaryHeight,
+            };
+            secondaryArea = {
+                x: area.x,
+                y: area.y + primaryHeight + this._innerGap,
+                width: area.width,
+                height: area.height - primaryHeight - this._innerGap,
+            };
+        }
+        this._splitLayout(primaryWindows, primaryArea);
+        this._splitLayout(secondaryWindows, secondaryArea);
+    }
+
+    _tileWindows() {
+        const windowsToTile = this.windows.filter((win) => !win.minimized);
+        if (windowsToTile.length === 0) return;
+
+        const monitor = Main.layoutManager.primaryMonitor;
+        const workspace = this._workspaceManager.get_active_workspace();
+        const workArea = workspace.get_work_area_for_monitor(monitor.index);
+
+        const innerArea = {
+            x: workArea.x + this._outerGapHorizontal,
+            y: workArea.y + this._outerGapVertical,
+            width: workArea.width - 2 * this._outerGapHorizontal,
+            height: workArea.height - 2 * this._outerGapVertical,
+        };
+        windowsToTile.forEach((win) => {
+            if (win.get_maximized()) win.unmaximize(Meta.MaximizeFlags.BOTH);
+        });
+        if (windowsToTile.length === 1) {
+            windowsToTile[0].move_resize_frame(
+                true,
+                innerArea.x,
+                innerArea.y,
+                innerArea.width,
+                innerArea.height
+            );
+            return;
+        }
+        const gap = Math.floor(this._innerGap / 2);
+        const masterWidth = Math.floor(innerArea.width / 2) - gap;
+        const master = windowsToTile[0];
+        master.move_resize_frame(
+            true,
+            innerArea.x,
+            innerArea.y,
+            masterWidth,
+            innerArea.height
+        );
+        const stackArea = {
+            x: innerArea.x + masterWidth + this._innerGap,
+            y: innerArea.y,
+            width: innerArea.width - masterWidth - this._innerGap,
+            height: innerArea.height,
+        };
+        this._splitLayout(windowsToTile.slice(1), stackArea);
+    }
+}
+
+// ── EXTENSION‑WRAPPER ───────────────────────────────────
+export default class InterimExtension extends Extension {
+    enable() {
+        this.tiler = new Tiler(this);
+        this.tiler.enable();
+    }
+
+    disable() {
+        if (this.tiler) {
+            this.tiler.disable();
+            this.tiler = null;
+        }
+    }
+}

legacy.js

@@ -1,11 +1,10 @@
-// ---------------------------------------------------- //
-// Simple-Tiling – GNOME Shell 3.38 (X11) - Version 6   //
+/////////////////////////////////////////////////////////////
+//     Simple-Tiling – LEGACY (for GNOME Shell 3.38)       //
 //                   © 2025 domoel – MIT                   //
-// ---------------------------------------------------- //
+/////////////////////////////////////////////////////////////
+
+'use strict';
 
-// ---------------------------------------------------- //
-// Global Imports                                       //
-// ---------------------------------------------------- //
 const Main = imports.ui.main;
 const Meta = imports.gi.Meta;
 const Shell = imports.gi.Shell;
@@ -13,29 +12,27 @@ const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
 const ExtensionUtils = imports.misc.extensionUtils;
 const ByteArray = imports.byteArray;
-const TILING_DELAY_MS = 20; // Change Tiling Window Delay
-const CENTERING_DELAY_MS = 5; // Change Centered Window Delay
 
 const Me = ExtensionUtils.getCurrentExtension();
 const SCHEMA_NAME = "org.gnome.shell.extensions.simple-tiling.domoel";
 const WM_SCHEMA = "org.gnome.desktop.wm.keybindings";
 
-const KEYBINDINGS = {
-    "swap-master-window": (self) => self._swapWithMaster(),
-    "swap-left-window":   (self) => self._swapInDirection("left"),
-    "swap-right-window":  (self) => self._swapInDirection("right"),
-    "swap-up-window":     (self) => self._swapInDirection("up"),
-    "swap-down-window":   (self) => self._swapInDirection("down"),
+const TILING_DELAY_MS = 20;   // Change Tiling Window Delay
+const CENTERING_DELAY_MS = 5; // Change Centered Window Delay
 
-    "focus-left":         (self) => self._focusInDirection("left"),
-    "focus-right":        (self) => self._focusInDirection("right"),
-    "focus-up":           (self) => self._focusInDirection("up"),
-    "focus-down":         (self) => self._focusInDirection("down"),
+const KEYBINDINGS = {
+    'swap-master-window': (self) => self._swapWithMaster(),
+    'swap-left-window':   (self) => self._swapInDirection('left'),
+    'swap-right-window':  (self) => self._swapInDirection('right'),
+    'swap-up-window':     (self) => self._swapInDirection('up'),
+    'swap-down-window':   (self) => self._swapInDirection('down'),
+    'focus-left':         (self) => self._focusInDirection('left'),
+    'focus-right':        (self) => self._focusInDirection('right'),
+    'focus-up':           (self) => self._focusInDirection('up'),
+    'focus-down':         (self) => self._focusInDirection('down'),
 };
 
-// ---------------------------------------------------- //
-// InteractionHandler                                   //
-// ---------------------------------------------------- //
+// --- INTERACTIONHANDLER ---
 class InteractionHandler {
     constructor(tiler) {
         this.tiler = tiler;
@@ -100,6 +97,7 @@ class InteractionHandler {
             this._bind(key, handler);
         }
     }
+
     _unbindAllShortcuts() {
         for (const key in KEYBINDINGS) {
             Main.wm.removeKeybinding(key);
@@ -110,6 +108,7 @@ class InteractionHandler {
         this._unbindAllShortcuts();
         this._bindAllShortcuts();
     }
+    
     _prepareWmShortcuts() {
         const schema = this._wmSettings.settings_schema;
         const keys = [];
@@ -125,10 +124,7 @@ class InteractionHandler {
         if (keys.length) {
             this._wmKeysToDisable = keys;
             keys.forEach(
-                (key) =>
-                    (this._savedWmShortcuts[
-                        key
-                    ] = this._wmSettings.get_value(key))
+                (key) => (this._savedWmShortcuts[key] = this._wmSettings.get_value(key))
             );
         }
     }
@@ -301,10 +297,7 @@ class InteractionHandler {
     }
 }
 
-// ---------------------------------------------------- //
-// Tiler                                                //
-// Main Classes for Tiling Logic                        //
-// ---------------------------------------------------- //
+// --- TILER ---
 class Tiler {
     constructor() {
         this.windows = [];
@@ -315,9 +308,7 @@ class Tiler {
 
         this._innerGap = this._settings.get_int("inner-gap");
         this._outerGapVertical = this._settings.get_int("outer-gap-vertical");
-        this._outerGapHorizontal = this._settings.get_int(
-            "outer-gap-horizontal"
-        );
+        this._outerGapHorizontal = this._settings.get_int("outer-gap-horizontal");
 
         this._tilingDelay = TILING_DELAY_MS;
         this._centeringDelay = CENTERING_DELAY_MS;
@@ -379,9 +370,7 @@ class Tiler {
     _onSettingsChanged() {
         this._innerGap = this._settings.get_int("inner-gap");
         this._outerGapVertical = this._settings.get_int("outer-gap-vertical");
-        this._outerGapHorizontal = this._settings.get_int(
-            "outer-gap-horizontal"
-        );
+        this._outerGapHorizontal = this._settings.get_int("outer-gap-horizontal");
         this.queueTile();
     }
 
@@ -402,10 +391,10 @@ class Tiler {
     }
 
     _isException(win) {
-        return (
-            !!win &&
-            this._exceptions.includes((win.get_wm_class() || "").toLowerCase())
-        );
+        if (!win) return false;
+        const wmClass = (win.get_wm_class() || "").toLowerCase();
+        const appId = (win.get_gtk_application_id() || "").toLowerCase();
+        return this._exceptions.includes(wmClass) || this._exceptions.includes(appId);
     }
 
     _isTileable(win) {
@@ -670,11 +659,9 @@ class Tiler {
     }
 }
 
-// ---------------------------------------------------- //
-// Extension Wrapper                                    //
-// ---------------------------------------------------- //
-class SimpleTilingExtension {
-    constructor() {
+// --- EXTENSION-WRAPPER (for legacy loader) ---
+var LegacyExtension = class {
+    constructor(metadata) {
         this.tiler = null;
     }
     enable() {
@@ -687,8 +674,8 @@ class SimpleTilingExtension {
             this.tiler = null;
         }
     }
-}
+};
 
-function init() {
-    return new SimpleTilingExtension();
+function init(metadata) {
+    return new LegacyExtension(metadata);
 }

metadata.json

@@ -1,11 +0,0 @@
-{
-  "uuid": "simple-tiling@domoel",
-  "name": "Simple Tiling",
-  "description": "A Simple Tiling Extension for Gnome Shell 3.38.",
-  "version": 6,
-  "shell-version": [ "3.38" ],
-  "settings-schema": "org.gnome.shell.extensions.simple-tiling.domoel",
-  "preferences_ui": "prefs.js",
-  "url": "https://github.com/Domoel/Simple-Tiling",
-  "gettext-domain": "simple-tiling-domoel"
-}

metadata_interim.json.in

@@ -0,0 +1,17 @@
+{
+  "uuid": "__UUID__",
+  "name": "Simple Tiling",
+  "description": "A Simple Tiling Extension for Gnome Shell.",
+  "version": __VERSION__,
+  "shell-version": [
+    "40",
+    "41",
+    "42",
+    "43",
+    "44"
+  ],
+  "settings-schema": "org.gnome.shell.extensions.simple-tiling.domoel",
+  "preferences_ui": "prefs.js",
+  "url": "https://github.com/Domoel/Simple-Tiling",
+  "gettext-domain": "__UUID__"
+}

metadata_legacy.json.in

@@ -0,0 +1,13 @@
+{
+  "uuid": "__UUID__",
+  "name": "Simple Tiling",
+  "description": "A Simple Tiling Extension for Gnome Shell.",
+  "version": __VERSION__,
+  "shell-version": [
+    "3.38"
+  ],
+  "settings-schema": "org.gnome.shell.extensions.simple-tiling.domoel",
+  "preferences_ui": "prefs.js",
+  "url": "https://github.com/Domoel/Simple-Tiling",
+  "gettext-domain": "__UUID__"
+}

metadata_modern.json.in

@@ -0,0 +1,16 @@
+{
+  "uuid": "__UUID__",
+  "name": "Simple Tiling",
+  "description": "A Simple Tiling Extension for Gnome Shell.",
+  "version": __VERSION__,
+  "shell-version": [
+    "45",
+    "46",
+    "47",
+    "48"
+  ],
+  "settings-schema": "org.gnome.shell.extensions.simple-tiling.domoel",
+  "preferences_ui": "prefs.js",
+  "url": "https://github.com/Domoel/Simple-Tiling",
+  "gettext-domain": "__UUID__"
+}

modern.js

@@ -0,0 +1,597 @@
+/////////////////////////////////////////////////////////////
+//      Simple‑Tiling – MODERN (GNOME Shell 45+)          //
+//               © 2025 domoel – MIT                       //
+/////////////////////////////////////////////////////////////
+
+
+// ── GLOBAL IMPORTS ────────────────────────────────────────
+import { Extension }  from 'resource:///org/gnome/shell/extensions/extension.js';
+import * as Main       from 'resource:///org/gnome/shell/ui/main.js';
+import Meta            from 'gi://Meta';
+import Shell           from 'gi://Shell';
+import Gio             from 'gi://Gio';
+import GLib            from 'gi://GLib';
+import Clutter         from 'gi://Clutter';
+
+// ── CONST ────────────────────────────────────────────
+const WM_SCHEMA          = 'org.gnome.desktop.wm.keybindings';
+
+const TILING_DELAY_MS    = 20;   // Change Tiling Window Delay
+const CENTERING_DELAY_MS = 5;    // Change Centered Window Delay
+
+const KEYBINDINGS = {
+    'swap-master-window': (self) => self._swapWithMaster(),
+    'swap-left-window':   (self) => self._swapInDirection('left'),
+    'swap-right-window':  (self) => self._swapInDirection('right'),
+    'swap-up-window':     (self) => self._swapInDirection('up'),
+    'swap-down-window':   (self) => self._swapInDirection('down'),
+    'focus-left':         (self) => self._focusInDirection('left'),
+    'focus-right':        (self) => self._focusInDirection('right'),
+    'focus-up':           (self) => self._focusInDirection('up'),
+    'focus-down':         (self) => self._focusInDirection('down'),
+};
+
+// ── HELPER‑FUNCTION ────────────────────────────────────────
+function getPointerXY() {
+    if (global.get_pointer) {
+        const [x, y] = global.get_pointer();
+        return [x, y];
+    }
+
+    const ev = Clutter.get_current_event();
+    if (ev) {
+        const coords = ev.get_coords();
+        if (Array.isArray(coords)) 
+            return coords;
+    }
+
+    const device = Clutter.get_default_backend()
+                          .get_default_seat()
+                          .get_pointer();
+    return device ? device.get_position() : [0, 0];
+}
+
+// ── INTERACTIONHANDLER ───────────────────────────────────
+class InteractionHandler {
+    constructor(tiler) {
+        this.tiler              = tiler;
+        this._settings          = this.tiler.settings;
+        this._wmSettings        = new Gio.Settings({ schema: WM_SCHEMA });
+
+        this._wmKeysToDisable   = [];
+        this._savedWmShortcuts  = {};
+        this._grabOpIds         = [];
+        this._settingsChangedId = null;
+    }
+
+    enable() {
+        this._prepareWmShortcuts();
+
+        if (this._wmKeysToDisable.length)
+            this._wmKeysToDisable.forEach(k =>
+                this._wmSettings.set_value(k, new GLib.Variant('as', [])));
+
+        this._bindAllShortcuts();
+        this._settingsChangedId =
+            this._settings.connect('changed', () => this._onSettingsChanged());
+
+        this._grabOpIds.push(
+            global.display.connect('grab-op-begin',
+                (_, __, win) => { if (this.tiler.windows.includes(win))
+                                      this.tiler.grabbedWindow = win; })
+        );
+        this._grabOpIds.push(
+            global.display.connect('grab-op-end', () => this._onGrabEnd())
+        );
+    }
+
+    disable() {
+        if (this._wmKeysToDisable.length)
+            this._wmKeysToDisable.forEach(k =>
+                this._wmSettings.set_value(k, this._savedWmShortcuts[k]));
+
+        this._unbindAllShortcuts();
+
+        if (this._settingsChangedId) {
+            this._settings.disconnect(this._settingsChangedId);
+            this._settingsChangedId = null;
+        }
+        this._grabOpIds.forEach(id => global.display.disconnect(id));
+        this._grabOpIds = [];
+    }
+
+    _bind(key, handler) {
+        global.display.add_keybinding(
+            key,
+            this._settings,
+            Meta.KeyBindingFlags.NONE,
+            (..._args) => handler(this)
+        );
+    }
+
+    _bindAllShortcuts()  { for (const [k,h] of Object.entries(KEYBINDINGS)) this._bind(k, h); }
+    _unbindAllShortcuts(){ for (const k in KEYBINDINGS) global.display.remove_keybinding(k); }
+
+    _onSettingsChanged() {
+        this._unbindAllShortcuts();
+        this._bindAllShortcuts();
+    }
+
+    _prepareWmShortcuts() {
+        const schema = this._wmSettings.settings_schema;
+        if (!schema) return;
+
+        const keys = [];
+
+        const add = key => { if (schema.has_key(key)) keys.push(key); };
+
+        if (schema.has_key('toggle-tiled-left'))
+            keys.push('toggle-tiled-left', 'toggle-tiled-right');
+        else {
+            add('tile-left');  add('tile-right');
+        }
+
+        if (schema.has_key('toggle-maximized'))
+            keys.push('toggle-maximized');
+        else {
+            add('maximize');   add('unmaximize');
+        }
+
+        if (keys.length) {
+            this._wmKeysToDisable = keys;
+            keys.forEach(k => this._savedWmShortcuts[k] =
+                             this._wmSettings.get_value(k));
+        }
+    }
+
+    _focusInDirection(direction) {
+        const src = global.display.get_focus_window();
+        if (!src || !this.tiler.windows.includes(src)) return;
+        const tgt = this._findTargetInDirection(src, direction);
+        if (tgt) tgt.activate(global.get_current_time());
+    }
+
+    _swapWithMaster() {
+        const w = this.tiler.windows;
+        if (w.length < 2) return;
+        const foc = global.display.get_focus_window();
+        if (!foc || !w.includes(foc)) return;
+        const idx = w.indexOf(foc);
+        if (idx > 0) [w[0], w[idx]] = [w[idx], w[0]];
+        else         [w[0], w[1]]   = [w[1], w[0]];
+        this.tiler.tileNow();
+        w[0]?.activate(global.get_current_time());
+    }
+
+    _swapInDirection(direction) {
+        const src = global.display.get_focus_window();
+        if (!src || !this.tiler.windows.includes(src)) return;
+        let tgt = null;
+        const idx = this.tiler.windows.indexOf(src);
+        if (idx === 0 && direction==='right' && this.tiler.windows.length>1)
+            tgt = this.tiler.windows[1];
+        else
+            tgt = this._findTargetInDirection(src, direction);
+        if (!tgt) return;
+        const tidx = this.tiler.windows.indexOf(tgt);
+        [this.tiler.windows[idx], this.tiler.windows[tidx]] =
+            [this.tiler.windows[tidx], this.tiler.windows[idx]];
+        this.tiler.tileNow();
+        src.activate(global.get_current_time());
+    }
+
+    _findTargetInDirection(src, dir) {
+        const sRect = src.get_frame_rect(), cand=[];
+        for (const win of this.tiler.windows) {
+            if (win===src) continue;
+            const r=win.get_frame_rect();
+            if (dir==='left' && r.x<sRect.x)  cand.push(win);
+            if (dir==='right'&& r.x>sRect.x)  cand.push(win);
+            if (dir==='up'   && r.y<sRect.y)  cand.push(win);
+            if (dir==='down' && r.y>sRect.y)  cand.push(win);
+        }
+        if (!cand.length) return null;
+        let best=null, min=Infinity;
+        for (const w of cand) {
+            const r=w.get_frame_rect();
+            const dev = (dir==='left'||dir==='right')
+                       ? Math.abs(sRect.y - r.y)
+                       : Math.abs(sRect.x - r.x);
+            if (dev<min){min=dev; best=w;}
+        }
+        return best;
+    }
+
+    _onGrabEnd() {
+        const grabbed = this.tiler.grabbedWindow;
+        if (!grabbed) return;
+        const tgt = this._findTargetUnderPointer(grabbed);
+        if (tgt) {
+            const a = this.tiler.windows.indexOf(grabbed);
+            const b = this.tiler.windows.indexOf(tgt);
+            [this.tiler.windows[a], this.tiler.windows[b]] =
+                [this.tiler.windows[b], this.tiler.windows[a]];
+        }
+        this.tiler.queueTile();
+        this.tiler.grabbedWindow = null;
+    }
+
+    _findTargetUnderPointer(exclude) {
+        const [x,y] = getPointerXY();
+        const wins = global.get_window_actors()
+                           .map(a=>a.meta_window)
+                           .filter(w=>w && w!==exclude &&
+                                      this.tiler.windows.includes(w) && (()=>{const f=w.get_frame_rect();
+                                           return x>=f.x && x<f.x+f.width &&
+                                                  y>=f.y && y<f.y+f.height;})());
+        if (wins.length) return wins[wins.length-1];
+
+        let best=null, max=0, sRect=exclude.get_frame_rect();
+        for (const w of this.tiler.windows) {
+            if (w===exclude) continue;
+            const r=w.get_frame_rect();
+            const ovX=Math.max(0, Math.min(sRect.x+sRect.width, r.x+r.width)-Math.max(sRect.x,r.x));
+            const ovY=Math.max(0, Math.min(sRect.y+sRect.height,r.y+r.height)-Math.max(sRect.y,r.y));
+            const area=ovX*ovY;
+            if (area>max){max=area; best=w;}
+        }
+        return best;
+    }
+}
+
+// ── TILER ────────────────────────────────────────────────
+class Tiler {
+    constructor(extension) {
+        this._extension       = extension;
+        this.settings         = this._extension.getSettings();
+
+        this.windows          = [];
+        this.grabbedWindow    = null;
+        this._signalIds       = new Map();
+        this._tileInProgress  = false;
+
+        this._innerGap        = this.settings.get_int('inner-gap');
+        this._outerGapVertical= this.settings.get_int('outer-gap-vertical');
+        this._outerGapHorizontal = this.settings.get_int('outer-gap-horizontal');
+
+        this._tilingDelay     = TILING_DELAY_MS;
+        this._centeringDelay  = CENTERING_DELAY_MS;
+
+        this._exceptions      = [];
+        this._interactionHandler = new InteractionHandler(this);
+
+        this._tileTimeoutId   = null;
+        this._centerTimeoutIds= [];
+    }
+
+    enable() {
+        this._loadExceptions();
+        this._workspaceManager = global.workspace_manager;
+
+        this._signalIds.set('workspace-changed', {
+            object: this._workspaceManager,
+            id: this._workspaceManager.connect('active-workspace-changed',
+                                               ()=>this._onActiveWorkspaceChanged())
+        });
+
+        this._connectToWorkspace();
+        this._interactionHandler.enable();
+
+        this._signalIds.set('settings-changed', {
+            object: this.settings,
+            id: this.settings.connect('changed', ()=>this._onSettingsChanged())
+        });
+    }
+
+    disable() {
+        if (this._tileTimeoutId) {
+            GLib.source_remove(this._tileTimeoutId);
+            this._tileTimeoutId = null;
+        }
+        this._centerTimeoutIds.forEach(id=>GLib.source_remove(id));
+        this._centerTimeoutIds = [];
+
+        this._interactionHandler.disable();
+        this._disconnectFromWorkspace();
+
+        for (const [,sig] of this._signalIds) {
+            try { sig.object.disconnect(sig.id); } catch {}
+        }
+        this._signalIds.clear();
+        this.windows = [];
+    }
+
+    _onSettingsChanged() {
+        this._innerGap          = this.settings.get_int('inner-gap');
+        this._outerGapVertical  = this.settings.get_int('outer-gap-vertical');
+        this._outerGapHorizontal= this.settings.get_int('outer-gap-horizontal');
+        this.queueTile();
+    }
+
+    _loadExceptions() {
+        const file = Gio.File.new_for_path(this._extension.path + '/exceptions.txt');
+        if (!file.query_exists(null)) { this._exceptions=[]; return; }
+
+        const [ok,data] = file.load_contents(null);
+        if (!ok) { this._exceptions=[]; return; }
+
+        const txt = new TextDecoder('utf-8').decode(data);
+        this._exceptions = txt.split('\n')
+                              .map(l=>l.trim())
+                              .filter(l=>l && !l.startsWith('#'))
+                              .map(l=>l.toLowerCase());
+    }
+
+    _isException(win) {
+        if (!win) return false;
+        const wmClass = (win.get_wm_class() || "").toLowerCase();
+        const appId = (win.get_gtk_application_id() || "").toLowerCase();
+        return this._exceptions.includes(wmClass) || this._exceptions.includes(appId);
+    }
+
+    _isTileable(win) {
+        return (
+            win &&
+            !win.minimized &&
+            !this._isException(win) &&
+            win.get_window_type() === Meta.WindowType.NORMAL
+        );
+    }
+
+    _centerWindow(win) {
+        const timeoutId = GLib.timeout_add(
+            GLib.PRIORITY_DEFAULT,
+            this._centeringDelay,
+            () => {
+                const index = this._centerTimeoutIds.indexOf(timeoutId);
+                if (index > -1) this._centerTimeoutIds.splice(index, 1);
+
+                if (!win || !win.get_display()) return GLib.SOURCE_REMOVE;
+                if (win.get_maximized())
+                    win.unmaximize(Meta.MaximizeFlags.BOTH);
+
+                const monitorIndex = win.get_monitor();
+                const workspace = this._workspaceManager.get_active_workspace();
+                const workArea = workspace.get_work_area_for_monitor(
+                    monitorIndex
+                );
+
+                const frame = win.get_frame_rect();
+                win.move_frame(
+                    true,
+                    workArea.x + Math.floor((workArea.width - frame.width) / 2),
+                    workArea.y +
+                        Math.floor((workArea.height - frame.height) / 2)
+                );
+
+                GLib.idle_add(GLib.PRIORITY_DEFAULT, () => {
+                    if (win.get_display()) {
+                        if (typeof win.set_keep_above === "function")
+                            win.set_keep_above(true);
+                        else if (typeof win.make_above === "function")
+                            win.make_above();
+                    }
+                    return GLib.SOURCE_REMOVE;
+                });
+                return GLib.SOURCE_REMOVE;
+            }
+        );
+        this._centerTimeoutIds.push(timeoutId);
+    }
+
+    _onWindowMinimizedStateChanged() {
+        this.queueTile();
+    }
+
+    _onWindowAdded(workspace, win) {
+        if (this.windows.includes(win)) return;
+        if (this._isException(win)) {
+            this._centerWindow(win);
+            return;
+        }
+        if (this._isTileable(win)) {
+            if (this.settings.get_string("new-window-behavior") === "master") {
+                this.windows.unshift(win);
+            } else {
+                this.windows.push(win);
+            }
+            const id = win.get_id();
+            this._signalIds.set(`unmanaged-${id}`, {
+                object: win,
+                id: win.connect("unmanaged", () =>
+                    this._onWindowRemoved(null, win)
+                ),
+            });
+            this._signalIds.set(`size-changed-${id}`, {
+                object: win,
+                id: win.connect("size-changed", () => {
+                    if (!this.grabbedWindow) this.queueTile();
+                }),
+            });
+            this._signalIds.set(`minimized-${id}`, {
+                object: win,
+                id: win.connect("notify::minimized", () =>
+                    this._onWindowMinimizedStateChanged()
+                ),
+            });
+            this.queueTile();
+        }
+    }
+
+    _onWindowRemoved(workspace, win) {
+        const index = this.windows.indexOf(win);
+        if (index > -1) this.windows.splice(index, 1);
+
+        ["unmanaged", "size-changed", "minimized"].forEach((prefix) => {
+            const key = `${prefix}-${win.get_id()}`;
+            if (this._signalIds.has(key)) {
+                const { object, id } = this._signalIds.get(key);
+                try {
+                    object.disconnect(id);
+                } catch (e) {}
+                this._signalIds.delete(key);
+            }
+        });
+        this.queueTile();
+    }
+
+    _onActiveWorkspaceChanged() {
+        this._disconnectFromWorkspace();
+        this._connectToWorkspace();
+    }
+
+    _connectToWorkspace() {
+        const workspace = this._workspaceManager.get_active_workspace();
+        workspace
+            .list_windows()
+            .forEach((win) => this._onWindowAdded(workspace, win));
+        this._signalIds.set("window-added", {
+            object: workspace,
+            id: workspace.connect("window-added", (ws, win) =>
+                this._onWindowAdded(ws, win)
+            ),
+        });
+        this._signalIds.set("window-removed", {
+            object: workspace,
+            id: workspace.connect("window-removed", (ws, win) =>
+                this._onWindowRemoved(ws, win)
+            ),
+        });
+        this.queueTile();
+    }
+
+    _disconnectFromWorkspace() {
+        this.windows.slice().forEach((win) => this._onWindowRemoved(null, win));
+        ["window-added", "window-removed"].forEach((key) => {
+            if (this._signalIds.has(key)) {
+                const { object, id } = this._signalIds.get(key);
+                try {
+                    object.disconnect(id);
+                } catch (e) {}
+                this._signalIds.delete(key);
+            }
+        });
+    }
+
+    queueTile() {
+        if (this._tileInProgress || this._tileTimeoutId) return;
+        this._tileInProgress = true;
+        this._tileTimeoutId = GLib.timeout_add(
+            GLib.PRIORITY_DEFAULT,
+            this._tilingDelay,
+            () => {
+                this._tileWindows();
+                this._tileInProgress = false;
+                this._tileTimeoutId = null;
+                return GLib.SOURCE_REMOVE;
+            }
+        );
+    }
+
+    tileNow() {
+        if (!this._tileInProgress) {
+            this._tileWindows();
+        }
+    }
+
+    _splitLayout(windows, area) {
+        if (windows.length === 0) return;
+        if (windows.length === 1) {
+            windows[0].move_resize_frame(
+                true,
+                area.x,
+                area.y,
+                area.width,
+                area.height
+            );
+            return;
+        }
+        const gap = Math.floor(this._innerGap / 2);
+        const primaryWindows = [windows[0]];
+        const secondaryWindows = windows.slice(1);
+        let primaryArea, secondaryArea;
+        if (area.width > area.height) {
+            const primaryWidth = Math.floor(area.width / 2) - gap;
+            primaryArea = {
+                x: area.x,
+                y: area.y,
+                width: primaryWidth,
+                height: area.height,
+            };
+            secondaryArea = {
+                x: area.x + primaryWidth + this._innerGap,
+                y: area.y,
+                width: area.width - primaryWidth - this._innerGap,
+                height: area.height,
+            };
+        } else {
+            const primaryHeight = Math.floor(area.height / 2) - gap;
+            primaryArea = {
+                x: area.x,
+                y: area.y,
+                width: area.width,
+                height: primaryHeight,
+            };
+            secondaryArea = {
+                x: area.x,
+                y: area.y + primaryHeight + this._innerGap,
+                width: area.width,
+                height: area.height - primaryHeight - this._innerGap,
+            };
+        }
+        this._splitLayout(primaryWindows, primaryArea);
+        this._splitLayout(secondaryWindows, secondaryArea);
+    }
+
+    _tileWindows() {
+        const windowsToTile = this.windows.filter((win) => !win.minimized);
+        if (windowsToTile.length === 0) return;
+
+        const monitor = Main.layoutManager.primaryMonitor;
+        const workspace = this._workspaceManager.get_active_workspace();
+        const workArea = workspace.get_work_area_for_monitor(monitor.index);
+
+        const innerArea = {
+            x: workArea.x + this._outerGapHorizontal,
+            y: workArea.y + this._outerGapVertical,
+            width: workArea.width - 2 * this._outerGapHorizontal,
+            height: workArea.height - 2 * this._outerGapVertical,
+        };
+        windowsToTile.forEach((win) => {
+            if (win.get_maximized()) win.unmaximize(Meta.MaximizeFlags.BOTH);
+        });
+        if (windowsToTile.length === 1) {
+            windowsToTile[0].move_resize_frame(
+                true,
+                innerArea.x,
+                innerArea.y,
+                innerArea.width,
+                innerArea.height
+            );
+            return;
+        }
+        const gap = Math.floor(this._innerGap / 2);
+        const masterWidth = Math.floor(innerArea.width / 2) - gap;
+        const master = windowsToTile[0];
+        master.move_resize_frame(
+            true,
+            innerArea.x,
+            innerArea.y,
+            masterWidth,
+            innerArea.height
+        );
+        const stackArea = {
+            x: innerArea.x + masterWidth + this._innerGap,
+            y: innerArea.y,
+            width: innerArea.width - masterWidth - this._innerGap,
+            height: innerArea.height,
+        };
+        this._splitLayout(windowsToTile.slice(1), stackArea);
+    }
+}
+
+// ── EXTENSION‑WRAPPER ───────────────────────────────────
+export default class ModernExtension extends Extension {
+    enable()  { this.tiler = new Tiler(this); this.tiler.enable(); }
+    disable() { this.tiler?.disable(); this.tiler = null; }
+}

prefs.interim.js

@@ -0,0 +1,89 @@
+///////////////////////////////////////////////////////////////
+//    Simple-Tiling – MODERN MENU (GNOME Shell 40-44)        //
+//                   © 2025 domoel – MIT                     //
+///////////////////////////////////////////////////////////////
+
+'use strict';
+
+import Adw from 'gi://Adw';
+import Gio from 'gi://Gio';
+import Gtk from 'gi://Gtk';
+import GLib from 'gi://GLib';
+import { ExtensionPreferences, gettext as _ } from 'resource:///org/gnome/shell/extensions/js/extensions/prefs.js';
+
+export default class SimpleTilingPrefs extends ExtensionPreferences {
+    fillPreferencesWindow(window) {
+        const settings = this.getSettings();
+        const page = new Adw.PreferencesPage();
+        window.add(page);
+
+        // --- Group for Window Gaps ---
+        const groupGaps = new Adw.PreferencesGroup({ title: 'Window Gaps' });
+        page.add(groupGaps);
+
+        const rowInnerGap = new Adw.SpinRow({
+            title: 'Inner Gap',
+            subtitle: 'The gap between windows in pixels.',
+            adjustment: new Gtk.Adjustment({ lower: 0, upper: 100, step_increment: 1 }),
+        });
+        groupGaps.add(rowInnerGap);
+        settings.bind('inner-gap', rowInnerGap, 'value', Gio.SettingsBindFlags.DEFAULT);
+
+        const rowOuterH = new Adw.SpinRow({
+            title: 'Outer Gap (horizontal)',
+            subtitle: 'Left / right screen edges (pixels)',
+            adjustment: new Gtk.Adjustment({ lower: 0, upper: 100, step_increment: 1 }),
+        });
+        groupGaps.add(rowOuterH);
+        settings.bind('outer-gap-horizontal', rowOuterH, 'value', Gio.SettingsBindFlags.DEFAULT);
+
+        const rowOuterV = new Adw.SpinRow({
+            title: 'Outer Gap (vertical)',
+            subtitle: 'Top / bottom screen edges (pixels)',
+            adjustment: new Gtk.Adjustment({ lower: 0, upper: 100, step_increment: 1 }),
+        });
+        groupGaps.add(rowOuterV);
+        settings.bind('outer-gap-vertical', rowOuterV, 'value', Gio.SettingsBindFlags.DEFAULT);
+
+        // --- Group for Window Behavior ---
+        const groupBehavior = new Adw.PreferencesGroup({ title: 'Window Behavior' });
+        page.add(groupBehavior);
+
+        const rowNewWindow = new Adw.ComboRow({
+            title: 'Open new windows as',
+            subtitle: 'Whether a new window starts as Master or Stack',
+            model: new Gtk.StringList({
+                strings: ['Stack Window (Default)', 'Master Window'],
+            }),
+        });
+        groupBehavior.add(rowNewWindow);
+
+        const currentBehavior = settings.get_string('new-window-behavior');
+        rowNewWindow.selected = currentBehavior === 'master' ? 1 : 0;
+
+        rowNewWindow.connect('notify::selected', () => {
+            const newVal = rowNewWindow.selected === 1 ? 'master' : 'stack';
+            settings.set_string('new-window-behavior', newVal);
+        });
+
+        // --- Group for Keybindings ---
+        const groupKeys = new Adw.PreferencesGroup({ title: 'Keybindings' });
+        page.add(groupKeys);
+
+        const rowKeys = new Adw.ActionRow({
+            title: 'Configure Shortcuts',
+            subtitle: 'Adjust all shortcuts in GNOME Keyboard settings.',
+        });
+        groupKeys.add(rowKeys);
+
+        const btnOpenKeyboard = new Gtk.Button({ label: 'Open Keyboard Settings' });
+        btnOpenKeyboard.connect('clicked', () => {
+            const appInfo = Gio.AppInfo.create_from_commandline(
+                'gnome-control-center keyboard', null, Gio.AppInfoCreateFlags.NONE
+            );
+            appInfo.launch([], null);
+        });
+        rowKeys.add_suffix(btnOpenKeyboard);
+        rowKeys.set_activatable_widget(btnOpenKeyboard);
+    }
+}

prefs_legacy.js

@@ -1,11 +1,10 @@
-// ------------------------------------------------------ //
-// Extension Settings Menu for Simple Tiling - Version 6  //
-// © 2025 domoel – MIT                                    //
-// ------------------------------------------------------ //
+///////////////////////////////////////////////////////////////
+//   Simple‑Tiling – LEGACY MENU (GNOME Shell 3.38 ‑ 44)      //
+//                © 2025 domoel – MIT                        //
+/////////////////////////////////////////////////////////////
 
-// ---------------------------------------------------- //
-// Global Imports                                       //
-// ---------------------------------------------------- //
+
+// ── GLOBAL IMPORTS ────────────────────────────────────────
 "use strict";
 
 const { Gtk, GObject, Gio } = imports.gi;
@@ -13,9 +12,7 @@ const ExtensionUtils = imports.misc.extensionUtils;
 
 const SCHEMA_NAME = "org.gnome.shell.extensions.simple-tiling.domoel";
 
-// ---------------------------------------------------- //
-// Definition of Row Model                              //
-// ---------------------------------------------------- //
+// ── DEFINITIONS ────────────────────────────────────────────
 const COLUMN_ID = 0;
 const COLUMN_DESC = 1;
 const COLUMN_KEY = 2;
@@ -36,9 +33,7 @@ function buildPrefsWidget() {
         visible: true,
     });
 
-    // ---------------------------------------------------- //
-    // Section for Keybindings                              //
-    // ---------------------------------------------------- //
+    // ── KEYBINDINGS ────────────────────────────────────────────
     const keysTitle = new Gtk.Label({
         label: "<b>Keybindings</b>",
         use_markup: true,
@@ -122,9 +117,7 @@ function buildPrefsWidget() {
 
     prefsWidget.add(keysFrame);
 
-    // ---------------------------------------------------- //
-    // Section for Window Gaps                              //
-    // ---------------------------------------------------- //
+    // ── WINDOW GAPS ────────────────────────────────────────────
     const gapsTitle = new Gtk.Label({
         label: "<b>Window Gaps</b>",
         use_markup: true,
@@ -145,26 +138,12 @@ function buildPrefsWidget() {
     gapsFrame.add(gapsGrid);
 
     addSpinButtonRow(gapsGrid, settings, "Inner Gap", "inner-gap", 0);
-    addSpinButtonRow(
-        gapsGrid,
-        settings,
-        "Outer Gap (horizontal)",
-        "outer-gap-horizontal",
-        1
-    );
-    addSpinButtonRow(
-        gapsGrid,
-        settings,
-        "Outer Gap (vertical)",
-        "outer-gap-vertical",
-        2
-    );
+    addSpinButtonRow(gapsGrid, settings, "Outer Gap (horizontal)", "outer-gap-horizontal", 1);
+    addSpinButtonRow(gapsGrid, settings, "Outer Gap (vertical)", "outer-gap-vertical", 2);
 
     prefsWidget.add(gapsFrame);
 
-    // ---------------------------------------------------- //
-    // Section for Window Behavior (Master vs. Stack)       //
-    // ---------------------------------------------------- //
+    // ── WINDOW BEHAVIOR ────────────────────────────────────────────
     const behaviorTitle = new Gtk.Label({
         label: "<b>Window Behavior</b>",
         use_markup: true,
@@ -192,6 +171,7 @@ function buildPrefsWidget() {
     );
     prefsWidget.add(behaviorFrame);
     
+    prefsWidget.show_all();
     return prefsWidget;
 }
 
@@ -215,7 +195,7 @@ function addSpinButtonRow(grid, settings, desc, key, pos) {
         visible: true,
     });
     grid.attach(label, 0, pos, 1, 1);
-    const adj = new Gtk.Adjustment({ lower: 0, upper: 50, step_increment: 1 });
+    const adj = new Gtk.Adjustment({ lower: 0, upper: 100, step_increment: 1 });
     const spin = new Gtk.SpinButton({
         adjustment: adj,
         climb_rate: 1,

prefs_modern.js

@@ -0,0 +1,91 @@
+///////////////////////////////////////////////////////////////
+//     Simple-Tiling – MODERN MENU (GNOME Shell 45+)         //
+//                   © 2025 domoel – MIT                     //
+///////////////////////////////////////////////////////////////
+
+// ── GLOBAL IMPORTS ────────────────────────────────────────
+import Adw from 'gi://Adw';
+import Gio from 'gi://Gio';
+import Gtk from 'gi://Gtk';
+import GLib from 'gi://GLib';
+import { ExtensionPreferences, gettext as _ } from 'resource:///org/gnome/Shell/Extensions/js/extensions/prefs.js';
+
+export default class SimpleTilingPrefs extends ExtensionPreferences {
+    fillPreferencesWindow(window) {
+        const settings = this.getSettings();
+        const page = new Adw.PreferencesPage();
+        window.add(page);
+
+        // ── WINDOW GAPS ────────────────────────────────────────────
+        const groupGaps = new Adw.PreferencesGroup({
+            title: 'Window Gaps',
+            description: 'Adjust spacing between windows and screen edges.'
+        });
+        page.add(groupGaps);
+
+        const rowInnerGap = new Adw.SpinRow({
+            title: 'Inner Gap',
+            subtitle: 'Space between tiled windows (pixels)',
+            adjustment: new Gtk.Adjustment({ lower: 0, upper: 100, step_increment: 1 }),
+        });
+        groupGaps.add(rowInnerGap);
+        settings.bind('inner-gap', rowInnerGap, 'value', Gio.SettingsBindFlags.DEFAULT);
+
+        const rowOuterH = new Adw.SpinRow({
+            title: 'Outer Gap (horizontal)',
+            subtitle: 'Left / right screen edges (pixels)',
+            adjustment: new Gtk.Adjustment({ lower: 0, upper: 100, step_increment: 1 }),
+        });
+        groupGaps.add(rowOuterH);
+        settings.bind('outer-gap-horizontal', rowOuterH, 'value', Gio.SettingsBindFlags.DEFAULT);
+
+        const rowOuterV = new Adw.SpinRow({
+            title: 'Outer Gap (vertical)',
+            subtitle: 'Top / bottom screen edges (pixels)',
+            adjustment: new Gtk.Adjustment({ lower: 0, upper: 100, step_increment: 1 }),
+        });
+        groupGaps.add(rowOuterV);
+        settings.bind('outer-gap-vertical', rowOuterV, 'value', Gio.SettingsBindFlags.DEFAULT);
+
+        // ── WINDOW BEHAVIOR ────────────────────────────────────────────
+        const groupBehavior = new Adw.PreferencesGroup({ title: 'Window Behavior' });
+        page.add(groupBehavior);
+
+        const rowNewWindow = new Adw.ComboRow({
+            title: 'Open new windows as',
+            subtitle: 'Whether a new window starts as Master or Stack',
+            model: new Gtk.StringList({
+                strings: ['Stack Window (Default)', 'Master Window'],
+            }),
+        });
+        groupBehavior.add(rowNewWindow);
+
+        const currentBehavior = settings.get_string('new-window-behavior');
+        rowNewWindow.selected = currentBehavior === 'master' ? 1 : 0;
+
+        rowNewWindow.connect('notify::selected', () => {
+            const newVal = rowNewWindow.selected === 1 ? 'master' : 'stack';
+            settings.set_string('new-window-behavior', newVal);
+        });
+
+        // ── KEYBINDINGS ────────────────────────────────────────────
+        const groupKeys = new Adw.PreferencesGroup({ title: 'Keybindings' });
+        page.add(groupKeys);
+
+        const rowKeys = new Adw.ActionRow({
+            title: 'Configure Shortcuts',
+            subtitle: 'Adjust all shortcuts in GNOME Keyboard settings.',
+        });
+        groupKeys.add(rowKeys);
+
+        const btnOpenKeyboard = new Gtk.Button({ label: 'Open Keyboard Settings' });
+        btnOpenKeyboard.connect('clicked', () => {
+            const appInfo = Gio.AppInfo.create_from_commandline(
+                'gnome-control-center keyboard', null, Gio.AppInfoCreateFlags.NONE
+            );
+            appInfo.launch([], null);
+        });
+        rowKeys.add_suffix(btnOpenKeyboard);
+        rowKeys.set_activatable_widget(btnOpenKeyboard);
+    }
+}