diff --git a/Makefile b/Makefile
index 870314b1..a80cda5f 100755
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ debug: FORCE
 	meson compile -C build_dbg
 
 release: FORCE
-	meson setup -Dbuildtype=release -Db_lto=true -Db_ndebug=true -Db_pgo=use build_release
+	meson setup -Dbuildtype=release -Db_lto=true -Db_ndebug=true build_release
 	meson compile -C build_release
 
 sanitize: FORCE
@@ -11,7 +11,7 @@ sanitize: FORCE
 	meson compile -C build_sani
 
 small: FORCE
-	meson setup -Dbuildtype=minsize -Db_lto=true -Db_ndebug=true -Db_pgo=use build_small
+	meson setup -Dbuildtype=minsize -Db_lto=true -Db_ndebug=true build_small
 	meson compile -C build_small
 
 web: FORCE
diff --git a/icons/airplane.png b/icons_dev/airplane.png
similarity index 100%
rename from icons/airplane.png
rename to icons_dev/airplane.png
diff --git a/icons/ak47.png b/icons_dev/ak47.png
similarity index 100%
rename from icons/ak47.png
rename to icons_dev/ak47.png
diff --git a/icons/amputation.png b/icons_dev/amputation.png
similarity index 100%
rename from icons/amputation.png
rename to icons_dev/amputation.png
diff --git a/icons/ant.png b/icons_dev/ant.png
similarity index 100%
rename from icons/ant.png
rename to icons_dev/ant.png
diff --git a/icons/archer.png b/icons_dev/archer.png
similarity index 100%
rename from icons/archer.png
rename to icons_dev/archer.png
diff --git a/icons/armadillo.png b/icons_dev/armadillo.png
similarity index 100%
rename from icons/armadillo.png
rename to icons_dev/armadillo.png
diff --git a/icons/atom.png b/icons_dev/atom.png
similarity index 100%
rename from icons/atom.png
rename to icons_dev/atom.png
diff --git a/icons/banana.png b/icons_dev/banana.png
similarity index 100%
rename from icons/banana.png
rename to icons_dev/banana.png
diff --git a/icons/bank.png b/icons_dev/bank.png
similarity index 100%
rename from icons/bank.png
rename to icons_dev/bank.png
diff --git a/icons/banknote.png b/icons_dev/banknote.png
similarity index 100%
rename from icons/banknote.png
rename to icons_dev/banknote.png
diff --git a/icons/barn.png b/icons_dev/barn.png
similarity index 100%
rename from icons/barn.png
rename to icons_dev/barn.png
diff --git a/icons/barrel.png b/icons_dev/barrel.png
similarity index 100%
rename from icons/barrel.png
rename to icons_dev/barrel.png
diff --git a/icons/basket.png b/icons_dev/basket.png
similarity index 100%
rename from icons/basket.png
rename to icons_dev/basket.png
diff --git a/icons/bat.png b/icons_dev/bat.png
similarity index 100%
rename from icons/bat.png
rename to icons_dev/bat.png
diff --git a/icons/bed.png b/icons_dev/bed.png
similarity index 100%
rename from icons/bed.png
rename to icons_dev/bed.png
diff --git a/icons/belt.png b/icons_dev/belt.png
similarity index 100%
rename from icons/belt.png
rename to icons_dev/belt.png
diff --git a/icons/boar.png b/icons_dev/boar.png
similarity index 100%
rename from icons/boar.png
rename to icons_dev/boar.png
diff --git a/icons/broom.png b/icons_dev/broom.png
similarity index 100%
rename from icons/broom.png
rename to icons_dev/broom.png
diff --git a/icons/cabin.png b/icons_dev/cabin.png
similarity index 100%
rename from icons/cabin.png
rename to icons_dev/cabin.png
diff --git a/icons/card-10-clubs.png b/icons_dev/card-10-clubs.png
similarity index 100%
rename from icons/card-10-clubs.png
rename to icons_dev/card-10-clubs.png
diff --git a/icons/card-10-diamonds.png b/icons_dev/card-10-diamonds.png
similarity index 100%
rename from icons/card-10-diamonds.png
rename to icons_dev/card-10-diamonds.png
diff --git a/icons/card-10-hearts.png b/icons_dev/card-10-hearts.png
similarity index 100%
rename from icons/card-10-hearts.png
rename to icons_dev/card-10-hearts.png
diff --git a/icons/card-10-spades.png b/icons_dev/card-10-spades.png
similarity index 100%
rename from icons/card-10-spades.png
rename to icons_dev/card-10-spades.png
diff --git a/icons/card-2-clubs.png b/icons_dev/card-2-clubs.png
similarity index 100%
rename from icons/card-2-clubs.png
rename to icons_dev/card-2-clubs.png
diff --git a/icons/card-2-diamonds.png b/icons_dev/card-2-diamonds.png
similarity index 100%
rename from icons/card-2-diamonds.png
rename to icons_dev/card-2-diamonds.png
diff --git a/icons/card-2-hearts.png b/icons_dev/card-2-hearts.png
similarity index 100%
rename from icons/card-2-hearts.png
rename to icons_dev/card-2-hearts.png
diff --git a/icons/card-2-spades.png b/icons_dev/card-2-spades.png
similarity index 100%
rename from icons/card-2-spades.png
rename to icons_dev/card-2-spades.png
diff --git a/icons/card-3-clubs.png b/icons_dev/card-3-clubs.png
similarity index 100%
rename from icons/card-3-clubs.png
rename to icons_dev/card-3-clubs.png
diff --git a/icons/card-3-diamonds.png b/icons_dev/card-3-diamonds.png
similarity index 100%
rename from icons/card-3-diamonds.png
rename to icons_dev/card-3-diamonds.png
diff --git a/icons/card-3-hearts.png b/icons_dev/card-3-hearts.png
similarity index 100%
rename from icons/card-3-hearts.png
rename to icons_dev/card-3-hearts.png
diff --git a/icons/card-3-spades.png b/icons_dev/card-3-spades.png
similarity index 100%
rename from icons/card-3-spades.png
rename to icons_dev/card-3-spades.png
diff --git a/icons/card-4-clubs.png b/icons_dev/card-4-clubs.png
similarity index 100%
rename from icons/card-4-clubs.png
rename to icons_dev/card-4-clubs.png
diff --git a/icons/card-4-diamonds.png b/icons_dev/card-4-diamonds.png
similarity index 100%
rename from icons/card-4-diamonds.png
rename to icons_dev/card-4-diamonds.png
diff --git a/icons/card-4-hearts.png b/icons_dev/card-4-hearts.png
similarity index 100%
rename from icons/card-4-hearts.png
rename to icons_dev/card-4-hearts.png
diff --git a/icons/card-4-spades.png b/icons_dev/card-4-spades.png
similarity index 100%
rename from icons/card-4-spades.png
rename to icons_dev/card-4-spades.png
diff --git a/icons/card-5-clubs.png b/icons_dev/card-5-clubs.png
similarity index 100%
rename from icons/card-5-clubs.png
rename to icons_dev/card-5-clubs.png
diff --git a/icons/card-5-diamonds.png b/icons_dev/card-5-diamonds.png
similarity index 100%
rename from icons/card-5-diamonds.png
rename to icons_dev/card-5-diamonds.png
diff --git a/icons/card-5-hearts.png b/icons_dev/card-5-hearts.png
similarity index 100%
rename from icons/card-5-hearts.png
rename to icons_dev/card-5-hearts.png
diff --git a/icons/card-5-spades.png b/icons_dev/card-5-spades.png
similarity index 100%
rename from icons/card-5-spades.png
rename to icons_dev/card-5-spades.png
diff --git a/icons/card-6-clubs.png b/icons_dev/card-6-clubs.png
similarity index 100%
rename from icons/card-6-clubs.png
rename to icons_dev/card-6-clubs.png
diff --git a/icons/card-6-diamonds.png b/icons_dev/card-6-diamonds.png
similarity index 100%
rename from icons/card-6-diamonds.png
rename to icons_dev/card-6-diamonds.png
diff --git a/icons/card-6-hearts.png b/icons_dev/card-6-hearts.png
similarity index 100%
rename from icons/card-6-hearts.png
rename to icons_dev/card-6-hearts.png
diff --git a/icons/card-6-spades.png b/icons_dev/card-6-spades.png
similarity index 100%
rename from icons/card-6-spades.png
rename to icons_dev/card-6-spades.png
diff --git a/icons/card-7-clubs.png b/icons_dev/card-7-clubs.png
similarity index 100%
rename from icons/card-7-clubs.png
rename to icons_dev/card-7-clubs.png
diff --git a/icons/card-7-diamonds.png b/icons_dev/card-7-diamonds.png
similarity index 100%
rename from icons/card-7-diamonds.png
rename to icons_dev/card-7-diamonds.png
diff --git a/icons/card-7-hearts.png b/icons_dev/card-7-hearts.png
similarity index 100%
rename from icons/card-7-hearts.png
rename to icons_dev/card-7-hearts.png
diff --git a/icons/card-7-spades.png b/icons_dev/card-7-spades.png
similarity index 100%
rename from icons/card-7-spades.png
rename to icons_dev/card-7-spades.png
diff --git a/icons/card-8-clubs.png b/icons_dev/card-8-clubs.png
similarity index 100%
rename from icons/card-8-clubs.png
rename to icons_dev/card-8-clubs.png
diff --git a/icons/card-8-diamonds.png b/icons_dev/card-8-diamonds.png
similarity index 100%
rename from icons/card-8-diamonds.png
rename to icons_dev/card-8-diamonds.png
diff --git a/icons/card-8-hearts.png b/icons_dev/card-8-hearts.png
similarity index 100%
rename from icons/card-8-hearts.png
rename to icons_dev/card-8-hearts.png
diff --git a/icons/card-8-spades.png b/icons_dev/card-8-spades.png
similarity index 100%
rename from icons/card-8-spades.png
rename to icons_dev/card-8-spades.png
diff --git a/icons/card-9-clubs.png b/icons_dev/card-9-clubs.png
similarity index 100%
rename from icons/card-9-clubs.png
rename to icons_dev/card-9-clubs.png
diff --git a/icons/card-9-diamonds.png b/icons_dev/card-9-diamonds.png
similarity index 100%
rename from icons/card-9-diamonds.png
rename to icons_dev/card-9-diamonds.png
diff --git a/icons/card-9-hearts.png b/icons_dev/card-9-hearts.png
similarity index 100%
rename from icons/card-9-hearts.png
rename to icons_dev/card-9-hearts.png
diff --git a/icons/card-9-spades.png b/icons_dev/card-9-spades.png
similarity index 100%
rename from icons/card-9-spades.png
rename to icons_dev/card-9-spades.png
diff --git a/icons/card-ace-clubs.png b/icons_dev/card-ace-clubs.png
similarity index 100%
rename from icons/card-ace-clubs.png
rename to icons_dev/card-ace-clubs.png
diff --git a/icons/card-ace-diamonds.png b/icons_dev/card-ace-diamonds.png
similarity index 100%
rename from icons/card-ace-diamonds.png
rename to icons_dev/card-ace-diamonds.png
diff --git a/icons/card-ace-hearts.png b/icons_dev/card-ace-hearts.png
similarity index 100%
rename from icons/card-ace-hearts.png
rename to icons_dev/card-ace-hearts.png
diff --git a/icons/card-ace-spades.png b/icons_dev/card-ace-spades.png
similarity index 100%
rename from icons/card-ace-spades.png
rename to icons_dev/card-ace-spades.png
diff --git a/icons/card-discard.png b/icons_dev/card-discard.png
similarity index 100%
rename from icons/card-discard.png
rename to icons_dev/card-discard.png
diff --git a/icons/card-draw.png b/icons_dev/card-draw.png
similarity index 100%
rename from icons/card-draw.png
rename to icons_dev/card-draw.png
diff --git a/icons/card-jack-clubs.png b/icons_dev/card-jack-clubs.png
similarity index 100%
rename from icons/card-jack-clubs.png
rename to icons_dev/card-jack-clubs.png
diff --git a/icons/card-jack-diamonds.png b/icons_dev/card-jack-diamonds.png
similarity index 100%
rename from icons/card-jack-diamonds.png
rename to icons_dev/card-jack-diamonds.png
diff --git a/icons/card-jack-hearts.png b/icons_dev/card-jack-hearts.png
similarity index 100%
rename from icons/card-jack-hearts.png
rename to icons_dev/card-jack-hearts.png
diff --git a/icons/card-jack-spades.png b/icons_dev/card-jack-spades.png
similarity index 100%
rename from icons/card-jack-spades.png
rename to icons_dev/card-jack-spades.png
diff --git a/icons/card-joker.png b/icons_dev/card-joker.png
similarity index 100%
rename from icons/card-joker.png
rename to icons_dev/card-joker.png
diff --git a/icons/card-king-clubs.png b/icons_dev/card-king-clubs.png
similarity index 100%
rename from icons/card-king-clubs.png
rename to icons_dev/card-king-clubs.png
diff --git a/icons/card-king-diamonds.png b/icons_dev/card-king-diamonds.png
similarity index 100%
rename from icons/card-king-diamonds.png
rename to icons_dev/card-king-diamonds.png
diff --git a/icons/card-king-hearts.png b/icons_dev/card-king-hearts.png
similarity index 100%
rename from icons/card-king-hearts.png
rename to icons_dev/card-king-hearts.png
diff --git a/icons/card-king-spades.png b/icons_dev/card-king-spades.png
similarity index 100%
rename from icons/card-king-spades.png
rename to icons_dev/card-king-spades.png
diff --git a/icons/card-pick.png b/icons_dev/card-pick.png
similarity index 100%
rename from icons/card-pick.png
rename to icons_dev/card-pick.png
diff --git a/icons/card-queen-clubs.png b/icons_dev/card-queen-clubs.png
similarity index 100%
rename from icons/card-queen-clubs.png
rename to icons_dev/card-queen-clubs.png
diff --git a/icons/card-queen-diamonds.png b/icons_dev/card-queen-diamonds.png
similarity index 100%
rename from icons/card-queen-diamonds.png
rename to icons_dev/card-queen-diamonds.png
diff --git a/icons/card-queen-hearts.png b/icons_dev/card-queen-hearts.png
similarity index 100%
rename from icons/card-queen-hearts.png
rename to icons_dev/card-queen-hearts.png
diff --git a/icons/card-queen-spades.png b/icons_dev/card-queen-spades.png
similarity index 100%
rename from icons/card-queen-spades.png
rename to icons_dev/card-queen-spades.png
diff --git a/icons/card-random.png b/icons_dev/card-random.png
similarity index 100%
rename from icons/card-random.png
rename to icons_dev/card-random.png
diff --git a/icons/chess-bishop.png b/icons_dev/chess-bishop.png
similarity index 100%
rename from icons/chess-bishop.png
rename to icons_dev/chess-bishop.png
diff --git a/icons/chess-king.png b/icons_dev/chess-king.png
similarity index 100%
rename from icons/chess-king.png
rename to icons_dev/chess-king.png
diff --git a/icons/chess-knight.png b/icons_dev/chess-knight.png
similarity index 100%
rename from icons/chess-knight.png
rename to icons_dev/chess-knight.png
diff --git a/icons/chess-pawn.png b/icons_dev/chess-pawn.png
similarity index 100%
rename from icons/chess-pawn.png
rename to icons_dev/chess-pawn.png
diff --git a/icons/chess-queen.png b/icons_dev/chess-queen.png
similarity index 100%
rename from icons/chess-queen.png
rename to icons_dev/chess-queen.png
diff --git a/icons/chess-rook.png b/icons_dev/chess-rook.png
similarity index 100%
rename from icons/chess-rook.png
rename to icons_dev/chess-rook.png
diff --git a/icons/chicken.png b/icons_dev/chicken.png
similarity index 100%
rename from icons/chicken.png
rename to icons_dev/chicken.png
diff --git a/icons/clarinet.png b/icons_dev/clarinet.png
similarity index 100%
rename from icons/clarinet.png
rename to icons_dev/clarinet.png
diff --git a/icons/cloak.png b/icons_dev/cloak.png
similarity index 100%
rename from icons/cloak.png
rename to icons_dev/cloak.png
diff --git a/icons/clown.png b/icons_dev/clown.png
similarity index 100%
rename from icons/clown.png
rename to icons_dev/clown.png
diff --git a/icons/coins.png b/icons_dev/coins.png
similarity index 100%
rename from icons/coins.png
rename to icons_dev/coins.png
diff --git a/icons/compass.png b/icons_dev/compass.png
similarity index 100%
rename from icons/compass.png
rename to icons_dev/compass.png
diff --git a/icons/cow.png b/icons_dev/cow.png
similarity index 100%
rename from icons/cow.png
rename to icons_dev/cow.png
diff --git a/icons/crossed-swords.png b/icons_dev/crossed-swords.png
similarity index 100%
rename from icons/crossed-swords.png
rename to icons_dev/crossed-swords.png
diff --git a/icons/deer.png b/icons_dev/deer.png
similarity index 100%
rename from icons/deer.png
rename to icons_dev/deer.png
diff --git a/icons/dice.png b/icons_dev/dice.png
similarity index 100%
rename from icons/dice.png
rename to icons_dev/dice.png
diff --git a/icons/dodo.png b/icons_dev/dodo.png
similarity index 100%
rename from icons/dodo.png
rename to icons_dev/dodo.png
diff --git a/icons/donkey.png b/icons_dev/donkey.png
similarity index 100%
rename from icons/donkey.png
rename to icons_dev/donkey.png
diff --git a/icons/door.png b/icons_dev/door.png
similarity index 100%
rename from icons/door.png
rename to icons_dev/door.png
diff --git a/icons/duck.png b/icons_dev/duck.png
similarity index 100%
rename from icons/duck.png
rename to icons_dev/duck.png
diff --git a/icons/dynamite.png b/icons_dev/dynamite.png
similarity index 100%
rename from icons/dynamite.png
rename to icons_dev/dynamite.png
diff --git a/icons/f-clef.png b/icons_dev/f-clef.png
similarity index 100%
rename from icons/f-clef.png
rename to icons_dev/f-clef.png
diff --git a/icons/fairy.png b/icons_dev/fairy.png
similarity index 100%
rename from icons/fairy.png
rename to icons_dev/fairy.png
diff --git a/icons/fangs.png b/icons_dev/fangs.png
similarity index 100%
rename from icons/fangs.png
rename to icons_dev/fangs.png
diff --git a/icons/fez.png b/icons_dev/fez.png
similarity index 100%
rename from icons/fez.png
rename to icons_dev/fez.png
diff --git a/icons/files.png b/icons_dev/files.png
similarity index 100%
rename from icons/files.png
rename to icons_dev/files.png
diff --git a/icons/finch.png b/icons_dev/finch.png
similarity index 100%
rename from icons/finch.png
rename to icons_dev/finch.png
diff --git a/icons/fire.png b/icons_dev/fire.png
similarity index 100%
rename from icons/fire.png
rename to icons_dev/fire.png
diff --git a/icons/flashlight.png b/icons_dev/flashlight.png
similarity index 100%
rename from icons/flashlight.png
rename to icons_dev/flashlight.png
diff --git a/icons/footsteps.png b/icons_dev/footsteps.png
similarity index 100%
rename from icons/footsteps.png
rename to icons_dev/footsteps.png
diff --git a/icons/forest.png b/icons_dev/forest.png
similarity index 100%
rename from icons/forest.png
rename to icons_dev/forest.png
diff --git a/icons/fox.png b/icons_dev/fox.png
similarity index 100%
rename from icons/fox.png
rename to icons_dev/fox.png
diff --git a/icons/fuji.png b/icons_dev/fuji.png
similarity index 100%
rename from icons/fuji.png
rename to icons_dev/fuji.png
diff --git a/icons/g-clef.png b/icons_dev/g-clef.png
similarity index 100%
rename from icons/g-clef.png
rename to icons_dev/g-clef.png
diff --git a/icons/gargoyle.png b/icons_dev/gargoyle.png
similarity index 100%
rename from icons/gargoyle.png
rename to icons_dev/gargoyle.png
diff --git a/icons/garlic.png b/icons_dev/garlic.png
similarity index 100%
rename from icons/garlic.png
rename to icons_dev/garlic.png
diff --git a/icons/gasmask.png b/icons_dev/gasmask.png
similarity index 100%
rename from icons/gasmask.png
rename to icons_dev/gasmask.png
diff --git a/icons/gate.png b/icons_dev/gate.png
similarity index 100%
rename from icons/gate.png
rename to icons_dev/gate.png
diff --git a/icons/goblin.png b/icons_dev/goblin.png
similarity index 100%
rename from icons/goblin.png
rename to icons_dev/goblin.png
diff --git a/icons/goose.png b/icons_dev/goose.png
similarity index 100%
rename from icons/goose.png
rename to icons_dev/goose.png
diff --git a/icons/gorilla.png b/icons_dev/gorilla.png
similarity index 100%
rename from icons/gorilla.png
rename to icons_dev/gorilla.png
diff --git a/icons/grass.png b/icons_dev/grass.png
similarity index 100%
rename from icons/grass.png
rename to icons_dev/grass.png
diff --git a/icons/harp.png b/icons_dev/harp.png
similarity index 100%
rename from icons/harp.png
rename to icons_dev/harp.png
diff --git a/icons/hatchet.png b/icons_dev/hatchet.png
similarity index 100%
rename from icons/hatchet.png
rename to icons_dev/hatchet.png
diff --git a/icons/heart.png b/icons_dev/heart.png
similarity index 100%
rename from icons/heart.png
rename to icons_dev/heart.png
diff --git a/icons/hedgehog.png b/icons_dev/hedgehog.png
similarity index 100%
rename from icons/hedgehog.png
rename to icons_dev/hedgehog.png
diff --git a/icons/heron.png b/icons_dev/heron.png
similarity index 100%
rename from icons/heron.png
rename to icons_dev/heron.png
diff --git a/icons/hook.png b/icons_dev/hook.png
similarity index 100%
rename from icons/hook.png
rename to icons_dev/hook.png
diff --git a/icons/hotdog.png b/icons_dev/hotdog.png
similarity index 100%
rename from icons/hotdog.png
rename to icons_dev/hotdog.png
diff --git a/icons/info.png b/icons_dev/info.png
similarity index 100%
rename from icons/info.png
rename to icons_dev/info.png
diff --git a/icons/key.png b/icons_dev/key.png
similarity index 100%
rename from icons/key.png
rename to icons_dev/key.png
diff --git a/icons/kite.png b/icons_dev/kite.png
similarity index 100%
rename from icons/kite.png
rename to icons_dev/kite.png
diff --git a/icons/ladder.png b/icons_dev/ladder.png
similarity index 100%
rename from icons/ladder.png
rename to icons_dev/ladder.png
diff --git a/icons/lambda.png b/icons_dev/lambda.png
similarity index 100%
rename from icons/lambda.png
rename to icons_dev/lambda.png
diff --git a/icons/led.png b/icons_dev/led.png
similarity index 100%
rename from icons/led.png
rename to icons_dev/led.png
diff --git a/icons/lemon.png b/icons_dev/lemon.png
similarity index 100%
rename from icons/lemon.png
rename to icons_dev/lemon.png
diff --git a/icons/log.png b/icons_dev/log.png
similarity index 100%
rename from icons/log.png
rename to icons_dev/log.png
diff --git a/icons/maracas.png b/icons_dev/maracas.png
similarity index 100%
rename from icons/maracas.png
rename to icons_dev/maracas.png
diff --git a/icons/moai.png b/icons_dev/moai.png
similarity index 100%
rename from icons/moai.png
rename to icons_dev/moai.png
diff --git a/icons/mole.png b/icons_dev/mole.png
similarity index 100%
rename from icons/mole.png
rename to icons_dev/mole.png
diff --git a/icons/mouse.png b/icons_dev/mouse.png
similarity index 100%
rename from icons/mouse.png
rename to icons_dev/mouse.png
diff --git a/icons/move.png b/icons_dev/move.png
similarity index 100%
rename from icons/move.png
rename to icons_dev/move.png
diff --git a/icons/necklace.png b/icons_dev/necklace.png
similarity index 100%
rename from icons/necklace.png
rename to icons_dev/necklace.png
diff --git a/icons/ocarina.png b/icons_dev/ocarina.png
similarity index 100%
rename from icons/ocarina.png
rename to icons_dev/ocarina.png
diff --git a/icons/panflute.png b/icons_dev/panflute.png
similarity index 100%
rename from icons/panflute.png
rename to icons_dev/panflute.png
diff --git a/icons/pangolin.png b/icons_dev/pangolin.png
similarity index 100%
rename from icons/pangolin.png
rename to icons_dev/pangolin.png
diff --git a/icons/pc.png b/icons_dev/pc.png
similarity index 100%
rename from icons/pc.png
rename to icons_dev/pc.png
diff --git a/icons/phone.png b/icons_dev/phone.png
similarity index 100%
rename from icons/phone.png
rename to icons_dev/phone.png
diff --git a/icons/piechart.png b/icons_dev/piechart.png
similarity index 100%
rename from icons/piechart.png
rename to icons_dev/piechart.png
diff --git a/icons/pin.png b/icons_dev/pin.png
similarity index 100%
rename from icons/pin.png
rename to icons_dev/pin.png
diff --git a/icons/pizza.png b/icons_dev/pizza.png
similarity index 100%
rename from icons/pizza.png
rename to icons_dev/pizza.png
diff --git a/icons/poi.png b/icons_dev/poi.png
similarity index 100%
rename from icons/poi.png
rename to icons_dev/poi.png
diff --git a/icons/polarbear.png b/icons_dev/polarbear.png
similarity index 100%
rename from icons/polarbear.png
rename to icons_dev/polarbear.png
diff --git a/icons/quiver.png b/icons_dev/quiver.png
similarity index 100%
rename from icons/quiver.png
rename to icons_dev/quiver.png
diff --git a/icons/rabbit.png b/icons_dev/rabbit.png
similarity index 100%
rename from icons/rabbit.png
rename to icons_dev/rabbit.png
diff --git a/icons/raft.png b/icons_dev/raft.png
similarity index 100%
rename from icons/raft.png
rename to icons_dev/raft.png
diff --git a/icons/random.png b/icons_dev/random.png
similarity index 100%
rename from icons/random.png
rename to icons_dev/random.png
diff --git a/icons/rat.png b/icons_dev/rat.png
similarity index 100%
rename from icons/rat.png
rename to icons_dev/rat.png
diff --git a/icons/rattlesnake.png b/icons_dev/rattlesnake.png
similarity index 100%
rename from icons/rattlesnake.png
rename to icons_dev/rattlesnake.png
diff --git a/icons/resize.png b/icons_dev/resize.png
similarity index 100%
rename from icons/resize.png
rename to icons_dev/resize.png
diff --git a/icons/revolver.png b/icons_dev/revolver.png
similarity index 100%
rename from icons/revolver.png
rename to icons_dev/revolver.png
diff --git a/icons/ring.png b/icons_dev/ring.png
similarity index 100%
rename from icons/ring.png
rename to icons_dev/ring.png
diff --git a/icons/rooster.png b/icons_dev/rooster.png
similarity index 100%
rename from icons/rooster.png
rename to icons_dev/rooster.png
diff --git a/icons/rss.png b/icons_dev/rss.png
similarity index 100%
rename from icons/rss.png
rename to icons_dev/rss.png
diff --git a/icons/rupee.png b/icons_dev/rupee.png
similarity index 100%
rename from icons/rupee.png
rename to icons_dev/rupee.png
diff --git a/icons/sausage.png b/icons_dev/sausage.png
similarity index 100%
rename from icons/sausage.png
rename to icons_dev/sausage.png
diff --git a/icons/scorpion.png b/icons_dev/scorpion.png
similarity index 100%
rename from icons/scorpion.png
rename to icons_dev/scorpion.png
diff --git a/icons/screw.png b/icons_dev/screw.png
similarity index 100%
rename from icons/screw.png
rename to icons_dev/screw.png
diff --git a/icons/shamrock.png b/icons_dev/shamrock.png
similarity index 100%
rename from icons/shamrock.png
rename to icons_dev/shamrock.png
diff --git a/icons/sheep.png b/icons_dev/sheep.png
similarity index 100%
rename from icons/sheep.png
rename to icons_dev/sheep.png
diff --git a/icons/shirt.png b/icons_dev/shirt.png
similarity index 100%
rename from icons/shirt.png
rename to icons_dev/shirt.png
diff --git a/icons/shop.png b/icons_dev/shop.png
similarity index 100%
rename from icons/shop.png
rename to icons_dev/shop.png
diff --git a/icons/shuriken.png b/icons_dev/shuriken.png
similarity index 100%
rename from icons/shuriken.png
rename to icons_dev/shuriken.png
diff --git a/icons/sloth.png b/icons_dev/sloth.png
similarity index 100%
rename from icons/sloth.png
rename to icons_dev/sloth.png
diff --git a/icons/snail.png b/icons_dev/snail.png
similarity index 100%
rename from icons/snail.png
rename to icons_dev/snail.png
diff --git a/icons/snake.png b/icons_dev/snake.png
similarity index 100%
rename from icons/snake.png
rename to icons_dev/snake.png
diff --git a/icons/soap.png b/icons_dev/soap.png
similarity index 100%
rename from icons/soap.png
rename to icons_dev/soap.png
diff --git a/icons/sombrero.png b/icons_dev/sombrero.png
similarity index 100%
rename from icons/sombrero.png
rename to icons_dev/sombrero.png
diff --git a/icons/stairs.png b/icons_dev/stairs.png
similarity index 100%
rename from icons/stairs.png
rename to icons_dev/stairs.png
diff --git a/icons/steak.png b/icons_dev/steak.png
similarity index 100%
rename from icons/steak.png
rename to icons_dev/steak.png
diff --git a/icons/tomato.png b/icons_dev/tomato.png
similarity index 100%
rename from icons/tomato.png
rename to icons_dev/tomato.png
diff --git a/icons/trade.png b/icons_dev/trade.png
similarity index 100%
rename from icons/trade.png
rename to icons_dev/trade.png
diff --git a/icons/trombone.png b/icons_dev/trombone.png
similarity index 100%
rename from icons/trombone.png
rename to icons_dev/trombone.png
diff --git a/icons/trousers.png b/icons_dev/trousers.png
similarity index 100%
rename from icons/trousers.png
rename to icons_dev/trousers.png
diff --git a/icons/trumpet.png b/icons_dev/trumpet.png
similarity index 100%
rename from icons/trumpet.png
rename to icons_dev/trumpet.png
diff --git a/icons/tuba.png b/icons_dev/tuba.png
similarity index 100%
rename from icons/tuba.png
rename to icons_dev/tuba.png
diff --git a/icons/tv.png b/icons_dev/tv.png
similarity index 100%
rename from icons/tv.png
rename to icons_dev/tv.png
diff --git a/icons/ufo.png b/icons_dev/ufo.png
similarity index 100%
rename from icons/ufo.png
rename to icons_dev/ufo.png
diff --git a/icons/vial.png b/icons_dev/vial.png
similarity index 100%
rename from icons/vial.png
rename to icons_dev/vial.png
diff --git a/icons/watch.png b/icons_dev/watch.png
similarity index 100%
rename from icons/watch.png
rename to icons_dev/watch.png
diff --git a/icons/waterfall.png b/icons_dev/waterfall.png
similarity index 100%
rename from icons/waterfall.png
rename to icons_dev/waterfall.png
diff --git a/icons/well.png b/icons_dev/well.png
similarity index 100%
rename from icons/well.png
rename to icons_dev/well.png
diff --git a/icons/windmill.png b/icons_dev/windmill.png
similarity index 100%
rename from icons/windmill.png
rename to icons_dev/windmill.png
diff --git a/icons/wizard.png b/icons_dev/wizard.png
similarity index 100%
rename from icons/wizard.png
rename to icons_dev/wizard.png
diff --git a/icons/zipper.png b/icons_dev/zipper.png
similarity index 100%
rename from icons/zipper.png
rename to icons_dev/zipper.png
diff --git a/meson.build b/meson.build
index 59722158..38d43a01 100644
--- a/meson.build
+++ b/meson.build
@@ -106,7 +106,7 @@ if get_option('chipmunk')
 endif
 
 if get_option('enet')
