diff --git a/.cirrus.yml b/.cirrus.yml
index d3ca995e..07c439bf 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -27,7 +27,7 @@ freebsd-x86_64-binaries_task:
         image_family: freebsd-12-2
 
     setup_script:
-        - pkg install --yes gmake gdb gcc8 pkgconf sdl2 openal-soft gtk2 libXv zip
+        - pkg install --yes gmake gdb gcc8 pkgconf sdl2 openal-soft gtk3 gtksourceview3 libXv zip
 
     compile_script:
         - gmake -C bsnes local=false
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 08fb83c4..9ba952a2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -23,9 +23,7 @@ jobs:
       if: matrix.os.name == 'ubuntu'
       run: |
         sudo apt-get update -y -qq
-        sudo apt-get install \
-          libgtk2.0-dev libpulse-dev mesa-common-dev libcairo2-dev \
-          libsdl2-dev libxv-dev libao-dev libopenal-dev libudev-dev
+        sudo apt-get install libsdl2-dev libgtk-3-dev gtksourceview-3.0 libao-dev libopenal-dev
     - name: Make
       run: make -j4 -C bsnes local=false
     - name: Upload
diff --git a/hiro/GNUmakefile b/hiro/GNUmakefile
index 94736db5..b86a4245 100755
--- a/hiro/GNUmakefile
+++ b/hiro/GNUmakefile
@@ -32,7 +32,7 @@ endif
 
 ifneq ($(filter $(platform),linux bsd),)
   ifeq ($(hiro),)
-    hiro := gtk2
+    hiro := gtk3
   endif
 
   ifeq ($(hiro),gtk2)