diff --git a/.vs/Gästeliste/v14/.suo b/.vs/Gästeliste/v14/.suo
index 23cc052..876e6b0 100644
Binary files a/.vs/Gästeliste/v14/.suo and b/.vs/Gästeliste/v14/.suo differ
diff --git a/Gästeliste/Gästeliste.vbproj b/Gästeliste/Gästeliste.vbproj
index 6737021..35b4839 100644
--- a/Gästeliste/Gästeliste.vbproj
+++ b/Gästeliste/Gästeliste.vbproj
@@ -14,7 +14,7 @@
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <IsWebBootstrapper>true</IsWebBootstrapper>
-    <PublishUrl>Z:\Gaesteliste\</PublishUrl>
+    <PublishUrl>Z:\tools\Gaesteliste\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Web</InstallFrom>
     <UpdateEnabled>false</UpdateEnabled>
@@ -26,13 +26,13 @@
     <MapFileExtensions>false</MapFileExtensions>
     <InstallUrl>http://tools.dominicreich.com/Gaesteliste/</InstallUrl>
     <UpdateUrl>http://tools.dominicreich.com/Gaesteliste/</UpdateUrl>
-    <SupportUrl>http://klamm.io</SupportUrl>
+    <SupportUrl>https://github.com/freefallcid/Gaesteliste</SupportUrl>
     <ErrorReportUrl>https://github.com/freefallcid/Gaesteliste/issues</ErrorReportUrl>
     <ProductName>Gästeliste</ProductName>
     <PublisherName>Dominic Reich</PublisherName>
     <MinimumRequiredVersion>1.0.0.0</MinimumRequiredVersion>
     <OpenBrowserOnPublish>false</OpenBrowserOnPublish>
-    <ApplicationRevision>22</ApplicationRevision>
+    <ApplicationRevision>23</ApplicationRevision>
     <ApplicationVersion>1.0.1.%2a</ApplicationVersion>
     <UseApplicationTrust>true</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
@@ -173,6 +173,7 @@
     </EmbeddedResource>
     <EmbeddedResource Include="frmPerson.resx">
       <DependentUpon>frmPerson.vb</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="My Project\Resources.resx">
       <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
diff --git a/Gästeliste/Gästeliste.vbproj.user b/Gästeliste/Gästeliste.vbproj.user
index ba260d5..1c58b58 100644
--- a/Gästeliste/Gästeliste.vbproj.user
+++ b/Gästeliste/Gästeliste.vbproj.user
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <PublishUrlHistory>Z:\Gaesteliste\|publish\</PublishUrlHistory>
+    <PublishUrlHistory>Z:\tools\Gaesteliste\|Z:\Gaesteliste\|publish\</PublishUrlHistory>
     <InstallUrlHistory>http://tools.dominicreich.com/Gaesteliste/</InstallUrlHistory>
     <SupportUrlHistory>http://klamm.io|http://tmsn.at/%3ftools&amp;gaesteliste</SupportUrlHistory>
     <UpdateUrlHistory>http://tools.dominicreich.com/Gaesteliste/</UpdateUrlHistory>
diff --git a/Gästeliste/frmPerson.designer.vb b/Gästeliste/frmPerson.designer.vb
index 0cc14f6..6a808bb 100644
--- a/Gästeliste/frmPerson.designer.vb
+++ b/Gästeliste/frmPerson.designer.vb
@@ -80,7 +80,8 @@ Partial Class frmPerson
         Me.OK_Button.Location = New System.Drawing.Point(3, 3)
         Me.OK_Button.Name = "OK_Button"
         Me.OK_Button.Size = New System.Drawing.Size(67, 23)
-        Me.OK_Button.TabIndex = 0
+        Me.OK_Button.TabIndex = 12
+        Me.OK_Button.TabStop = False
         Me.OK_Button.Text = "OK"
         '
         'Cancel_Button
@@ -90,7 +91,8 @@ Partial Class frmPerson
         Me.Cancel_Button.Location = New System.Drawing.Point(76, 3)
         Me.Cancel_Button.Name = "Cancel_Button"
         Me.Cancel_Button.Size = New System.Drawing.Size(67, 23)
-        Me.Cancel_Button.TabIndex = 1
+        Me.Cancel_Button.TabIndex = 13
+        Me.Cancel_Button.TabStop = False
         Me.Cancel_Button.Text = "Abbrechen"
         '
         'TableLayoutPanel2
@@ -256,7 +258,8 @@ Partial Class frmPerson
         Me.txtID.Name = "txtID"
         Me.txtID.ReadOnly = True
         Me.txtID.Size = New System.Drawing.Size(234, 20)
-        Me.txtID.TabIndex = 1
+        Me.txtID.TabIndex = 99
+        Me.txtID.TabStop = False
         '
         'txtNachname
         '
@@ -272,7 +275,7 @@ Partial Class frmPerson
         Me.txtVorname.Location = New System.Drawing.Point(103, 61)
         Me.txtVorname.Name = "txtVorname"
         Me.txtVorname.Size = New System.Drawing.Size(234, 20)
-        Me.txtVorname.TabIndex = 1
+        Me.txtVorname.TabIndex = 2
         '
         'txtStrasse
         '
@@ -280,7 +283,7 @@ Partial Class frmPerson
         Me.txtStrasse.Location = New System.Drawing.Point(103, 90)
         Me.txtStrasse.Name = "txtStrasse"
         Me.txtStrasse.Size = New System.Drawing.Size(234, 20)
