diff --git a/.travis.yml b/.travis.yml
index 1383c0e6..bf566730 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,7 @@
 sudo: required
 
+# osx_image: xcode7.3
+
 env:
   - distribution: ubuntu
   - distribution: fedora
@@ -7,15 +9,19 @@ env:
   - distribution: debian-testing
   - distribution: debian
 
+#matrix:
+#  include:
+#    - os: osx
+
 services:
   - docker
-  
+
 before_install:
-  - ./ci/update_travis.sh
+  - ./ci/update_ci.sh #travis_wait 90 ./ci/update_ci.sh
 
 script:
   - script=compile CXX=clang++ CC=clang ./ci/execute.sh
   - script=clean ./ci/execute.sh
-  - script=compile ./ci/execute.sh
+  - script=compile CXX=g++ CC=gcc ./ci/execute.sh
   - script=static_analysis ./ci/execute.sh
-  - script=compile make_command="broadwayd & make test" ./ci/execute.sh
\ No newline at end of file
+  - script=compile make_command="broadwayd & CTEST_OUTPUT_ON_FAILURE=1 make test" ./ci/execute.sh
diff --git a/README.md b/README.md
index b74dcb3f..9f50c083 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,5 @@
-# juCi++ [![Build Status](https://travis-ci.org/cppit/jucipp.svg?branch=master)](https://travis-ci.org/cppit/jucipp)
+# juCi++ [![Build Status](https://travis-ci.org/cppit/jucipp.svg?branch=master)](https://travis-ci.org/cppit/jucipp) [![Build status](https://ci.appveyor.com/api/projects/status/tj8ants9q8ouuoob/branch/master?svg=true)](https://ci.appveyor.com/project/zalox/jucipp-6hwdu/branch/master)
+
 ###### a lightweight, platform independent C++-IDE with support for C++11, C++14, and experimental C++17 features depending on libclang version.
 <!--<img src="https://github.com/cppit/jucipp/blob/master/docs/images/screenshot3.png"/>-->
 ## About
diff --git a/appveyor.yml b/appveyor.yml
new file mode 100644
index 00000000..9fed3a7d
--- /dev/null
+++ b/appveyor.yml
@@ -0,0 +1,15 @@
+platform:
+  - x64
+
+environment:
+  MSYSTEM: MSYS
+
+before_build:
+  - C:\msys64\usr\bin\pacman --noconfirm --sync --refresh --refresh pacman
+  - C:\msys64\usr\bin\pacman --noconfirm --sync --refresh --refresh git
+  - C:\msys64\usr\bin\pacman --noconfirm --sync --refresh --refresh --sysupgrade --sysupgrade
+  - C:\msys64\usr\bin\bash -lc "$(cygpath ${APPVEYOR_BUILD_FOLDER})/ci/update_ci.sh"
+
+build_script:    
+  - C:\msys64\usr\bin\bash -lc "script=compile $(cygpath ${APPVEYOR_BUILD_FOLDER})/ci/execute.sh"
+  - C:\msys64\usr\bin\bash -lc "script=compile make_command='CTEST_OUTPUT_ON_FAILURE=1 make test' $(cygpath ${APPVEYOR_BUILD_FOLDER})/ci/execute.sh"
diff --git a/ci/compile.sh b/ci/compile.sh
index 9a072b0f..59d86f21 100755
--- a/ci/compile.sh
+++ b/ci/compile.sh
@@ -1,14 +1,25 @@
 #!/bin/bash
 
 if [ "${cmake_command}" == "" ]; then
-  cmake_command="cmake -DENABLE_TESTING=1 -DCMAKE_CXX_FLAGS=-Werror .."
+  if [ "$APPVEYOR" != "" ]; then
+    if [ "$PLATFORM" == "x64" ]; then
+      mingw="mingw64"
+    else
+      mingw="mingw32"
+    fi
+    cmake_command="cmake -G\"MSYS Makefiles\" -DCMAKE_INSTALL_PREFIX=/${mingw} -DENABLE_TESTING=1 -DCMAKE_CXX_FLAGS=-Werror .."
+    make_command="make"
+  else
+    cmake_command="cmake -DENABLE_TESTING=1 -DCMAKE_CXX_FLAGS=-Werror .."
+  fi
 fi
 
 if [ "${make_command}" == "" ]; then
   make_command="make -j 2"
 fi
 
