diff --git a/.gitignore b/.gitignore
index 63fce565..c1b1126d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@ deskflow-config.toml
 /scripts/*.egg-info
 /*.user
 *.ui.autosave
+synergy-config.toml
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 40c296b2..6fa13433 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -26,6 +26,48 @@
       "program": "${workspaceFolder}/build/odin/bin/synergy",
       "preLaunchTask": "build"
     },
+    {
+      "name": "unix - unittests",
+      "type": "lldb",
+      "cwd": "${workspaceRoot}",
+      "request": "launch",
+      "program": "${workspaceFolder}/build/odin/bin/unittests",
+      "args": [ "${input:gtest-args}" ],
+      "preLaunchTask": "build"
+    },
+    {
+      "name": "unix - integtests",
+      "type": "lldb",
+      "cwd": "${workspaceRoot}",
+      "request": "launch",
+      "program": "${workspaceFolder}/build/odin/bin/integtests",
+      "args": [ "${input:gtest-args}" ],
+      "preLaunchTask": "build",
+    },
+    {
+      "name": "unix - server",
+      "type": "lldb",
+      "cwd": "${workspaceRoot}",
+      "request": "launch",
+      "program": "${workspaceFolder}/build/odin/bin/synergy-server",
+      "args": ["--config-toml", "synergy-config.toml"],
+      "preLaunchTask": "build"
+    },
+    {
+      "name": "unix - client",
+      "type": "lldb",
+      "cwd": "${workspaceRoot}",
+      "request": "launch",
+      "program": "${workspaceFolder}/build/odin/bin/synergy-client",
+      "args": ["--config-toml", "synergy-config.toml"],
+      "preLaunchTask": "build"
+    },
+    {
+      "name": "unix - attach",
+      "type": "lldb",
+      "request": "attach",
+      "pid": "${command:pickProcess}"
+    },
     {
       "name": "windows - gui",
       "type": "cppvsdbg",
@@ -34,6 +76,62 @@
       "program": "${workspaceFolder}/build/odin/bin/synergy",
       "internalConsoleOptions": "openOnSessionStart",
       "preLaunchTask": "kill-build"
-    }
+    },
+    {
+      "name": "windows - unittests",
+      "type": "cppvsdbg",
+      "cwd": "${workspaceRoot}",
+      "request": "launch",
+      "program": "${workspaceFolder}/build/odin/bin/unittests",
+      "args": [ "${input:gtest-args}" ],
+      "internalConsoleOptions": "openOnSessionStart",
+      "preLaunchTask": "build"
+    },
+    {
+      "name": "windows - integtests",
+      "type": "cppvsdbg",
+      "cwd": "${workspaceRoot}",
+      "request": "launch",
+      "program": "${workspaceFolder}/build/odin/bin/integtests",
+      "args": [ "${input:gtest-args}" ],
+      "internalConsoleOptions": "openOnSessionStart",
+      "preLaunchTask": "build"
+    },
+    {
+      "name": "windows - server",
+      "type": "cppvsdbg",
+      "cwd": "${workspaceRoot}",
+      "request": "launch",
+      "program": "${workspaceFolder}/build/odin/bin/synergy-server",
+      "args": ["--config-toml", "synergy-config.toml"],
+      "internalConsoleOptions": "openOnSessionStart",
+      "preLaunchTask": "build"
+    },
+    {
+      "name": "windows - client",
+      "type": "cppvsdbg",
+      "cwd": "${workspaceRoot}",
+      "request": "launch",
+      "program": "${workspaceFolder}/build/odin/bin/synergy-client",
+      "args": ["--config-toml", "synergy-config.toml"],
+      "internalConsoleOptions": "openOnSessionStart",
+      "preLaunchTask": "build"
+    },
+    {
+      "name": "windows - daemon",
+      "type": "cppvsdbg",
+      "cwd": "${workspaceRoot}",
+      "request": "launch",
+      "program": "${workspaceFolder}/build/odin/bin/synergy-daemon",
+      "args": ["-f"],
+      "internalConsoleOptions": "openOnSessionStart",
+      "preLaunchTask": "build"
+    },
+    {
+      "name": "windows - attach",
+      "type": "cppvsdbg",
+      "request": "attach",
+      "processId": "${command:pickProcess}"
+    },
   ]
 }
diff --git a/cmake/Odin.cmake b/cmake/Odin.cmake
index e575f07e..d8a006ac 100644
--- a/cmake/Odin.cmake
+++ b/cmake/Odin.cmake
@@ -31,7 +31,7 @@ macro(configure_gui_hook)
   set(DESKFLOW_GUI_HOOK_START
       "if (!synergy::hooks::onStart(&mainWindow, &appConfig)) { return 0; }")
   set(DESKFLOW_GUI_HOOK_SETTINGS
-      "synergy::hooks::onSettings(this, m_pCheckBoxEnableTls, m_pInvertConnection);"
+      "synergy::hooks::onSettings(this, m_pCheckBoxEnableTls, m_pCheckBoxInvertConnection);"
   )
   set(DESKFLOW_GUI_HOOK_LIB "synergy-gui")
 
diff --git a/odin b/odin
index b4f114a3..ed4f5a0b 160000
--- a/odin
+++ b/odin
@@ -1 +1 @@
-Subproject commit b4f114a3ec951888ccfa2e7dbde58ea019395aa7
+Subproject commit ed4f5a0be265afbeaa4db9144403707c6c667909