diff --git a/env/bfd b/env/bfd
new file mode 100644
index 0000000..0965f74
--- /dev/null
+++ b/env/bfd
@@ -0,0 +1,4 @@
+LD="ld.bfd"
+
+LDFLAGS="${LDFLAGS} -fuse-ld=bfd"
+
diff --git a/env/clang b/env/clang
index 03c319d..e751298 100644
--- a/env/clang
+++ b/env/clang
@@ -21,13 +21,11 @@ READELF="llvm-readelf"
 ADDR2LINE="llvm-addr2line"
 
 
-LD="ld.lld"
-
 LDFLAGS="-Wl,-O1 -Wl,--as-needed"
 
 LDFLAGS="${LDFLAGS} -rtlib=compiler-rt -unwindlib=libunwind"
 
-LDFLAGS="${LDFLAGS} -fuse-ld=lld -flto"
+LDFLAGS="${LDFLAGS} -flto"
 
 
 USE="${USE} clang llvm-libunwind"
diff --git a/env/clang-18 b/env/clang-18
deleted file mode 100644
index 1a1c23a..0000000
--- a/env/clang-18
+++ /dev/null
@@ -1,34 +0,0 @@
-COMMON_FLAGS="-O2 -pipe -march=native -flto=thin"
-
-CFLAGS="${COMMON_FLAGS}"
-CXXFLAGS="${COMMON_FLAGS}"
-FCFLAGS="${COMMON_FLAGS}"
-FFLAGS="${COMMON_FLAGS}"
-
-CC="clang-18"
-CXX="clang++-18"
-
-AR="llvm-ar"
-AS="clang-18 -c"
-CPP="clang-cpp-18"
-NM="llvm-nm"
-STRIP="llvm-strip"
-RANLIB="llvm-ranlib"
-OBJCOPY="llvm-objcopy"
-STRINGS="llvm-strings"
-OBJDUMP="llvm-objdump"
-READELF="llvm-readelf"
-ADDR2LINE="llvm-addr2line"
-
-
-LD="ld.lld"
-
-LDFLAGS="-Wl,-O1 -Wl,--as-needed"
-
-LDFLAGS="${LDFLAGS} -rtlib=compiler-rt -unwindlib=libunwind"
-
-LDFLAGS="${LDFLAGS} -fuse-ld=lld -flto"
-
-# RUSTFLAGS="-C target-cpu=native -C opt-level=3 -C linker=clang-18 -C link-arg=-fuse-ld=mold" 
-
-USE="${USE} clang llvm-libunwind"
diff --git a/env/clang-19 b/env/clang-19
index d4f1e6e..2241ba5 100644
--- a/env/clang-19
+++ b/env/clang-19
@@ -21,13 +21,11 @@ READELF="llvm-readelf"
 ADDR2LINE="llvm-addr2line"
 
 
-LD="ld.lld"
-
 LDFLAGS="-Wl,-O1 -Wl,--as-needed"
 
 LDFLAGS="${LDFLAGS} -rtlib=compiler-rt -unwindlib=libunwind"
 
-LDFLAGS="${LDFLAGS} -fuse-ld=lld -flto"
+LDFLAGS="${LDFLAGS} -flto"
 
 # RUSTFLAGS="-C target-cpu=native -C opt-level=3 -C linker=clang-19 -C link-arg=-fuse-ld=mold" 
 
diff --git a/env/clang-20 b/env/clang-20
index b3f53f9..518baed 100644
--- a/env/clang-20
+++ b/env/clang-20
@@ -21,13 +21,11 @@ READELF="llvm-readelf"
 ADDR2LINE="llvm-addr2line"
 
 
-LD="ld.lld"
-
 LDFLAGS="-Wl,-O1 -Wl,--as-needed"
 
 LDFLAGS="${LDFLAGS} -rtlib=compiler-rt -unwindlib=libunwind"
 
-LDFLAGS="${LDFLAGS} -fuse-ld=lld -flto"
+LDFLAGS="${LDFLAGS} -flto"
 
 # RUSTFLAGS="-C target-cpu=native -C opt-level=3 -C linker=clang-20 -C link-arg=-fuse-ld=mold" 
 
