diff --git a/Demos/FPC/Demo01/project1.lpi b/Demos/FPC/Demo01/project1.lpi
index bfc0f0d8..629aef08 100644
--- a/Demos/FPC/Demo01/project1.lpi
+++ b/Demos/FPC/Demo01/project1.lpi
@@ -1,33 +1,35 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="9"/>
+    <Version Value="11"/>
     <PathDelim Value="\"/>
     <General>
       <MainUnit Value="0"/>
       <UseXPManifest Value="True"/>
       <Icon Value="0"/>
-      <ActiveWindowIndexAtStart Value="0"/>
     </General>
     <VersionInfo>
       <Language Value=""/>
       <CharSet Value=""/>
-      <StringTable ProductVersion=""/>
     </VersionInfo>
     <BuildModes Count="1">
       <Item1 Name="default" Default="True"/>
     </BuildModes>
     <PublishOptions>
       <Version Value="2"/>
-      <IgnoreBinaries Value="False"/>
-      <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
-      <ExcludeFileFilter Value="*.(bak|ppu|ppw|o|so);*~;backup"/>
     </PublishOptions>
     <RunParams>
       <local>
-        <FormatVersion Value="1"/>
         <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
       </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default">
+          <local>
+            <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
+          </local>
+        </Mode0>
+      </Modes>
     </RunParams>
     <RequiredPackages Count="2">
       <Item1>
@@ -38,120 +40,92 @@
         <PackageName Value="LCL"/>
       </Item2>
     </RequiredPackages>
-    <Units Count="8">
+    <Units Count="9">
       <Unit0>
         <Filename Value="project1.lpr"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="project1"/>
         <UsageCount Value="74"/>
       </Unit0>
       <Unit1>
         <Filename Value="unit1.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="Form1"/>
+        <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="Unit1"/>
-        <EditorIndex Value="0"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="30"/>
-        <CursorPos X="62" Y="43"/>
+        <CursorPos X="55" Y="9"/>
         <UsageCount Value="74"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
       </Unit1>
       <Unit2>
         <Filename Value="..\..\..\..\..\..\lazarus\fpc\2.2.4\source\rtl\inc\variants.pp"/>
-        <UnitName Value="variants"/>
-        <WindowIndex Value="0"/>
         <TopLine Value="4220"/>
         <CursorPos X="9" Y="4225"/>
         <UsageCount Value="37"/>
       </Unit2>
       <Unit3>
         <Filename Value="..\..\..\..\..\..\lazarus\fpc\2.2.4\source\rtl\inc\varianth.inc"/>
-        <WindowIndex Value="0"/>
         <TopLine Value="115"/>
         <CursorPos X="94" Y="134"/>
         <UsageCount Value="37"/>
       </Unit3>
       <Unit4>
         <Filename Value="..\..\..\Components\Sources\Core\PythonGUIInputOutput.pas"/>
-        <UnitName Value="PythonGUIInputOutput"/>
-        <EditorIndex Value="3"/>
-        <WindowIndex Value="0"/>
+        <EditorIndex Value="-1"/>
         <TopLine Value="154"/>
         <CursorPos X="52" Y="166"/>
         <UsageCount Value="11"/>
-        <Loaded Value="True"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit4>
       <Unit5>
         <Filename Value="..\..\..\Components\Sources\Core\PythonEngine.pas"/>
-        <UnitName Value="PythonEngine"/>
-        <EditorIndex Value="4"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="1"/>
-        <CursorPos X="1" Y="1"/>
+        <EditorIndex Value="-1"/>
         <UsageCount Value="11"/>
-        <Loaded Value="True"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit5>
       <Unit6>
         <Filename Value="..\..\..\Components\p4dlaz.pas"/>
         <UnitName Value="P4DLaz"/>
-        <EditorIndex Value="2"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="1"/>
+        <EditorIndex Value="-1"/>
         <CursorPos X="36" Y="11"/>
         <UsageCount Value="10"/>
-        <Loaded Value="True"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit6>
       <Unit7>
         <Filename Value="..\Demo06\Unit1.lfm"/>
-        <IsVisibleTab Value="True"/>
-        <EditorIndex Value="1"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="1"/>
-        <CursorPos X="1" Y="1"/>
+        <ComponentName Value="Form1"/>
+        <HasResources Value="True"/>
+        <ResourceBaseClass Value="Form"/>
+        <EditorIndex Value="2"/>
         <UsageCount Value="10"/>
         <Loaded Value="True"/>
+        <LoadedDesigner Value="True"/>
         <DefaultSyntaxHighlighter Value="LFM"/>
       </Unit7>
+      <Unit8>
+        <Filename Value="..\..\..\Source\PythonEngine.pas"/>
+        <IsVisibleTab Value="True"/>
+        <EditorIndex Value="1"/>
+        <TopLine Value="4691"/>
+        <CursorPos X="11" Y="4720"/>
+        <UsageCount Value="10"/>
+        <Loaded Value="True"/>
+        <DefaultSyntaxHighlighter Value="Delphi"/>
+      </Unit8>
     </Units>
-    <JumpHistory Count="7" HistoryIndex="6">
+    <JumpHistory Count="2" HistoryIndex="1">
       <Position1>
-        <Filename Value="..\..\..\Components\Sources\Core\PythonGUIInputOutput.pas"/>
-        <Caret Line="1" Column="1" TopLine="1"/>
+        <Filename Value="..\Demo06\Unit1.lfm"/>
       </Position1>
       <Position2>
-        <Filename Value="..\..\..\Components\Sources\Core\PythonGUIInputOutput.pas"/>
-        <Caret Line="205" Column="19" TopLine="193"/>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="9" Column="55"/>
       </Position2>
-      <Position3>
-        <Filename Value="..\..\..\Components\Sources\Core\PythonEngine.pas"/>
-        <Caret Line="1" Column="1" TopLine="1"/>
-      </Position3>
-      <Position4>
-        <Filename Value="..\..\..\Components\Sources\Core\PythonEngine.pas"/>
-        <Caret Line="3044" Column="28" TopLine="3032"/>
-      </Position4>
-      <Position5>
-        <Filename Value="..\..\..\Components\Sources\Core\PythonEngine.pas"/>
-        <Caret Line="9602" Column="10" TopLine="9597"/>
-      </Position5>
-      <Position6>
-        <Filename Value="..\..\..\Components\Sources\Core\PythonEngine.pas"/>
-        <Caret Line="2875" Column="61" TopLine="2863"/>
-      </Position6>
-      <Position7>
-        <Filename Value="..\..\..\Components\p4dlaz.pas"/>
-        <Caret Line="1" Column="1" TopLine="1"/>
-      </Position7>
     </JumpHistory>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="9"/>
