diff --git a/editor/studio/AMXX_Studio.dof b/editor/studio/AMXX_Studio.dof
index 8db0bff2..1a286307 100755
--- a/editor/studio/AMXX_Studio.dof
+++ b/editor/studio/AMXX_Studio.dof
@@ -115,7 +115,7 @@ AutoIncBuild=1
 MajorVer=1
 MinorVer=4
 Release=0
-Build=16
+Build=17
 Debug=0
 PreRelease=0
 Special=0
@@ -126,7 +126,7 @@ CodePage=1252
 [Version Info Keys]
 CompanyName=AMX Mod X Dev Team
 FileDescription=
-FileVersion=1.4.0.16
+FileVersion=1.4.0.17
 InternalName=gaben
 LegalCopyright=AMX Mod X Dev Team
 LegalTrademarks=
@@ -134,9 +134,3 @@ OriginalFilename=
 ProductName=AMXX-Studio
 ProductVersion=1.4.0.0
 Comments=
-[HistoryLists\hlConditionals]
-Count=1
-Item0=madExcept
-[HistoryLists\hlUnitAliases]
-Count=1
-Item0=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
diff --git a/editor/studio/AMXX_Studio.exe b/editor/studio/AMXX_Studio.exe
index c686bd1e..5fbe592e 100755
Binary files a/editor/studio/AMXX_Studio.exe and b/editor/studio/AMXX_Studio.exe differ
diff --git a/editor/studio/AMXX_Studio.res b/editor/studio/AMXX_Studio.res
index 069a1809..5290c4a1 100755
Binary files a/editor/studio/AMXX_Studio.res and b/editor/studio/AMXX_Studio.res differ
diff --git a/editor/studio/SciSearchReplace.pas b/editor/studio/SciSearchReplace.pas
index 937cc1de..39e60688 100755
--- a/editor/studio/SciSearchReplace.pas
+++ b/editor/studio/SciSearchReplace.pas
@@ -280,8 +280,11 @@ end;
 
 procedure TSciSearchReplace.ShowSearchReplaceDialog(AReplace: boolean);
 var
-  dlg: TTextSearchDialog;
+  dlg: TForm;
   SelectedText : string;
+  SearchFromCursor: Boolean;
+  SearchInSelectionOnly: Boolean;
+  SearchRegularExpression: Boolean;
 begin
   if not Assigned(FEditor) then Exit;
   if AReplace then
diff --git a/editor/studio/UnitCodeExplorerUpdater.pas b/editor/studio/UnitCodeExplorerUpdater.pas
index bad7631a..8ebb9ce3 100755
--- a/editor/studio/UnitCodeExplorerUpdater.pas
+++ b/editor/studio/UnitCodeExplorerUpdater.pas
@@ -152,16 +152,10 @@ var exConstants, exDefined, exIncluded, exMethods, exDefault, exEvents,
   eStr: TStringList;
   eScrollPosX, eScrollPosY: Integer;
   eTempNode: TTreeNode;
-  eSelected: Integer;
 begin
   if Application.Terminated then exit;
   if (frmMain.trvExplorer.Items.Count = 0) or (eActive <> ActiveDoc.Index) then exit;
 
-  if Assigned(frmMain.trvExplorer.Selected) then
-    eSelected := frmMain.trvExplorer.Selected.AbsoluteIndex
-  else
-    eSelected := -1;
-
   frmMain.trvExplorer.Items.BeginUpdate;
   try
     eScrollPosX := GetScrollPos(frmMain.trvExplorer.Handle, SB_HORZ);
@@ -324,8 +318,6 @@ begin
 
     SetScrollPos(frmMain.trvExplorer.Handle, SB_HORZ, eScrollPosX, False);
     SetScrollPos(frmMain.trvExplorer.Handle, SB_VERT, eScrollPosY, False);
-    if eSelected <> -1 then
-      frmMain.trvExplorer.Items[eSelected].Selected := True;
   except
     // well, yes.
   end;
diff --git a/editor/studio/UnitMainTools.pas b/editor/studio/UnitMainTools.pas
index 26d0c4ea..6872b1dc 100755
--- a/editor/studio/UnitMainTools.pas
+++ b/editor/studio/UnitMainTools.pas
@@ -641,7 +641,7 @@ begin
   if eConfig.ReadString('Editor', 'AutoDisable', '1500') <> '-1' then
     frmSettings.txtAUDisable.Text := eConfig.ReadString('Editor', 'AutoDisable', '1500');
   if foldFold in frmMain.sciEditor.Folding then begin