-cd jucipp || exit
-mkdir -p build && cd build || exit
-sh -c "${cmake_command}" || exit
-exec sh -c "${make_command}"
\ No newline at end of file
+cd jucipp || echo "Can't cd into jucipp"
+git submodule update --init --recursive # appveyor doesn't checkout recursively
+mkdir -p build && cd build || echo "Error making build directory"
+sh -c "${cmake_command}" || echo "Cmake configuration failed"
+exec sh -c "${make_command}"
diff --git a/ci/execute.sh b/ci/execute.sh
index a90cee56..18df1d60 100755
--- a/ci/execute.sh
+++ b/ci/execute.sh
@@ -19,7 +19,28 @@ function linux () {
 
 #TODO Should run compile/install instructions for osx
 function osx () {
-  true
+  cd .. || (echo "Error changing directory";return 1)
+  if [ "${script}" == "clean" ]; then
+    sudo rm -rf "./jucipp/build"
+    return 0
+  fi
+  sh -c "./jucipp/ci/${script}.sh" || return 1
+}
+
+function windows () {
+  export PATH="/mingw64/bin:/usr/local/bin:/usr/bin:/bin:/c/WINDOWS/system32:/c/WINDOWS:/c/WINDOWS/System32/Wbem:/c/WINDOWS/System32/WindowsPowerShell/v1.0:/usr/bin/site_perl:/usr/bin/vendor_perl:/usr/bin/core_perl"
+  bf=$(cygpath ${APPVEYOR_BUILD_FOLDER})
+  cd "$bf" || (echo "Error changing directory"; return 1)
+  if [ "${script}" == "clean" ]; then
+    sudo rm "./build" -rf
+    return 0
+  fi
+  sh -c "${bf}/ci/${script}.sh"
 }
 
+
+if [ "$TRAVIS_OS_NAME" == "" ]; then
+  TRAVIS_OS_NAME=windows
+fi
+
 $TRAVIS_OS_NAME
diff --git a/ci/update_ci.sh b/ci/update_ci.sh
new file mode 100755
index 00000000..795ac870
--- /dev/null
+++ b/ci/update_ci.sh
@@ -0,0 +1,42 @@
+#!/bin/bash
+
+function linux () {
+  sudo apt-get update
+  sudo apt-get purge lxc-docker
+  sudo apt-get install --yes --force-yes -o Dpkg::Options::="--force-confnew" linux-image-extra-$(uname -r) docker-engine
+  sudo service docker stop || exit
+  sudo rm -rf /var/lib/docker || exit
+  sudo service docker start || exit
+}
+
+function brew_install() {
+  (brew outdated "$1" || brew install $1) || (echo "Error installing $1"; return 1)
+}
+
+function osx () {
+  brew update || return 1
+  brew uninstall llvm --force || return 1
+  brew upgrade --all || return 1
+  brew update || return 1
+  brew upgrade --all || return 1
+  brew install --with-clang llvm
+  brew_install "boost" || return 1
+  brew_install "aspell" || return 1
+  brew_install "clang-format" || return 1
+  brew_install "pkg-config" || return 1
+  brew_install "gtksourceviewmm3" || return 1
+}
+
+function windows () {
+  arch=x86_64
+  if [ "$PLATFORM" == "x86" ]; then
+    arch=i686
+  fi
+  sh -c "pacman -S --noconfirm git mingw-w64-${arch}-cmake make mingw-w64-${arch}-toolchain mingw-w64-${arch}-clang mingw-w64-${arch}-gtkmm3 mingw-w64-${arch}-gtksourceviewmm3 mingw-w64-${arch}-boost mingw-w64-${arch}-aspell mingw-w64-${arch}-aspell-en"
+}
+
+if [ "$TRAVIS_OS_NAME" == "" ]; then
+  TRAVIS_OS_NAME=windows
+fi
+
+$TRAVIS_OS_NAME
\ No newline at end of file
diff --git a/ci/update_travis.sh b/ci/update_travis.sh
deleted file mode 100755
index 8969baee..00000000
--- a/ci/update_travis.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-
-function linux () {
-  sudo apt-get update
-  sudo apt-get purge lxc-docker
-  sudo apt-get install --yes --force-yes -o Dpkg::Options::="--force-confnew" linux-image-extra-$(uname -r) docker-engine
-  sudo service docker stop || exit
-  sudo rm -rf /var/lib/docker || exit
-  sudo service docker start || exit
-}
-
-# TODO method should update osx, brew, packages etc needed for juCi++
-function osx () {
-  brew update
-  brew rm llvm
-  brew doctor
-  brew upgrade
-  brew install --with-clang --with-lldb llvm
-  brew install cmake pkg-config boost homebrew/x11/gtksourceviewmm3 aspell clang-format
-}
-
-$TRAVIS_OS_NAME
\ No newline at end of file
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9a3f2556..1b750f12 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -44,6 +44,7 @@ set(global_libraries
 set(project_files
     config.cc
     dialogs.cc
+    dialogs_unix.cc
     directories.cc
     entrybox.cc
     info.cc
@@ -56,8 +57,6 @@ set(project_files
     terminal.cc
     tooltips.cc
     window.cc
-
-    ../tiny-process-library/process.cpp
 )
 
 #Files used both in ../src and ../tests
@@ -83,6 +82,8 @@ set(project_shared_files
     ../libclangmm/src/Tokens.cc
     ../libclangmm/src/TranslationUnit.cc
     ../libclangmm/src/Utility.cc
+    
+    ../tiny-process-library/process.cpp
 )
 
 if(LIBLLDB_FOUND)
@@ -90,9 +91,9 @@ if(LIBLLDB_FOUND)
 endif()
 
 if(MSYS)
-  list(APPEND project_files dialogs_unix.cc ../tiny-process-library/process_win.cpp)
+  list(APPEND project_shared_files ../tiny-process-library/process_win.cpp)
 else()
-  list(APPEND project_files dialogs_unix.cc ../tiny-process-library/process_unix.cpp)
+  list(APPEND project_shared_files ../tiny-process-library/process_unix.cpp)
 endif()
 
 include_directories(${global_includes})
diff --git a/src/config.cc b/src/config.cc
index 363bcfdd..11680f66 100644
--- a/src/config.cc
+++ b/src/config.cc
@@ -49,7 +49,7 @@ void Config::load() {
   catch(const std::exception &e) {
     ::Terminal::get().print("Error: could not parse "+config_json+": "+e.what()+"\n", true);
     std::stringstream ss;
-    ss << configjson;
+    ss << default_config_file;
     boost::property_tree::read_json(ss, cfg);
     retrieve_config();
   }
@@ -64,7 +64,7 @@ void Config::find_or_create_config_files() {
   boost::filesystem::create_directories(home/"plugins");
 
   if (!boost::filesystem::exists(config_json))
-    filesystem::write(config_json, configjson);
+    filesystem::write(config_json, default_config_file);
 
   auto juci_style_path = home/"styles";
   boost::filesystem::create_directories(juci_style_path); // io exp captured by calling method
@@ -163,7 +163,7 @@ void Config::update_config_file() {
   try {
     if(cfg.get<std::string>("version")!=JUCI_VERSION) {
       std::stringstream ss;
-      ss << configjson;
+      ss << default_config_file;
       boost::property_tree::read_json(ss, default_cfg);
       cfg_ok=false;
       if(cfg.count("version")>0)
@@ -199,6 +199,7 @@ void Config::get_source() {
   source.default_tab_char = source_json.get<char>("default_tab_char");
   source.default_tab_size = source_json.get<unsigned>("default_tab_size");
   source.auto_tab_char_and_size = source_json.get<bool>("auto_tab_char_and_size");
+  source.tab_indents_line = source_json.get<bool>("tab_indents_line");
 
   source.wrap_lines = source_json.get<bool>("wrap_lines");
 
diff --git a/src/config.h b/src/config.h
index b96f4e09..3647631d 100644
--- a/src/config.h
+++ b/src/config.h
@@ -64,6 +64,7 @@ class Config {
     bool auto_tab_char_and_size;
     char default_tab_char;
     unsigned default_tab_size;
+    bool tab_indents_line;
     bool wrap_lines;
     bool highlight_current_line;
     bool show_line_numbers;
diff --git a/src/debug_clang.cc b/src/debug_clang.cc
index 143cba4b..b5fe4791 100644
--- a/src/debug_clang.cc
+++ b/src/debug_clang.cc
@@ -357,7 +357,7 @@ void Debug::Clang::select_frame(uint32_t frame_index, uint32_t thread_index_id)
   }
 }
 
-void Debug::Clang::delete_debug() {
+void Debug::Clang::cancel() {
   kill();
   if(debug_thread.joinable())
     debug_thread.join();
diff --git a/src/debug_clang.h b/src/debug_clang.h
index 0e9001aa..3be3c1ba 100644
--- a/src/debug_clang.h
+++ b/src/debug_clang.h
@@ -55,7 +55,7 @@ namespace Debug {
     std::vector<Variable> get_variables();
     void select_frame(uint32_t frame_index, uint32_t thread_index_id=0);
     
-    void delete_debug(); //can't use delete as function name
+    void cancel();
     
     std::string get_value(const std::string &variable, const boost::filesystem::path &file_path, unsigned int line_nr, unsigned int line_index);
     std::string get_return_value(const boost::filesystem::path &file_path, unsigned int line_nr, unsigned int line_index);
diff --git a/src/files.h b/src/files.h
index 906c44c6..028e2e5f 100644
--- a/src/files.h
+++ b/src/files.h
@@ -2,331 +2,342 @@
 #define JUCI_FILES_H_
 #include <string>
 
-#define JUCI_VERSION "1.1.3-3"
-
-const std::string configjson =
-"{\n"
-"    \"version\": \""+std::string(JUCI_VERSION)+"\",\n"
-"    \"default_window_size\": {\n"
-"        \"width\": 800,\n"
-"        \"height\": 600\n"
-"    },\n"
-"    \"gtk_theme\": {\n"
-"        \"name_comment\": \"Use \\\"\\\" for default theme, At least these two exist on all systems: Adwaita, Raleigh\",\n"
-"        \"name\": \"\",\n"
-"        \"variant_comment\": \"Use \\\"\\\" for default variant, and \\\"dark\\\" for dark theme variant. Note that not all themes support dark variant, but for instance Adwaita does\",\n"
-"        \"variant\": \"\"\n"
-"    },\n"
-"    \"terminal\": {\n"
-"        \"history_size\": 1000,\n"
-"        \"font_comment\": \"Use \\\"\\\" to use source.font with slightly smaller size\",\n"
-"        \"font\": \"\"\n"
-"    },\n"
-"    \"source\": {\n"
-"        \"style_comment\": \"Use \\\"\\\" for default style, and for instance juci-dark or juci-dark-blue together with dark gtk_theme variant. Styles from normal gtksourceview install: classic, cobalt, kate, oblivion, solarized-dark, solarized-light, tango\",\n"
-"        \"style\": \"juci-light\",\n"
-"        \"font_comment\": \"Use \\\"\\\" for default font, and for instance \\\"Monospace 12\\\" to also set size\",\n"
+#define JUCI_VERSION "1.1.3-4"
+
+const std::string default_config_file = R"RAW({
+    "version": ")RAW"+std::string(JUCI_VERSION)+R"RAW(",
+    "default_window_size": {
+        "width": 800,
+        "height": 600
+    },
+    "gtk_theme": {
+        "name_comment": "Use \"\" for default theme, At least these two exist on all systems: Adwaita, Raleigh",
+        "name": "",
+        "variant_comment": "Use \"\" for default variant, and \"dark\" for dark theme variant. Note that not all themes support dark variant, but for instance Adwaita does",
+        "variant": ""
+    },
+    "terminal": {
+        "history_size": 1000,
+        "font_comment": "Use \"\" to use source.font with slightly smaller size",
+        "font": ""
+    },
+    "source": {
+        "style_comment": "Use \"\" for default style, and for instance juci-dark or juci-dark-blue together with dark gtk_theme variant. Styles from normal gtksourceview install: classic, cobalt, kate, oblivion, solarized-dark, solarized-light, tango",
+        "style": "juci-light",
+        "font_comment": "Use \"\" for default font, and for instance \"Monospace 12\" to also set size",)RAW"
 #ifdef __APPLE__
-"        \"font\": \"Menlo 11\",\n"
+R"RAW(
+        "font": "Menlo 11",)RAW"
 #else
 #ifdef _WIN32
-"        \"font\": \"Consolas\",\n"
+R"RAW(
+        "font": "Consolas",)RAW"
 #else
-"        \"font\": \"Monospace\",\n"
+R"RAW(
+        "font": "Monospace",)RAW"
 #endif
 #endif
-"        \"cleanup_whitespace_characters_comment\": \"Remove trailing whitespace characters on save, and add trailing newline if missing\",\n"
-"        \"cleanup_whitespace_characters\": false,\n"
-"        \"show_whitespace_characters_comment\": \"Determines what kind of whitespaces should be drawn. Use comma-separated list of: space, tab, newline, nbsp, leading, text, trailing or all\",\n"
-"        \"show_whitespace_characters\": \"\",\n"
-"        \"show_map\": true,\n"
-"        \"map_font_size\": \"1\",\n"
-"        \"spellcheck_language_comment\": \"Use \\\"\\\" to set language from your locale settings\",\n"
-"        \"spellcheck_language\": \"en_US\",\n"
-"        \"auto_tab_char_and_size_comment\": \"Use false to always use default tab char and size\",\n"
-"        \"auto_tab_char_and_size\": true,\n"
-"        \"default_tab_char_comment\": \"Use \\\"\\t\\\" for regular tab\",\n"
-"        \"default_tab_char\": \" \",\n"
-"        \"default_tab_size\": 2,\n"
-"        \"wrap_lines\": false,\n"
-"        \"highlight_current_line\": true,\n"
-"        \"show_line_numbers\": true,\n"
-"        \"clang_types\": {\n"
-"            \"8\": \"def:function\",\n"
-"            \"21\": \"def:function\",\n"
-"            \"22\": \"def:identifier\",\n"
-"            \"24\": \"def:function\",\n"
-"            \"25\": \"def:function\",\n"
-"            \"43\": \"def:type\",\n"
-"            \"44\": \"def:type\",\n"
-"            \"45\": \"def:type\",\n"
-"            \"46\": \"def:identifier\",\n"
-"            \"109\": \"def:string\",\n"
-"            \"702\": \"def:statement\",\n"
-"            \"705\": \"def:comment\"\n"
-"        },\n"
-"        \"clang_format_style_comment\": \"IndentWidth, AccessModifierOffset and UseTab are set automatically. See http://clang.llvm.org/docs/ClangFormatStyleOptions.html\",\n"
-"        \"clang_format_style\": \"ColumnLimit: 0, MaxEmptyLinesToKeep: 2\"\n"
-"    },\n"
-"    \"keybindings\": {\n"
-"        \"preferences\": \"<primary>comma\",\n"
-"        \"quit\": \"<primary>q\",\n"
-"        \"new_file\": \"<primary>n\",\n"
-"        \"new_folder\": \"<primary><shift>n\",\n"
-"        \"open_file\": \"<primary>o\",\n"
-"        \"open_folder\": \"<primary><shift>o\",\n"
-"        \"save\": \"<primary>s\",\n"
-"        \"save_as\": \"<primary><shift>s\",\n"
-"        \"print\": \"<primary>p\",\n"
-"        \"edit_undo\": \"<primary>z\",\n"
-"        \"edit_redo\": \"<primary><shift>z\",\n"
-"        \"edit_cut\": \"<primary>x\",\n"
-"        \"edit_copy\": \"<primary>c\",\n"
-"        \"edit_paste\": \"<primary>v\",\n"
-"        \"edit_find\": \"<primary>f\",\n"
-"        \"edit_set_tab\": \"\",\n"
-"        \"source_spellcheck\": \"\",\n"
-"        \"source_spellcheck_clear\": \"\",\n"
-"        \"source_spellcheck_next_error\": \"<primary><shift>e\",\n"
-"        \"source_indentation_set_buffer_tab\": \"\",\n"
-"        \"source_indentation_auto_indent_buffer\": \"<primary><shift>i\",\n"
-"        \"source_goto_line\": \"<primary>g\",\n"
-"        \"source_center_cursor\": \"<primary>l\",\n"
-"        \"source_find_documentation\": \"<primary><shift>d\",\n"
-"        \"source_goto_declaration\": \"<primary>d\",\n"
-"        \"source_goto_implementation\": \"<primary>i\",\n"
-"        \"source_goto_usage\": \"<primary>u\",\n"
-"        \"source_goto_method\": \"<primary>m\",\n"
-"        \"source_rename\": \"<primary>r\",\n"
-"        \"source_goto_next_diagnostic\": \"<primary>e\",\n"
-"        \"source_apply_fix_its\": \"<control>space\",\n"
-"        \"project_set_run_arguments\": \"\",\n"
-"        \"compile_and_run\": \"<primary>Return\",\n"
-"        \"compile\": \"<primary><shift>Return\",\n"
-"        \"run_command\": \"<alt>Return\",\n"
-"        \"kill_last_running\": \"<primary>Escape\",\n"
-"        \"force_kill_last_running\": \"<primary><shift>Escape\",\n"
-"        \"debug_set_run_arguments\": \"\",\n"
-"        \"debug_start_continue\": \"<primary>y\",\n"
-"        \"debug_stop\": \"<primary><shift>y\",\n"
-"        \"debug_kill\": \"<primary><shift>k\",\n"
-"        \"debug_step_over\": \"<primary>j\",\n"
-"        \"debug_step_into\": \"<primary>t\",\n"
-"        \"debug_step_out\": \"<primary><shift>t\",\n"
-"        \"debug_backtrace\": \"<primary><shift>j\",\n"
-"        \"debug_show_variables\": \"<primary><shift>b\",\n"
-"        \"debug_run_command\": \"<alt><shift>Return\",\n"
-"        \"debug_toggle_breakpoint\": \"<primary>b\",\n"
-"        \"debug_goto_stop\": \"<primary><shift>l\",\n"
+R"RAW(
+        "cleanup_whitespace_characters_comment": "Remove trailing whitespace characters on save, and add trailing newline if missing",
+        "cleanup_whitespace_characters": false,
+        "show_whitespace_characters_comment": "Determines what kind of whitespaces should be drawn. Use comma-separated list of: space, tab, newline, nbsp, leading, text, trailing or all",
+        "show_whitespace_characters": "",
+        "show_map": true,
+        "map_font_size": "1",
+        "spellcheck_language_comment": "Use \"\" to set language from your locale settings",
+        "spellcheck_language": "en_US",
+        "auto_tab_char_and_size_comment": "Use false to always use default tab char and size",
+        "auto_tab_char_and_size": true,
+        "default_tab_char_comment": "Use \"\t\" for regular tab",
+        "default_tab_char": " ",
+        "default_tab_size": 2,
+        "tab_indents_line": true,
+        "wrap_lines": false,
+        "highlight_current_line": true,
+        "show_line_numbers": true,
+        "clang_types": {
+            "8": "def:function",
+            "21": "def:function",
+            "22": "def:identifier",
+            "24": "def:function",
+            "25": "def:function",
+            "43": "def:type",
+            "44": "def:type",
+            "45": "def:type",
+            "46": "def:identifier",
+            "109": "def:string",
+            "702": "def:statement",
+            "705": "def:comment"
+        },
+        "clang_format_style_comment": "IndentWidth, AccessModifierOffset and UseTab are set automatically. See http://clang.llvm.org/docs/ClangFormatStyleOptions.html",
+        "clang_format_style": "ColumnLimit: 0, MaxEmptyLinesToKeep: 2"
+    },
+    "keybindings": {
+        "preferences": "<primary>comma",
+        "quit": "<primary>q",
+        "new_file": "<primary>n",
+        "new_folder": "<primary><shift>n",
+        "open_file": "<primary>o",
+        "open_folder": "<primary><shift>o",
+        "save": "<primary>s",
+        "save_as": "<primary><shift>s",
+        "print": "<primary>p",
+        "edit_undo": "<primary>z",
+        "edit_redo": "<primary><shift>z",
+        "edit_cut": "<primary>x",
+        "edit_copy": "<primary>c",
+        "edit_paste": "<primary>v",
+        "edit_find": "<primary>f",
+        "edit_set_tab": "",
+        "source_spellcheck": "",
+        "source_spellcheck_clear": "",
+        "source_spellcheck_next_error": "<primary><shift>e",
+        "source_indentation_set_buffer_tab": "",
+        "source_indentation_auto_indent_buffer": "<primary><shift>i",
+        "source_goto_line": "<primary>g",
+        "source_center_cursor": "<primary>l",
+        "source_find_documentation": "<primary><shift>d",
+        "source_goto_declaration": "<primary>d",
+        "source_goto_implementation": "<primary>i",
+        "source_goto_usage": "<primary>u",
+        "source_goto_method": "<primary>m",
+        "source_rename": "<primary>r",
+        "source_goto_next_diagnostic": "<primary>e",
+        "source_apply_fix_its": "<control>space",
+        "project_set_run_arguments": "",
+        "compile_and_run": "<primary>Return",
+        "compile": "<primary><shift>Return",
+        "run_command": "<alt>Return",
+        "kill_last_running": "<primary>Escape",
+        "force_kill_last_running": "<primary><shift>Escape",
+        "debug_set_run_arguments": "",
+        "debug_start_continue": "<primary>y",
+        "debug_stop": "<primary><shift>y",
+        "debug_kill": "<primary><shift>k",
+        "debug_step_over": "<primary>j",
+        "debug_step_into": "<primary>t",
+        "debug_step_out": "<primary><shift>t",
+        "debug_backtrace": "<primary><shift>j",
+        "debug_show_variables": "<primary><shift>b",
+        "debug_run_command": "<alt><shift>Return",
+        "debug_toggle_breakpoint": "<primary>b",
+        "debug_goto_stop": "<primary><shift>l",)RAW"
 #ifdef __linux
-"        \"next_tab\": \"<primary>Tab\",\n"
-"        \"previous_tab\": \"<primary><shift>Tab\",\n"
+R"RAW(
+        "next_tab": "<primary>Tab",
+        "previous_tab": "<primary><shift>Tab",)RAW"
 #else
-"        \"next_tab\": \"<primary><alt>Right\",\n"
-"        \"previous_tab\": \"<primary><alt>Left\",\n"
+R"RAW(
+        "next_tab": "<primary><alt>Right",
+        "previous_tab": "<primary><alt>Left",)RAW"
 #endif
-"        \"close_tab\": \"<primary>w\"\n"
-"    },\n"
-"    \"project\": {\n"
-"        \"default_build_path_comment\": \"Use <project_directory_name> to insert the project top level directory name\",\n"
-"        \"default_build_path\": \"./build\",\n"
-"        \"debug_build_path_comment\": \"Use <project_directory_name> to insert the project top level directory name, and <default_build_path> to insert your default_build_path setting.\",\n"
-"        \"debug_build_path\": \"<default_build_path>/debug\",\n"
+R"RAW(
+        "close_tab": "<primary>w"
+    },
+    "project": {
+        "default_build_path_comment": "Use <project_directory_name> to insert the project top level directory name",
+        "default_build_path": "./build",
+        "debug_build_path_comment": "Use <project_directory_name> to insert the project top level directory name, and <default_build_path> to insert your default_build_path setting.",
+        "debug_build_path": "<default_build_path>/debug",)RAW"
 #ifdef _WIN32
-"        \"cmake_command\": \"cmake -G\\\"MSYS Makefiles\\\"\",\n"
+R"RAW(
+        "cmake_command": "cmake -G\"MSYS Makefiles\"",)RAW"
 #else
-"        \"cmake_command\": \"cmake\",\n"
+R"RAW(
+        "cmake_command": "cmake",)RAW"
 #endif
-"        \"make_command\": \"cmake --build .\",\n"
-"        \"save_on_compile_or_run\": true,\n"
-"        \"clear_terminal_on_compile\": true\n"
-"    },\n"
-"    \"documentation_searches\": {\n"
-"        \"clang\": {\n"
-"            \"separator\": \"::\",\n"
-"            \"queries\": {\n"
-"                \"@empty\": \"https://www.google.com/search?btnI&q=c%2B%2B+\",\n"
-"                \"std\": \"https://www.google.com/search?btnI&q=site:http://www.cplusplus.com/reference/+\",\n"
-"                \"boost\": \"https://www.google.com/search?btnI&q=site:http://www.boost.org/doc/libs/1_59_0/+\",\n"
-"                \"Gtk\": \"https://www.google.com/search?btnI&q=site:https://developer.gnome.org/gtkmm/stable/+\",\n"
-"                \"@any\": \"https://www.google.com/search?btnI&q=\"\n"
-"            }\n"
-"        }\n"
-"    }\n"
-"}\n";
-
-const std::string juci_light_style =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"\n"
-"<style-scheme id=\"juci-light\" _name=\"juci\" version=\"1.0\">\n"
-"  <author>juCi++ team</author>\n"
-"  <_description>Default juCi++ style</_description>\n"
-"\n"
-"  <!-- Palette -->\n"
-"  <color name=\"white\"                       value=\"#FFFFFF\"/>\n"
-"  <color name=\"black\"                       value=\"#000000\"/>\n"
-"  <color name=\"gray\"                        value=\"#888888\"/>\n"
-"  <color name=\"red\"                         value=\"#CC0000\"/>\n"
-"  <color name=\"green\"                       value=\"#008800\"/>\n"
-"  <color name=\"blue\"                        value=\"#0000FF\"/>\n"
-"  <color name=\"dark-blue\"                   value=\"#002299\"/>\n"
-"  <color name=\"yellow\"                      value=\"#FFFF00\"/>\n"
-"  <color name=\"light-yellow\"                value=\"#FFFF88\"/>\n"
-"  <color name=\"orange\"                      value=\"#FF8800\"/>\n"
-"  <color name=\"purple\"                      value=\"#990099\"/>\n"
-"\n"
-"  <style name=\"text\"                        foreground=\"#000000\" background=\"#FFFFFF\"/>\n"
-"  <style name=\"background-pattern\"          background=\"#rgba(0,0,0,.03)\"/>\n"
-"  <style name=\"selection\"                   background=\"#4A90D9\"/>\n"
-"\n"
-"  <!-- Current Line Highlighting -->\n"
-"  <style name=\"current-line\"                background=\"#rgba(0,0,0,.07)\"/>\n"
-"\n"
-"  <!-- Bracket Matching -->\n"
-"  <style name=\"bracket-match\"               foreground=\"white\" background=\"gray\" bold=\"true\"/>\n"
-"  <style name=\"bracket-mismatch\"            foreground=\"white\" background=\"#FF0000\" bold=\"true\"/>\n"
-"\n"
-"  <!-- Search Matching -->\n"
-"  <style name=\"search-match\"                background=\"yellow\"/>\n"
-"\n"
-"  <!-- Language specifics -->\n"
-"  <style name=\"def:builtin\"                 foreground=\"blue\"/>\n"
-"  <style name=\"def:constant\"                foreground=\"blue\"/>\n"
-"  <style name=\"def:boolean\"                 foreground=\"red\"/>\n"
-"  <style name=\"def:decimal\"                 foreground=\"red\"/>\n"
-"  <style name=\"def:base-n-integer\"          foreground=\"red\"/>\n"
-"  <style name=\"def:floating-point\"          foreground=\"red\"/>\n"
-"  <style name=\"def:complex\"                 foreground=\"red\"/>\n"
-"  <style name=\"def:character\"               foreground=\"red\"/>\n"
-"  <style name=\"def:special-char\"            foreground=\"red\"/>\n"
-"\n\n"
-"  <!-- Language specifics used by clang-parser in default config -->\n"
-"  <style name=\"def:string\"                  foreground=\"red\"/>\n"
-"  <style name=\"def:comment\"                 foreground=\"gray\"/>\n"
-"  <style name=\"def:statement\"               foreground=\"blue\"/>\n"
-"  <style name=\"def:type\"                    foreground=\"blue\"/>\n"
-"  <style name=\"def:function\"                foreground=\"dark-blue\"/>\n"
-"  <style name=\"def:identifier\"              foreground=\"purple\"/>\n"
-"  <style name=\"def:preprocessor\"            foreground=\"green\"/>\n"
-"  <style name=\"def:error\"                   foreground=\"red\"/>\n"
-"  <style name=\"def:warning\"                 foreground=\"orange\"/>\n"
-"  <style name=\"def:note\"                    foreground=\"black\" background=\"light-yellow\"/>\n"
-"\n"
-"</style-scheme>\n";
-
-const std::string juci_dark_style =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"\n"
-"<style-scheme id=\"juci-dark\" _name=\"juci\" version=\"1.0\">\n"
-"  <author>juCi++ team</author>\n"
-"  <_description>Dark juCi++ style</_description>\n"
-"\n"
-"  <!-- Palette -->\n"
-"  <color name=\"white\"                       value=\"#CCCCCC\"/>\n"
-"  <color name=\"black\"                       value=\"#292929\"/>\n"
-"  <color name=\"gray\"                        value=\"#888888\"/>\n"
-"  <color name=\"red\"                         value=\"#FF9999\"/>\n"
-"  <color name=\"green\"                       value=\"#AACC99\"/>\n"
-"  <color name=\"blue\"                        value=\"#9090FF\"/>\n"
-"  <color name=\"light-blue\"                  value=\"#AAAAFF\"/>\n"
-"  <color name=\"purple\"                      value=\"#DD88DD\"/>\n"
-"\n"
-"  <style name=\"text\"                        foreground=\"white\" background=\"black\"/>\n"
-"  <style name=\"background-pattern\"          background=\"#rgba(255,255,255,.04)\"/>\n"
-"  <style name=\"selection\"                   background=\"#215D9C\"/>\n"
-"\n"
-"  <!-- Current Line Highlighting -->\n"
-"  <style name=\"current-line\"                background=\"#rgba(255,255,255,.06)\"/>\n"
-"\n"
-"  <!-- Bracket Matching -->\n"
-"  <style name=\"bracket-match\"               foreground=\"black\" background=\"gray\" bold=\"true\"/>\n"
-"  <style name=\"bracket-mismatch\"            foreground=\"black\" background=\"#FF0000\" bold=\"true\"/>\n"
-"\n"
-"  <!-- Search Matching -->\n"
-"  <style name=\"search-match\"                foreground=\"black\" background=\"white\"/>\n"
-"\n"
-"  <!-- Language specifics -->\n"
-"  <style name=\"def:builtin\"                 foreground=\"blue\"/>\n"
-"  <style name=\"def:constant\"                foreground=\"blue\"/>\n"
-"  <style name=\"def:boolean\"                 foreground=\"red\"/>\n"
-"  <style name=\"def:decimal\"                 foreground=\"red\"/>\n"
-"  <style name=\"def:base-n-integer\"          foreground=\"red\"/>\n"
-"  <style name=\"def:floating-point\"          foreground=\"red\"/>\n"
-"  <style name=\"def:complex\"                 foreground=\"red\"/>\n"
-"  <style name=\"def:character\"               foreground=\"red\"/>\n"
-"  <style name=\"def:special-char\"            foreground=\"red\"/>\n"
-"\n\n"
-"  <!-- Language specifics used by clang-parser in default config -->\n"
-"  <style name=\"def:string\"                  foreground=\"red\"/>\n"
-"  <style name=\"def:comment\"                 foreground=\"gray\"/>\n"
-"  <style name=\"def:statement\"               foreground=\"blue\"/>\n"
-"  <style name=\"def:type\"                    foreground=\"blue\"/>\n"
-"  <style name=\"def:function\"                foreground=\"light-blue\"/>\n"
-"  <style name=\"def:identifier\"              foreground=\"purple\"/>\n"
-"  <style name=\"def:preprocessor\"            foreground=\"green\"/>\n"
-"  <style name=\"def:error\"                   foreground=\"#FF6666\"/>\n"
-"  <style name=\"def:warning\"                 foreground=\"#FFE100\"/>\n"
-"  <style name=\"def:note\"                    foreground=\"white\" background=\"#444444\"/>\n"
-"\n"
-"</style-scheme>\n";
-
-const std::string juci_dark_blue_style =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"\n"
-"<style-scheme id=\"juci-dark-blue\" _name=\"juci\" version=\"1.0\">\n"
-"  <author>juCi++ team</author>\n"
-"  <_description>Dark blue juCi++ style based on the Emacs deeper blue theme</_description>\n"
-"\n"
-"  <!-- Palette -->\n"
-"  <color name=\"white\"                       value=\"#D6D6D6\"/>\n"
-"  <color name=\"dark-blue\"                   value=\"#202233\"/>\n"
-"  <color name=\"gray\"                        value=\"#919191\"/>\n"
-"  <color name=\"red\"                         value=\"#FF7777\"/>\n"
-"  <color name=\"yellow\"                      value=\"#FFE100\"/>\n"
-"  <color name=\"light-yellow\"                value=\"#EAC595\"/>\n"
-"  <color name=\"light-blue\"                  value=\"#00CCFF\"/>\n"
-"  <color name=\"green\"                       value=\"#14ECA8\"/>\n"
-"  <color name=\"blue\"                        value=\"#282A40\"/>\n"
-"  <color name=\"orange\"                      value=\"#FF8800\"/>\n"
-"  <color name=\"light-green\"                 value=\"#A0DB6B\"/>\n"
-"\n"
-"  <style name=\"text\"                        foreground=\"white\" background=\"dark-blue\"/>\n"
-"  <style name=\"background-pattern\"          background=\"#rgba(255,255,255,.04)\"/>\n"
-"  <style name=\"selection\"                   background=\"#215D9C\"/>\n"
-"\n"
-"  <!-- Current Line Highlighting -->\n"
-"  <style name=\"current-line\"                background=\"#rgba(255,255,255,.05)\"/>\n"
-"\n"
-"  <!-- Bracket Matching -->\n"
-"  <style name=\"bracket-match\"               foreground=\"dark-blue\" background=\"gray\" bold=\"true\"/>\n"
-"  <style name=\"bracket-mismatch\"            foreground=\"dark-blue\" background=\"#FF0000\" bold=\"true\"/>\n"
-"\n"
-"  <!-- Search Matching -->\n"
-"  <style name=\"search-match\"                foreground=\"dark-blue\" background=\"white\"/>\n"
-"\n"
-"  <!-- Language specifics -->\n"
-"  <style name=\"def:builtin\"                 foreground=\"light-blue\"/>\n"
-"  <style name=\"def:constant\"                foreground=\"light-blue\"/>\n"
-"  <style name=\"def:boolean\"                 foreground=\"light-yellow\"/>\n"
-"  <style name=\"def:decimal\"                 foreground=\"light-yellow\"/>\n"
-"  <style name=\"def:base-n-integer\"          foreground=\"light-yellow\"/>\n"
-"  <style name=\"def:floating-point\"          foreground=\"light-yellow\"/>\n"
-"  <style name=\"def:complex\"                 foreground=\"light-yellow\"/>\n"
-"  <style name=\"def:character\"               foreground=\"light-yellow\"/>\n"
-"  <style name=\"def:special-char\"            foreground=\"light-yellow\"/>\n"
-"\n\n"
-"  <!-- Language specifics used by clang-parser in default config -->\n"
-"  <style name=\"def:string\"                  foreground=\"light-yellow\"/>\n"
-"  <style name=\"def:comment\"                 foreground=\"gray\"/>\n"
-"  <style name=\"def:statement\"               foreground=\"light-blue\"/>\n"
-"  <style name=\"def:type\"                    foreground=\"light-blue\"/>\n"
-"  <style name=\"def:function\"                foreground=\"green\"/>\n"
-"  <style name=\"def:identifier\"              foreground=\"light-green\"/>\n"
-"  <style name=\"def:preprocessor\"            foreground=\"yellow\"/>\n"
-"  <style name=\"def:error\"                   foreground=\"red\"/>\n"
-"  <style name=\"def:warning\"                 foreground=\"yellow\"/>\n"
-"  <style name=\"def:note\"                    foreground=\"white\" background=\"#404466\"/>\n"
-"\n"
-"</style-scheme>\n";
+R"RAW(
+        "make_command": "cmake --build .",
+        "save_on_compile_or_run": true,
+        "clear_terminal_on_compile": true
+    },
+    "documentation_searches": {
+        "clang": {
+            "separator": "::",
+            "queries": {
+                "@empty": "https://www.google.com/search?btnI&q=c%2B%2B+",
+                "std": "https://www.google.com/search?btnI&q=site:http://www.cplusplus.com/reference/+",
+                "boost": "https://www.google.com/search?btnI&q=site:http://www.boost.org/doc/libs/1_59_0/+",
+                "Gtk": "https://www.google.com/search?btnI&q=site:https://developer.gnome.org/gtkmm/stable/+",
+                "@any": "https://www.google.com/search?btnI&q="
+            }
+        }
+    }
+}
+)RAW";
+
+const std::string juci_light_style = R"RAW(<?xml version="1.0" encoding="UTF-8"?>
+
+<style-scheme id="juci-light" _name="juci" version="1.0">
+  <author>juCi++ team</author>
+  <_description>Default juCi++ style</_description>
+
+  <!-- Palette -->
+  <color name="white"                       value="#FFFFFF"/>
+  <color name="black"                       value="#000000"/>
+  <color name="gray"                        value="#888888"/>
+  <color name="red"                         value="#CC0000"/>
+  <color name="green"                       value="#008800"/>
+  <color name="blue"                        value="#0000FF"/>
+  <color name="dark-blue"                   value="#002299"/>
+  <color name="yellow"                      value="#FFFF00"/>
+  <color name="light-yellow"                value="#FFFF88"/>
+  <color name="orange"                      value="#FF8800"/>
+  <color name="purple"                      value="#990099"/>
+
+  <style name="text"                        foreground="#000000" background="#FFFFFF"/>
+  <style name="background-pattern"          background="#rgba(0,0,0,.03)"/>
+  <style name="selection"                   background="#4A90D9"/>
+
+  <!-- Current Line Highlighting -->
+  <style name="current-line"                background="#rgba(0,0,0,.07)"/>
+
+  <!-- Bracket Matching -->
+  <style name="bracket-match"               foreground="white" background="gray" bold="true"/>
+  <style name="bracket-mismatch"            foreground="white" background="#FF0000" bold="true"/>
+
+  <!-- Search Matching -->
+  <style name="search-match"                background="yellow"/>
+
+  <!-- Language specifics -->
+  <style name="def:builtin"                 foreground="blue"/>
+  <style name="def:constant"                foreground="blue"/>
+  <style name="def:boolean"                 foreground="red"/>
+  <style name="def:decimal"                 foreground="red"/>
+  <style name="def:base-n-integer"          foreground="red"/>
+  <style name="def:floating-point"          foreground="red"/>
+  <style name="def:complex"                 foreground="red"/>
+  <style name="def:character"               foreground="red"/>
+  <style name="def:special-char"            foreground="red"/>
+
+  <!-- Language specifics used by clang-parser in default config -->
+  <style name="def:string"                  foreground="red"/>
+  <style name="def:comment"                 foreground="gray"/>
+  <style name="def:statement"               foreground="blue"/>
+  <style name="def:type"                    foreground="blue"/>
+  <style name="def:function"                foreground="dark-blue"/>
+  <style name="def:identifier"              foreground="purple"/>
+  <style name="def:preprocessor"            foreground="green"/>
+  <style name="def:error"                   foreground="red"/>
+  <style name="def:warning"                 foreground="orange"/>
+  <style name="def:note"                    foreground="black" background="light-yellow"/>
+
+</style-scheme>
+)RAW";
+
+const std::string juci_dark_style = R"RAW(<?xml version="1.0" encoding="UTF-8"?>
+
+<style-scheme id="juci-dark" _name="juci" version="1.0">
+  <author>juCi++ team</author>
+  <_description>Dark juCi++ style</_description>
+
+  <!-- Palette -->
+  <color name="white"                       value="#CCCCCC"/>
+  <color name="black"                       value="#292929"/>
+  <color name="gray"                        value="#888888"/>
+  <color name="red"                         value="#FF9999"/>
+  <color name="green"                       value="#AACC99"/>
+  <color name="blue"                        value="#9090FF"/>
+  <color name="light-blue"                  value="#AAAAFF"/>
+  <color name="purple"                      value="#DD88DD"/>
+
+  <style name="text"                        foreground="white" background="black"/>
+  <style name="background-pattern"          background="#rgba(255,255,255,.04)"/>
+  <style name="selection"                   background="#215D9C"/>
+
+  <!-- Current Line Highlighting -->
+  <style name="current-line"                background="#rgba(255,255,255,.06)"/>
+
+  <!-- Bracket Matching -->
+  <style name="bracket-match"               foreground="black" background="gray" bold="true"/>
+  <style name="bracket-mismatch"            foreground="black" background="#FF0000" bold="true"/>
+
+  <!-- Search Matching -->
+  <style name="search-match"                foreground="black" background="white"/>
+
+  <!-- Language specifics -->
+  <style name="def:builtin"                 foreground="blue"/>
+  <style name="def:constant"                foreground="blue"/>
+  <style name="def:boolean"                 foreground="red"/>
+  <style name="def:decimal"                 foreground="red"/>
+  <style name="def:base-n-integer"          foreground="red"/>
+  <style name="def:floating-point"          foreground="red"/>
+  <style name="def:complex"                 foreground="red"/>
+  <style name="def:character"               foreground="red"/>
+  <style name="def:special-char"            foreground="red"/>
+
+  <!-- Language specifics used by clang-parser in default config -->
+  <style name="def:string"                  foreground="red"/>
+  <style name="def:comment"                 foreground="gray"/>
+  <style name="def:statement"               foreground="blue"/>
+  <style name="def:type"                    foreground="blue"/>
+  <style name="def:function"                foreground="light-blue"/>
+  <style name="def:identifier"              foreground="purple"/>
+  <style name="def:preprocessor"            foreground="green"/>
+  <style name="def:error"                   foreground="#FF6666"/>
+  <style name="def:warning"                 foreground="#FFE100"/>
+  <style name="def:note"                    foreground="white" background="#444444"/>
+
+</style-scheme>
+)RAW";
+
+const std::string juci_dark_blue_style = R"RAW(<?xml version="1.0" encoding="UTF-8"?>
+
+<style-scheme id="juci-dark-blue" _name="juci" version="1.0">
+  <author>juCi++ team</author>
+  <_description>Dark blue juCi++ style based on the Emacs deeper blue theme</_description>
+
+  <!-- Palette -->
+  <color name="white"                       value="#D6D6D6"/>
+  <color name="dark-blue"                   value="#202233"/>
+  <color name="gray"                        value="#919191"/>
+  <color name="red"                         value="#FF7777"/>
+  <color name="yellow"                      value="#FFE100"/>
+  <color name="light-yellow"                value="#EAC595"/>
+  <color name="light-blue"                  value="#00CCFF"/>
+  <color name="green"                       value="#14ECA8"/>
+  <color name="blue"                        value="#282A40"/>
+  <color name="orange"                      value="#FF8800"/>
+  <color name="light-green"                 value="#A0DB6B"/>
+
+  <style name="text"                        foreground="white" background="dark-blue"/>
+  <style name="background-pattern"          background="#rgba(255,255,255,.04)"/>
+  <style name="selection"                   background="#215D9C"/>
+
+  <!-- Current Line Highlighting -->
+  <style name="current-line"                background="#rgba(255,255,255,.05)"/>
+
+  <!-- Bracket Matching -->
+  <style name="bracket-match"               foreground="dark-blue" background="gray" bold="true"/>
+  <style name="bracket-mismatch"            foreground="dark-blue" background="#FF0000" bold="true"/>
+
+  <!-- Search Matching -->
+  <style name="search-match"                foreground="dark-blue" background="white"/>
+
+  <!-- Language specifics -->
+  <style name="def:builtin"                 foreground="light-blue"/>
+  <style name="def:constant"                foreground="light-blue"/>
+  <style name="def:boolean"                 foreground="light-yellow"/>
+  <style name="def:decimal"                 foreground="light-yellow"/>
+  <style name="def:base-n-integer"          foreground="light-yellow"/>
+  <style name="def:floating-point"          foreground="light-yellow"/>
+  <style name="def:complex"                 foreground="light-yellow"/>
+  <style name="def:character"               foreground="light-yellow"/>
+  <style name="def:special-char"            foreground="light-yellow"/>
+
+  <!-- Language specifics used by clang-parser in default config -->
+  <style name="def:string"                  foreground="light-yellow"/>
+  <style name="def:comment"                 foreground="gray"/>
+  <style name="def:statement"               foreground="light-blue"/>
+  <style name="def:type"                    foreground="light-blue"/>
+  <style name="def:function"                foreground="green"/>
+  <style name="def:identifier"              foreground="light-green"/>
+  <style name="def:preprocessor"            foreground="yellow"/>
+  <style name="def:error"                   foreground="red"/>
+  <style name="def:warning"                 foreground="yellow"/>
+  <style name="def:note"                    foreground="white" background="#404466"/>
+
+</style-scheme>
+)RAW";
 
 #endif  // JUCI_FILES_H_