-  deps += dependency('qjs-enet', static:false)
+  #deps += dependency('qjs-enet', static:false)
 endif
 
 sources = []
diff --git a/source/jsffi.c b/source/jsffi.c
index 927e88d1..ba92b771 100644
--- a/source/jsffi.c
+++ b/source/jsffi.c
@@ -472,7 +472,7 @@ static int rets_SDL_GPUSwapchainComposition[] = {
   SDL_GPU_SWAPCHAINCOMPOSITION_SDR,
   SDL_GPU_SWAPCHAINCOMPOSITION_SDR_LINEAR,
   SDL_GPU_SWAPCHAINCOMPOSITION_HDR_EXTENDED_LINEAR,
-  SDL_GPU_SWAPCHAINCOMPOSITION_HDR10_ST2048
+  SDL_GPU_SWAPCHAINCOMPOSITION_HDR10_ST2084
 };
 
 static const char *vals_SDL_GPUSwapchainComposition[] = {
@@ -7002,7 +7002,7 @@ JSC_CCALL(os_freemem,
   if (sysinfo(&info) == 0)
     return JS_NewInt64(js,(int64_t)info.freeram * info.mem_unit);
   return JS_NewInt64(js,0);
-#elif defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__)
+#elif defined(__FreeBSD__) || defined(__OpenBSD__)
   // A very rough fallback using the same sysconf approach
   // (macOS or *BSD typically need specialized APIs to get free mem accurately)
   // This is often only "unused" pages, ignoring caches, etc.