-    case frmMain.sciEditor.FoldMarkerType of
+    case frmMain.sciEditor.FoldMarkers.MarkerType of
       sciMarkArrows: frmSettings.cboCodeFolding.ItemIndex := 0;
       sciMarkBox: frmSettings.cboCodeFolding.ItemIndex := 1;
       sciMarkCircle: frmSettings.cboCodeFolding.ItemIndex := 2;
@@ -1017,6 +1017,8 @@ begin
     frmMain.sciEditor.Colors.SelBack := clHighlight;
   end;
   frmMain.mnuRestoreBackup.Enabled := (FileExists(Document.FileName + '.bak')) and (not Document.Untitled);
+
+  frmMain.trvExplorer.Selected := nil;
   Screen.Cursor := crDefault;
   Plugin_DocChange(Document.Index, Document.FileName, Document.Highlighter, RestoreCaret, False);
 end;
diff --git a/editor/studio/UnitfrmAllFilesForm.pas b/editor/studio/UnitfrmAllFilesForm.pas
index 17c75873..871bebaf 100755
--- a/editor/studio/UnitfrmAllFilesForm.pas
+++ b/editor/studio/UnitfrmAllFilesForm.pas
@@ -5,7 +5,7 @@ interface
 uses
   SysUtils, Windows, Messages, Classes, Graphics, Controls,
   StdCtrls, ExtCtrls, Forms, TBXDkPanels, SpTBXDkPanels, mbTBXListBox,
-  mbTBXCheckListBox;
+  mbTBXCheckListBox, SpTBXControls;
 
 type
   TfrmAllFilesForm = class(TForm)
diff --git a/editor/studio/UnitfrmConnGen.dfm b/editor/studio/UnitfrmConnGen.dfm
index b004f974..36370fec 100755
Binary files a/editor/studio/UnitfrmConnGen.dfm and b/editor/studio/UnitfrmConnGen.dfm differ
diff --git a/editor/studio/UnitfrmConnGen.pas b/editor/studio/UnitfrmConnGen.pas
index 2f7ff3c6..ef1ac890 100755
--- a/editor/studio/UnitfrmConnGen.pas
+++ b/editor/studio/UnitfrmConnGen.pas
@@ -5,7 +5,7 @@ interface
 uses
   SysUtils, Windows, Messages, Classes, Graphics, Controls,
   StdCtrls, ExtCtrls, Forms, SpTBXEditors, TntStdCtrls, TBXDkPanels,
-  SpTBXDkPanels;
+  SpTBXDkPanels, SpTBXControls;
 
 type
   TfrmConnGen = class(TForm)
diff --git a/editor/studio/UnitfrmGoToLine.pas b/editor/studio/UnitfrmGoToLine.pas
index 6b8f46c0..ed665ce5 100755
--- a/editor/studio/UnitfrmGoToLine.pas
+++ b/editor/studio/UnitfrmGoToLine.pas
@@ -5,7 +5,7 @@ interface
 uses
   SysUtils, Windows, Messages, Classes, Graphics, Controls,
   StdCtrls, ExtCtrls, Forms, mbTBXEdit, mbTBXValidateEdit, TBXDkPanels,
-  SpTBXDkPanels, SpTBXEditors;
+  SpTBXDkPanels, SpTBXEditors, SpTBXControls;
 
 type
   TfrmGoToLine = class(TForm)
diff --git a/editor/studio/UnitfrmHTMLPreview.pas b/editor/studio/UnitfrmHTMLPreview.pas
index 9c29c7f4..6aa669d8 100755
--- a/editor/studio/UnitfrmHTMLPreview.pas
+++ b/editor/studio/UnitfrmHTMLPreview.pas
@@ -4,7 +4,7 @@ interface
 
 uses
   SysUtils, Windows, Messages, Classes, Graphics, Controls,
-  StdCtrls, ExtCtrls, Forms, OleCtrls, SHDocVw, ActiveX;
+  StdCtrls, ExtCtrls, Forms, OleCtrls, SHDocVw_TLB, ActiveX;
 
 type
   TfrmHTMLPreview = class(TForm)
diff --git a/editor/studio/UnitfrmIRCPaster.pas b/editor/studio/UnitfrmIRCPaster.pas
index b611e2a2..acc45c47 100755
--- a/editor/studio/UnitfrmIRCPaster.pas
+++ b/editor/studio/UnitfrmIRCPaster.pas
@@ -4,7 +4,8 @@ interface
 
 uses
   SysUtils, Windows, Messages, Classes, Graphics, Controls,
