alpha stage commit

- changed the tab control used to a different third party tool hopefully this will speed up both changing themes and loading/switching between tabs. not everything is completely done (in regards to themes/colors/graphics), this is just for proof of concept.
pjf · Dec 22, 2013 · dbf1a2c · dbf1a2c
1 parent 14046de
commit dbf1a2c
Show file tree

Hide file tree

Showing 138 changed files with 17,254 additions and 13,091 deletions.
diff --git a/Settings Source/MainForm.Designer.vb b/Settings Source/MainForm.Designer.vb
diff --git a/Settings Source/MainForm.resx b/Settings Source/MainForm.resx
@@ -3841,143 +3841,143 @@
         nWzhi7P0wVn+juAD42puaIR94XQAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="grpWorldSettings.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="grpExtraCreatures.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAqSURBVChTjcixDQAACMOwnt7TYUYeiOQl2frEKZzC
         KZzCKZzCKZzCeaQDwuMyAcTQ5QAAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="grpSaveSettings.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="optBtnMoreAnimals.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAqSURBVChTjcixDQAACMOwnt7TYUYeiOQl2frEKZzC
         KZzCKZzCKZzCeaQDwuMyAcTQ5QAAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="grpGraphics.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="optBtnMoreAnimals.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAqSURBVChTjcixDQAACMOwnt7TYUYeiOQl2frEKZzC
-        KZzCKZzCKZzCeaQDwuMyAcTQ5QAAAAAASUVORK5CYII=
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAADeSURBVDhPpY69DgFBFIXPE/iJQkRWwhuIjkIr2UKv
+        tBqlZDulDiUlQkh4l30JnVKpcp27UcxsJlkTxZebc+abOwMR+Qtn6YOz9MFZ+uAsfbDCFcANGJBE5yWT
+        9dz0FSucKZDkHceik8wz2fIVKxwo7PnSjvIrisScR6BzyluwpfBlTpJnGIrODTBbs1/mLVBhxR9QTh7t
+        tphT+9wFLQoLyvcgEJ0RXzaznpu+Ygeg0QPGU8oBMGSu94GR5i4wYW6afnrHCkCRVEmNVEiBlIyubPrp
+        nWzhi7P0wVn+juAD42puaIR94XQAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="btnTilesetPreview.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="grpRandomCreatures.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAqSURBVChTjcixDQAACMOwnt7TYUYeiOQl2frEKZzC
         KZzCKZzCKZzCeaQDwuMyAcTQ5QAAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="grpFps.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="grpFortressDefense.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAqSURBVChTjcixDQAACMOwnt7TYUYeiOQl2frEKZzC
         KZzCKZzCKZzCeaQDwuMyAcTQ5QAAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="grpSound.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="grpWorkshops.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAqSURBVChTjcixDQAACMOwnt7TYUYeiOQl2frEKZzC
         KZzCKZzCKZzCeaQDwuMyAcTQ5QAAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="grpEmbark.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="grpMiscBuildings.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAqSURBVChTjcixDQAACMOwnt7TYUYeiOQl2frEKZzC
         KZzCKZzCKZzCeaQDwuMyAcTQ5QAAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="grpAnnouncements.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="grpFarming.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAqSURBVChTjcixDQAACMOwnt7TYUYeiOQl2frEKZzC
         KZzCKZzCKZzCeaQDwuMyAcTQ5QAAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="grpExtraCreatures.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="grpStudies.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAqSURBVChTjcixDQAACMOwnt7TYUYeiOQl2frEKZzC
         KZzCKZzCKZzCeaQDwuMyAcTQ5QAAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="optBtnMoreAnimals.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="grpLaboratories.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAqSURBVChTjcixDQAACMOwnt7TYUYeiOQl2frEKZzC
         KZzCKZzCKZzCeaQDwuMyAcTQ5QAAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="optBtnMoreAnimals.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="grpDiplomacy.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAADeSURBVDhPpY69DgFBFIXPE/iJQkRWwhuIjkIr2UKv
