diff --git a/Lib/D2006/UnitSwitcherD2006.bpl b/Lib/D2006/UnitSwitcherD2006.bpl
index 46a649f..481fee7 100644
Binary files a/Lib/D2006/UnitSwitcherD2006.bpl and b/Lib/D2006/UnitSwitcherD2006.bpl differ
diff --git a/Lib/D7/UnitSwitcherD7.bpl b/Lib/D7/UnitSwitcherD7.bpl
index 2409be1..848ea50 100644
Binary files a/Lib/D7/UnitSwitcherD7.bpl and b/Lib/D7/UnitSwitcherD7.bpl differ
diff --git a/Source/UnSwConfiguration.dfm b/Source/UnSwConfiguration.dfm
index c54719b..2548be1 100644
--- a/Source/UnSwConfiguration.dfm
+++ b/Source/UnSwConfiguration.dfm
@@ -268,7 +268,7 @@ object frmUnSwConfiguration: TfrmUnSwConfiguration
         Top = 23
         Width = 54
         Height = 13
-        Caption = 'Version 0.4'
+        Caption = 'Version 0.5'
       end
       object TLabel
         Left = 135
diff --git a/Source/UnSwConfiguration.pas b/Source/UnSwConfiguration.pas
index aad9c4d..e661783 100644
--- a/Source/UnSwConfiguration.pas
+++ b/Source/UnSwConfiguration.pas
@@ -33,18 +33,18 @@ type
     lblDataModuleColor:                         TLabel;
     lblFormColor:                               TLabel;
     lblProjectColor:                            TLabel;
+    lblShortcutKeys:                            TLabel;
     lblUnitColor:                               TLabel;
     lblVersion:                                 TLabel;
     pcConfiguration:                            TPageControl;
     pnlCustomColor:                             TPanel;
     tsAbout:                                    TTabSheet;
     tsGeneral:                                  TTabSheet;
-    lblShortcutKeys: TLabel;
-    procedure lblShortcutKeysClick(Sender: TObject);
 
     procedure btnDefaultClick(Sender: TObject);
     procedure chkCustomColorClick(Sender: TObject);
     procedure lblBugReportClick(Sender: TObject);
+    procedure lblShortcutKeysClick(Sender: TObject);
     procedure PickColor(Sender: TObject);
   private
     FLabels:        array[0..3] of TLabel;
@@ -72,6 +72,8 @@ class function TfrmUnSwConfiguration.Execute(): Boolean;
 begin
   with Self.Create(nil) do
   try
+    pcConfiguration.ActivePage  := tsGeneral;
+    
     Result  := InternalExecute();
   finally
     Free();
diff --git a/Source/UnSwShortcuts.dfm b/Source/UnSwShortcuts.dfm
index 0adfce6..ad98bb3 100644
--- a/Source/UnSwShortcuts.dfm
+++ b/Source/UnSwShortcuts.dfm
@@ -4,7 +4,7 @@ object frmUnSwShortcuts: TfrmUnSwShortcuts
   BorderIcons = [biSystemMenu]
   BorderStyle = bsDialog
   Caption = 'UnitSwitcher Shortcut keys'
-  ClientHeight = 470
+  ClientHeight = 484
   ClientWidth = 354
   Color = clBtnFace
   Font.Charset = DEFAULT_CHARSET
@@ -221,14 +221,14 @@ object frmUnSwShortcuts: TfrmUnSwShortcuts
   end
   object TLabel
     Left = 28
-    Top = 384
+    Top = 400
     Width = 68
     Height = 13
     Caption = 'Ctrl-Alt-Enter:'
   end
   object TLabel
     Left = 168
-    Top = 384
+    Top = 400
     Width = 95
     Height = 13
     Caption = 'Open file properties'
@@ -276,21 +276,35 @@ object frmUnSwShortcuts: TfrmUnSwShortcuts
   end
   object TLabel
     Left = 28
-    Top = 400
+    Top = 416
     Width = 77
     Height = 13
     Caption = 'Ctrl-Shift-Enter:'
   end
   object TLabel
     Left = 168
-    Top = 400
+    Top = 416
     Width = 156
     Height = 13
     Caption = 'Open file properties for the .dfm'
   end
+  object TLabel
+    Left = 28
+    Top = 384
+    Width = 49
+    Height = 13
+    Caption = 'Ctrl-Alt-R:'
+  end
+  object TLabel
+    Left = 168
+    Top = 384
+    Width = 121
+    Height = 13
+    Caption = 'Toggle the read-only flag'
+  end
   object btnOk: TButton
     Left = 139
-    Top = 437
+    Top = 449
     Width = 75
     Height = 25
     Cancel = True