-  StdCtrls, ExtCtrls, Forms, TBXDkPanels, SpTBXDkPanels, SpTBXEditors;
+  StdCtrls, ExtCtrls, Forms, TBXDkPanels, SpTBXDkPanels, SpTBXEditors,
+  SpTBXControls;
 
 type
   TfrmIRCPaster = class(TForm)
diff --git a/editor/studio/UnitfrmInfo.pas b/editor/studio/UnitfrmInfo.pas
index 0fcb3e3a..c3a376ad 100755
--- a/editor/studio/UnitfrmInfo.pas
+++ b/editor/studio/UnitfrmInfo.pas
@@ -5,7 +5,7 @@ interface
 uses
   SysUtils, Windows, Messages, Classes, Graphics, Controls,
   StdCtrls, ExtCtrls, Forms, TBXDkPanels, SpTBXDkPanels, JvExControls,
-  JvComponent, JvScrollText, ShellAPI, IdHTTP, jpeg, Dialogs;
+  JvComponent, JvScrollText, ShellAPI, IdHTTP, jpeg, Dialogs, SpTBXControls;
 
 type
   TfrmInfo = class(TForm)
diff --git a/editor/studio/UnitfrmMOTDGen.pas b/editor/studio/UnitfrmMOTDGen.pas
index 4b3f113f..ac49448b 100755
--- a/editor/studio/UnitfrmMOTDGen.pas
+++ b/editor/studio/UnitfrmMOTDGen.pas
@@ -4,7 +4,8 @@ interface
 
 uses
   SysUtils, Windows, Messages, Classes, Graphics, Controls, ClipBrd,
-  StdCtrls, ExtCtrls, Forms, mxFlatControls, TBXDkPanels, SpTBXDkPanels;
+  StdCtrls, ExtCtrls, Forms, mxFlatControls, TBXDkPanels, SpTBXDkPanels,
+  SpTBXControls;
 
 type
   TfrmMOTDGen = class(TForm)
diff --git a/editor/studio/UnitfrmMain.dfm b/editor/studio/UnitfrmMain.dfm
index 62d16249..2f1f97f0 100755
--- a/editor/studio/UnitfrmMain.dfm
+++ b/editor/studio/UnitfrmMain.dfm
@@ -695,12 +695,14 @@ object frmMain: TfrmMain
       Height = 501
       Align = alClient
       ActiveTabIndex = 0
+      TabAutofitMaxSize = 100
       ThemeType = tttTBX
       OnActiveTabChange = tsDocumentsActiveTabChange
       HiddenItems = <>
       object tiDocument1: TSpTBXTabItem
         Checked = True
         OnSelect = OnTabSelect
+        CustomWidth = 100
         ThemeType = tttTBX
         CaptionW = '< 1 Untitled.sma >'
       end
@@ -809,13 +811,16 @@ object frmMain: TfrmMain
           Colors.WhiteSpaceBack = clDefault
           Bookmark.BackColor = clGray
           Bookmark.ForeColor = clWhite
-          Bookmark.MarkerType = 0
+          Bookmark.MarkerType = sciMFullRect
           Gutter0.Width = 0
           Gutter0.MarginType = gutLineNumber
+          Gutter0.Sensitive = False
           Gutter1.Width = 40
           Gutter1.MarginType = gutLineNumber
+          Gutter1.Sensitive = False
           Gutter2.Width = 14
           Gutter2.MarginType = gutSymbol
+          Gutter2.Sensitive = True
           WordWrapVisualFlags = []
           WordWrapVisualFlagsLocation = []
           LayoutCache = sciCacheCaret
@@ -827,7 +832,28 @@ object frmMain: TfrmMain
           WordChars = '_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'
           ControlCharSymbol = #0
           Folding = [foldFold, foldCompact, foldComment, foldPreprocessor, foldCommentPython, foldAtElse, foldHTML, foldHTMLPreProcessor]