+    <Version Value="11"/>
     <PathDelim Value="\"/>
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)"/>
@@ -168,9 +142,6 @@
         </Win32>
       </Options>
     </Linking>
-    <Other>
-      <CompilerPath Value="$(CompPath)"/>
-    </Other>
   </CompilerOptions>
   <Debugging>
     <Exceptions Count="3">
diff --git a/Demos/FPC/Demo01/project1.res b/Demos/FPC/Demo01/project1.res
index 7c6cf3e4..f6e84995 100644
Binary files a/Demos/FPC/Demo01/project1.res and b/Demos/FPC/Demo01/project1.res differ
diff --git a/Demos/FPC/Demo01/unit1.lfm b/Demos/FPC/Demo01/unit1.lfm
index 5cd84666..40e1816b 100644
--- a/Demos/FPC/Demo01/unit1.lfm
+++ b/Demos/FPC/Demo01/unit1.lfm
@@ -6,7 +6,7 @@ object Form1: TForm1
   Caption = 'Form1'
   ClientHeight = 391
   ClientWidth = 547
-  LCLVersion = '0.9.30.2'
+  LCLVersion = '2.0.10.0'
   object Panel1: TPanel
     Left = 0
     Height = 391
@@ -79,15 +79,15 @@ object Form1: TForm1
   end
   object PythonEngine1: TPythonEngine
     IO = PythonGUIInputOutput1
-    left = 96
-    top = 48
+    Left = 96
+    Top = 48
   end
   object PythonGUIInputOutput1: TPythonGUIInputOutput
     DelayWrites = True
     UnicodeIO = False
     RawOutput = False
     Output = Memo1
-    left = 338
-    top = 48
+    Left = 338
+    Top = 48
   end
 end
