From dc57a8749cba465e875af6446489a6bf8fb6d0e8 Mon Sep 17 00:00:00 2001
From: eidheim <eidheim@gmail.com>
Date: Sat, 10 Jul 2021 21:39:46 +0200
Subject: [PATCH] Added version_compare and adds parallel to default value in
 preference item project.cmake.compile_command

---
 src/CMakeLists.txt        |   2 +-
 src/config.cpp            | 493 +++++++++++++++++++++++++++++++++++++-
 src/config.hpp            |   8 +
 src/files.hpp             | 440 ----------------------------------
 src/filesystem.cpp        |  45 ++--
 src/filesystem.hpp        |   4 +-
 src/utility.cpp           |  40 ++++
 src/utility.hpp           |   3 +
 tests/CMakeLists.txt      |   1 -
 tests/filesystem_test.cpp |   8 +
 tests/json_test.cpp       |   4 +-
 tests/source_test.cpp     |   2 +-
 tests/stubs/config.cpp    |   3 -
 tests/utility_test.cpp    |  22 ++
 14 files changed, 593 insertions(+), 482 deletions(-)
 delete mode 100644 src/files.hpp
 delete mode 100644 tests/stubs/config.cpp

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 71cb1d9..1612307 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -3,6 +3,7 @@ set(JUCI_SHARED_FILES
   autocomplete.cpp
   cmake.cpp
   commands.cpp
+  config.cpp
   compile_commands.cpp
   ctags.cpp
   dispatcher.cpp
@@ -44,7 +45,6 @@ target_link_libraries(juci_shared
 )
 
 set(JUCI_FILES
-  config.cpp
   dialog.cpp
   directories.cpp
   entrybox.cpp
diff --git a/src/config.cpp b/src/config.cpp
index 283955f..b26349f 100644
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -1,10 +1,12 @@
 #include "config.hpp"
-#include "files.hpp"
 #include "filesystem.hpp"
+#include "process.hpp"
 #include "terminal.hpp"
+#include "utility.hpp"
 #include <algorithm>
 #include <exception>
 #include <iostream>
+#include <thread>
 
 Config::Config() {
   home_path = filesystem::get_home_path();
@@ -20,22 +22,22 @@ void Config::load() {
     boost::filesystem::create_directories(config_dir);
 
     if(!boost::filesystem::exists(config_json))
-      filesystem::write(config_json, default_config_file);
+      filesystem::write(config_json, default_config());
 
     auto juci_style_path = home_juci_path / "styles";
     boost::filesystem::create_directories(juci_style_path);
 
     juci_style_path /= "juci-light.xml";
     if(!boost::filesystem::exists(juci_style_path))
-      filesystem::write(juci_style_path, juci_light_style);
+      filesystem::write(juci_style_path, juci_light_style());
     juci_style_path = juci_style_path.parent_path();
     juci_style_path /= "juci-dark.xml";
     if(!boost::filesystem::exists(juci_style_path))
-      filesystem::write(juci_style_path, juci_dark_style);
+      filesystem::write(juci_style_path, juci_dark_style());
     juci_style_path = juci_style_path.parent_path();
     juci_style_path /= "juci-dark-blue.xml";
     if(!boost::filesystem::exists(juci_style_path))
-      filesystem::write(juci_style_path, juci_dark_blue_style);
+      filesystem::write(juci_style_path, juci_dark_blue_style());
 
     JSON cfg(config_json);
     update(cfg);
@@ -45,7 +47,7 @@ void Config::load() {
     dispatcher.post([config_json = std::move(config_json), e_what = std::string(e.what())] {
       ::Terminal::get().print("\e[31mError\e[m: could not parse " + filesystem::get_short_path(config_json).string() + ": " + e_what + "\n", true);
     });
-    JSON default_cfg(default_config_file);
+    JSON default_cfg(default_config());
     read(default_cfg);
   }
 }
@@ -54,7 +56,7 @@ void Config::update(JSON &cfg) {
   auto version = cfg.string("version");
   if(version == JUCI_VERSION)
     return;
-  JSON default_cfg(default_config_file);
+  JSON default_cfg(default_config());
   make_version_dependent_corrections(cfg, default_cfg, version);
   cfg.set("version", JUCI_VERSION);
 
@@ -64,14 +66,14 @@ void Config::update(JSON &cfg) {
   cfg.to_file(home_juci_path / "config" / "config.json", 2);
 
   auto style_path = home_juci_path / "styles";
-  filesystem::write(style_path / "juci-light.xml", juci_light_style);
-  filesystem::write(style_path / "juci-dark.xml", juci_dark_style);
-  filesystem::write(style_path / "juci-dark-blue.xml", juci_dark_blue_style);
+  filesystem::write(style_path / "juci-light.xml", juci_light_style());
+  filesystem::write(style_path / "juci-dark.xml", juci_dark_style());
+  filesystem::write(style_path / "juci-dark-blue.xml", juci_dark_blue_style());
 }
 
 void Config::make_version_dependent_corrections(JSON &cfg, const JSON &default_cfg, const std::string &version) {
   try {
-    if(version <= "1.2.4") {
+    if(version_compare(version, "1.2.4") <= 0) {
       auto keybindings = cfg.object("keybindings");
       auto print = keybindings.string_optional("print");
       if(print && *print == "<primary>p") {
@@ -197,3 +199,472 @@ void Config::read(const JSON &cfg) {
   log.libclang = log_json.boolean("libclang", JSON::ParseOptions::accept_string);
   log.language_server = log_json.boolean("language_server", JSON::ParseOptions::accept_string);
 }
+
+std::string Config::default_config() {
+  static auto get_config = [] {
+    std::string cmake_version;
+    unsigned thread_count = 0;
+    std::stringstream ss;
+    TinyProcessLib::Process process(
+        "cmake --version", "",
+        [&ss](const char *buffer, size_t n) {
+          ss.write(buffer, n);
+        },
+        [](const char *buffer, size_t n) {});
+    if(process.get_exit_status() == 0) {
+      std::string line;
+      if(std::getline(ss, line)) {
+        auto pos = line.rfind(" ");
+        if(pos != std::string::npos) {
+          cmake_version = line.substr(pos + 1);
+          thread_count = std::thread::hardware_concurrency();
+        }
+      }
+    }
+
+    return std::string(R"RAW({
+  "version": ")RAW" +
+                       std::string(JUCI_VERSION) +
+                       R"RAW(",
+  "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": "",
+    "font_comment": "Set to override theme font, for instance: \"Arial 12\"",
+    "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__
+                       R"RAW(
+    "font": "Menlo",)RAW"
+#else
+#ifdef _WIN32
+                       R"RAW(
+    "font": "Consolas",)RAW"
+#else
+                       R"RAW(
+    "font": "Monospace",)RAW"
+#endif
+#endif
+                       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": "",
+    "format_style_on_save_comment": "Performs style format on save if supported on language in buffer",
+    "format_style_on_save": false,
+    "format_style_on_save_if_style_file_found_comment": "Format style if format file is found, even if format_style_on_save is false",
+    "format_style_on_save_if_style_file_found": true,
+    "smart_brackets_comment": "If smart_inserts is enabled, this option is automatically enabled. When inserting an already closed bracket, the cursor might instead be moved, avoiding the need of arrow keys after autocomplete",
+    "smart_brackets": true,
+    "smart_inserts_comment": "When for instance inserting (, () gets inserted. Applies to: (), [], \", '. Also enables pressing ; inside an expression before a final ) to insert ; at the end of line, and deletions of empty insertions",
+    "smart_inserts": true,
+    "show_map": true,
+    "map_font_size": 1,
+    "show_git_diff": true,
+    "show_background_pattern": true,
+    "show_right_margin": false,
+    "right_margin_position": 80,
+    "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,
+    "word_wrap_comment": "Specify language ids that should enable word wrap, for instance: chdr, c, cpphdr, cpp, js, python, or all to enable word wrap for all languages",
+    "word_wrap": "markdown, latex",
+    "highlight_current_line": true,
+    "show_line_numbers": true,
+    "enable_multiple_cursors": false,
+    "auto_reload_changed_files": true,
+    "search_for_selection": true,
+    "clang_format_style_comment": "IndentWidth, AccessModifierOffset and UseTab are set automatically. See http://clang.llvm.org/docs/ClangFormatStyleOptions.html",
+    "clang_format_style": "ColumnLimit: 0, NamespaceIndentation: All",
+    "clang_tidy_enable_comment": "Enable clang-tidy in new C/C++ buffers",
+    "clang_tidy_enable": false,
+    "clang_tidy_checks_comment": "In new C/C++ buffers, these checks are appended to the value of 'Checks' in the .clang-tidy file, if any",
+    "clang_tidy_checks": "",
+    "clang_usages_threads_comment": "The number of threads used in finding usages in unparsed files. -1 corresponds to the number of cores available, and 0 disables the search",
+    "clang_usages_threads": -1,
+    "clang_detailed_preprocessing_record_comment": "Set to true to, at the cost of increased resource use, include all macro definitions and instantiations when parsing new C/C++ buffers. You should reopen buffers and delete build/.usages_clang after changing this option.",
+    "clang_detailed_preprocessing_record": false,
+    "debug_place_cursor_at_stop": false
+  },
+  "terminal": {
+    "history_size": 10000,
+    "font_comment": "Use \"\" to use source.font with slightly smaller size",
+    "font": "",
+    "clear_on_compile": true,
+    "clear_on_run_command": false,
+    "hide_entry_on_run_command": true
+  },
+  "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",
+    "cmake": {)RAW"
+#ifdef _WIN32
+                       R"RAW(
+      "command": "cmake -G\"MSYS Makefiles\"",)RAW"
+#else
+                       R"RAW(
+      "command": "cmake",)RAW"
+#endif
+                       R"RAW(
+      "compile_command": "cmake --build .)RAW" +
+                       (thread_count > 1 && !cmake_version.empty() && version_compare(cmake_version, "3.12") >= 0 ? " --parallel " + std::to_string(thread_count) : "") +
+                       R"RAW("
+    },
+    "meson": {
+      "command": "meson",
+      "compile_command": "ninja"
+    },
+    "default_build_management_system_comment": "Select which build management system to use when creating a new C or C++ project, for instance \"cmake\" or \"meson\"",
+    "default_build_management_system": "cmake",
+    "save_on_compile_or_run": true,)RAW"
+#ifdef JUCI_USE_UCTAGS
+                       R"RAW(
+    "ctags_command": "uctags",)RAW"
+#else
+                       R"RAW(
+    "ctags_command": "ctags",)RAW"
+#endif
+                       R"RAW(
+    "grep_command": "grep",
+    "cargo_command": "cargo",
+    "python_command": "python -u",
+    "markdown_command": "grip -b"
+  },
+  "keybindings": {
+    "preferences": "<primary>comma",
+    "snippets": "",
+    "commands": "",
+    "quit": "<primary>q",
+    "file_new_file": "<primary>n",
+    "file_new_folder": "<primary><shift>n",
+    "file_open_file": "<primary>o",
+    "file_open_folder": "<primary><shift>o",
+    "file_reload_file": "",
+    "file_save": "<primary>s",
+    "file_save_as": "<primary><shift>s",
+    "file_close_file": "<primary>w",
+    "file_close_folder": "",
+    "file_close_project": "",
+    "file_print": "",
+    "edit_undo": "<primary>z",
+    "edit_redo": "<primary><shift>z",
+    "edit_cut": "<primary>x",
+    "edit_cut_lines": "<primary><shift>x",
+    "edit_copy": "<primary>c",
+    "edit_copy_lines": "<primary><shift>c",
+    "edit_paste": "<primary>v",
+    "edit_extend_selection": "<primary><shift>a",
+    "edit_shrink_selection": "<primary><shift><alt>a",
+    "edit_show_or_hide": "",
+    "edit_find": "<primary>f",
+    "source_spellcheck": "",
+    "source_spellcheck_clear": "",
+    "source_spellcheck_next_error": "<primary><shift>e",
+    "source_git_next_diff": "<primary>k",
+    "source_git_show_diff": "<alt>k",
+    "source_indentation_set_buffer_tab": "",
+    "source_indentation_auto_indent_buffer": "<primary><shift>i",
+    "source_goto_line": "<primary>g",
+    "source_center_cursor": "<primary>l",
+    "source_cursor_history_back": "<alt>Left",
+    "source_cursor_history_forward": "<alt>Right",
+    "source_show_completion_comment": "Add completion keybinding to disable interactive autocompletion",
+    "source_show_completion": "",
+    "source_find_file": "<primary>p",
+    "source_find_symbol": "<primary><shift>f",
+    "source_find_pattern": "<alt><shift>f",
+    "source_comments_toggle": "<primary>slash",
+    "source_comments_add_documentation": "<primary><alt>slash",
+    "source_find_documentation": "<primary><shift>d",
+    "source_goto_declaration": "<primary>d",
+    "source_goto_type_declaration": "<alt><shift>d",
+    "source_goto_implementation": "<primary>i",
+    "source_goto_usage": "<primary>u",
+    "source_goto_method": "<primary>m",
+    "source_rename": "<primary>r",
+    "source_implement_method": "<primary><shift>m",
+    "source_goto_next_diagnostic": "<primary>e",
+    "source_apply_fix_its": "<control>space",
+    "project_set_run_arguments": "",
+    "project_compile_and_run": "<primary>Return",
+    "project_compile": "<primary><shift>Return",
+    "project_run_command": "<alt>Return",
+    "project_kill_last_running": "<primary>Escape",
+    "project_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_show_breakpoints": "<primary><shift><alt>b",
+    "debug_goto_stop": "<primary><shift>l",)RAW"
+#ifdef __linux
+                       R"RAW(
+    "window_next_tab": "<primary>Tab",
+    "window_previous_tab": "<primary><shift>Tab",)RAW"
+#else
+                       R"RAW(
+    "window_next_tab": "<primary><alt>Right",
+    "window_previous_tab": "<primary><alt>Left",)RAW"
+#endif
+                       R"RAW(
+    "window_goto_tab": "",
+    "window_toggle_split": "",
+    "window_split_source_buffer": "",)RAW"
+#ifdef __APPLE__
+                       R"RAW(
+    "window_toggle_full_screen": "<primary><control>f",)RAW"
+#else
+                       R"RAW(
+    "window_toggle_full_screen": "F11",)RAW"
+#endif
+                       R"RAW(
+    "window_toggle_directories": "",
+    "window_toggle_terminal": "",
+    "window_toggle_menu": "",
+    "window_toggle_tabs": "",
+    "window_toggle_zen_mode": "",
+    "window_clear_terminal": ""
+  },
+  "documentation_searches": {
+    "clang": {
+      "separator": "::",
+      "queries": {
+        "@empty": "https://www.google.com/search?q=c%2B%2B+",
+        "std": "https://www.google.com/search?q=site:http://www.cplusplus.com/reference/+",
+        "boost": "https://www.google.com/search?q=site:http://www.boost.org/doc/libs/1_59_0/+",
+        "Gtk": "https://www.google.com/search?q=site:https://developer.gnome.org/gtkmm/stable/+",
+        "@any": "https://www.google.com/search?q="
+      }
+    }
+  },
+  "log": {
+    "libclang_comment": "Outputs diagnostics for new C/C++ buffers",
+    "libclang": false,
+    "language_server": false
+  }
+}
+)RAW");
+  };
+  static auto config = get_config();
+  return config;
+}
+
+const char *Config::juci_light_style() {
+  return 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"                foreground="#000000" background="#FFFF00"/>
+
+  <!-- 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 name="diff:added-line"             foreground="green"/>
+  <style name="diff:removed-line"           foreground="red"/>
+  <style name="diff:changed-line"           foreground="orange"/>
+  <style name="diff:diff-file"              use-style="def:type"/>
+  <style name="diff:location"               use-style="def:statement"/>
+  <style name="diff:special-case"           use-style="def:constant"/>
+
+</style-scheme>
+)RAW";
+}
+
+const char *Config::juci_dark_style() {
+  return 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="#D6D6D6"/>
+  <color name="black"                       value="#202428"/>
+  <color name="gray"                        value="#919191"/>
+  <color name="red"                         value="#FF9999"/>
+  <color name="yellow"                      value="#EEEE66"/>
+  <color name="green"                       value="#AACC99"/>
+  <color name="blue"                        value="#88AAFF"/>
+  <color name="light-blue"                  value="#AABBEE"/>
+  <color name="purple"                      value="#DD99DD"/>
+
+  <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,.05)"/>
+
+  <!-- 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="#000000" background="#FFFF00"/>
+
+  <!-- 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="red"/>
+  <style name="def:warning"                 foreground="yellow"/>
+  <style name="def:note"                    foreground="#E6E6E6" background="#383F46"/>
+
+  <style name="diff:added-line"             foreground="green"/>
+  <style name="diff:removed-line"           foreground="red"/>
+  <style name="diff:changed-line"           foreground="yellow"/>
+  <style name="diff:diff-file"              use-style="def:type"/>
+  <style name="diff:location"               use-style="def:statement"/>
+  <style name="diff:special-case"           use-style="def:constant"/>
+
+</style-scheme>
+)RAW";
+}
+
+const char *Config::juci_dark_blue_style() {
+  return 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="blue"                        value="#00CCFF"/>
+  <color name="green"                       value="#14ECA8"/>
+  <color name="light-blue"                  value="#8BFAFF"/>
+  <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="#000000" background="#FFFF00"/>
+
+  <!-- Language specifics -->
+  <style name="def:builtin"                 foreground="blue"/>
+  <style name="def:constant"                foreground="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="blue"/>
+  <style name="def:type"                    foreground="blue"/>
+  <style name="def:function"                foreground="light-blue"/>
+  <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="#E6E6E6" background="#383C59"/>
+
+  <style name="diff:added-line"             foreground="green"/>
+  <style name="diff:removed-line"           foreground="red"/>
+  <style name="diff:changed-line"           foreground="yellow"/>
+  <style name="diff:diff-file"              use-style="def:type"/>
+  <style name="diff:location"               use-style="def:statement"/>
+  <style name="diff:special-case"           use-style="def:constant"/>
+
+</style-scheme>
+)RAW";
+}
diff --git a/src/config.hpp b/src/config.hpp
index fd7f4c4..28d1abc 100644
--- a/src/config.hpp
+++ b/src/config.hpp
@@ -144,4 +144,12 @@ private:
   void add_missing_nodes(JSON &cfg, const JSON &default_cfg);
   void remove_deprecated_nodes(JSON &cfg, const JSON &default_cfg);
   void read(const JSON &cfg);