-          FoldMarkerType = sciMarkBox
+          FoldMarkers.MarkerType = sciMarkBox
+          FoldMarkers.FoldOpen.BackColor = clDefault
+          FoldMarkers.FoldOpen.ForeColor = clDefault
+          FoldMarkers.FoldOpen.MarkerType = sciMBoxMinus
+          FoldMarkers.FoldClosed.BackColor = clDefault
+          FoldMarkers.FoldClosed.ForeColor = clDefault
+          FoldMarkers.FoldClosed.MarkerType = sciMBoxPlus
+          FoldMarkers.FoldSub.BackColor = clDefault
+          FoldMarkers.FoldSub.ForeColor = clDefault
+          FoldMarkers.FoldSub.MarkerType = sciMVLine
+          FoldMarkers.FoldTail.BackColor = clDefault
+          FoldMarkers.FoldTail.ForeColor = clDefault
+          FoldMarkers.FoldTail.MarkerType = sciMLCorner
+          FoldMarkers.FoldEnd.BackColor = clDefault
+          FoldMarkers.FoldEnd.ForeColor = clDefault
+          FoldMarkers.FoldEnd.MarkerType = sciMBoxPlusConnected
+          FoldMarkers.FoldOpenMid.BackColor = clDefault
+          FoldMarkers.FoldOpenMid.ForeColor = clDefault
+          FoldMarkers.FoldOpenMid.MarkerType = sciMBoxMinusConnected
+          FoldMarkers.FoldMidTail.BackColor = clDefault
+          FoldMarkers.FoldMidTail.ForeColor = clDefault
+          FoldMarkers.FoldMidTail.MarkerType = sciMTCorner
           LanguageManager.LanguageList = <
             item
               Name = 'null'
@@ -6428,6 +6454,8 @@ object frmMain: TfrmMain
     ParametersSeparators = ','
     ParametersStart = '('
     WordCharacters = '_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'
+    TabSize = 0
+    UseStyle = False
     OnBeforeShow = sciCallTipsBeforeShow
     Left = 842
     Top = 36
diff --git a/editor/studio/UnitfrmMain.pas b/editor/studio/UnitfrmMain.pas
index 14bb98c3..57851c99 100755
--- a/editor/studio/UnitfrmMain.pas
+++ b/editor/studio/UnitfrmMain.pas
@@ -20,7 +20,7 @@ uses
   ShellAPI, IdFTPCommon, IdAntiFreezeBase, IdAntiFreeze, JvComponent,
   JvInspector, JvExControls, JvPluginManager, JvgLanguageLoader,
   JvWndProcHook, CommCtrl, JvPageList, JvPageListTreeView,
-  SciSearchReplaceBase;
+  SciSearchReplaceBase, SpTBXControls;
 
 type
   TfrmMain = class(TForm)
@@ -536,10 +536,10 @@ begin
       sciEditor.WordWrap := sciNoWrap;
 
     case frmSettings.cboCodeFolding.ItemIndex of
-      0: sciEditor.FoldMarkerType := sciMarkArrows;
-      1: sciEditor.FoldMarkerType := sciMarkBox;
-      2: sciEditor.FoldMarkerType := sciMarkCircle;
-      3: sciEditor.FoldMarkerType := sciMarkPlusMinus;
+      0: sciEditor.FoldMarkers.MarkerType := sciMarkArrows;
+      1: sciEditor.FoldMarkers.MarkerType := sciMarkBox;
+      2: sciEditor.FoldMarkers.MarkerType := sciMarkCircle;
+      3: sciEditor.FoldMarkers.MarkerType := sciMarkPlusMinus;
     end;
     if frmSettings.cboCodeFolding.ItemIndex = 4 then
       sciEditor.Folding := sciEditor.Folding - [foldFold]
@@ -1651,9 +1651,17 @@ begin
 end;
 
 procedure TfrmMain.trvExplorerDblClick(Sender: TObject);
+var eFile, eTemp: String;
 begin
   if Assigned(trvExplorer.Selected) then begin
-    if (trvExplorer.Selected.ImageIndex <> 42) and (trvExplorer.Selected.ImageIndex <> 43) then begin
+    if (Assigned(trvExplorer.Selected.Parent)) and (trvExplorer.Selected.Parent.Text = 'Included') then begin
+      eFile := UpdateIncPath(trvExplorer.Selected.Text);
+      eTemp := odOpen.FileName;
+      odOpen.FileName := eFile;
+      mnuOpenClick(nil);
+      odOpen.FileName := eTemp;
+    end
+    else if (trvExplorer.Selected.ImageIndex <> 42) and (trvExplorer.Selected.ImageIndex <> 43) then begin
       sciEditor.GotoLineEnsureVisible(Integer(trvExplorer.Selected.Data));
       sciEditor.SetFocus;
       UpdateCI(frmMain.sciEditor.GetCurrentLineNumber);
