diff --git a/editor/studio/AMXX_Studio.cfg b/editor/studio/AMXX_Studio.cfg
index d696e73a..b36dc92c 100755
--- a/editor/studio/AMXX_Studio.cfg
+++ b/editor/studio/AMXX_Studio.cfg
@@ -34,7 +34,6 @@
 -K$00400000
 -LE"c:\programme\borland\delphi7\Projects\Bpl"
 -LN"c:\programme\borland\delphi7\Projects\Bpl"
--DmadExcept
 -w-UNSAFE_TYPE
 -w-UNSAFE_CODE
 -w-UNSAFE_CAST
diff --git a/editor/studio/AMXX_Studio.dof b/editor/studio/AMXX_Studio.dof
index 48743c1b..2a241008 100755
--- a/editor/studio/AMXX_Studio.dof
+++ b/editor/studio/AMXX_Studio.dof
@@ -96,7 +96,7 @@ PackageDLLOutputDir=
 PackageDCPOutputDir=
 SearchPath=
 Packages=vcl;rtl;vclx;vclie;xmlrtl;inetdbbde;inet;inetdbxpress;VclSmp;dbrtl;dbexpress;vcldb;dsnap;dbxcds;inetdb;bdertl;vcldbx;adortl;teeui;teedb;tee;ibxpress;visualclx;visualdbclx;vclactnband;vclshlctrls;Rave50CLX;Rave50VCL;dclOffice2k;Indy70;DJcl;FlatStyle_D5;DelphiX_for7;mxFlatPack_D7;tbx_d7;tb2k_d7;mbTBXLibPack;TntUnicodeVcl_R70;SynEdit_R7
-Conditionals=madExcept
+Conditionals=
 DebugSourceDirs=
 UsePackages=0
 [Parameters]
@@ -115,7 +115,7 @@ AutoIncBuild=1
 MajorVer=1
 MinorVer=0
 Release=0
-Build=7
+Build=9
 Debug=0
 PreRelease=1
 Special=0
@@ -126,7 +126,7 @@ CodePage=1252
 [Version Info Keys]
 CompanyName=AMX Mod X Dev Team
 FileDescription=
-FileVersion=1.0.0.7
+FileVersion=1.0.0.9
 InternalName=
 LegalCopyright=
 LegalTrademarks=
@@ -134,3 +134,9 @@ OriginalFilename=
 ProductName=AMXX-Studio
 ProductVersion=1.0.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.dpr b/editor/studio/AMXX_Studio.dpr
index 342fb543..ebd17649 100755
--- a/editor/studio/AMXX_Studio.dpr
+++ b/editor/studio/AMXX_Studio.dpr
@@ -1,9 +1,6 @@
 program AMXX_Studio;
 
 uses
-  madExcept,
-  madLinkDisAsm,
-  madScreenShot,
   Forms,
   Windows,
   Messages,
@@ -38,12 +35,13 @@ uses
   UnitPlugins in 'UnitPlugins.pas';
 
 { Used components:
-  JVCL 3.0
-  FlatPack
-  FlatStyle
-  Toolbar2000, TBX, SpTBX, mbTBX Lib
-  Scintilla and DelphiSci
-  madExcept
+  - JVCL 3.0
+  - FlatPack
+  - FlatStyle
+  - Toolbar2000, TBX, SpTBX, mbTBX Lib
+  - Scintilla and DelphiSci
+  - madExcept
+}
 
 {$R *.res}
 
diff --git a/editor/studio/AMXX_Studio.exe b/editor/studio/AMXX_Studio.exe
index f7290541..05bbe59c 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 51a7698a..91288bc6 100755
Binary files a/editor/studio/AMXX_Studio.res and b/editor/studio/AMXX_Studio.res differ
diff --git a/editor/studio/UnitfrmMain.pas b/editor/studio/UnitfrmMain.pas
index 41203d54..9d00d8e8 100755
--- a/editor/studio/UnitfrmMain.pas
+++ b/editor/studio/UnitfrmMain.pas
@@ -553,7 +553,7 @@ begin
   if frmSettings.ShowModal = mrOk then begin
     { Shortcuts }
 		for i := 0 to frmSettings.lvShortcuts.Items.Count - 1 do
-      TSciKeyCommand(frmSettings.lvShortcuts.Items[i].Data).ShortCut := ShortcutToSciKey(TextToShortCut(frmSettings.lvShortcuts.Items[i].SubItems[0]));
+      TSciKeyCommand(frmSettings.lvShortcuts.Items[i].Data).ShortCut := (TextToShortCut(frmSettings.lvShortcuts.Items[i].SubItems[0]));
     { Tools }
     if frmSettings.chkIndentGuides.Checked then
       sciEditor.Indentation := sciEditor.Indentation + [IndentationGuides]
diff --git a/editor/studio/UnitfrmSettings.dfm b/editor/studio/UnitfrmSettings.dfm
index 81569977..3e68cd66 100755
--- a/editor/studio/UnitfrmSettings.dfm
+++ b/editor/studio/UnitfrmSettings.dfm
@@ -59,7 +59,7 @@ object frmSettings: TfrmSettings
     Top = 0
     Width = 353
     Height = 260
-    ActivePage = jspTools
+    ActivePage = jspShortcuts
     PropagateEnable = False
     Align = alClient
     OnChange = jplSettingsChange
@@ -105,7 +105,7 @@ object frmSettings: TfrmSettings
         Height = 21
         Style = csDropDownList
         Color = clWindow
-        ItemHeight = 13
+        ItemHeight = 0
         TabOrder = 0
         ItemIndex = -1
         OnChange = cboLanguageChange