-        tBqlZDulDiUlQkh4l30JnVKpcp27UcxsJlkTxZebc+abOwMR+Qtn6YOz9MFZ+uAsfbDCFcANGJBE5yWT
-        9dz0FSucKZDkHceik8wz2fIVKxwo7PnSjvIrisScR6BzyluwpfBlTpJnGIrODTBbs1/mLVBhxR9QTh7t
-        tphT+9wFLQoLyvcgEJ0RXzaznpu+Ygeg0QPGU8oBMGSu94GR5i4wYW6afnrHCkCRVEmNVEiBlIyubPrp
-        nWzhi7P0wVn+juAD42puaIR94XQAAAAASUVORK5CYII=
+        iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAqSURBVChTjcixDQAACMOwnt7TYUYeiOQl2frEKZzC
+        KZzCKZzCKZzCeaQDwuMyAcTQ5QAAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="grpRandomCreatures.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="grpLibrary.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAqSURBVChTjcixDQAACMOwnt7TYUYeiOQl2frEKZzC
         KZzCKZzCKZzCeaQDwuMyAcTQ5QAAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="grpFortressDefense.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="grpWorldSettings.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAqSURBVChTjcixDQAACMOwnt7TYUYeiOQl2frEKZzC
         KZzCKZzCKZzCeaQDwuMyAcTQ5QAAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="grpWorkshops.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="grpSaveSettings.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAqSURBVChTjcixDQAACMOwnt7TYUYeiOQl2frEKZzC
         KZzCKZzCKZzCeaQDwuMyAcTQ5QAAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="grpMiscBuildings.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="grpGraphics.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAqSURBVChTjcixDQAACMOwnt7TYUYeiOQl2frEKZzC
         KZzCKZzCKZzCeaQDwuMyAcTQ5QAAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="grpFarming.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="btnTilesetPreview.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAqSURBVChTjcixDQAACMOwnt7TYUYeiOQl2frEKZzC
         KZzCKZzCKZzCeaQDwuMyAcTQ5QAAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="grpStudies.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="grpFps.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAqSURBVChTjcixDQAACMOwnt7TYUYeiOQl2frEKZzC
         KZzCKZzCKZzCeaQDwuMyAcTQ5QAAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="grpLaboratories.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="grpSound.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAqSURBVChTjcixDQAACMOwnt7TYUYeiOQl2frEKZzC
         KZzCKZzCKZzCeaQDwuMyAcTQ5QAAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="grpDiplomacy.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="grpEmbark.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAqSURBVChTjcixDQAACMOwnt7TYUYeiOQl2frEKZzC
         KZzCKZzCKZzCeaQDwuMyAcTQ5QAAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="grpLibrary.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="grpAnnouncements.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAqSURBVChTjcixDQAACMOwnt7TYUYeiOQl2frEKZzC

diff --git a/Settings Source/MainForm.vb b/Settings Source/MainForm.vb
@@ -139,7 +139,7 @@ Imports System.ComponentModel
         setTheme()
         Dim frmWait As New frmThemeChange
         Me.Opacity = 0
-        Me.tabMain.SelectedTab = tabSettings 'choose a tab with few controls as the refresh causes massive flickering
+        Me.tabMain.SelectedTab = tabSettings2 'choose a tab with few controls as the refresh causes massive flickering
         frmWait.Show()
         Application.DoEvents() 'hurrghh, this is a bad idea
         initControls(Me, ToolTipMaker, False, False, True)
@@ -239,17 +239,17 @@ Imports System.ComponentModel
         globals.currentWorldGenIndex = CType(cmbWorldGenIndex.SelectedItem, comboItem).value
         'refresh our world gen controls. the internal loading will check the global var
         'm_refreshingWorldGen = True
-        initControls(tabWorldGen, ToolTipMaker, True, False, False)
+        initControls(tabWorldGen2, ToolTipMaker, True, False, False)
         'm_refreshingWorldGen = False
     End Sub
 
     Private Sub tabMain_SelectedIndexChanged(sender As Object, e As EventArgs) Handles tabMain.SelectedIndexChanged
-        If tabMain.SelectedTab Is tabWorldGen Then
+        If tabMain.SelectedTab Is tabWorldGen2 Then
             AddHandler cmbWorldGenIndex.SelectionChangeCommitted, AddressOf refreshWorldGen
         Else
             RemoveHandler cmbWorldGenIndex.SelectionChangeCommitted, AddressOf refreshWorldGen
             globals.currentWorldGenIndex = -2