diff --git a/Demos/FPC/Demo01/unit1.lrs b/Demos/FPC/Demo01/unit1.lrs
index 4dcd8024..72fa03ba 100644
--- a/Demos/FPC/Demo01/unit1.lrs
+++ b/Demos/FPC/Demo01/unit1.lrs
@@ -3,7 +3,7 @@
 LazarusResources.Add('TForm1','FORMDATA',[
   'TPF0'#6'TForm1'#5'Form1'#4'Left'#3'"'#1#6'Height'#3#135#1#3'Top'#3#175#0#5'W'
   +'idth'#3'#'#2#7'Caption'#6#5'Form1'#12'ClientHeight'#3#135#1#11'ClientWidth'
-  +#3'#'#2#10'LCLVersion'#6#8'0.9.30.2'#0#6'TPanel'#6'Panel1'#4'Left'#2#0#6'Hei'
+  +#3'#'#2#10'LCLVersion'#6#8'2.0.10.0'#0#6'TPanel'#6'Panel1'#4'Left'#2#0#6'Hei'
   +'ght'#3#135#1#3'Top'#2#0#5'Width'#3'#'#2#5'Align'#7#8'alClient'#12'ClientHei'
   +'ght'#3#135#1#11'ClientWidth'#3'#'#2#8'TabOrder'#2#0#0#5'TMemo'#5'Memo1'#4'L'
   +'eft'#2#1#6'Height'#3#183#0#3'Top'#2#1#5'Width'#3'!'#2#5'Align'#7#5'alTop'#8
@@ -13,13 +13,13 @@ LazarusResources.Add('TForm1','FORMDATA',[
   +#6'Height'#2#8#3'Top'#2#0#5'Width'#2'-'#0#0#17'TPairSplitterSide'#17'PairSpl'
   +'itterSide2'#6'Cursor'#7#7'crArrow'#4'Left'#2'2'#6'Height'#2#8#3'Top'#2#0#5
   +'Width'#3#239#1#0#0#0#5'TMemo'#5'Memo2'#4'Left'#2#1#6'Height'#3#152#0#3'Top'
-  +#3#192#0#5'Width'#3'!'#2#5'Align'#7#8'alClient'#13'Lines.Strings'#1#6#9'prin'
-  +'t 2+2'#0#8'TabOrder'#2#2#0#0#6'TPanel'#6'Panel2'#4'Left'#2#1#6'Height'#2'.'
-  +#3'Top'#3'X'#1#5'Width'#3'!'#2#5'Align'#7#8'alBottom'#12'ClientHeight'#2'.'
-  +#11'ClientWidth'#3'!'#2#8'TabOrder'#2#3#0#7'TButton'#7'Button1'#4'Left'#3#223
-  +#0#6'Height'#2#25#3'Top'#2#8#5'Width'#2'K'#7'Caption'#6#7'Execute'#7'OnClick'
-  +#7#12'Button1Click'#8'TabOrder'#2#0#0#0#0#0#13'TPythonEngine'#13'PythonEngin'
-  +'e1'#2'IO'#7#21'PythonGUIInputOutput1'#4'left'#2'`'#3'top'#2'0'#0#0#21'TPyth'
-  +'onGUIInputOutput'#21'PythonGUIInputOutput1'#11'DelayWrites'#9#9'UnicodeIO'#8
-  +#9'RawOutput'#8#6'Output'#7#5'Memo1'#4'left'#3'R'#1#3'top'#2'0'#0#0#0
+  +#3#192#0#5'Width'#3'!'#2#5'Align'#7#8'alClient'#13'Lines.Strings'#1#6#10'pri'
+  +'nt(2+2)'#0#8'TabOrder'#2#2#0#0#6'TPanel'#6'Panel2'#4'Left'#2#1#6'Height'#2
+  +'.'#3'Top'#3'X'#1#5'Width'#3'!'#2#5'Align'#7#8'alBottom'#12'ClientHeight'#2
+  +'.'#11'ClientWidth'#3'!'#2#8'TabOrder'#2#3#0#7'TButton'#7'Button1'#4'Left'#3
+  +#223#0#6'Height'#2#25#3'Top'#2#8#5'Width'#2'K'#7'Caption'#6#7'Execute'#7'OnC'
+  +'lick'#7#12'Button1Click'#8'TabOrder'#2#0#0#0#0#0#13'TPythonEngine'#13'Pytho'
+  +'nEngine1'#2'IO'#7#21'PythonGUIInputOutput1'#4'Left'#2'`'#3'Top'#2'0'#0#0#21
+  +'TPythonGUIInputOutput'#21'PythonGUIInputOutput1'#11'DelayWrites'#9#9'Unicod'
+  +'eIO'#8#9'RawOutput'#8#6'Output'#7#5'Memo1'#4'Left'#3'R'#1#3'Top'#2'0'#0#0#0
 ]);
diff --git a/Demos/FPC/Demo01/unit1.pas b/Demos/FPC/Demo01/unit1.pas
index 26fe9250..78b70cb6 100644
--- a/Demos/FPC/Demo01/unit1.pas
+++ b/Demos/FPC/Demo01/unit1.pas
@@ -6,7 +6,7 @@ interface
 
 uses
   Classes, SysUtils, FileUtil, LResources, Forms, Controls, Graphics, Dialogs,
-  StdCtrls, ExtCtrls, PairSplitter, PythonEngine, PythonGUIInputOutput;
+  StdCtrls, ExtCtrls, PairSplitter, PythonEngine, lcl.PythonGUIInputOutput;
 
 type
 
diff --git a/Demos/FPC/Demo06/Project1.lpi b/Demos/FPC/Demo06/Project1.lpi
index 21a8b55f..6751b6f9 100644
--- a/Demos/FPC/Demo06/Project1.lpi
+++ b/Demos/FPC/Demo06/Project1.lpi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="10"/>
+    <Version Value="11"/>
     <PathDelim Value="\"/>
     <General>
       <MainUnit Value="0"/>
@@ -17,15 +17,19 @@
     </BuildModes>
     <PublishOptions>
       <Version Value="2"/>
-      <IgnoreBinaries Value="False"/>
-      <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
-      <ExcludeFileFilter Value="*.(bak|ppu|ppw|o|so);*~;backup"/>
     </PublishOptions>
     <RunParams>
       <local>
-        <FormatVersion Value="1"/>
         <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
       </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default">
+          <local>
+            <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
+          </local>
+        </Mode0>
+      </Modes>
     </RunParams>
     <RequiredPackages Count="2">
       <Item1>
@@ -51,8 +55,8 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <IsVisibleTab Value="True"/>
-        <TopLine Value="4"/>
-        <CursorPos X="17" Y="16"/>
+        <TopLine Value="244"/>
+        <CursorPos X="16" Y="292"/>
         <UsageCount Value="45"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
@@ -112,13 +116,42 @@
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit8>
     </Units>
-    <JumpHistory HistoryIndex="-1"/>
+    <JumpHistory Count="7" HistoryIndex="6">
+      <Position1>
+        <Filename Value="Unit1.pas"/>
+        <Caret Line="16" Column="17" TopLine="4"/>
+      </Position1>
+      <Position2>
+        <Filename Value="Unit1.pas"/>
+        <Caret Line="11" Column="17"/>
+      </Position2>
+      <Position3>
+        <Filename Value="Unit1.pas"/>
+        <Caret Line="9" Column="2" TopLine="2"/>
+      </Position3>
+      <Position4>
+        <Filename Value="Unit1.pas"/>
+        <Caret Line="292"/>
+      </Position4>
+      <Position5>
+        <Filename Value="Unit1.pas"/>
+        <Caret Line="57" Column="23" TopLine="29"/>
+      </Position5>
+      <Position6>
+        <Filename Value="Unit1.pas"/>
+        <Caret Line="58" Column="31" TopLine="30"/>
+      </Position6>
+      <Position7>
+        <Filename Value="Unit1.pas"/>
+        <Caret Line="59" Column="35" TopLine="31"/>
+      </Position7>
+    </JumpHistory>
   </ProjectOptions>
   <CompilerOptions>
     <Version Value="11"/>
     <PathDelim Value="\"/>
     <SearchPaths>
-      <IncludeFiles Value="$(ProjOutDir);..\..\..\Components\Sources\Core"/>
+      <IncludeFiles Value="$(ProjOutDir);..\..\..\Source"/>
     </SearchPaths>
     <Parsing>
       <SyntaxOptions>
diff --git a/Demos/FPC/Demo06/Project1.res b/Demos/FPC/Demo06/Project1.res
index 877868cb..f6e84995 100644
Binary files a/Demos/FPC/Demo06/Project1.res and b/Demos/FPC/Demo06/Project1.res differ
diff --git a/Demos/FPC/Demo06/Unit1.lfm b/Demos/FPC/Demo06/Unit1.lfm
index efb1a880..45497ad7 100644
--- a/Demos/FPC/Demo06/Unit1.lfm
+++ b/Demos/FPC/Demo06/Unit1.lfm
@@ -11,8 +11,7 @@ object Form1: TForm1
   Font.Color = clWindowText
   Font.Height = -11
   Font.Name = 'MS Sans Serif'
-  LCLVersion = '1.8.0.6'
-  Visible = False
+  LCLVersion = '2.0.10.0'
   object Splitter1: TSplitter
     Cursor = crVSplit
     Left = 0
@@ -93,7 +92,7 @@ object Form1: TForm1
     end
     object Edit1: TEdit
       Left = 500
-      Height = 20
+      Height = 21
       Top = 8
       Width = 150
       TabOrder = 4
@@ -118,7 +117,7 @@ object Form1: TForm1
       'print()'
     )
     IO = PythonGUIInputOutput1
-    left = 8
+    Left = 8
   end
   object PythonType1: TPythonType
     Engine = PythonEngine1
@@ -130,24 +129,24 @@ object Form1: TForm1
     Services.Number = []
     Services.Sequence = []
     Services.Mapping = []
-    left = 72
+    Left = 72
   end
   object PythonModule1: TPythonModule
     Engine = PythonEngine1
     OnInitialization = PythonModule1Initialization
     ModuleName = 'spam'
     Errors = <>
-    left = 104
+    Left = 104
   end
   object OpenDialog1: TOpenDialog
     DefaultExt = '.*.py'
     Filter = 'Python files|*.py|Text files|*.txt|All files|*.*'
-    left = 176
+    Left = 176
   end
   object SaveDialog1: TSaveDialog
     DefaultExt = '.*.py'
     Filter = 'Python files|*.py|Text files|*.txt|All files|*.*'
-    left = 208
+    Left = 208
   end
   object PythonDelphiVar1: TPythonDelphiVar
     Engine = PythonEngine1
@@ -156,12 +155,12 @@ object Form1: TForm1
     OnGetData = PythonDelphiVar1GetData
     OnSetData = PythonDelphiVar1SetData
     OnChange = PythonDelphiVar1Change
-    left = 136
+    Left = 136
   end
   object PythonGUIInputOutput1: TPythonGUIInputOutput
     UnicodeIO = True
     RawOutput = False
     Output = Memo2
-    left = 40
+    Left = 40
   end
 end
diff --git a/Demos/FPC/Demo06/Unit1.pas b/Demos/FPC/Demo06/Unit1.pas
index 3cf0d935..1caf8f5e 100644
--- a/Demos/FPC/Demo06/Unit1.pas
+++ b/Demos/FPC/Demo06/Unit1.pas
@@ -6,9 +6,9 @@ interface
 
 uses
   SysUtils, Classes,
-  Windows, Messages, Graphics, Controls, Forms, Dialogs,
+  Graphics, Controls, Forms, Dialogs,
   StdCtrls, ComCtrls, ExtCtrls,
-  PythonEngine, PythonGUIInputOutput;
+  PythonEngine, lcl.PythonGUIInputOutput;
 
 type
 
diff --git a/Demos/FPC/Demo25/fpc-res.or b/Demos/FPC/Demo25/fpc-res.or
deleted file mode 100644
index 3676804f..00000000
Binary files a/Demos/FPC/Demo25/fpc-res.or and /dev/null differ
diff --git a/Demos/FPC/Demo25/project1.lpi b/Demos/FPC/Demo25/project1.lpi
index b90ec537..5e6384e1 100644
--- a/Demos/FPC/Demo25/project1.lpi
+++ b/Demos/FPC/Demo25/project1.lpi
@@ -1,31 +1,32 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
+    <Version Value="11"/>
     <PathDelim Value="\"/>
-    <Version Value="7"/>
     <General>
       <MainUnit Value="0"/>
-      <TargetFileExt Value=".exe"/>
-      <Icon Value="0"/>
       <UseXPManifest Value="True"/>
-      <ActiveEditorIndexAtStart Value="2"/>
+      <Icon Value="0"/>
     </General>
     <VersionInfo>
-      <ProjectVersion Value=""/>
       <Language Value=""/>
       <CharSet Value=""/>
     </VersionInfo>
+    <BuildModes Count="1">
+      <Item1 Name="default" Default="True"/>
+    </BuildModes>
     <PublishOptions>
       <Version Value="2"/>
-      <IgnoreBinaries Value="False"/>
-      <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
-      <ExcludeFileFilter Value="*.(bak|ppu|ppw|o|so);*~;backup"/>
     </PublishOptions>
     <RunParams>
-      <local>
-        <FormatVersion Value="1"/>
-        <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
-      </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default">
+          <local>
+            <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
+          </local>
+        </Mode0>
+      </Modes>
     </RunParams>
     <RequiredPackages Count="2">
       <Item1>
@@ -40,205 +41,131 @@
       <Unit0>
         <Filename Value="project1.lpr"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="project1"/>
         <UsageCount Value="176"/>
       </Unit0>
       <Unit1>
         <Filename Value="unit1.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="Form1"/>
+        <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="Unit1"/>
-        <CursorPos X="1" Y="66"/>
-        <TopLine Value="61"/>
-        <EditorIndex Value="0"/>
+        <IsVisibleTab Value="True"/>
+        <TopLine Value="34"/>
+        <CursorPos Y="62"/>
         <UsageCount Value="176"/>
         <Loaded Value="True"/>
+        <LoadedDesigner Value="True"/>
       </Unit1>
       <Unit2>
         <Filename Value="..\..\..\..\..\..\lazarus\fpc\2.2.4\source\rtl\inc\variants.pp"/>
-        <UnitName Value="variants"/>
-        <CursorPos X="98" Y="1653"/>
+        <EditorIndex Value="-1"/>
         <TopLine Value="1646"/>
-        <EditorIndex Value="2"/>
+        <CursorPos X="98" Y="1653"/>
         <UsageCount Value="88"/>
-        <Loaded Value="True"/>
       </Unit2>
       <Unit3>
         <Filename Value="..\..\..\..\..\..\lazarus\fpc\2.2.4\source\rtl\inc\varianth.inc"/>
-        <CursorPos X="7" Y="171"/>
+        <EditorIndex Value="-1"/>
         <TopLine Value="159"/>
-        <EditorIndex Value="3"/>
+        <CursorPos X="7" Y="171"/>
         <UsageCount Value="88"/>
-        <Loaded Value="True"/>
       </Unit3>
       <Unit4>
         <Filename Value="..\..\..\Components\Sources\Core\VarPyth.pas"/>
-        <UnitName Value="VarPyth"/>
-        <CursorPos X="5" Y="865"/>
+        <EditorIndex Value="-1"/>
         <TopLine Value="841"/>
-        <EditorIndex Value="1"/>
-        <UsageCount Value="57"/>
-        <Loaded Value="True"/>
+        <CursorPos X="5" Y="865"/>
         <SyntaxHighlighter Value="Delphi"/>
+        <UsageCount Value="57"/>
       </Unit4>
       <Unit5>
         <Filename Value="..\..\..\..\..\..\lazarus\fpc\2.2.4\source\rtl\inc\variant.inc"/>
-        <CursorPos X="21" Y="505"/>
+        <EditorIndex Value="-1"/>
         <TopLine Value="501"/>
-        <EditorIndex Value="4"/>
+        <CursorPos X="21" Y="505"/>
         <UsageCount Value="57"/>
-        <Loaded Value="True"/>
       </Unit5>
       <Unit6>
         <Filename Value="..\..\..\..\..\..\lazarus\fpc\2.2.4\source\rtl\inc\system.inc"/>
-        <CursorPos X="5" Y="338"/>
+        <EditorIndex Value="-1"/>
         <TopLine Value="326"/>
-        <EditorIndex Value="6"/>
+        <CursorPos X="5" Y="338"/>
         <UsageCount Value="57"/>
-        <Loaded Value="True"/>
       </Unit6>
       <Unit7>
         <Filename Value="..\..\..\..\..\..\lazarus\fpc\2.2.4\source\rtl\inc\rtti.inc"/>
-        <CursorPos X="7" Y="175"/>
+        <EditorIndex Value="-1"/>
         <TopLine Value="163"/>
-        <EditorIndex Value="5"/>
+        <CursorPos X="7" Y="175"/>
         <UsageCount Value="57"/>
-        <Loaded Value="True"/>
       </Unit7>
     </Units>
-    <JumpHistory Count="30" HistoryIndex="29">
+    <JumpHistory Count="13" HistoryIndex="12">
       <Position1>
-        <Filename Value="..\..\..\..\..\..\lazarus\fpc\2.2.4\source\rtl\inc\variants.pp"/>
-        <Caret Line="3700" Column="65" TopLine="3687"/>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="66" Column="10" TopLine="54"/>
       </Position1>
       <Position2>
         <Filename Value="unit1.pas"/>
-        <Caret Line="66" Column="10" TopLine="54"/>
+        <Caret Line="62" TopLine="50"/>
       </Position2>
       <Position3>
         <Filename Value="unit1.pas"/>
-        <Caret Line="62" Column="1" TopLine="50"/>
+        <Caret Line="63" TopLine="51"/>
       </Position3>
       <Position4>
         <Filename Value="unit1.pas"/>
-        <Caret Line="63" Column="1" TopLine="51"/>
+        <Caret Line="64" TopLine="52"/>
       </Position4>
       <Position5>
         <Filename Value="unit1.pas"/>
-        <Caret Line="64" Column="1" TopLine="52"/>
+        <Caret Line="65" TopLine="53"/>
       </Position5>
       <Position6>
         <Filename Value="unit1.pas"/>
-        <Caret Line="65" Column="1" TopLine="53"/>
+        <Caret Line="66" TopLine="54"/>
       </Position6>
       <Position7>
         <Filename Value="unit1.pas"/>
-        <Caret Line="66" Column="1" TopLine="54"/>
+        <Caret Line="67" TopLine="55"/>
       </Position7>
       <Position8>
         <Filename Value="unit1.pas"/>
-        <Caret Line="67" Column="1" TopLine="55"/>
+        <Caret Line="69" TopLine="57"/>
       </Position8>
       <Position9>
         <Filename Value="unit1.pas"/>
-        <Caret Line="69" Column="1" TopLine="57"/>
+        <Caret Line="70" TopLine="58"/>
       </Position9>
       <Position10>
         <Filename Value="unit1.pas"/>
-        <Caret Line="70" Column="1" TopLine="58"/>
+        <Caret Line="71" TopLine="59"/>
       </Position10>
       <Position11>
         <Filename Value="unit1.pas"/>
-        <Caret Line="71" Column="1" TopLine="59"/>
+        <Caret Line="72" TopLine="60"/>
       </Position11>
       <Position12>
         <Filename Value="unit1.pas"/>
-        <Caret Line="72" Column="1" TopLine="60"/>
+        <Caret Line="66" TopLine="61"/>
       </Position12>
       <Position13>
-        <Filename Value="..\..\..\..\..\..\lazarus\fpc\2.2.4\source\rtl\inc\variants.pp"/>
-        <Caret Line="1" Column="1" TopLine="1"/>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="9" Column="54"/>
       </Position13>
-      <Position14>
-        <Filename Value="..\..\..\..\..\..\lazarus\fpc\2.2.4\source\rtl\inc\variant.inc"/>
-        <Caret Line="627" Column="28" TopLine="622"/>
-      </Position14>
-      <Position15>
-        <Filename Value="..\..\..\..\..\..\lazarus\fpc\2.2.4\source\rtl\inc\variant.inc"/>
-        <Caret Line="505" Column="22" TopLine="497"/>
-      </Position15>
-      <Position16>
-        <Filename Value="..\..\..\..\..\..\lazarus\fpc\2.2.4\source\rtl\inc\varianth.inc"/>
-        <Caret Line="171" Column="7" TopLine="191"/>
-      </Position16>
-      <Position17>
-        <Filename Value="..\..\..\..\..\..\lazarus\fpc\2.2.4\source\rtl\inc\variant.inc"/>
-        <Caret Line="505" Column="22" TopLine="497"/>
-      </Position17>
-      <Position18>
-        <Filename Value="..\..\..\..\..\..\lazarus\fpc\2.2.4\source\rtl\inc\variant.inc"/>
-        <Caret Line="547" Column="21" TopLine="535"/>
-      </Position18>
-      <Position19>
-        <Filename Value="..\..\..\..\..\..\lazarus\fpc\2.2.4\source\rtl\inc\variant.inc"/>
-        <Caret Line="505" Column="21" TopLine="493"/>
-      </Position19>
-      <Position20>
-        <Filename Value="..\..\..\..\..\..\lazarus\fpc\2.2.4\source\rtl\inc\varianth.inc"/>
-        <Caret Line="310" Column="3" TopLine="310"/>
-      </Position20>
-      <Position21>
-        <Filename Value="..\..\..\..\..\..\lazarus\fpc\2.2.4\source\rtl\inc\variants.pp"/>
-        <Caret Line="2611" Column="10" TopLine="2599"/>
-      </Position21>
-      <Position22>
-        <Filename Value="..\..\..\..\..\..\lazarus\fpc\2.2.4\source\rtl\inc\variants.pp"/>
-        <Caret Line="3799" Column="49" TopLine="3787"/>
-      </Position22>
-      <Position23>
-        <Filename Value="..\..\..\..\..\..\lazarus\fpc\2.2.4\source\rtl\inc\variants.pp"/>
-        <Caret Line="3802" Column="65" TopLine="3818"/>
-      </Position23>
-      <Position24>
-        <Filename Value="..\..\..\..\..\..\lazarus\fpc\2.2.4\source\rtl\inc\variants.pp"/>
-        <Caret Line="3699" Column="100" TopLine="3687"/>
-      </Position24>
-      <Position25>
-        <Filename Value="..\..\..\..\..\..\lazarus\fpc\2.2.4\source\rtl\inc\variants.pp"/>
-        <Caret Line="1575" Column="21" TopLine="1563"/>
-      </Position25>
-      <Position26>
-        <Filename Value="..\..\..\..\..\..\lazarus\fpc\2.2.4\source\rtl\inc\variants.pp"/>
-        <Caret Line="1582" Column="15" TopLine="1579"/>
-      </Position26>
-      <Position27>
-        <Filename Value="..\..\..\..\..\..\lazarus\fpc\2.2.4\source\rtl\inc\variants.pp"/>
-        <Caret Line="1437" Column="3" TopLine="1433"/>
-      </Position27>
-      <Position28>
-        <Filename Value="..\..\..\..\..\..\lazarus\fpc\2.2.4\source\rtl\inc\variants.pp"/>
-        <Caret Line="1669" Column="10" TopLine="1653"/>
-      </Position28>
-      <Position29>
-        <Filename Value="..\..\..\..\..\..\lazarus\fpc\2.2.4\source\rtl\inc\variants.pp"/>
-        <Caret Line="1564" Column="32" TopLine="1556"/>
-      </Position29>
-      <Position30>
-        <Filename Value="..\..\..\..\..\..\lazarus\fpc\2.2.4\source\rtl\inc\variants.pp"/>
-        <Caret Line="409" Column="1" TopLine="441"/>
-      </Position30>
     </JumpHistory>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="8"/>
+    <Version Value="11"/>
     <PathDelim Value="\"/>
     <SearchPaths>
-      <IncludeFiles Value="$(ProjOutDir)\"/>
+      <IncludeFiles Value="$(ProjOutDir)"/>
     </SearchPaths>
     <Parsing>
       <SyntaxOptions>
         <IncludeAssertionCode Value="True"/>
+        <UseAnsiStrings Value="False"/>
       </SyntaxOptions>
     </Parsing>
     <Linking>
@@ -248,25 +175,34 @@
         </Win32>
       </Options>
     </Linking>
-    <Other>
-      <CompilerPath Value="$(CompPath)"/>
-    </Other>
   </CompilerOptions>
   <Debugging>
     <BreakPoints Count="4">
       <Item1>
+        <Kind Value="bpkSource"/>
+        <WatchScope Value="wpsGlobal"/>
+        <WatchKind Value="wpkWrite"/>
         <Source Value="..\..\..\Components\Sources\Core\VarPyth.pas"/>
         <Line Value="1633"/>
       </Item1>
       <Item2>
+        <Kind Value="bpkSource"/>
+        <WatchScope Value="wpsGlobal"/>
+        <WatchKind Value="wpkWrite"/>
         <Source Value="..\..\..\Components\Sources\Core\VarPyth.pas"/>
         <Line Value="1086"/>
       </Item2>
       <Item3>
+        <Kind Value="bpkSource"/>
+        <WatchScope Value="wpsGlobal"/>
+        <WatchKind Value="wpkWrite"/>
         <Source Value="..\..\..\Components\Sources\Core\VarPyth.pas"/>
         <Line Value="1629"/>
       </Item3>
       <Item4>
+        <Kind Value="bpkSource"/>
+        <WatchScope Value="wpsLocal"/>
+        <WatchKind Value="wpkWrite"/>
         <Source Value="unit1.pas"/>
         <Line Value="62"/>
       </Item4>
diff --git a/Demos/FPC/Demo25/project1.res b/Demos/FPC/Demo25/project1.res
index 708df3c5..f6e84995 100644
Binary files a/Demos/FPC/Demo25/project1.res and b/Demos/FPC/Demo25/project1.res differ
diff --git a/Demos/FPC/Demo25/unit1.lfm b/Demos/FPC/Demo25/unit1.lfm
index 71b1a0f6..31cae000 100644
--- a/Demos/FPC/Demo25/unit1.lfm
+++ b/Demos/FPC/Demo25/unit1.lfm
@@ -7,7 +7,7 @@ object Form1: TForm1
   ClientHeight = 522
   ClientWidth = 795
   OnCreate = FormCreate
-  LCLVersion = '0.9.28.2'
+  LCLVersion = '2.0.10.0'
   object Panel1: TPanel
     Left = 0
     Height = 522
@@ -133,15 +133,15 @@ object Form1: TForm1
   end
   object PythonEngine1: TPythonEngine
     IO = PythonGUIInputOutput1
-    left = 96
-    top = 48
+    Left = 96
+    Top = 48
   end
   object PythonGUIInputOutput1: TPythonGUIInputOutput
     DelayWrites = True
     UnicodeIO = False
     RawOutput = False
     Output = Memo1
-    left = 338
-    top = 48
+    Left = 338
+    Top = 48
   end
 end
diff --git a/Demos/FPC/Demo25/unit1.lrs b/Demos/FPC/Demo25/unit1.lrs
index 1ab0eccf..775c6356 100644
--- a/Demos/FPC/Demo25/unit1.lrs
+++ b/Demos/FPC/Demo25/unit1.lrs
@@ -1,7 +1,9 @@
+{ This is an automatically generated lazarus resource file }
+
 LazarusResources.Add('TForm1','FORMDATA',[
   'TPF0'#6'TForm1'#5'Form1'#4'Left'#3't'#1#6'Height'#3#10#2#3'Top'#2'd'#5'Width'
   +#3#27#3#7'Caption'#6#5'Form1'#12'ClientHeight'#3#10#2#11'ClientWidth'#3#27#3
-  +#8'OnCreate'#7#10'FormCreate'#10'LCLVersion'#6#8'0.9.28.2'#0#6'TPanel'#6'Pan'
+  +#8'OnCreate'#7#10'FormCreate'#10'LCLVersion'#6#8'2.0.10.0'#0#6'TPanel'#6'Pan'
   +'el1'#4'Left'#2#0#6'Height'#3#10#2#3'Top'#2#0#5'Width'#3#27#3#5'Align'#7#8'a'
   +'lClient'#12'ClientHeight'#3#10#2#11'ClientWidth'#3#27#3#8'TabOrder'#2#0#0#5
   +'TMemo'#5'Memo1'#4'Left'#2#1#6'Height'#3#231#0#3'Top'#2#1#5'Width'#3#25#3#5
@@ -14,27 +16,27 @@ LazarusResources.Add('TForm1','FORMDATA',[
   +'eight'#3#168#0#3'Top'#3#240#0#5'Width'#3#25#3#5'Align'#7#8'alClient'#13'Lin'
   +'es.Strings'#1#6#18'class XYZ(object):'#6#6'  pass'#6#0#6#10'class Foo:'#6#30
   +'  def __init__(Self, Value=0):'#6#22'    Self.Value = Value'#6#20'  def __d'
-  +'el__(Self):'#6#24'    print "delete", Self'#6#27'  def __add__(self, other)'
-  +':'#6'(    return Foo(self.Value + other.Value)'#6#28'  def Inc(Self, AValue'
-  +' = 1):'#6'$    Self.Value = Self.Value + AValue'#6#20'  def GetSelf(Self):'
+  +'el__(Self):'#6#25'    print("delete", Self)'#6#27'  def __add__(self, other'
+  +'):'#6'(    return Foo(self.Value + other.Value)'#6#28'  def Inc(Self, AValu'
+  +'e = 1):'#6'$    Self.Value = Self.Value + AValue'#6#20'  def GetSelf(Self):'
   +#6#15'    return Self'#6#21'  def GetValue(Self):'#6#21'    return Self.Valu'
   +'e'#6#28'  def SetABC(Self, A, B, C):'#6#14'    Self.A = A'#6#14'    Self.B '
   +'= B'#6#14'    Self.C = C'#6#26'  def Add(Self, AFooInst):'#6',    Self.Valu'
   +'e = Self.Value + AFooInst.Value'#6#15'class Bar(Foo):'#6#28'  def Inc(Self,'
   +' AValue = 1):'#6'$    Self.Value = Self.Value - AValue'#6#14'def Add(a, b):'
   +#6#14'  return a + b'#6#25'def MakeList(a, b, c, d):'#6#21'  return [a, b, c'
-  +', d]'#6#0#6#9'f = Foo()'#6#18'print "Created", f'#6#7'f.Inc()'#6#8'f.Inc(2)'
-  +#6#9'b = Bar()'#6#7'b.Inc()'#6#8'b.Inc(2)'#0#8'TabOrder'#2#2#0#0#6'TPanel'#6
-  +'Panel2'#4'Left'#2#1#6'Height'#2'q'#3'Top'#3#152#1#5'Width'#3#25#3#5'Align'#7
-  +#8'alBottom'#12'ClientHeight'#2'q'#11'ClientWidth'#3#25#3#8'TabOrder'#2#3#0#7
-  +'TButton'#7'Button1'#4'Left'#2#15#6'Height'#2#25#3'Top'#2#8#5'Width'#2'K'#7
+  +', d]'#6#0#6#9'f = Foo()'#6#19'print("Created", f)'#6#7'f.Inc()'#6#8'f.Inc(2'
+  +')'#6#9'b = Bar()'#6#7'b.Inc()'#6#8'b.Inc(2)'#0#8'TabOrder'#2#2#0#0#6'TPanel'
+  +#6'Panel2'#4'Left'#2#1#6'Height'#2'q'#3'Top'#3#152#1#5'Width'#3#25#3#5'Align'
+  +#7#8'alBottom'#12'ClientHeight'#2'q'#11'ClientWidth'#3#25#3#8'TabOrder'#2#3#0
+  +#7'TButton'#7'Button1'#4'Left'#2#15#6'Height'#2#25#3'Top'#2#8#5'Width'#2'K'#7
   +'Caption'#6#7'Execute'#7'OnClick'#7#12'Button1Click'#8'TabOrder'#2#0#0#0#7'T'
   +'Button'#15'btnTestIntegers'#4'Left'#2'w'#6'Height'#2#25#3'Top'#2#8#5'Width'
   +#2'K'#7'Caption'#6#13'Test Integers'#7'OnClick'#7#20'btnTestIntegersClick'#8
   +'TabOrder'#2#1#0#0#9'TCheckBox'#14'cbTestIntegers'#4'Left'#2'z'#6'Height'#2
   +#19#3'Top'#2')'#5'Width'#2'B'#7'Caption'#6#8'Included'#8'TabOrder'#2#2#0#0#0
-  +#0#13'TPythonEngine'#13'PythonEngine1'#2'IO'#7#21'PythonGUIInputOutput1'#4'l'
-  +'eft'#2'`'#3'top'#2'0'#0#0#21'TPythonGUIInputOutput'#21'PythonGUIInputOutput'
-  +'1'#11'DelayWrites'#9#9'UnicodeIO'#8#9'RawOutput'#8#6'Output'#7#5'Memo1'#4'l'
-  +'eft'#3'R'#1#3'top'#2'0'#0#0#0
+  +#0#13'TPythonEngine'#13'PythonEngine1'#2'IO'#7#21'PythonGUIInputOutput1'#4'L'
+  +'eft'#2'`'#3'Top'#2'0'#0#0#21'TPythonGUIInputOutput'#21'PythonGUIInputOutput'
+  +'1'#11'DelayWrites'#9#9'UnicodeIO'#8#9'RawOutput'#8#6'Output'#7#5'Memo1'#4'L'
+  +'eft'#3'R'#1#3'Top'#2'0'#0#0#0
 ]);
diff --git a/Demos/FPC/Demo25/unit1.pas b/Demos/FPC/Demo25/unit1.pas
index ad0c3a84..5b9eeb59 100644
--- a/Demos/FPC/Demo25/unit1.pas
+++ b/Demos/FPC/Demo25/unit1.pas
@@ -6,7 +6,7 @@ interface
 
 uses
   Classes, SysUtils, FileUtil, LResources, Forms, Controls, Graphics, Dialogs,
-  StdCtrls, ExtCtrls, PairSplitter, PythonEngine, PythonGUIInputOutput;
+  StdCtrls, ExtCtrls, PairSplitter, PythonEngine, lcl.PythonGUIInputOutput;
 
 type
 
diff --git a/Demos/FPC/Demo31/Project1.lpi b/Demos/FPC/Demo31/Project1.lpi
index 9645cf5e..34aac6a3 100644
--- a/Demos/FPC/Demo31/Project1.lpi
+++ b/Demos/FPC/Demo31/Project1.lpi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="9"/>
+    <Version Value="11"/>
     <PathDelim Value="\"/>
     <General>
       <Flags>
@@ -15,21 +15,17 @@
     <i18n>
       <EnableI18N LFM="False"/>
     </i18n>
-    <VersionInfo>
-      <StringTable ProductVersion=""/>
-    </VersionInfo>
     <BuildModes Count="1" Active="Default">
       <Item1 Name="Default" Default="True"/>
     </BuildModes>
     <PublishOptions>
       <Version Value="2"/>
-      <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
-      <ExcludeFileFilter Value="*.(bak|ppu|o|so);*~;backup"/>
     </PublishOptions>
     <RunParams>
-      <local>
-        <FormatVersion Value="1"/>
-      </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default"/>
+      </Modes>
     </RunParams>
     <RequiredPackages Count="2">
       <Item1>
@@ -44,7 +40,7 @@
       <Unit0>
         <Filename Value="Project1.lpr"/>
         <IsPartOfProject Value="True"/>
-        <EditorIndex Value="3"/>
+        <EditorIndex Value="2"/>
         <CursorPos Y="15"/>
         <UsageCount Value="109"/>
         <Loaded Value="True"/>
@@ -56,8 +52,8 @@
         <ComponentName Value="Form1"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="Unit1"/>
-        <CursorPos X="48" Y="72"/>
+        <IsVisibleTab Value="True"/>
+        <CursorPos X="21" Y="10"/>
         <UsageCount Value="55"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
@@ -69,8 +65,7 @@
         <ComponentName Value="TestForm"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="Unit2"/>
-        <EditorIndex Value="2"/>
+        <EditorIndex Value="1"/>
         <CursorPos X="3" Y="8"/>
         <UsageCount Value="55"/>
         <Loaded Value="True"/>
@@ -79,7 +74,6 @@
       </Unit2>
       <Unit3>
         <Filename Value="..\..\..\Components\Sources\Core\WrapDelphi.pas"/>
-        <UnitName Value="WrapDelphi"/>
         <EditorIndex Value="-1"/>
         <TopLine Value="292"/>
         <CursorPos X="27" Y="292"/>
@@ -95,7 +89,6 @@
       </Unit4>
       <Unit5>
         <Filename Value="..\..\..\Components\Sources\Core\WrapDelphiWindows.pas"/>
-        <UnitName Value="WrapDelphiWindows"/>
         <EditorIndex Value="-1"/>
         <TopLine Value="51"/>
         <CursorPos X="10" Y="64"/>
@@ -104,12 +97,10 @@
       </Unit5>
       <Unit6>
         <Filename Value="..\..\..\Components\Sources\Core\WrapDelphiGraphics.pas"/>
-        <UnitName Value="WrapDelphiGraphics"/>
-        <EditorIndex Value="4"/>
+        <EditorIndex Value="-1"/>
         <TopLine Value="554"/>
         <CursorPos Y="572"/>
         <UsageCount Value="16"/>
-        <Loaded Value="True"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit6>
       <Unit7>
@@ -135,21 +126,17 @@
       </Unit9>
       <Unit10>
         <Filename Value="..\..\..\Components\Sources\Core\WrapDelphiForms.pas"/>
-        <UnitName Value="WrapDelphiForms"/>
-        <EditorIndex Value="5"/>
+        <EditorIndex Value="-1"/>
         <CursorPos X="14" Y="9"/>
         <UsageCount Value="15"/>
-        <Loaded Value="True"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit10>
       <Unit11>
         <Filename Value="..\..\..\Components\Sources\Core\WrapDelphiComCtrls.pas"/>
-        <UnitName Value="WrapDelphiComCtrls"/>
-        <EditorIndex Value="6"/>
+        <EditorIndex Value="-1"/>
         <TopLine Value="595"/>
         <CursorPos X="36" Y="605"/>
         <UsageCount Value="14"/>
-        <Loaded Value="True"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit11>
       <Unit12>
@@ -161,12 +148,10 @@
       </Unit12>
       <Unit13>
         <Filename Value="..\..\..\Components\Sources\Core\WrapDelphiExtCtrls.pas"/>
-        <UnitName Value="WrapDelphiExtCtrls"/>
-        <EditorIndex Value="7"/>
+        <EditorIndex Value="-1"/>
         <TopLine Value="101"/>
         <CursorPos Y="119"/>
         <UsageCount Value="14"/>
-        <Loaded Value="True"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit13>
       <Unit14>
@@ -185,12 +170,10 @@
       </Unit15>
       <Unit16>
         <Filename Value="..\..\..\Components\Sources\Core\WrapDelphiGrids.pas"/>
-        <UnitName Value="WrapDelphiGrids"/>
-        <EditorIndex Value="8"/>
+        <EditorIndex Value="-1"/>
         <TopLine Value="250"/>
         <CursorPos X="43" Y="260"/>
         <UsageCount Value="14"/>
-        <Loaded Value="True"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit16>
       <Unit17>
@@ -238,13 +221,10 @@
       </Unit22>
       <Unit23>
         <Filename Value="..\..\..\Components\Sources\Core\PythonEngine.pas"/>
-        <UnitName Value="PythonEngine"/>
-        <IsVisibleTab Value="True"/>
-        <EditorIndex Value="1"/>
+        <EditorIndex Value="-1"/>
         <TopLine Value="131"/>
         <CursorPos X="33" Y="143"/>
         <UsageCount Value="10"/>
-        <Loaded Value="True"/>
         <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit23>
     </Units>
@@ -302,8 +282,8 @@
         <Caret Line="14"/>
       </Position13>
       <Position14>
-        <Filename Value="..\..\..\Components\Sources\Core\PythonEngine.pas"/>
-        <Caret Line="154" Column="33" TopLine="130"/>
+        <Filename Value="Unit1.pas"/>
+        <Caret Line="72" Column="48"/>
       </Position14>
     </JumpHistory>
   </ProjectOptions>
diff --git a/Demos/FPC/Demo31/Project1.res b/Demos/FPC/Demo31/Project1.res
index e66ecf85..0ad004b9 100644
Binary files a/Demos/FPC/Demo31/Project1.res and b/Demos/FPC/Demo31/Project1.res differ
diff --git a/Demos/FPC/Demo31/Unit1.lfm b/Demos/FPC/Demo31/Unit1.lfm
index cc22595f..74cdb328 100644
--- a/Demos/FPC/Demo31/Unit1.lfm
+++ b/Demos/FPC/Demo31/Unit1.lfm
@@ -14,7 +14,7 @@ object Form1: TForm1
   Font.Name = 'MS Sans Serif'
   Font.Pitch = fpVariable
   OnCreate = FormCreate
-  LCLVersion = '0.9.30.2'
+  LCLVersion = '2.0.10.0'
   Visible = True
   object Splitter1: TSplitter
     Cursor = crVSplit
@@ -103,7 +103,7 @@ object Form1: TForm1
       '        MainForm.Caption = ''PyDelphi rocks!''  #setting properties'
       '        self.assertEqual(MainForm.Caption, ''PyDelphi rocks!'')'
       '        print()'
-      '        print(''MainForm.ActiveControl='',  MainForm.ActiveControl  # class properties)'
+      '        print(''MainForm.ActiveControl='',  MainForm.ActiveControl ) # class properties'
       '        MainForm.BorderStyle = ''bsSizeable'' #enumeration property'
       '        MainForm.Anchors = [''akTop'', ''akLeft''] #set property'
       '        self.assertEqual(MainForm.Anchors, [''akTop'', ''akLeft''])'
@@ -118,7 +118,7 @@ object Form1: TForm1
       '            self.assertEqual(DVar.SValue, ''Age'')'
       '            self.assertEqual(DVar.IValue, 25)'
       '            print()'
-      '            print(DVar.DescribeMe() #method calls)'
+      '            print(DVar.DescribeMe()) #method calls'
       ''
       '    def testRepr(self):'
       '        print()'
@@ -126,8 +126,8 @@ object Form1: TForm1
       '        print(DVar)'
       '        print(MainForm)'
       '        if DelphiVersion >= 7:'
-      '            print(DVar.DescribeMe  # method object)'
-      '        print(DVar.SL # TStrings)'
+      '            print(DVar.DescribeMe)  # method object'
+      '        print(DVar.SL) # TStrings'
       ''
       '    def testTStrings(self):'
       '        SL = DVar.SL'
@@ -402,9 +402,6 @@ object Form1: TForm1
       '    except SystemExit:'
       '        pass'
       '    MainForm.ActiveControl = MainForm.Memo2 # Class property!'
-      ''
-      ' '
-      ' '
     )
     ScrollBars = ssVertical
     TabOrder = 0
@@ -440,8 +437,8 @@ object Form1: TForm1
   end
   object PyEngine: TPythonEngine
     IO = PythonGUIInputOutput1
-    left = 16
-    top = 16
+    Left = 16
+    Top = 16
   end
   object PythonModule: TPythonModule
     Engine = PyEngine
@@ -455,19 +452,19 @@ object Form1: TForm1
       end>
     ModuleName = 'spam'
     Errors = <>
-    left = 56
-    top = 16
+    Left = 56
+    Top = 16
   end
   object PythonGUIInputOutput1: TPythonGUIInputOutput
     UnicodeIO = False
     RawOutput = False
     Output = Memo2
-    left = 168
-    top = 17
+    Left = 168
+    Top = 17
   end
   object ActionList1: TActionList
-    left = 96
-    top = 80
+    Left = 96
+    Top = 80
     object actTest: TAction
       Caption = 'Test'
       OnExecute = actTestExecute
diff --git a/Demos/FPC/Demo31/Unit1.pas b/Demos/FPC/Demo31/Unit1.pas
index c28ad7b1..f0ddcc65 100644
--- a/Demos/FPC/Demo31/Unit1.pas
+++ b/Demos/FPC/Demo31/Unit1.pas
@@ -7,7 +7,7 @@ interface
 uses
   SysUtils, Classes, Graphics, Controls, Forms, Dialogs,
   StdCtrls, ExtCtrls, ComCtrls,
-  PythonEngine, PythonGUIInputOutput, WrapDelphi, ActnList;
+  PythonEngine, lcl.PythonGUIInputOutput, WrapDelphi, ActnList;
 
 type
   TForm1 = class(TForm)