diff --git a/.local/share/flatpak/overrides/global b/.local/share/flatpak/overrides/global
new file mode 100644
index 0000000..462aa14
--- /dev/null
+++ b/.local/share/flatpak/overrides/global
@@ -0,0 +1,2 @@
+[Environment]
+GTK_THEME=Materia-dark
diff --git a/.zshenv b/.zshenv
index f43bc3d..5f14a53 100644
--- a/.zshenv
+++ b/.zshenv
@@ -3,7 +3,7 @@ export XDG_CONFIG_HOME="$HOME/.config"
 export XDG_DATA_HOME="$HOME/.local/share"
 export XDG_STATE_HOME="$HOME/.local/state"
 export XDG_CONFIG_DIRS=/etc/xdg
-export XDG_DATA_DIRS='/usr/local/share:/usr/share'
+export XDG_DATA_DIRS="$XDG_DATA_HOME/flatpak/exports/share:/var/lib/flatpak/exports/share:/usr/local/share:/usr/share"
 
 export ZDOTDIR="$XDG_CONFIG_HOME/zsh"
 export ZSH="$ZDOTDIR/ohmyzsh"
@@ -14,7 +14,7 @@ export ZSH_COMPDUMP="$XDG_CACHE_HOME/.zcompdump-$ZSH_VERSION"
 
 export LESSHISTFILE='-'
 
-path=("$HOME/bin" "$HOME/bin/containers" "$HOME/.local/bin" $path)
+path=("$HOME/bin" "$HOME/.local/bin" /var/lib/flatpak/exports/bin $path)
 
 export EDITOR='nvim'
 export MAKEFLAGS='-j'
diff --git a/bin/containers/banana b/bin/banana
similarity index 94%
rename from bin/containers/banana
rename to bin/banana
index 0dc1bba..846c1eb 100755
--- a/bin/containers/banana
+++ b/bin/banana
@@ -1,5 +1,4 @@
 #!/bin/bash -e
-# shellcheck disable=SC2034
 
 CRI=(podman)
 
diff --git a/bin/containers/debian b/bin/containers/debian
deleted file mode 100755
index f885776..0000000
--- a/bin/containers/debian
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash -e
-
-CRI=(podman)
-
-"${CRI[@]}" run --rm -it -v "$PWD:/mnt/" -w /mnt/ debian:12-slim
diff --git a/bin/containers/gui b/bin/containers/gui
deleted file mode 100755
index 93015c3..0000000
--- a/bin/containers/gui
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash -e
-
-if [ -z "$WAYLAND_DISPLAY" ]; then
-    CRI_OPT+=(
-        --network host
-        -e XAUTHORITY=/app/.Xauthority
-        -v "$XAUTHORITY:/app/.Xauthority:ro"
-    )
-fi
-
-CRI=(podman)
-
-"${CRI[@]}" run --rm --name gui            \
-    --userns=keep-id                       \
-    --device /dev/dri/                     \
-    -e DISPLAY                             \
-    -e XDG_RUNTIME_DIR                     \
-    -v /tmp/.X11-unix/:/tmp/.X11-unix/     \
-    -v "$XDG_RUNTIME_DIR:$XDG_RUNTIME_DIR" \
-    -v home:/app/                          \
-    git.maby.dev/ange/docker-gui:0.1
diff --git a/bin/containers/lutris b/bin/containers/lutris
deleted file mode 100755
index 2ce02d4..0000000
--- a/bin/containers/lutris
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash -e
-
-if [ -z "$WAYLAND_DISPLAY" ]; then
-    CRI_OPT+=(
-        --network host
-        -e XAUTHORITY=/app/.Xauthority
-        -v "$XAUTHORITY:/app/.Xauthority:ro"
-    )
-fi
-
-CRI=(podman)
-
-HOMEDIR="$HOME/.local/state/docker-gui/lutris"
-mkdir -p "$HOMEDIR"
-
-"${CRI[@]}" run --rm --name lutris         \
-    "${CRI_OPT[@]}"                        \
-    --userns=keep-id                       \
-    --device /dev/dri/                     \
-    -e DISPLAY                             \
-    -e XDG_RUNTIME_DIR                     \
-    -v /tmp/.X11-unix/:/tmp/.X11-unix/     \
-    -v "$XDG_RUNTIME_DIR:$XDG_RUNTIME_DIR" \
-    -v "$HOMEDIR:/app/"                    \
-    git.maby.dev/ange/docker-lutris:0.1
diff --git a/bin/containers/minecraft b/bin/containers/minecraft
deleted file mode 100755
index f8fe15b..0000000
--- a/bin/containers/minecraft
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash -e
-
-if [ -z "$WAYLAND_DISPLAY" ]; then
-    CRI_OPT+=(
-        --network host
-        -e XAUTHORITY=/app/.Xauthority
-        -v "$XAUTHORITY:/app/.Xauthority:ro"
-    )
-fi
-
-CRI=(podman)
-
-HOMEDIR="$HOME/.local/state/GUI/minecraft"
-mkdir -p "$HOMEDIR"
-
-"${CRI[@]}" run --rm --name minecraft      \
-    "${CRI_OPT[@]}"                        \
-    --userns=keep-id                       \
-    --device /dev/dri/                     \
-    -e DISPLAY                             \
-    -e XDG_RUNTIME_DIR                     \
-    -v /tmp/.X11-unix/:/tmp/.X11-unix/     \
-    -v "$XDG_RUNTIME_DIR:$XDG_RUNTIME_DIR" \
-    -v "$HOMEDIR:/app/"                    \
-    git.maby.dev/ange/docker-minecraft:0.1
diff --git a/bin/debian b/bin/debian
new file mode 100755
index 0000000..a1ab773
--- /dev/null
+++ b/bin/debian
@@ -0,0 +1,5 @@
+#!/bin/bash -e
+
+CRI=(podman)
+
+"${CRI[@]}" run --rm -it -v "$PWD:/mnt/" -w /mnt/ docker.io/debian:12-slim
diff --git a/bin/containers/epitest b/bin/epitest
similarity index 100%
rename from bin/containers/epitest
rename to bin/epitest