diff --git a/hosts/nb-epicenter/hardware-configuration.nix b/hosts/nb-epicenter/hardware-configuration.nix
index 7f7c20f..e5cd502 100644
--- a/hosts/nb-epicenter/hardware-configuration.nix
+++ b/hosts/nb-epicenter/hardware-configuration.nix
@@ -10,7 +10,7 @@
 
   boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "usb_storage" "sd_mod" "sdhci_pci" ];
   boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-amd" ];
+  boot.kernelModules = [ "kvm-amd" "amdgpu" ];
   boot.kernelParams = [ "psmouse.synaptics_intertouch=0" ];
   boot.extraModulePackages = [ ];
 # Bootloader.
@@ -47,4 +47,17 @@
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+
+  hardware.opengl.driSupport = true;
+  # For 32 bit applications
+  hardware.opengl.driSupport32Bit = true;
+
+  hardware.opengl.extraPackages = with pkgs; [
+    amdvlk
+  ];
+  # For 32 bit applications 
+  # Only available on unstable
+  hardware.opengl.extraPackages32 = with pkgs; [
+    driversi686Linux.amdvlk
+  ];
 }
diff --git a/utils/modules/sway/sway.nix b/utils/modules/sway/sway.nix
index 62b3483..191d102 100644
--- a/utils/modules/sway/sway.nix
+++ b/utils/modules/sway/sway.nix
@@ -51,6 +51,7 @@ in {
     environment.systemPackages = with pkgs; [
       alsaUtils
       alacritty
+      enlightenment.terminology
       bitwarden
       chromium
       cryptomator
@@ -92,10 +93,6 @@ in {
       wtype
       apache-directory-studio
       firefox
-
-
-      onlyoffice-bin
-      # kexi
     ];
 
     # nixpkgs.config.permittedInsecurePackages = [
diff --git a/utils/modules/sway/xdg-waybar-config.nix b/utils/modules/sway/xdg-waybar-config.nix
index e35fff3..2071716 100644
--- a/utils/modules/sway/xdg-waybar-config.nix
+++ b/utils/modules/sway/xdg-waybar-config.nix
@@ -5,81 +5,81 @@
       // -*- mode: json -*-
 
       {
-      "layer": "top",
-      "position": "top",
+        "layer": "top",
+        "position": "top",
 
-      "modules-left": [
-      "sway/workspaces",
-      "custom/right-arrow-dark"
-      ],
-      "modules-center": [
-      "custom/left-arrow-dark",
-      "clock#1",
-      "custom/left-arrow-light",
-      "custom/left-arrow-dark",
-      "clock#2",
-      "custom/right-arrow-dark",
-      "custom/right-arrow-light",
-      "clock#3",
-      "custom/right-arrow-dark"
-      ],
-      "modules-right": [
-      "custom/left-arrow-dark",
-      "network",
-      "custom/left-arrow-light",
-      "custom/left-arrow-dark",
-      "pulseaudio",
-      "custom/left-arrow-light",
-      "custom/left-arrow-dark",
-      "memory",
-      "custom/left-arrow-light",
-      "custom/left-arrow-dark",
-      "cpu",
-      "custom/left-arrow-light",
-      "custom/left-arrow-dark",
-      "battery",
-      "custom/left-arrow-light",
-      "custom/left-arrow-dark",
-      "disk",
-      "custom/left-arrow-light",
-      "custom/left-arrow-dark",
-      "tray"
-      ],
+        "modules-left": [
+          "sway/workspaces",
+          "custom/right-arrow-dark"
+        ],
+        "modules-center": [
+          "custom/left-arrow-dark",
+          "clock#1",
+          "custom/left-arrow-light",
+          "custom/left-arrow-dark",
+          "clock#2",
+          "custom/right-arrow-dark",
+          "custom/right-arrow-light",
+          "clock#3",
+          "custom/right-arrow-dark"
+        ],
+        "modules-right": [
+          "custom/left-arrow-dark",
+          "network",
+          "custom/left-arrow-light",
+          "custom/left-arrow-dark",
+          "pulseaudio",
+          "custom/left-arrow-light",
+          "custom/left-arrow-dark",
+          "memory",
+          "custom/left-arrow-light",
+          "custom/left-arrow-dark",
+          "cpu",
+          "custom/left-arrow-light",
+          "custom/left-arrow-dark",
+          "battery",
+          "custom/left-arrow-light",
+          "custom/left-arrow-dark",
+          "disk",
+          "custom/left-arrow-light",
+          "custom/left-arrow-dark",
+          "tray"
+        ],
 
-      "custom/left-arrow-dark": {
-      "format": "",
-      "tooltip": false
-      },
-      "custom/left-arrow-light": {
-      "format": "",
-      "tooltip": false
-      },
-      "custom/right-arrow-dark": {
-      "format": "",
-      "tooltip": false
-      },
-      "custom/right-arrow-light": {
-      "format": "",
-      "tooltip": false
-      },
+        "custom/left-arrow-dark": {
+          "format": "",
+          "tooltip": false
+        },
+        "custom/left-arrow-light": {
+          "format": "",
+          "tooltip": false
+        },
+        "custom/right-arrow-dark": {
+          "format": "",
+          "tooltip": false
+        },
+        "custom/right-arrow-light": {
+          "format": "",
+          "tooltip": false
+        },
 
-      "sway/workspaces": {
-      "disable-scroll": true,
-      "format": "{name}"
-      },
+        "sway/workspaces": {
+          "disable-scroll": true,
+          "format": "{name}"
+        },
 
-      "clock#1": {
-      "format": "{:%a}",
-      "tooltip": false
-      },
-      "clock#2": {
-      "format": "{:%H:%M}",
-      "tooltip": false
-      },
-      "clock#3": {
-      "format": "{:%d.%m}",
-      "tooltip": false
-      },
+        "clock#1": {
+          "format": "{:%a}",
+          "tooltip": false
+        },
+        "clock#2": {
+          "format": "{:%H:%M}",
+          "tooltip": false
+        },
+        "clock#3": {
+          "format": "{:%d.%m}",
+          "tooltip": false
+        },
 
         "pulseaudio": {
             "format": "{icon}{volume}%",
@@ -101,37 +101,37 @@
             "format-disconnected": "Disconnected ",
             "format-alt": "{ifname}: {ipaddr}/{cidr}"
         },
-      "memory": {
-      "interval": 5,
-      "format": "{}%"
-      },
-      "cpu": {
-      "interval": 5,
-      "format": "﬙{usage:2}%"
-      },
-      "battery": {
-      "states": {
-      "good": 95,
-      "warning": 30,
-      "critical": 15
-      },
-      "format": "{icon} {capacity}%",
-      "format-icons": [
-      "",
-      "",
-      "",
-      "",
-      ""
-      ]
-      },
-      "disk": {
-      "interval": 5,
-      "format": "{percentage_used:2}%",
-      "path": "/home/"
-      },
-      "tray": {
-      "icon-size": 20
-      }
+        "memory": {
+          "interval": 5,
+          "format": "{}%"
+        },
+        "cpu": {
+          "interval": 5,
+          "format": "﬙{usage:2}%"
+        },
+        "battery": {
+          "states": {
+            "good": 95,
+            "warning": 30,
+            "critical": 15
+          },
+          "format": "{icon} {capacity}%",
+          "format-icons": [
+            "",
+            "",
+            "",
+            "",
+            ""
+          ]
+        },
+        "disk": {
+          "interval": 5,
+          "format": "{percentage_used:2}%",
+          "path": "/home/"
+        },
+        "tray": {
+          "icon-size": 20
+        }
       }
     '';