+
+  /// If you add or remove nodes from the default_config, increase the juci
+  /// version number (JUCI_VERSION) in ../CMakeLists.txt to automatically apply
+  /// the changes to user's ~/.juci/config/config.json files
+  std::string default_config();
+  const char *juci_light_style();
+  const char *juci_dark_style();
+  const char *juci_dark_blue_style();
 };
diff --git a/src/files.hpp b/src/files.hpp
deleted file mode 100644
index 249a6b9..0000000
--- a/src/files.hpp
+++ /dev/null
@@ -1,440 +0,0 @@
-#pragma once
-#include <string>
-
-/// If you add or remove nodes from the default_config_file, increase the juci
-/// version number (JUCI_VERSION) in ../CMakeLists.txt to automatically apply
-/// the changes to user's ~/.juci/config/config.json files
-const std::string default_config_file = R"RAW({
-  "version": ")RAW" +
-                                        std::string(JUCI_VERSION) +
-                                        R"RAW(",
-  "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": "",
-    "font_comment": "Set to override theme font, for instance: \"Arial 12\"",
-    "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__
-                                        R"RAW(
-    "font": "Menlo",)RAW"
-#else
-#ifdef _WIN32
-                                        R"RAW(
-    "font": "Consolas",)RAW"
-#else
-                                        R"RAW(
-    "font": "Monospace",)RAW"
-#endif
-#endif
-                                        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": "",
-    "format_style_on_save_comment": "Performs style format on save if supported on language in buffer",
-    "format_style_on_save": false,
-    "format_style_on_save_if_style_file_found_comment": "Format style if format file is found, even if format_style_on_save is false",
-    "format_style_on_save_if_style_file_found": true,
-    "smart_brackets_comment": "If smart_inserts is enabled, this option is automatically enabled. When inserting an already closed bracket, the cursor might instead be moved, avoiding the need of arrow keys after autocomplete",
-    "smart_brackets": true,
-    "smart_inserts_comment": "When for instance inserting (, () gets inserted. Applies to: (), [], \", '. Also enables pressing ; inside an expression before a final ) to insert ; at the end of line, and deletions of empty insertions",
-    "smart_inserts": true,
-    "show_map": true,
-    "map_font_size": 1,
-    "show_git_diff": true,
-    "show_background_pattern": true,
-    "show_right_margin": false,
-    "right_margin_position": 80,
-    "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,
-    "word_wrap_comment": "Specify language ids that should enable word wrap, for instance: chdr, c, cpphdr, cpp, js, python, or all to enable word wrap for all languages",
-    "word_wrap": "markdown, latex",
-    "highlight_current_line": true,
-    "show_line_numbers": true,
-    "enable_multiple_cursors": false,
-    "auto_reload_changed_files": true,
-    "search_for_selection": true,
-    "clang_format_style_comment": "IndentWidth, AccessModifierOffset and UseTab are set automatically. See http://clang.llvm.org/docs/ClangFormatStyleOptions.html",
-    "clang_format_style": "ColumnLimit: 0, NamespaceIndentation: All",
-    "clang_tidy_enable_comment": "Enable clang-tidy in new C/C++ buffers",
-    "clang_tidy_enable": false,
-    "clang_tidy_checks_comment": "In new C/C++ buffers, these checks are appended to the value of 'Checks' in the .clang-tidy file, if any",
-    "clang_tidy_checks": "",
-    "clang_usages_threads_comment": "The number of threads used in finding usages in unparsed files. -1 corresponds to the number of cores available, and 0 disables the search",
-    "clang_usages_threads": -1,
-    "clang_detailed_preprocessing_record_comment": "Set to true to, at the cost of increased resource use, include all macro definitions and instantiations when parsing new C/C++ buffers. You should reopen buffers and delete build/.usages_clang after changing this option.",
-    "clang_detailed_preprocessing_record": false,
-    "debug_place_cursor_at_stop": false
-  },
-  "terminal": {
-    "history_size": 10000,
-    "font_comment": "Use \"\" to use source.font with slightly smaller size",
-    "font": "",
-    "clear_on_compile": true,
-    "clear_on_run_command": false,
-    "hide_entry_on_run_command": true
-  },
-  "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",
-    "cmake": {)RAW"
-#ifdef _WIN32
-                                        R"RAW(
-      "command": "cmake -G\"MSYS Makefiles\"",)RAW"
-#else
-                                        R"RAW(
-      "command": "cmake",)RAW"
-#endif
-                                        R"RAW(
-      "compile_command": "cmake --build ."
-    },
-    "meson": {
-      "command": "meson",
-      "compile_command": "ninja"
-    },
-    "default_build_management_system_comment": "Select which build management system to use when creating a new C or C++ project, for instance \"cmake\" or \"meson\"",
-    "default_build_management_system": "cmake",
-    "save_on_compile_or_run": true,)RAW"
-#ifdef JUCI_USE_UCTAGS
-                                        R"RAW(
-    "ctags_command": "uctags",)RAW"
-#else
-                                        R"RAW(
-    "ctags_command": "ctags",)RAW"
-#endif
-                                        R"RAW(
-    "grep_command": "grep",
-    "cargo_command": "cargo",
-    "python_command": "python -u",
-    "markdown_command": "grip -b"
-  },
-  "keybindings": {
-    "preferences": "<primary>comma",
-    "snippets": "",
-    "commands": "",
-    "quit": "<primary>q",
-    "file_new_file": "<primary>n",
-    "file_new_folder": "<primary><shift>n",
-    "file_open_file": "<primary>o",
-    "file_open_folder": "<primary><shift>o",
-    "file_reload_file": "",
-    "file_save": "<primary>s",
-    "file_save_as": "<primary><shift>s",
-    "file_close_file": "<primary>w",
-    "file_close_folder": "",
-    "file_close_project": "",
-    "file_print": "",
-    "edit_undo": "<primary>z",
-    "edit_redo": "<primary><shift>z",
-    "edit_cut": "<primary>x",
-    "edit_cut_lines": "<primary><shift>x",
-    "edit_copy": "<primary>c",
-    "edit_copy_lines": "<primary><shift>c",
-    "edit_paste": "<primary>v",
-    "edit_extend_selection": "<primary><shift>a",
-    "edit_shrink_selection": "<primary><shift><alt>a",
-    "edit_show_or_hide": "",
-    "edit_find": "<primary>f",
-    "source_spellcheck": "",
-    "source_spellcheck_clear": "",
-    "source_spellcheck_next_error": "<primary><shift>e",
-    "source_git_next_diff": "<primary>k",
-    "source_git_show_diff": "<alt>k",
-    "source_indentation_set_buffer_tab": "",
-    "source_indentation_auto_indent_buffer": "<primary><shift>i",
-    "source_goto_line": "<primary>g",
-    "source_center_cursor": "<primary>l",
-    "source_cursor_history_back": "<alt>Left",
-    "source_cursor_history_forward": "<alt>Right",
-    "source_show_completion_comment": "Add completion keybinding to disable interactive autocompletion",
-    "source_show_completion": "",
-    "source_find_file": "<primary>p",
-    "source_find_symbol": "<primary><shift>f",
-    "source_find_pattern": "<alt><shift>f",
-    "source_comments_toggle": "<primary>slash",
-    "source_comments_add_documentation": "<primary><alt>slash",
-    "source_find_documentation": "<primary><shift>d",
-    "source_goto_declaration": "<primary>d",
-    "source_goto_type_declaration": "<alt><shift>d",
-    "source_goto_implementation": "<primary>i",
-    "source_goto_usage": "<primary>u",
-    "source_goto_method": "<primary>m",
-    "source_rename": "<primary>r",
-    "source_implement_method": "<primary><shift>m",
-    "source_goto_next_diagnostic": "<primary>e",
-    "source_apply_fix_its": "<control>space",
-    "project_set_run_arguments": "",
-    "project_compile_and_run": "<primary>Return",
-    "project_compile": "<primary><shift>Return",
-    "project_run_command": "<alt>Return",
-    "project_kill_last_running": "<primary>Escape",
-    "project_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_show_breakpoints": "<primary><shift><alt>b",
-    "debug_goto_stop": "<primary><shift>l",)RAW"
-#ifdef __linux
-                                        R"RAW(
-    "window_next_tab": "<primary>Tab",
-    "window_previous_tab": "<primary><shift>Tab",)RAW"
-#else
-                                        R"RAW(
-    "window_next_tab": "<primary><alt>Right",
-    "window_previous_tab": "<primary><alt>Left",)RAW"
-#endif
-                                        R"RAW(
-    "window_goto_tab": "",
-    "window_toggle_split": "",
-    "window_split_source_buffer": "",)RAW"
-#ifdef __APPLE__
-                                        R"RAW(
-    "window_toggle_full_screen": "<primary><control>f",)RAW"
-#else
-                                        R"RAW(
-    "window_toggle_full_screen": "F11",)RAW"
-#endif
-                                        R"RAW(
-    "window_toggle_directories": "",
-    "window_toggle_terminal": "",
-    "window_toggle_menu": "",
-    "window_toggle_tabs": "",
-    "window_toggle_zen_mode": "",
-    "window_clear_terminal": ""
-  },
-  "documentation_searches": {
-    "clang": {
-      "separator": "::",
-      "queries": {
-        "@empty": "https://www.google.com/search?q=c%2B%2B+",
-        "std": "https://www.google.com/search?q=site:http://www.cplusplus.com/reference/+",
-        "boost": "https://www.google.com/search?q=site:http://www.boost.org/doc/libs/1_59_0/+",
-        "Gtk": "https://www.google.com/search?q=site:https://developer.gnome.org/gtkmm/stable/+",
-        "@any": "https://www.google.com/search?q="
-      }
-    }
-  },
-  "log": {
-    "libclang_comment": "Outputs diagnostics for new C/C++ buffers",
-    "libclang": false,
-    "language_server": false
-  }
-}
-)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"                foreground="#000000" background="#FFFF00"/>
-
-  <!-- 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 name="diff:added-line"             foreground="green"/>
-  <style name="diff:removed-line"           foreground="red"/>
-  <style name="diff:changed-line"           foreground="orange"/>
-  <style name="diff:diff-file"              use-style="def:type"/>
-  <style name="diff:location"               use-style="def:statement"/>
-  <style name="diff:special-case"           use-style="def:constant"/>
-
-</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="#D6D6D6"/>
-  <color name="black"                       value="#202428"/>
-  <color name="gray"                        value="#919191"/>
-  <color name="red"                         value="#FF9999"/>
-  <color name="yellow"                      value="#EEEE66"/>
-  <color name="green"                       value="#AACC99"/>
-  <color name="blue"                        value="#88AAFF"/>
-  <color name="light-blue"                  value="#AABBEE"/>
-  <color name="purple"                      value="#DD99DD"/>
-
-  <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,.05)"/>
-
-  <!-- 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="#000000" background="#FFFF00"/>
-
-  <!-- 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="red"/>
-  <style name="def:warning"                 foreground="yellow"/>
-  <style name="def:note"                    foreground="#E6E6E6" background="#383F46"/>
-
-  <style name="diff:added-line"             foreground="green"/>
-  <style name="diff:removed-line"           foreground="red"/>
-  <style name="diff:changed-line"           foreground="yellow"/>
-  <style name="diff:diff-file"              use-style="def:type"/>
-  <style name="diff:location"               use-style="def:statement"/>
-  <style name="diff:special-case"           use-style="def:constant"/>
-
-</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="blue"                        value="#00CCFF"/>
-  <color name="green"                       value="#14ECA8"/>
-  <color name="light-blue"                  value="#8BFAFF"/>
-  <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="#000000" background="#FFFF00"/>
-
-  <!-- Language specifics -->
-  <style name="def:builtin"                 foreground="blue"/>
-  <style name="def:constant"                foreground="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="blue"/>
-  <style name="def:type"                    foreground="blue"/>
-  <style name="def:function"                foreground="light-blue"/>
-  <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="#E6E6E6" background="#383C59"/>
-
-  <style name="diff:added-line"             foreground="green"/>
-  <style name="diff:removed-line"           foreground="red"/>
-  <style name="diff:changed-line"           foreground="yellow"/>
-  <style name="diff:diff-file"              use-style="def:type"/>
-  <style name="diff:location"               use-style="def:statement"/>
-  <style name="diff:special-case"           use-style="def:constant"/>
-
-</style-scheme>
-)RAW";
diff --git a/src/filesystem.cpp b/src/filesystem.cpp
index 902d76d..4e4c5ed 100644
--- a/src/filesystem.cpp
+++ b/src/filesystem.cpp
@@ -279,35 +279,38 @@ boost::filesystem::path filesystem::get_executable(const boost::filesystem::path
   return executable_name;
 #endif
 
-  static std::vector<boost::filesystem::path> bin_paths = {"/usr/bin", "/usr/local/bin"};
-
   try {
-    for(auto &path : bin_paths) {
+    for(auto &path : get_executable_search_paths()) {
       if(is_executable(path / executable_name))
         return executable_name;
     }
 
     auto &executable_name_str = executable_name.string();
-    for(auto &path : bin_paths) {
-      boost::filesystem::path executable;
-      for(boost::filesystem::directory_iterator it(path), end; it != end; ++it) {
-        auto it_path = it->path();
-        auto it_path_filename_str = it_path.filename().string();
-        if(starts_with(it_path_filename_str, executable_name_str)) {
-          if(it_path > executable &&
-             ((it_path_filename_str.size() > executable_name_str.size() &&
-               it_path_filename_str[executable_name_str.size()] >= '0' &&
-               it_path_filename_str[executable_name_str.size()] <= '9') ||
-              (it_path_filename_str.size() > executable_name_str.size() + 1 &&
-               it_path_filename_str[executable_name_str.size()] == '-' &&
-               it_path_filename_str[executable_name_str.size() + 1] >= '0' &&
-               it_path_filename_str[executable_name_str.size() + 1] <= '9')) &&
-             !boost::filesystem::is_directory(it_path))
-            executable = it_path;
+    for(auto &folder : get_executable_search_paths()) {
+      boost::filesystem::path latest_executable;
+      std::string latest_version;
+      for(boost::filesystem::directory_iterator it(folder), end; it != end; ++it) {
+        const auto &file = it->path();
+        auto filename = file.filename().string();
+        if(starts_with(filename, executable_name_str)) {
+          if(filename.size() > executable_name_str.size() && filename[executable_name_str.size()] >= '0' && filename[executable_name_str.size()] <= '9' && is_executable(file)) {
+            auto version = filename.substr(executable_name_str.size());
+            if(version_compare(version, latest_version) > 0) {
+              latest_executable = file;
+              latest_version = version;
+            }
+          }
+          else if(filename.size() > executable_name_str.size() + 1 && filename[executable_name_str.size()] == '-' && filename[executable_name_str.size() + 1] >= '0' && filename[executable_name_str.size() + 1] <= '9' && is_executable(file)) {
+            auto version = filename.substr(executable_name_str.size() + 1);
+            if(version_compare(version, latest_version) > 0) {
+              latest_executable = file;
+              latest_version = version;
+            }
+          }
         }
       }
-      if(!executable.empty())
-        return executable;
+      if(!latest_executable.empty())
+        return latest_executable;
     }
   }
   catch(...) {
diff --git a/src/filesystem.hpp b/src/filesystem.hpp
index 90d53d1..627b673 100644
--- a/src/filesystem.hpp
+++ b/src/filesystem.hpp
@@ -37,14 +37,14 @@ public:
   static bool file_in_path(const boost::filesystem::path &file_path, const boost::filesystem::path &path) noexcept;
   static boost::filesystem::path find_file_in_path_parents(const std::string &file_name, const boost::filesystem::path &path) noexcept;
 
-  /// Return path with dot, dot-dot and directory separator elements removed
+  /// Returns path with dot, dot-dot and directory separator elements removed
   static boost::filesystem::path get_normal_path(const boost::filesystem::path &path) noexcept;
 
   static boost::filesystem::path get_relative_path(const boost::filesystem::path &path, const boost::filesystem::path &base) noexcept;
 
   static boost::filesystem::path get_absolute_path(const boost::filesystem::path &path, const boost::filesystem::path &base) noexcept;
 
-  /// Return executable with latest version in filename on systems that is lacking executable_name symbolic link
+  /// Returns executable name with latest version in filename on systems that is lacking executable_name symbolic link
   static boost::filesystem::path get_executable(const boost::filesystem::path &executable_name) noexcept;
 
   static const std::vector<boost::filesystem::path> &get_executable_search_paths() noexcept;
diff --git a/src/utility.cpp b/src/utility.cpp
index 94dbf5d..4987d28 100644
--- a/src/utility.cpp
+++ b/src/utility.cpp
@@ -1,6 +1,7 @@
 #include "utility.hpp"
 #include <algorithm>
 #include <cstring>
+#include <vector>
 
 ScopeGuard::~ScopeGuard() {
   if(on_exit)
@@ -192,3 +193,42 @@ std::string to_hex_string(const std::string &input) {
   }
   return result;
 }
+
+int version_compare(const std::string &lhs, const std::string &rhs) {
+  static auto get_parts = [](const std::string &str) {
+    std::vector<int> result;
+    std::string tmp;
+    for(auto &chr : str) {
+      if(chr >= '0' && chr <= '9')
+        tmp += chr;
+      else if(chr == '.') {
+        if(!tmp.empty()) {
+          try {
+            result.emplace_back(std::stoi(tmp));
+          }
+          catch(...) {
+          }
+          tmp.clear();
+        }
+      }
+      else
+        tmp += std::to_string(static_cast<unsigned char>(chr)); // Convert for instance letters to numbers
+    }
+    if(!tmp.empty()) {
+      try {
+        result.emplace_back(std::stoi(tmp));
+      }
+      catch(...) {
+      }
+      tmp.clear();
+    }
+    return result;
+  };
+  auto lhs_parts = get_parts(lhs);
+  auto rhs_parts = get_parts(rhs);
+  if(std::equal(lhs_parts.begin(), lhs_parts.end(), rhs_parts.begin(), rhs_parts.end()))
+    return 0;
+  if(std::lexicographical_compare(lhs_parts.begin(), lhs_parts.end(), rhs_parts.begin(), rhs_parts.end()))
+    return -1;
+  return 1;
+}
diff --git a/src/utility.hpp b/src/utility.hpp
index 7d2281f..bc4d84c 100644
--- a/src/utility.hpp
+++ b/src/utility.hpp
@@ -32,3 +32,6 @@ bool ends_with(const std::string &str, const char *test) noexcept;
 std::string escape(const std::string &input, const std::set<char> &escape_chars);
 
 std::string to_hex_string(const std::string &input);
+
+/// Returns -1 if lhs is smaller than rhs, 0 if equal, and 1 if lhs is larger than rhs
+int version_compare(const std::string &lhs, const std::string &rhs);
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index e081405..367892c 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -9,7 +9,6 @@ include_directories(${CMAKE_SOURCE_DIR}/src)
 include_directories(${CMAKE_SOURCE_DIR}/lib/tiny-process-library)
 
 add_library(test_stubs OBJECT
-  stubs/config.cpp
   stubs/dialog.cpp
   stubs/directories.cpp
   stubs/info.cpp
diff --git a/tests/filesystem_test.cpp b/tests/filesystem_test.cpp
index a5c7c66..93fc835 100644
--- a/tests/filesystem_test.cpp
+++ b/tests/filesystem_test.cpp
@@ -122,6 +122,14 @@ int main() {
     g_assert(path == filesystem::get_path_from_uri(uri));
   }
 
+  {
+    auto ls = filesystem::get_executable("ls");
+    g_assert(ls == "ls");
+
+    auto non_existing_executable = filesystem::get_executable("non_existing_executable");
+    g_assert(non_existing_executable == "non_existing_executable");
+  }
+
   {
     g_assert(!filesystem::is_executable(filesystem::get_home_path()));
     g_assert(!filesystem::is_executable(filesystem::get_current_path()));
diff --git a/tests/json_test.cpp b/tests/json_test.cpp
index 11511cb..8b49cd3 100644
--- a/tests/json_test.cpp
+++ b/tests/json_test.cpp
@@ -1,4 +1,4 @@
-#include "files.hpp"
+#include "config.hpp"
 #include "json.hpp"
 #include <glib.h>
 #include <iomanip>
@@ -45,7 +45,7 @@ int main() {
   }
 
   {
-    JSON j(default_config_file);
+    JSON j(Config::get().default_config());
     g_assert(!j.string("version").empty());
   }
 
diff --git a/tests/source_test.cpp b/tests/source_test.cpp
index d8b2be0..9066502 100644
--- a/tests/source_test.cpp
+++ b/tests/source_test.cpp
@@ -46,7 +46,7 @@ int main() {
     size_t found = 0;
     auto style_scheme_manager = Source::StyleSchemeManager::get_default();
     for(auto &search_path : style_scheme_manager->get_search_path()) {
-      if(search_path == "styles") // found added style
+      if(search_path == Config::get().home_juci_path / "styles") // found added style
         ++found;
     }
     g_assert(found == 1);
diff --git a/tests/stubs/config.cpp b/tests/stubs/config.cpp
deleted file mode 100644
index 0445e5d..0000000
--- a/tests/stubs/config.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "config.hpp"
-
-Config::Config() {}
diff --git a/tests/utility_test.cpp b/tests/utility_test.cpp
index 1739c28..8305d4b 100644
--- a/tests/utility_test.cpp
+++ b/tests/utility_test.cpp
@@ -158,4 +158,26 @@ int main() {
     g_assert(to_hex_string("\n!") == "0a21");
     g_assert(to_hex_string("\n!z") == "0a217a");
   }
+  {
+    g_assert(version_compare("", "") == 0);
+    g_assert(version_compare("1.2.3", "") == 1);
+    g_assert(version_compare("", "1.2.3") == -1);
+    g_assert(version_compare("1.2.3", "1.2.3") == 0);
+    g_assert(version_compare("1.2.3", "1.2.4") == -1);
+    g_assert(version_compare("1.2.4", "1.2.3") == 1);
+    g_assert(version_compare("1.2.3", "1.3.3") == -1);
+    g_assert(version_compare("1.3.3", "1.2.3") == 1);
+    g_assert(version_compare("1.2.3", "2.2.3") == -1);
+    g_assert(version_compare("2.2.3", "1.2.3") == 1);
+    g_assert(version_compare("3.12", "3.12.1") == -1);
+    g_assert(version_compare("3.12.2", "3.12") == 1);
+    g_assert(version_compare("1.2.3", "1.20.3") == -1);
+    g_assert(version_compare("1.20.3", "1.2.3") == 1);
+    g_assert(version_compare("1.2.3", "1.2.3.1") == -1);
+    g_assert(version_compare("1.2.3", "1.2.10") == -1);
+    g_assert(version_compare("10.2.3", "1.2.3") == 1);
+    g_assert(version_compare("1.2.3a", "1.2.3b") == -1);
+    g_assert(version_compare("1.2.3x", "1.2.3z") == -1);
+    g_assert(version_compare("1.2.3a", "1.2.3z") == -1);
+  }
 }
\ No newline at end of file