diff --git a/src/config.cc b/src/config.cc
index e97df05..469a2f2 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();
   }
@@ -63,7 +63,7 @@ void Config::find_or_create_config_files() {
   boost::filesystem::create_directories(config_dir); // io exp captured by calling method
 
   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
@@ -160,7 +160,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)
@@ -196,6 +196,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 7212836..60d318e 100644
--- a/src/config.h
+++ b/src/config.h
@@ -64,6 +64,7 @@ public:
     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/files.h b/src/files.h
index 906c44c..028e2e5 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/source.cc b/src/source.cc
index dd05d36..61045f5 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;