diff --git a/options.conf.d/desktop.conf b/options.conf.d/desktop.conf
index 0dd360e..e82d0fb 100644
--- a/options.conf.d/desktop.conf
+++ b/options.conf.d/desktop.conf
@@ -154,6 +154,9 @@ media/ffmpeg vpx
 
 # firefox
 dev-lang/node bundled-openssl
+net-www/firefox wayland
+
+x11-dri/mesa wayland opencl llvm
 
 # because of dconf-editor
 gnome-desktop/dconf vapi
diff --git a/options.conf.d/development.conf b/options.conf.d/development.conf
index 31145ac..9579d2a 100644
--- a/options.conf.d/development.conf
+++ b/options.conf.d/development.conf
@@ -38,3 +38,6 @@ app-editors/gvim ruby
 dev-util/universal-ctags json xml yaml
 
 dev-db/sqlite readline
+
+# java
+=virtual/jdk-12.0 providers: openjdk-bin
diff --git a/options.conf.d/games.conf b/options.conf.d/games.conf
index 675737e..ed718a7 100644
--- a/options.conf.d/games.conf
+++ b/options.conf.d/games.conf
@@ -13,7 +13,7 @@ games-roguelike/dungeon-crawl-stone-soup tiles
 
 games-rpg/pillars-of-eternity pre-order-items white-march-1 white-march-2
 
-games-strategy/freeciv lua_abis: -* 5.2
+games-strategy/freeciv lua_abis: -* 5.3
 games-strategy/freeciv gtk3
 
 games-fps/eduke32 offensive hires-textures -tools vpx