@@ -2440,8 +2448,10 @@ begin
       SCM_RELOADINI: ReloadIni;
       SCM_SELECTLANGUAGE: SelectLanguage(eData);
       SCM_LOADFILE: begin
+          eTemp := odOpen.FileName;
           odOpen.FileName := eData;
           mnuOpenClick(nil);
+          odOpen.FileName := eTemp;
         end;
       SCM_CURRPROJECTS: Msg.Result := tsMain.ActiveTabIndex;
       SCM_COMPILE: mnuDoCompile.Click;
diff --git a/editor/studio/UnitfrmMenuGenerator.pas b/editor/studio/UnitfrmMenuGenerator.pas
index 9582d6ea..f6e88e30 100755
--- a/editor/studio/UnitfrmMenuGenerator.pas
+++ b/editor/studio/UnitfrmMenuGenerator.pas
@@ -7,7 +7,8 @@ uses
   StdCtrls, ExtCtrls, Forms, TBXDkPanels, SpTBXDkPanels, JvExControls,
   JvComponent, JvPageList, TFlatRadioButtonUnit, TFlatMemoUnit,
   TFlatEditUnit, TB2Dock, TB2Toolbar, TBX, SpTBXItem, ImgList, TB2Item,
-  Dialogs, TFlatComboBoxUnit, ComCtrls, ClipBrd, TFlatCheckBoxUnit;
+  Dialogs, TFlatComboBoxUnit, ComCtrls, ClipBrd, TFlatCheckBoxUnit,
+  SpTBXControls;
 
 type
   TfrmMenuGenerator = class(TForm)
diff --git a/editor/studio/UnitfrmParamEdit.pas b/editor/studio/UnitfrmParamEdit.pas
index 86fa9c37..8b5f7342 100644
--- a/editor/studio/UnitfrmParamEdit.pas
+++ b/editor/studio/UnitfrmParamEdit.pas
@@ -5,7 +5,7 @@ interface
 uses
   SysUtils, Windows, Messages, Classes, Graphics, Controls,
   StdCtrls, ExtCtrls, Forms, TBXDkPanels, SpTBXDkPanels, mbTBXMemo,
-  SpTBXEditors;
+  SpTBXEditors, SpTBXControls;
 
 type
   TfrmParamEdit = class(TForm)
diff --git a/editor/studio/UnitfrmPluginsIniEditor.pas b/editor/studio/UnitfrmPluginsIniEditor.pas
index b4b6bac8..aee4a359 100755
--- a/editor/studio/UnitfrmPluginsIniEditor.pas
+++ b/editor/studio/UnitfrmPluginsIniEditor.pas
@@ -5,7 +5,7 @@ interface
 uses
   SysUtils, Windows, Messages, Classes, Graphics, Controls,
   StdCtrls, ExtCtrls, Forms, TBXDkPanels, SpTBXDkPanels, mbTBXMemo, Dialogs,
-  IdFTPCommon;
+  IdFTPCommon, SpTBXControls;
 
 type
   TfrmPluginsIniEditor = class(TForm)
diff --git a/editor/studio/UnitfrmReplace.pas b/editor/studio/UnitfrmReplace.pas
index ebb3e83c..7a3b74b5 100755
--- a/editor/studio/UnitfrmReplace.pas
+++ b/editor/studio/UnitfrmReplace.pas
@@ -5,7 +5,7 @@ interface
 uses
   SysUtils, Windows, Messages, Classes, Graphics, Controls,
   StdCtrls, ExtCtrls, Forms, TntStdCtrls, SpTBXEditors, SpTBXDkPanels,
-  TBXDkPanels;
+  TBXDkPanels, SpTBXControls;
 
 type
   TfrmReplace = class(TForm)
diff --git a/editor/studio/UnitfrmSearch.pas b/editor/studio/UnitfrmSearch.pas
index 7678e41e..9a3ff244 100755
--- a/editor/studio/UnitfrmSearch.pas
+++ b/editor/studio/UnitfrmSearch.pas
@@ -5,7 +5,7 @@ interface
 uses
   SysUtils, Windows, Messages, Classes, Graphics, Controls,
   StdCtrls, ExtCtrls, Forms, TntStdCtrls, SpTBXEditors, SpTBXDkPanels,
-  TBXDkPanels, Dialogs;
+  TBXDkPanels, Dialogs, SpTBXControls;
 
 type
   TfrmSearch = class(TForm)