diff --git a/Projects/Simba/settings_const.inc b/Projects/Simba/settings_const.inc
index ca26c13..04ba393 100644
--- a/Projects/Simba/settings_const.inc
+++ b/Projects/Simba/settings_const.inc
@@ -1,55 +1,74 @@
-ssCheckUpdate = 'Settings/Updater/CheckForUpdates';
-ssCheckUpdateMinutes = 'Settings/Updater/CheckEveryXMinutes';
-ssUpdaterLink = 'Settings/Updater/RemoteLink';
-ssUpdaterVersionLink = 'Settings/Updater/RemoteVersionLink';
+ssSettings = 'Settings/';
+ssLastConfig = 'LastConfig/';
 
-ssLoadFontsOnStart = 'Settings/Fonts/LoadOnStartUp';
-ssFontsVersion = 'Settings/Fonts/Version';
-ssFontsLink = 'Settings/Fonts/UpdateLink';
-ssFontsVersionLink = 'Settings/Fonts/VersionLink';
-ssFontsPath = 'Settings/Fonts/Path';
+ssUpdater = 'Updater/';
+ssFonts = 'Fonts/';
+ssIncludes = 'Includes/';
+ssInterpreter = 'Interpreter/';
+ssTabs = 'Tabs/';
+ssColourPicker = 'ColourPicker/';
+ssScripts = 'Scripts/';
+ssExtensions = 'Extensions/';
+ssMainForm = 'MainForm/';
+ssSourceEditor = 'SourceEditor/';
+ssTray = 'Tray/';
+ssConsole = 'Console/';
+ssNews = 'News/';
+ssPlugins = 'Plugins/';
 
-ssIncludesPath = 'Settings/Includes/Path';
-ssInterpreterType = 'Settings/Interpreter/Type';
-
-ssTabsOpenNextOnClose = 'Settings/Tabs/OpenNextOnClose';
-ssTabsOpenScriptInNewTab = 'Settings/Tabs/OpenScriptInNewTab';
-ssTabsCheckBeforeOpen = 'Settings/Tabs/CheckTabsBeforeOpen';
-
-ssColourPickerShowHistoryOnPick = 'Settings/ColourPicker/ShowHistoryOnPick';
-ssColourPickerAddToHistoryOnPick = 'Settings/ColourPicker/AddToHistoryOnPick';
+ssCheckUpdate = ssSettings + ssUpdater + 'CheckForUpdates';
+ssCheckUpdateMinutes = ssSettings + ssUpdater + 'CheckEveryXMinutes';
+ssUpdaterLink = ssSettings + ssUpdater + 'RemoteLink';
+ssUpdaterVersionLink = ssSettings + ssUpdater + 'RemoteVersionLink';
 
 
-ssScriptsPath = 'Settings/Scripts/Path';
+ssLoadFontsOnStart = ssSettings + ssFonts + 'LoadOnStartUp';
+ssFontsVersion = ssSettings + ssFonts + 'Version';
+ssFontsLink = ssSettings + ssFonts + 'UpdateLink';
+ssFontsVersionLink = ssSettings + ssFonts + 'VersionLink';
+ssFontsPath = ssSettings + ssFonts + 'Path';
 
-ssCodeHintsShowAutomatically = 'Settings/CodeHints/ShowAutomatically';
-ssCodeCompletionShowAutomatically = 'Settings/CodeCompletion/ShowAutomatically';
-ssExtensionsFileExtension = 'Settings/Extensions/FileExtension';
+ssIncludesPath = ssSettings + ssIncludes + 'Path';
+ssInterpreterType = ssSettings + ssInterpreter + 'Type';
+
+ssTabsOpenNextOnClose = ssSettings + ssTabs + 'OpenNextOnClose';
+ssTabsOpenScriptInNewTab = ssSettings + ssTabs + 'OpenScriptInNewTab';
+ssTabsCheckBeforeOpen = ssSettings + ssTabs + 'CheckTabsBeforeOpen';
+
+ssColourPickerShowHistoryOnPick = ssSettings + ssColourPicker + 'ShowHistoryOnPick';
+ssColourPickerAddToHistoryOnPick = ssSettings + ssColourPicker + 'AddToHistoryOnPick';
 
 
-ssSourceEditorLazColors = 'Settings/SourceEditor/LazColors';
-ssSourceEditorDefScriptPath = 'Settings/SourceEditor/DefScriptPath';
+ssScriptsPath = ssSettings + ssScripts + 'Path';
 
-ssNewsLink = 'Settings/News/URL';
-ssPluginsPath = 'Settings/Plugins/Path';
+ssCodeHintsShowAutomatically = ssSettings + 'CodeHints/ShowAutomatically';
+ssCodeCompletionShowAutomatically = ssSettings + 'CodeCompletion/ShowAutomatically';
 