-        Me.txtStrasse.TabIndex = 1
+        Me.txtStrasse.TabIndex = 3
         '
         'txtPLZ
         '
@@ -288,7 +291,7 @@ Partial Class frmPerson
         Me.txtPLZ.Location = New System.Drawing.Point(103, 119)
         Me.txtPLZ.Name = "txtPLZ"
         Me.txtPLZ.Size = New System.Drawing.Size(234, 20)
-        Me.txtPLZ.TabIndex = 1
+        Me.txtPLZ.TabIndex = 4
         '
         'txtOrt
         '
@@ -296,7 +299,7 @@ Partial Class frmPerson
         Me.txtOrt.Location = New System.Drawing.Point(103, 148)
         Me.txtOrt.Name = "txtOrt"
         Me.txtOrt.Size = New System.Drawing.Size(234, 20)
-        Me.txtOrt.TabIndex = 1
+        Me.txtOrt.TabIndex = 5
         '
         'txtTelefon
         '
@@ -304,7 +307,7 @@ Partial Class frmPerson
         Me.txtTelefon.Location = New System.Drawing.Point(103, 206)
         Me.txtTelefon.Name = "txtTelefon"
         Me.txtTelefon.Size = New System.Drawing.Size(234, 20)
-        Me.txtTelefon.TabIndex = 1
+        Me.txtTelefon.TabIndex = 7
         '
         'txtEmail
         '
@@ -312,7 +315,7 @@ Partial Class frmPerson
         Me.txtEmail.Location = New System.Drawing.Point(103, 235)
         Me.txtEmail.Name = "txtEmail"
         Me.txtEmail.Size = New System.Drawing.Size(234, 20)
-        Me.txtEmail.TabIndex = 1
+        Me.txtEmail.TabIndex = 8
         '
         'txtAnmerkung
         '
@@ -321,7 +324,7 @@ Partial Class frmPerson
         Me.txtAnmerkung.Multiline = True
         Me.txtAnmerkung.Name = "txtAnmerkung"
         Me.txtAnmerkung.Size = New System.Drawing.Size(234, 102)
-        Me.txtAnmerkung.TabIndex = 1
+        Me.txtAnmerkung.TabIndex = 9
         '
         'chkStammgast
         '
@@ -330,7 +333,8 @@ Partial Class frmPerson
         Me.chkStammgast.Location = New System.Drawing.Point(103, 372)
         Me.chkStammgast.Name = "chkStammgast"
         Me.chkStammgast.Size = New System.Drawing.Size(234, 23)
-        Me.chkStammgast.TabIndex = 2
+        Me.chkStammgast.TabIndex = 10
+        Me.chkStammgast.TabStop = False
         Me.chkStammgast.UseVisualStyleBackColor = True
         '
         'chkBlacklist
@@ -340,7 +344,8 @@ Partial Class frmPerson
         Me.chkBlacklist.Location = New System.Drawing.Point(103, 401)
         Me.chkBlacklist.Name = "chkBlacklist"
         Me.chkBlacklist.Size = New System.Drawing.Size(234, 26)
-        Me.chkBlacklist.TabIndex = 2
+        Me.chkBlacklist.TabIndex = 11
+        Me.chkBlacklist.TabStop = False
         Me.chkBlacklist.UseVisualStyleBackColor = True
         '
         'cboLand
@@ -351,7 +356,7 @@ Partial Class frmPerson
         Me.cboLand.Location = New System.Drawing.Point(103, 177)
         Me.cboLand.Name = "cboLand"
         Me.cboLand.Size = New System.Drawing.Size(234, 21)
-        Me.cboLand.TabIndex = 3
+        Me.cboLand.TabIndex = 6
         '
         'GästeBindingSource
         '
diff --git a/Gästeliste/frmPerson.resx b/Gästeliste/frmPerson.resx
index c515bcc..5196b36 100644
--- a/Gästeliste/frmPerson.resx
+++ b/Gästeliste/frmPerson.resx
@@ -123,4 +123,7 @@
   <metadata name="GästeDataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
+  <metadata name="GästeDataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
 </root>
\ No newline at end of file
diff --git a/Gästeliste/frmPerson.vb b/Gästeliste/frmPerson.vb
index 87930ca..6c08f72 100644
--- a/Gästeliste/frmPerson.vb
+++ b/Gästeliste/frmPerson.vb
@@ -18,6 +18,7 @@ Public Class frmPerson
         ElseIf Me.Tag = "edit" Then
             Me.Text = "Gast bearbeiten"
         End If
+        ' INFO: Das scheint ja nicht wirklich zu funktionieren (fuck DataSet)
         'Dim dt As DataTable = GästeDataSet.Tables("Länder")
         'Dim dr As DataRow = dt.NewRow()
 
@@ -36,6 +37,9 @@ Public Class frmPerson
                     Dim Anzahl As Integer = cboLand.Items.Count
                     cboLand.Items.Insert(Anzahl - 1, NeuesLand.ToString)
                     cboLand.Text = NeuesLand.ToString
+                    'TODO: Das Land auch in die Registry schreiben.
+                    '       viele Länder in einem String (REG_SZ)
+                    '       oder wirklich nachlesen wie man den Schrott in das DataSet schiebt....
                 Else
                     MsgBox("Tut mir leid, das Land ist doch schon in der Liste!")
                     Exit Sub