diff --git a/env/gcc b/env/gcc
index c474124..575f57a 100644
--- a/env/gcc
+++ b/env/gcc
@@ -23,8 +23,6 @@ READELF="readelf"
 ADDR2LINE="addr2line"
 
 
-LD="ld.bfd"
-
 LDFLAGS="-Wl,-O1 -Wl,--as-needed"
 
-LDFLAGS="${LDFLAGS} -fuse-ld=bfd -flto"
+LDFLAGS="${LDFLAGS} -flto"
diff --git a/env/lld b/env/lld
index 5882f4e..86f0c82 100644
--- a/env/lld
+++ b/env/lld
@@ -1,2 +1,3 @@
 LD="ld.lld"
+
 LDFLAGS="${LDFLAGS} -fuse-ld=lld"
diff --git a/make.conf/00common b/make.conf/00common
index 8d3b955..1e6b62b 100644
--- a/make.conf/00common
+++ b/make.conf/00common
@@ -4,7 +4,7 @@ PORTAGE_STRIP_FLAGS="--strip-unneeded -N __gentoo_check_ldflags__ -R .GCC.comman
 
 USE="dist-kernel llvm-libunwind lto zstd"
 USE="${USE} pulseaudio"
-USE="${USE} -cups -gpm -systemd -wayland"
+USE="${USE} -cups -gpm -systemd"
 
 L10N="en en-GB de"
 
diff --git a/package.accept_keywords/duckdb b/package.accept_keywords/duckdb
new file mode 100644
index 0000000..7f911cc
--- /dev/null
+++ b/package.accept_keywords/duckdb
@@ -0,0 +1 @@
+dev-db/duckdb ~amd64
diff --git a/package.accept_keywords/llvm b/package.accept_keywords/llvm
index ed62ce3..fee741a 100644
--- a/package.accept_keywords/llvm
+++ b/package.accept_keywords/llvm
@@ -15,4 +15,4 @@ llvm-runtimes/openmp ~amd64
 
 llvm-core/lld-toolchain-symlinks:20 ~amd64
 
-=llvm-core/lldb-20.1.5 ~amd64
+=llvm-core/lldb-20.1.6 ~amd64
diff --git a/package.accept_keywords/zig b/package.accept_keywords/zig
index b077263..582715f 100644
--- a/package.accept_keywords/zig
+++ b/package.accept_keywords/zig
@@ -1,4 +1,3 @@
-dev-lang/zig:0.13 ~amd64
 dev-lang/zig:0.14 ~amd64
 
 app-eselect/eselect-zig ~amd64
diff --git a/package.env/00compiler b/package.env/00compiler
index 6c435c2..fdef365 100644
--- a/package.env/00compiler
+++ b/package.env/00compiler
@@ -57,9 +57,8 @@ app-crypt/seahorse gcc
 
 dev-scheme/racket gcc
 
-llvm-core/llvm:18 clang-18
-llvm-core/clang:18 clang-18
-
 dev-python/zstandard gcc
 
 llvm-core/lldb lto-werror
+
+gui-apps/waybar gcc
diff --git a/package.license b/package.license
index 9490032..5201c3e 100644
--- a/package.license
+++ b/package.license
@@ -1,6 +1,6 @@
 sys-kernel/linux-firmware @BINARY-REDISTRIBUTABLE
 
-x11-drivers/nvidia-drivers NVIDIA-r2
+x11-drivers/nvidia-drivers NVIDIA-r2 NVIDIA-2023
 dev-util/nvidia-cuda-toolkit NVIDIA-CUDA
 dev-libs/cudnn NVIDIA-cuDNN
 
diff --git a/package.use/python_targets b/package.use/python_targets
index 20d09bb..892a76c 100644
--- a/package.use/python_targets
+++ b/package.use/python_targets
@@ -1,3 +1,3 @@
-*/* PYTHON_TARGETS: python3_12 python3_13 python3_13t
+*/* PYTHON_TARGETS: python3_13 python3_13t
 
 */* PYTHON_SINGLE_TARGET: -* python3_13