diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
index e1a3f1b..f004227 100644
--- a/external/CMakeLists.txt
+++ b/external/CMakeLists.txt
@@ -26,6 +26,7 @@ endif()
 add_checked_subdirectory(ffmpeg)
 if (LINUX)
     add_checked_subdirectory(glib)
+    add_checked_subdirectory(glibmm)
 endif()
 add_checked_subdirectory(gsl)
 if (LINUX AND NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION)
diff --git a/external/fcitx5_qt5/CMakeLists.txt b/external/fcitx5_qt5/CMakeLists.txt
index 128e0a1..e2e9517 100644
--- a/external/fcitx5_qt5/CMakeLists.txt
+++ b/external/fcitx5_qt5/CMakeLists.txt
@@ -24,6 +24,12 @@ else()
     PRIVATE
         qfcitxplatforminputcontext.cpp
         qfcitxplatforminputcontext.h
+        fcitxcandidatewindow.cpp
+        fcitxcandidatewindow.h
+        fcitxtheme.cpp
+        fcitxtheme.h
+        font.cpp
+        font.h
         qtkey.cpp
         main.cpp
         main.h
diff --git a/external/glib/CMakeLists.txt b/external/glib/CMakeLists.txt
index 55c277e..05b51eb 100644
--- a/external/glib/CMakeLists.txt
+++ b/external/glib/CMakeLists.txt
@@ -11,10 +11,12 @@ find_package(PkgConfig REQUIRED)
 pkg_check_modules(GLIB2 REQUIRED IMPORTED_TARGET glib-2.0)
 pkg_check_modules(GOBJECT REQUIRED IMPORTED_TARGET gobject-2.0)
 pkg_check_modules(GIO REQUIRED IMPORTED_TARGET gio-2.0)
+pkg_check_modules(GIO_UNIX REQUIRED IMPORTED_TARGET gio-unix-2.0)
 
 if (DESKTOP_APP_USE_PACKAGED)
     target_link_libraries(external_glib
     INTERFACE
+        PkgConfig::GIO_UNIX
         PkgConfig::GIO
         PkgConfig::GOBJECT
         PkgConfig::GLIB2
@@ -22,6 +24,7 @@ if (DESKTOP_APP_USE_PACKAGED)
 else()
     target_include_directories(external_glib
     INTERFACE
+        ${GIO_UNIX_INCLUDE_DIRS}
         ${GIO_INCLUDE_DIRS}
         ${GOBJECT_INCLUDE_DIRS}
         ${GLIB2_INCLUDE_DIRS}
diff --git a/external/glibmm/CMakeLists.txt b/external/glibmm/CMakeLists.txt
new file mode 100644
index 0000000..8c53c5e
--- /dev/null
+++ b/external/glibmm/CMakeLists.txt
@@ -0,0 +1,40 @@
+# This file is part of Desktop App Toolkit,
+# a set of libraries for developing nice desktop applications.
+#
+# For license and copyright information please follow this link:
+# https://github.com/desktop-app/legal/blob/master/LEGAL
+
+add_library(external_glibmm INTERFACE IMPORTED GLOBAL)
+add_library(desktop-app::external_glibmm ALIAS external_glibmm)
+
+find_package(PkgConfig REQUIRED)
+pkg_check_modules(GLIBMM REQUIRED IMPORTED_TARGET glibmm-2.4)
+pkg_check_modules(GIOMM REQUIRED IMPORTED_TARGET giomm-2.4)
+
+if (DESKTOP_APP_USE_PACKAGED)
+    target_link_libraries(external_glibmm
+    INTERFACE
+        PkgConfig::GIOMM
+        PkgConfig::GLIBMM
+    )
+else()
+    target_include_directories(external_glibmm
+    INTERFACE
+        ${GIOMM_INCLUDE_DIRS}
+        ${GLIBMM_INCLUDE_DIRS}
+    )
+
+    target_link_static_libraries(external_glibmm
+    INTERFACE
+        giomm-2.4
+        glibmm-2.4
+        sigc-2.0
+    )
+
+    target_link_libraries(external_glibmm
+    INTERFACE
+        gio-2.0
+        gobject-2.0
+        glib-2.0
+    )
+endif()
diff --git a/options.cmake b/options.cmake
index 9a8729f..82fb6e3 100644
--- a/options.cmake
+++ b/options.cmake
@@ -9,7 +9,8 @@ add_library(desktop-app::common_options ALIAS common_options)
 
 target_compile_definitions(common_options
 INTERFACE
-    $<IF:$<CONFIG:Debug>,_DEBUG,NDEBUG>
+    $<$<CONFIG:Debug>:_DEBUG>
+    QT_NO_KEYWORDS
     QT_NO_CAST_FROM_BYTEARRAY
 )
 
diff --git a/options_mac.cmake b/options_mac.cmake
index 6411cc8..ba1b16f 100644
--- a/options_mac.cmake
+++ b/options_mac.cmake
@@ -74,6 +74,7 @@ INTERFACE
     QuartzCore
     AppKit
     CoreWLAN
+    WebKit
     IOKit
     GSS
 )
diff --git a/options_win.cmake b/options_win.cmake
index 860219c..1353c52 100644
--- a/options_win.cmake
+++ b/options_win.cmake
@@ -36,6 +36,7 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
     target_link_options(common_options
     INTERFACE
         $<IF:$<CONFIG:Debug>,/NODEFAULTLIB:LIBCMT,/DEBUG;/OPT:REF>
+        $<$<BOOL:${DESKTOP_APP_NO_PDB}>:/DEBUG:NONE>
     )
 
 elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
diff --git a/variables.cmake b/variables.cmake
index 11aabd5..aa01597 100644
--- a/variables.cmake
+++ b/variables.cmake
@@ -42,6 +42,7 @@ option(DESKTOP_APP_DISABLE_CRASH_REPORTS "Disable crash report generation." ${no
 option(DESKTOP_APP_DISABLE_AUTOUPDATE "Disable autoupdate." ${disable_autoupdate})
 option(DESKTOP_APP_USE_HUNSPELL_ONLY "Disable system spellchecker and use bundled Hunspell only. (For debugging purposes)" OFF)
 option(DESKTOP_APP_USE_ENCHANT "Use Enchant instead of bundled Hunspell. (Linux only)" OFF)
+option(DESKTOP_APP_NO_PDB "Disable PDB file generation. (Windows only)" OFF)
 set(DESKTOP_APP_QTWAYLANDCLIENT_PRIVATE_HEADERS "" CACHE STRING "QtWaylandClient headers location.")
 
 set(dont_bundle_fonts 0)