diff --git a/src/notebook.cc b/src/notebook.cc
index 01c7fe49..3dfd25d9 100644
--- a/src/notebook.cc
+++ b/src/notebook.cc
@@ -24,17 +24,28 @@ namespace sigc {
 #endif
 }
 
-Notebook::TabLabel::TabLabel(const boost::filesystem::path &path) : Gtk::Box(Gtk::ORIENTATION_HORIZONTAL) {
+Notebook::TabLabel::TabLabel(const boost::filesystem::path &path, std::function<void()> on_close) {
   set_can_focus(false);
   set_tooltip_text(path.string());
+  hbox.set_can_focus(false);
   label.set_text(path.filename().string()+' ');
   label.set_can_focus(false);
   button.set_image_from_icon_name("window-close-symbolic", Gtk::ICON_SIZE_MENU);
   button.set_can_focus(false);
   button.set_relief(Gtk::ReliefStyle::RELIEF_NONE);
-      
-  pack_start(label, Gtk::PACK_SHRINK);
-  pack_end(button, Gtk::PACK_SHRINK);
+  
+  hbox.pack_start(label, Gtk::PACK_SHRINK);
+  hbox.pack_end(button, Gtk::PACK_SHRINK);
+  add(hbox);
+  
+  button.signal_clicked().connect(on_close);
+  signal_button_press_event().connect([on_close](GdkEventButton *event) {
+    if(event->button==GDK_BUTTON_MIDDLE) {
+      on_close();
+      return true;
+    }
+    return false;
+  });
   
   show_all();
 }
@@ -141,16 +152,15 @@ void Notebook::open(const boost::filesystem::path &file_path) {
   configure(source_views.size()-1);
   
   //Set up tab label
-  tab_labels.emplace_back(new TabLabel(file_path));
   auto source_view=source_views.back();
-  tab_labels.back()->button.signal_clicked().connect([this, source_view](){
+  tab_labels.emplace_back(new TabLabel(file_path, [this, source_view](){
     for(int c=0;c<size();c++) {
       if(get_view(c)==source_view) {
         close(c);
         break;
       }
     }
-  });
+  }));
   append_page(*hboxes.back(), *tab_labels.back());
   
   set_tab_reorderable(*hboxes.back(), true);
diff --git a/src/notebook.h b/src/notebook.h
index 22c92432..1fad50d3 100644
--- a/src/notebook.h
+++ b/src/notebook.h
@@ -10,11 +10,12 @@
 #include <sigc++/sigc++.h>
 
 class Notebook : public Gtk::Notebook {
-  class TabLabel : public Gtk::Box {
+  class TabLabel : public Gtk::EventBox {
+    Gtk::HBox hbox;
+    Gtk::Button button;
   public:
-    TabLabel(const boost::filesystem::path &path);
+    TabLabel(const boost::filesystem::path &path, std::function<void()> on_close);
     Gtk::Label label;
-    Gtk::Button button;
   };
   
 private:
diff --git a/src/project.cc b/src/project.cc
index ed4634d5..43dc6631 100644
--- a/src/project.cc
+++ b/src/project.cc
@@ -504,9 +504,9 @@ void Project::Clang::debug_write(const std::string &buffer) {
   Debug::Clang::get().write(buffer);
 }
 
-void Project::Clang::debug_delete() {
+void Project::Clang::debug_cancel() {
   std::unique_lock<std::mutex> lock(debug_start_mutex);
-  Debug::Clang::get().delete_debug();
+  Debug::Clang::get().cancel();
 }
 #endif
 
diff --git a/src/project.h b/src/project.h
index 3e4cc8e3..f12556d1 100644
--- a/src/project.h
+++ b/src/project.h
@@ -52,7 +52,7 @@ namespace Project {
     virtual void debug_remove_breakpoint(const boost::filesystem::path &file_path, int line_nr, int line_count) {}
     virtual bool debug_is_running() { return false; }
     virtual void debug_write(const std::string &buffer) {}
-    virtual void debug_delete() {}
+    virtual void debug_cancel() {}
   };
   
   class Clang : public Base {
@@ -83,7 +83,7 @@ namespace Project {
     void debug_remove_breakpoint(const boost::filesystem::path &file_path, int line_nr, int line_count) override;
     bool debug_is_running() override;
     void debug_write(const std::string &buffer) override;
-    void debug_delete() override;
+    void debug_cancel() override;
   #endif
   };
   
diff --git a/src/source.cc b/src/source.cc
index dd05d363..61045f58 100644
--- a/src/source.cc
+++ b/src/source.cc
@@ -1219,8 +1219,13 @@ bool Source::View::on_key_press_event_basic(GdkEventKey* key) {
     get_buffer()->end_user_action();
     return true;
   }
-  //Indent right when clicking tab, no matter where in the line the cursor is. Also works on selected text.
-  else if(key->keyval==GDK_KEY_Tab) {
+  else if(key->keyval==GDK_KEY_Tab && (key->state&GDK_SHIFT_MASK)==0) {
+    if(!Config::get().source.tab_indents_line && !get_buffer()->get_has_selection()) {
+      get_buffer()->insert_at_cursor(tab);
+      get_buffer()->end_user_action();
+      return true;
+    }
+    //Indent right when clicking tab, no matter where in the line the cursor is. Also works on selected text.
     //Special case if insert is at beginning of empty line:
     if(iter.starts_line() && iter.ends_line() && !get_buffer()->get_has_selection()) {
       auto prev_line_iter=iter;
diff --git a/src/source.h b/src/source.h
index e29a22fa..5acfde1e 100644
--- a/src/source.h
+++ b/src/source.h
@@ -81,7 +81,7 @@ namespace Source {
     std::function<std::string()> get_token_spelling;
     std::function<std::vector<std::pair<boost::filesystem::path, size_t> >(const std::vector<Source::View*> &views, const std::string &text)> rename_similar_tokens;
     std::function<void()> goto_next_diagnostic;
-    std::function<void()> apply_fix_its;
+    std::function<std::vector<FixIt>()> get_fix_its;
     
     std::unique_ptr<CompletionDialog> autocomplete_dialog;
     std::unique_ptr<SelectionDialog> selection_dialog;
diff --git a/src/source_clang.cc b/src/source_clang.cc
index c6e59009..23beff54 100644
--- a/src/source_clang.cc
+++ b/src/source_clang.cc
@@ -1275,37 +1275,12 @@ Source::ClangViewAutocomplete(file_path, language) {
     }
   };
   
-  apply_fix_its=[this]() {
+  get_fix_its=[this]() {
     if(!parsed) {
       Info::get().print("Buffer is parsing");
-      return;
-    }
-    std::vector<std::pair<Glib::RefPtr<Gtk::TextMark>, Glib::RefPtr<Gtk::TextMark> > > fix_it_marks;
-    for(auto &fix_it: fix_its) {
-      auto start_iter=get_buffer()->get_iter_at_line_index(fix_it.offsets.first.line-1, fix_it.offsets.first.index-1);
-      auto end_iter=get_buffer()->get_iter_at_line_index(fix_it.offsets.second.line-1, fix_it.offsets.second.index-1);
-      fix_it_marks.emplace_back(get_buffer()->create_mark(start_iter), get_buffer()->create_mark(end_iter));
-    }
-    size_t c=0;
-    get_buffer()->begin_user_action();
-    for(auto &fix_it: fix_its) {
-      if(fix_it.type==FixIt::Type::INSERT) {
-        get_buffer()->insert(fix_it_marks[c].first->get_iter(), fix_it.source);
-      }
-      if(fix_it.type==FixIt::Type::REPLACE) {
-        get_buffer()->erase(fix_it_marks[c].first->get_iter(), fix_it_marks[c].second->get_iter());
-        get_buffer()->insert(fix_it_marks[c].first->get_iter(), fix_it.source);
-      }
-      if(fix_it.type==FixIt::Type::ERASE) {
-        get_buffer()->erase(fix_it_marks[c].first->get_iter(), fix_it_marks[c].second->get_iter());
-      }
-      c++;
+      return std::vector<FixIt>();
     }
-    for(auto &mark_pair: fix_it_marks) {
-      get_buffer()->delete_mark(mark_pair.first);
-      get_buffer()->delete_mark(mark_pair.second);
-    }
-    get_buffer()->end_user_action();
+    return fix_its;
   };
 }
 
diff --git a/src/window.cc b/src/window.cc
index 51818e87..feb055a0 100644
--- a/src/window.cc
+++ b/src/window.cc
@@ -572,8 +572,36 @@ void Window::set_menu_actions() {
   });
   menu.add_action("source_apply_fix_its", [this]() {
     if(notebook.get_current_page()!=-1) {
-      if(notebook.get_current_view()->apply_fix_its) {
-        notebook.get_current_view()->apply_fix_its();
+      auto view=notebook.get_current_view();
+      if(view->get_fix_its) {
+        auto buffer=view->get_buffer();
+        auto fix_its=view->get_fix_its();
+        std::vector<std::pair<Glib::RefPtr<Gtk::TextMark>, Glib::RefPtr<Gtk::TextMark> > > fix_it_marks;
+        for(auto &fix_it: fix_its) {
+          auto start_iter=buffer->get_iter_at_line_index(fix_it.offsets.first.line-1, fix_it.offsets.first.index-1);
+          auto end_iter=buffer->get_iter_at_line_index(fix_it.offsets.second.line-1, fix_it.offsets.second.index-1);
+          fix_it_marks.emplace_back(buffer->create_mark(start_iter), buffer->create_mark(end_iter));
+        }
+        size_t c=0;
+        buffer->begin_user_action();
+        for(auto &fix_it: fix_its) {
+          if(fix_it.type==Source::FixIt::Type::INSERT) {
+            buffer->insert(fix_it_marks[c].first->get_iter(), fix_it.source);
+          }
+          if(fix_it.type==Source::FixIt::Type::REPLACE) {
+            buffer->erase(fix_it_marks[c].first->get_iter(), fix_it_marks[c].second->get_iter());
+            buffer->insert(fix_it_marks[c].first->get_iter(), fix_it.source);
+          }
+          if(fix_it.type==Source::FixIt::Type::ERASE) {
+            buffer->erase(fix_it_marks[c].first->get_iter(), fix_it_marks[c].second->get_iter());
+          }
+          c++;
+        }
+        for(auto &mark_pair: fix_it_marks) {
+          buffer->delete_mark(mark_pair.first);
+          buffer->delete_mark(mark_pair.second);
+        }
+        buffer->end_user_action();
       }
     }
   });
@@ -830,7 +858,7 @@ void Window::activate_menu_items(bool activate) {
   menu.actions["source_goto_method"]->set_enabled(activate ? static_cast<bool>(notebook.get_current_view()->get_methods) : false);
   menu.actions["source_rename"]->set_enabled(activate ? static_cast<bool>(notebook.get_current_view()->rename_similar_tokens) : false);
   menu.actions["source_goto_next_diagnostic"]->set_enabled(activate ? static_cast<bool>(notebook.get_current_view()->goto_next_diagnostic) : false);
-  menu.actions["source_apply_fix_its"]->set_enabled(activate ? static_cast<bool>(notebook.get_current_view()->apply_fix_its) : false);
+  menu.actions["source_apply_fix_its"]->set_enabled(activate ? static_cast<bool>(notebook.get_current_view()->get_fix_its) : false);
 #ifdef JUCI_ENABLE_DEBUG
   if(notebook.get_current_page()!=-1) {
     auto view=notebook.get_current_view();
@@ -902,7 +930,7 @@ bool Window::on_delete_event(GdkEventAny *event) {
   Terminal::get().kill_async_processes();
 #ifdef JUCI_ENABLE_DEBUG
   if(Project::current)
-    Project::current->debug_delete();
+    Project::current->debug_cancel();
 #endif
   return false;
 }
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 7443bafc..1c3bb945 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-access-control -DJUCI_TESTS_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}\\\"")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-access-control -DJUCI_BUILD_PATH=\\\"${CMAKE_BINARY_DIR}\\\" -DJUCI_TESTS_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}\\\"")
 
 set(global_includes
    ${Boost_INCLUDE_DIRS}
@@ -33,6 +33,11 @@ add_library(stubs OBJECT ${stub_files})
 
 include_directories(${global_includes})
 
+add_executable(process_test process_test.cc
+               $<TARGET_OBJECTS:project_shared> $<TARGET_OBJECTS:stubs>)
+target_link_libraries(process_test ${global_libraries})
+add_test(process_test process_test)
+
 add_executable(cmake_build_test cmake_build_test.cc
                $<TARGET_OBJECTS:project_shared> $<TARGET_OBJECTS:stubs>)
 target_link_libraries(cmake_build_test ${global_libraries})
@@ -47,3 +52,11 @@ add_executable(source_clang_test source_clang_test.cc
                $<TARGET_OBJECTS:project_shared> $<TARGET_OBJECTS:stubs>)
 target_link_libraries(source_clang_test ${global_libraries})
 add_test(source_clang_test source_clang_test)
+
+if(LIBLLDB_FOUND)
+  add_executable(lldb_test lldb_test.cc
+                 $<TARGET_OBJECTS:project_shared> $<TARGET_OBJECTS:stubs>)
+  target_link_libraries(lldb_test ${global_libraries})
+  add_test(lldb_test lldb_test)
+  add_subdirectory("lldb_test_files")
+endif()
diff --git a/tests/lldb_test.cc b/tests/lldb_test.cc
new file mode 100644
index 00000000..49d2332e
--- /dev/null
+++ b/tests/lldb_test.cc
@@ -0,0 +1,71 @@
+#include <glib.h>
+#include "debug_clang.h"
+#include <thread>
+#include <boost/filesystem.hpp>
+#include <atomic>
+
+int main() {
+  auto build_path=boost::filesystem::canonical(JUCI_BUILD_PATH);
+  auto exec_path=build_path/"tests"/"lldb_test_files"/"lldb_test_executable";
+  g_assert(boost::filesystem::exists(exec_path));
+  
+  auto tests_path=boost::filesystem::canonical(JUCI_TESTS_PATH);
+  auto source_path=tests_path/"lldb_test_files"/"main.cpp";
+  g_assert(boost::filesystem::exists(source_path));
+  
+  std::vector<std::pair<boost::filesystem::path, int> > breakpoints;
+  breakpoints.emplace_back(source_path, 2);
+  
+  std::atomic<bool> exited(false);
+  int exit_status;
+  std::atomic<int> line_nr(0);
+  std::thread debug_thread([&] {
+    Debug::Clang::get().start(exec_path.string(), "", breakpoints, [&](int exit_status_){
+      exit_status=exit_status_;
+      exited=true;
+    }, [](const std::string &status) {
+      
+    }, [&](const boost::filesystem::path &file_path, int line_nr_, int line_index) {
+      line_nr=line_nr_;
+    });
+  });
+  debug_thread.detach();
+  
+  for(;;) {
+    if(exited) {
+      g_assert_cmpint(exit_status, ==, 0);
+      break;
+    }
+    else if(line_nr>0) {
+      for(;;) {
+        if(Debug::Clang::get().is_stopped())
+          break;
+        std::this_thread::sleep_for(std::chrono::milliseconds(100));
+      }
+      g_assert_cmpint(line_nr, ==, 2);
+      g_assert(Debug::Clang::get().get_backtrace().size()>0);
+      auto variables=Debug::Clang::get().get_variables();
+      g_assert_cmpstr(variables.at(0).name.c_str(), ==, "an_int");
+      line_nr=0;
+      Debug::Clang::get().step_over();
+      for(;;) {
+        if(line_nr>0 && Debug::Clang::get().is_stopped())
+          break;
+        std::this_thread::sleep_for(std::chrono::milliseconds(100));
+      }
+      g_assert_cmpint(line_nr, ==, 3);
+      g_assert(Debug::Clang::get().get_backtrace().size()>0);
+      variables=Debug::Clang::get().get_variables();
+      g_assert_cmpstr(variables.at(0).name.c_str(), ==, "an_int");
+      auto value=Debug::Clang::get().get_value("an_int", source_path, 2, 7);
+      g_assert_cmpuint(value.size(), >, 16);
+      auto value_substr=value.substr(0, 16);
+      g_assert_cmpstr(value_substr.c_str(), ==, "(int) an_int = 1");
+      line_nr=0;
+      Debug::Clang::get().continue_debug();
+    }
+    std::this_thread::sleep_for(std::chrono::milliseconds(10));
+  }
+  
+  Debug::Clang::get().cancel();
+}
diff --git a/tests/lldb_test_files/CMakeLists.txt b/tests/lldb_test_files/CMakeLists.txt
new file mode 100644
index 00000000..92fae301
--- /dev/null
+++ b/tests/lldb_test_files/CMakeLists.txt
@@ -0,0 +1,5 @@
+cmake_minimum_required(VERSION 2.8)
+
+set(CMAKE_CXX_FLAGS "-g")
+
+add_executable(lldb_test_executable main.cpp)
diff --git a/tests/lldb_test_files/main.cpp b/tests/lldb_test_files/main.cpp
new file mode 100644
index 00000000..37b7a13c
--- /dev/null
+++ b/tests/lldb_test_files/main.cpp
@@ -0,0 +1,4 @@
+int main() {
+  int an_int=1;
+  an_int++;
+}
diff --git a/tests/process_test.cc b/tests/process_test.cc
new file mode 100644
index 00000000..7cd9cb68
--- /dev/null
+++ b/tests/process_test.cc
@@ -0,0 +1,50 @@
+#include <glib.h>
+#include "process.hpp"
+
+int main() {
+  auto output=std::make_shared<std::string>();
+  auto error=std::make_shared<std::string>();
+  {
+    Process process("echo Test", "", [output](const char *bytes, size_t n) {
+      *output+=std::string(bytes, n);
+    });
+    g_assert(process.get_exit_status()==0);
+    g_assert(output->substr(0, 4)=="Test");
+    output->clear();
+  }
+  
+  {
+    Process process("echo Test && ls an_incorrect_path", "", [output](const char *bytes, size_t n) {
+      *output+=std::string(bytes, n);
+    }, [error](const char *bytes, size_t n) {
+      *error+=std::string(bytes, n);
+    });
+    g_assert(process.get_exit_status()>0);
+    g_assert(output->substr(0, 4)=="Test");
+    g_assert(!error->empty());
+    output->clear();
+    error->clear();
+  }
+  
+  {
+    Process process("bash", "", [output](const char *bytes, size_t n) {
+      *output+=std::string(bytes, n);
+    }, nullptr, true);
+    process.write("echo Test\n");
+    process.write("exit\n");
+    g_assert(process.get_exit_status()==0);
+    g_assert(output->substr(0, 4)=="Test");
+    output->clear();
+  }
+  
+  {
+    Process process("cat", "", [output](const char *bytes, size_t n) {
+      *output+=std::string(bytes, n);
+    }, nullptr, true);
+    process.write("Test\n");
+    process.close_stdin();
+    g_assert(process.get_exit_status()==0);
+    g_assert(output->substr(0, 4)=="Test");
+    output->clear();
+  }
+}
diff --git a/tests/source_clang_test.cc b/tests/source_clang_test.cc
index 52d02c1c..6a4c65e2 100644
--- a/tests/source_clang_test.cc
+++ b/tests/source_clang_test.cc
@@ -24,7 +24,7 @@ int main() {
   Gsv::init();
   
   Config::get().project.default_build_path="./build";
-  Source::ClangView *clang_view=new Source::ClangView(boost::filesystem::canonical(std::string(JUCI_TESTS_PATH)+"/clang_project/main.cpp"),
+  Source::ClangView *clang_view=new Source::ClangView(boost::filesystem::canonical(std::string(JUCI_TESTS_PATH)+"/source_clang_test_files/main.cpp"),
                                                       Gsv::LanguageManager::get_default()->get_language("cpp"));
   while(!clang_view->parsed)
     flush_events();
@@ -73,6 +73,7 @@ int main() {
   while(!clang_view->parsed)
     flush_events();
   g_assert_cmpuint(clang_view->diagnostics.size(), >, 0);
+  g_assert_cmpuint(clang_view->get_fix_its().size(), >, 0);
   
   clang_view->async_delete();
   clang_view->delete_thread.join();
diff --git a/tests/clang_project/CMakeLists.txt b/tests/source_clang_test_files/CMakeLists.txt
similarity index 100%
rename from tests/clang_project/CMakeLists.txt
rename to tests/source_clang_test_files/CMakeLists.txt
diff --git a/tests/clang_project/build/compile_commands.json b/tests/source_clang_test_files/build/compile_commands.json
similarity index 100%
rename from tests/clang_project/build/compile_commands.json
rename to tests/source_clang_test_files/build/compile_commands.json
diff --git a/tests/clang_project/main.cpp b/tests/source_clang_test_files/main.cpp
similarity index 100%
rename from tests/clang_project/main.cpp
rename to tests/source_clang_test_files/main.cpp
diff --git a/tests/source_test.cc b/tests/source_test.cc
index 8c1a733a..a3ab90ce 100644
--- a/tests/source_test.cc
+++ b/tests/source_test.cc
@@ -24,8 +24,20 @@ int main() {
   auto app=Gtk::Application::create();
   Gsv::init();
   
-  Source::View source_view("", Glib::RefPtr<Gsv::Language>());
-  source_view.get_buffer()->set_text(hello_world);
+  auto tests_path=boost::filesystem::canonical(JUCI_TESTS_PATH);
+  auto source_file=tests_path/"tmp"/"source_file.cpp";
+  
+  {
+    Source::View source_view(source_file, Glib::RefPtr<Gsv::Language>());
+    source_view.get_buffer()->set_text(hello_world);
+    g_assert(source_view.save({&source_view}));
+  }
+  
+  Source::View source_view(source_file, Glib::RefPtr<Gsv::Language>());
+  g_assert(source_view.get_buffer()->get_text()==hello_world);
   source_view.cleanup_whitespace_characters();
   g_assert(source_view.get_buffer()->get_text()==hello_world_cleaned);
+  
+  g_assert(boost::filesystem::remove(source_file));
+  g_assert(!boost::filesystem::exists(source_file));
 }
diff --git a/tests/tmp/.keep b/tests/tmp/.keep
new file mode 100644
index 00000000..e69de29b