-ssExtensionsExtensionN = 'Extensions/Extension';
-ssExtensionsPath = 'Settings/Extensions/Path';
-ssExtensionsCount = 'Extensions/ExtensionCount';
 
-ssTrayAlwaysVisible = 'Settings/Tray/AlwaysVisible';
+ssSourceEditorLazColors = ssSettings + ssSourceEditor + 'LazColors';
+ssSourceEditorDefScriptPath = ssSettings + ssSourceEditor + 'DefScriptPath';
 
-ssConsoleVisible = 'LastConfig/Console/Visible';
+ssNewsLink = ssSettings + ssNews + 'URL';
+ssPluginsPath = ssSettings + ssPlugins + 'Path';
 
-ssMainFormPosition = 'LastConfig/MainForm/Position';
-ssMainFormState = 'LastConfig/MainForm/State';
-ssMainFormNormalSize = 'Settings/MainForm/NormalSize';
+ssExtensionsExtensionN = ssExtensions + 'Extension';
+ssExtensionsPath = ssSettings + ssExtensions + 'Path';
+ssExtensionsCount = ssExtensions + 'ExtensionCount';
+ssExtensionsFileExtension = ssSettings + ssExtensions + 'FileExtension';
 
-ssFunctionListShown = 'LastConfig/MainForm/FunctionListShown';
-ssFunctionListShowOnStart = 'Settings/FunctionList/ShowOnStart';
+ssTrayAlwaysVisible = ssSettings + ssTray + 'AlwaysVisible';
 
-ssMaxRecentFiles = 'Settings/General/MaxRecentFiles';
-ssRecentFiles = 'LastConfig/MainForm/RecentFiles';
-ssRecentFilesCount = 'LastConfig/MainForm/RecentFiles/Count';
-ssRecentFileN = 'LastConfig/MainForm/RecentFiles/File';
+ssConsoleVisible = ssLastConfig + ssConsole + 'Visible';
+
+ssMainFormPosition = ssLastConfig + ssMainForm + 'Position';
+ssMainFormState = ssLastConfig + ssMainForm + 'State';
+ssMainFormNormalSize = ssSettings + ssMainForm + 'NormalSize';
+ssFunctionListShown = ssLastConfig + ssMainForm + 'FunctionListShown';
+
+ssFunctionListShowOnStart = ssSettings + 'FunctionList/ShowOnStart';
+
+ssMaxRecentFiles = ssSettings + 'General/MaxRecentFiles';
+ssRecentFiles = ssLastConfig + ssMainForm + 'RecentFiles';
+ssRecentFilesCount = ssLastConfig + ssMainForm + 'RecentFiles/Count';
+ssRecentFileN = ssLastConfig + ssMainForm + 'RecentFiles/File';
 
diff --git a/Projects/Simba/simbaunit.pas b/Projects/Simba/simbaunit.pas
index fe9df53..896e09d 100644
--- a/Projects/Simba/simbaunit.pas
+++ b/Projects/Simba/simbaunit.pas
@@ -1016,13 +1016,8 @@ begin
     mDebugLn(format('Current Simba version: %d',[SimbaVersion]));
     mDebugLn('Latest Simba Version: ' + IntToStr(LatestVersion));
   end;
-<<<<<<< HEAD
-  time := StrToIntDef(LoadSettingDef('Settings/Updater/CheckEveryXMinutes','30'),30);
-  UpdateTimer.Interval := time {mins} * 60 {secs} * 1000 {ms};//Every half hour
-=======
   time := StrToIntDef(LoadSettingDef(ssCheckUpdateMinutes, '30'),30);
   UpdateTimer.Interval:= time {mins} * 60 {secs} * 1000 {ms};//Every half hour
->>>>>>> master
 end;
 
 procedure TSimbaForm.UpdateMenuButtonClick(Sender: TObject);
@@ -3099,14 +3094,8 @@ begin
   if (CurrScript <> nil) then
     with CurrScript.Synedit do
       if (Lines.text = DefaultScript) and not(CanUndo or CanRedo) then
-<<<<<<< HEAD
-        UpdateCurrScript := True;
-
-  SetSetting('Settings/Interpreter/Type', IntToStr(AValue), True);
-=======
         UpdateCurrScript := true;
-  SetSetting(ssInterpreterType, Inttostr(AValue),true);
->>>>>>> master
+  SetSetting(ssInterpreterType, IntToStr(AValue),true);
   UpdateInterpreter;
 
   if UpdateCurrScript then