diff --git a/options.conf.d/wayland.conf b/options.conf.d/wayland.conf
new file mode 100644
index 0000000..090dfda
--- /dev/null
+++ b/options.conf.d/wayland.conf
@@ -0,0 +1,10 @@
+x11-server/xorg-server xwayland
+compositor/sway xwayland tray gdk-pixbuf
+wayland-apps/swaybg gdk-pixbuf
+sys-libs/wlroots xwayland
+
+
+sys-auth/elogind providers: -* openrc
+compositor/sway providers: eudev elogind
+
+wayland-apps/Waybar tray network
diff --git a/package_unmask.conf b/package_unmask.conf
index deafaf8..30657ce 100644
--- a/package_unmask.conf
+++ b/package_unmask.conf
@@ -39,6 +39,7 @@ games-rpg/flare[~scm]
 sci-apps/z3[~scm]
 dev-lang/fstar[~scm]
 dev-lang/fsharp[~scm]
+x11-drivers/xf86-video-wayland[~scm]
 
 # valyriatear
 media-libs/SDL_ttf:2
diff --git a/sets/wayland.conf b/sets/wayland.conf
new file mode 100644
index 0000000..5a34fbe
--- /dev/null
+++ b/sets/wayland.conf
@@ -0,0 +1,3 @@
+* compositor/sway
+* x11-apps/xkeyboard-config
+* wayland-apps/Waybar