-        End If        
+        End If
     End Sub
 
 #End Region

diff --git a/Settings Source/Masterwork Dwarf Fortress.sln b/Settings Source/Masterwork Dwarf Fortress.sln
@@ -3,13 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2012
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Masterwork Dwarf Fortress", "Masterwork Dwarf Fortress.vbproj", "{96BF8C4E-77FD-4ED3-9D28-33AEDB54CD0B}"
 	ProjectSection(ProjectDependencies) = postProject
-		{D98AE23B-1037-411B-B555-D7E49E7F8C62} = {D98AE23B-1037-411B-B555-D7E49E7F8C62}
+		{04506D1C-0E7E-4C9B-A07F-2EA358531AE9} = {04506D1C-0E7E-4C9B-A07F-2EA358531AE9}
 		{46A18A55-5AE8-49CE-91CD-C7421B642E7E} = {46A18A55-5AE8-49CE-91CD-C7421B642E7E}
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Windows.Forms.Ribbon35", "Third Party Extras\System.Windows.Forms.Ribbon\System.Windows.Forms.Ribbon\System.Windows.Forms.Ribbon35.csproj", "{46A18A55-5AE8-49CE-91CD-C7421B642E7E}"
 EndProject
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "VBCustomTabControl", "Third Party Extras\CustomTabControl\VBCustomTabControl\VBCustomTabControl.vbproj", "{D98AE23B-1037-411B-B555-D7E49E7F8C62}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KRBTabControl", "Third Party Extras\KRBTabControl\KRBTabControl\KRBTabControl.csproj", "{04506D1C-0E7E-4C9B-A07F-2EA358531AE9}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -33,19 +33,14 @@ Global
 		{46A18A55-5AE8-49CE-91CD-C7421B642E7E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{46A18A55-5AE8-49CE-91CD-C7421B642E7E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{46A18A55-5AE8-49CE-91CD-C7421B642E7E}.Release|x86.ActiveCfg = Release|Any CPU
-		{D98AE23B-1037-411B-B555-D7E49E7F8C62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D98AE23B-1037-411B-B555-D7E49E7F8C62}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D98AE23B-1037-411B-B555-D7E49E7F8C62}.Debug|x86.ActiveCfg = Debug|x86
-		{D98AE23B-1037-411B-B555-D7E49E7F8C62}.Debug|x86.Build.0 = Debug|x86
-		{D98AE23B-1037-411B-B555-D7E49E7F8C62}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D98AE23B-1037-411B-B555-D7E49E7F8C62}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D98AE23B-1037-411B-B555-D7E49E7F8C62}.Release|x86.ActiveCfg = Release|x86
-		{D98AE23B-1037-411B-B555-D7E49E7F8C62}.Release|x86.Build.0 = Release|x86
+		{04506D1C-0E7E-4C9B-A07F-2EA358531AE9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{04506D1C-0E7E-4C9B-A07F-2EA358531AE9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{04506D1C-0E7E-4C9B-A07F-2EA358531AE9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{04506D1C-0E7E-4C9B-A07F-2EA358531AE9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{04506D1C-0E7E-4C9B-A07F-2EA358531AE9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{04506D1C-0E7E-4C9B-A07F-2EA358531AE9}.Release|x86.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(Performance) = preSolution
-		HasPerformanceSessions = true
-	EndGlobalSection
 EndGlobal
diff --git a/Settings Source/Masterwork Dwarf Fortress.vbproj b/Settings Source/Masterwork Dwarf Fortress.vbproj
@@ -88,9 +88,8 @@
     <TargetZone>Custom</TargetZone>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Jacksonsoft.CustomTabControl, Version=1.0.1.5, Culture=neutral, PublicKeyToken=53c237210c7e462d, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>Third Party Extras\CustomTabControl\VBCustomTabControl\bin\Release\Jacksonsoft.CustomTabControl.dll</HintPath>
+    <Reference Include="KRBTabControl">
+      <HintPath>Third Party Extras\KRBTabControl\KRBTabControl\bin\Release\KRBTabControl.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.configuration">