diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..49e0aa4
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+PokemonGoIV.oxt
+build
diff --git a/oxt/AddonConfiguration.xcu b/oxt/AddonConfiguration.xcu
index 1a1ce0b..f901904 100644
--- a/oxt/AddonConfiguration.xcu
+++ b/oxt/AddonConfiguration.xcu
@@ -10,7 +10,7 @@
 		<prop oor:name="Description" oor:type="xs:string" oor:localized="true">
 			<value>Calculates the individual values (IVs) of the Pokémon.</value>
 			<value xml:lang="zh-TW">計算寶可夢的 IV 值。</value>
-			<value xml:lang="de-DE">Calculates the individual values (IVs) of the Pokémon.</value>
+			<value xml:lang="de-DE">Berechnet Individuelle Werte (IVs) von Pokémon.</value>
 		</prop>
 		<prop oor:name="Version" oor:type="xs:string">
 			<value>@VERSION@</value>
@@ -37,7 +37,7 @@
 					<value>Andreas Frisch</value>
 				</prop>
 				<prop oor:name="Email" oor:type="xs:string">
-					<value>andreas@repairfox.de</value>
+					<value>github@dreambox.guru</value>
 				</prop>
 				<prop oor:name="Language" oor:type="xs:string">
 					<value>German</value>
@@ -52,25 +52,25 @@
 			<prop oor:name="Text" oor:type="xs:string" oor:localized="true">	
 				<value>Found no matching IV.</value>
 				<value xml:lang="zh-TW">找不出符合的 IV 值。</value>
-			    <value xml:lang="de-DE">Found no matching IV.</value>
+				<value xml:lang="de-DE">Keine passenden individuellen Werte gefunden.</value>
 			</prop>
 		</node>
 		<node oor:name="StatAttack" oor:op="replace">		
 			<prop oor:name="Text" oor:type="xs:string" oor:localized="true">	
 				<value>Attack</value>
-			    <value xml:lang="de-DE">Attack</value>
+				<value xml:lang="de-DE">Angriff</value>
 			</prop>
 		</node>
 		<node oor:name="StatDefense" oor:op="replace">		
 			<prop oor:name="Text" oor:type="xs:string" oor:localized="true">	
 				<value>Defense</value>
-			    <value xml:lang="de-DE">Defense</value>
+				<value xml:lang="de-DE">Verteidigung</value>
 			</prop>
 		</node>
 		<node oor:name="StatHP" oor:op="replace">		
 			<prop oor:name="Text" oor:type="xs:string" oor:localized="true">	
 				<value>HP</value>
-			    <value xml:lang="de-DE">HP</value>
+				<value xml:lang="de-DE">KP</value>
 			</prop>
 		</node>
 		<!-- Team Valor (red) -->
@@ -78,67 +78,67 @@
 			<prop oor:name="Text" oor:type="xs:string" oor:localized="true">	
 				<value>Candela, leader of Team Valor, says:</value>
 				<value xml:lang="zh-TW">Valor 隊隊長 Candela 說：</value>
-			    <value xml:lang="de-DE">Candela, leader of Team Valor, says:</value>
+				<value xml:lang="de-DE">Candela, Leiter von Team Wagemut, sagt:</value>
 			</prop>
 		</node>
 		<node oor:name="AppraisalValorTotal37OrHigher" oor:op="replace">		
 			<prop oor:name="Text" oor:type="xs:string" oor:localized="true">	
 				<value>Overall, your [Pokémon] simply amazes me. It can accomplish anything!</value>
-			    <value xml:lang="de-DE">Overall, your [Pokémon] simply amazes me. It can accomplish anything!</value>
+				<value xml:lang="de-DE">Von deinem [Pokémon] bin ich insgesamt total beeindruckt. Es kann einfach alles!</value>
 			</prop>
 		</node>
 		<node oor:name="AppraisalValorTotal30To36" oor:op="replace">		
 			<prop oor:name="Text" oor:type="xs:string" oor:localized="true">	
 				<value>Overall, your [Pokémon] is a strong Pokémon. You should be proud!</value>
-			    <value xml:lang="de-DE">Overall, your [Pokémon] is a strong Pokémon. You should be proud!</value>
+				<value xml:lang="de-DE">Dein [Pokémon] ist insgesamt sehr stark. Du kannst stolz sein!</value>
 			</prop>
 		</node>
 		<node oor:name="AppraisalValorTotal23To29" oor:op="replace">		
 			<prop oor:name="Text" oor:type="xs:string" oor:localized="true">	
 				<value>Overall, your [Pokémon] is a decent Pokémon.</value>
-			    <value xml:lang="de-DE">Overall, your [Pokémon] is a decent Pokémon.</value>
+				<value xml:lang="de-DE">Dein [Pokémon] ist insgesamt ganz gut!</value>
 			</prop>
 		</node>
 		<node oor:name="AppraisalValorTotalUpTo22" oor:op="replace">		
 			<prop oor:name="Text" oor:type="xs:string" oor:localized="true">	
 				<value>Overall, your [Pokémon] may not be great in battle, but I still like it!</value>
-			    <value xml:lang="de-DE">Overall, your [Pokémon] may not be great in battle, but I still like it!</value>
+				<value xml:lang="de-DE">Dein [Pokémon] ist zwar insgesamt im Kampf nicht allzu beeindruckend, aber ich mag es trotzdem!</value>
 			</prop>
 		</node>
 		<node oor:name="AppraisalValorBest" oor:op="replace">		
 			<prop oor:name="Text" oor:type="xs:string" oor:localized="true">	
 				<value>Its [Stat] is its strongest feature.</value>
-			    <value xml:lang="de-DE">Its [Stat] is its strongest feature.</value>
+				<value xml:lang="de-DE">Sein [Stat]-Wert ist seine stärkste Eigenschaft.</value>
 			</prop>
 		</node>
 		<node oor:name="AppraisalValorBestToo" oor:op="replace">		
 			<prop oor:name="Text" oor:type="xs:string" oor:localized="true">	
 				<value>I'm just as impressed with its [Stat].</value>
-			    <value xml:lang="de-DE">I'm just as impressed with its [Stat].</value>
+				<value xml:lang="de-DE">Ich bin genauso beeindruckt durch seinen [Stat]-Wert.</value>
 			</prop>
 		</node>
 		<node oor:name="AppraisalValorMax15" oor:op="replace">		
 			<prop oor:name="Text" oor:type="xs:string" oor:localized="true">	
 				<value>I'm blown away by its stats. WOW!</value>
-			    <value xml:lang="de-DE">I'm blown away by its stats. WOW!</value>
+				<value xml:lang="de-DE">Seine Werte hauen mich um. WOW!</value>
 			</prop>
 		</node>
 		<node oor:name="AppraisalValorMax13Or14" oor:op="replace">		
 			<prop oor:name="Text" oor:type="xs:string" oor:localized="true">	
 				<value>It's got excellent stats! How exciting!</value>
-			    <value xml:lang="de-DE">It's got excellent stats! How exciting!</value>
+				<value xml:lang="de-DE">Es hat hervorragende Werte! Wie aufregend!</value>
 			</prop>
 		</node>
 		<node oor:name="AppraisalValorMax8To12" oor:op="replace">		
 			<prop oor:name="Text" oor:type="xs:string" oor:localized="true">	
 				<value>Its stats indicate that in battle, it'll get the job done.</value>
-			    <value xml:lang="de-DE">Its stats indicate that in battle, it'll get the job done.</value>
+				<value xml:lang="de-DE">Seine Werte sind nicht von schlechten Eltern.</value>
 			</prop>
 		</node>
 		<node oor:name="AppraisalValorMaxUpTo7" oor:op="replace">		
 			<prop oor:name="Text" oor:type="xs:string" oor:localized="true">	
 				<value>Its stats don't point to greatness in battle.</value>
-			    <value xml:lang="de-DE">Its stats don't point to greatness in battle.</value>
+				<value xml:lang="de-DE">Seine Werte werden dir im Kampf nicht viel bringen.</value>
 			</prop>
 		</node>
 		<!-- Team Mystic (blue) -->
@@ -146,67 +146,67 @@
 			<prop oor:name="Text" oor:type="xs:string" oor:localized="true">	
 				<value>Blanche, leader of Team Mystic, says:</value>
 				<value xml:lang="zh-TW">Mystic 隊隊長 Blanche 說：</value>
-			    <value xml:lang="de-DE">Blanche, leader of Team Mystic, says:</value>
+				<value xml:lang="de-DE">Blanche, Leiter von Team Weisheit, sagt:</value>
 			</prop>
 		</node>
 		<node oor:name="AppraisalMysticTotal37OrHigher" oor:op="replace">		
 			<prop oor:name="Text" oor:type="xs:string" oor:localized="true">	
 				<value>Overall, your [Pokémon] is a wonder! What a breathtaking Pokémon!</value>
-			    <value xml:lang="de-DE">Overall, your [Pokémon] is a wonder! What a breathtaking Pokémon!</value>
+				<value xml:lang="de-DE">Dein [Pokémon] ist insgesamt einfach erstaunlich. Wirklich ein atemberaubendes Exemplar!</value>
 			</prop>
 		</node>
 		<node oor:name="AppraisalMysticTotal30To36" oor:op="replace">		
 			<prop oor:name="Text" oor:type="xs:string" oor:localized="true">	
 				<value>Overall, your [Pokémon] has certainly caught my attention.</value>
-			    <value xml:lang="de-DE">Overall, your [Pokémon] has certainly caught my attention.</value>
+				<value xml:lang="de-DE">Dein [Pokémon] ist mir insgesamt wirklich aufgefallen.</value>
 			</prop>
 		</node>
 		<node oor:name="AppraisalMysticTotal23To29" oor:op="replace">		
 			<prop oor:name="Text" oor:type="xs:string" oor:localized="true">	
 				<value>Overall, your [Pokémon] is above average.</value>
-			    <value xml:lang="de-DE">Overall, your [Pokémon] is above average.</value>
+				<value xml:lang="de-DE">Dein [Pokémon] ist insgesamt ein gutes Pokémon.</value>
 			</prop>
 		</node>
 		<node oor:name="AppraisalMysticTotalUpTo22" oor:op="replace">		
 			<prop oor:name="Text" oor:type="xs:string" oor:localized="true">	
 				<value>Overall, your [Pokémon] is not likely to make much headway in battle.</value>
-			    <value xml:lang="de-DE">Overall, your [Pokémon] is not likely to make much headway in battle.</value>
+				<value xml:lang="de-DE">Dein [Pokémon] wird im Kampf insgesamt wahrscheinlich keine großen Fortschritte machen.</value>
 			</prop>
 		</node>
 		<node oor:name="AppraisalMysticBest" oor:op="replace">		
 			<prop oor:name="Text" oor:type="xs:string" oor:localized="true">	
 				<value>I see that its best attribute is its [Stat].</value>
-			    <value xml:lang="de-DE">I see that its best attribute is its [Stat].</value>
+				<value xml:lang="de-DE">Seine beste Eigenschaft ist offensichtlich sein [Stat]-Wert.</value>
 			</prop>
 		</node>
 		<node oor:name="AppraisalMysticBestToo" oor:op="replace">		
 			<prop oor:name="Text" oor:type="xs:string" oor:localized="true">	
 				<value>It is matched equally by its [Stat].</value>
-			    <value xml:lang="de-DE">It is matched equally by its [Stat].</value>
+				<value xml:lang="de-DE">Sein [Stat]-Wert ist genauso gut!</value>
 			</prop>
 		</node>
 		<node oor:name="AppraisalMysticMax15" oor:op="replace">		
 			<prop oor:name="Text" oor:type="xs:string" oor:localized="true">	
 				<value>Its stats exceed my calculations. It's incredible!</value>
-			    <value xml:lang="de-DE">Its stats exceed my calculations. It's incredible!</value>
+				<value xml:lang="de-DE">Seine Werte sind so hoch, dass ich sie gar nicht berechnen kann! Unglaublich!</value>
 			</prop>
 		</node>
 		<node oor:name="AppraisalMysticMax13Or14" oor:op="replace">		
 			<prop oor:name="Text" oor:type="xs:string" oor:localized="true">	
 				<value>I am certainly impressed by its stats, I must say.</value>
-			    <value xml:lang="de-DE">I am certainly impressed by its stats, I must say.</value>
+				<value xml:lang="de-DE">Ich muss sagen, dass ich von seinen Werten sehr beeindruckt bin.</value>
 			</prop>
 		</node>
 		<node oor:name="AppraisalMysticMax8To12" oor:op="replace">		
 			<prop oor:name="Text" oor:type="xs:string" oor:localized="true">	
 				<value>Its stats are noticeably trending to the positive.</value>
-			    <value xml:lang="de-DE">Its stats are noticeably trending to the positive.</value>
+				<value xml:lang="de-DE">Seine Werte sind recht beeindruckend.</value>
 			</prop>
 		</node>
 		<node oor:name="AppraisalMysticMaxUpTo7" oor:op="replace">		
 			<prop oor:name="Text" oor:type="xs:string" oor:localized="true">	
 				<value>Its stats are not out of the norm, in my opinion.</value>
-			    <value xml:lang="de-DE">Its stats are not out of the norm, in my opinion.</value>
+				<value xml:lang="de-DE">Seine Werte sind insgesamt ganz ok.</value>
 			</prop>
 		</node>
 		<!-- Team Instinct (yellow) -->
@@ -214,67 +214,67 @@
 			<prop oor:name="Text" oor:type="xs:string" oor:localized="true">	
 				<value>Spark, leader of Team Instinct, says:</value>
 				<value xml:lang="zh-TW">Instinct 隊隊長 Spark 說：</value>
-			    <value xml:lang="de-DE">Spark, leader of Team Instinct, says:</value>
+				<value xml:lang="de-DE">Spark, Leiter von Team Intuition, sagt:</value>
 			</prop>
 		</node>
 		<node oor:name="AppraisalInstinctTotal37OrHigher" oor:op="replace">		
 			<prop oor:name="Text" oor:type="xs:string" oor:localized="true">	
 				<value>Overall, your [Pokémon] is not likely to make much headway in battle.</value>
-			    <value xml:lang="de-DE">Overall, your [Pokémon] is not likely to make much headway in battle.</value>
+				<value xml:lang="de-DE">Dein [Pokémon] kann es im Kampf mit allen aufnehmen!</value>
 			</prop>
 		</node>
 		<node oor:name="AppraisalInstinctTotal30To36" oor:op="replace">		
 			<prop oor:name="Text" oor:type="xs:string" oor:localized="true">	
 				<value>Overall, your [Pokémon] is really strong!</value>
-			    <value xml:lang="de-DE">Overall, your [Pokémon] is really strong!</value>
+				<value xml:lang="de-DE">Dein [Pokémon] ist insgesamt wirklich stark!</value>
 			</prop>
 		</node>
 		<node oor:name="AppraisalInstinctTotal23To29" oor:op="replace">		
 			<prop oor:name="Text" oor:type="xs:string" oor:localized="true">	
 				<value>Overall, your [Pokémon] is pretty decent!</value>
-			    <value xml:lang="de-DE">Overall, your [Pokémon] is pretty decent!</value>
+				<value xml:lang="de-DE">Dein [Pokémon] ist insgesamt ganz gut.</value>
 			</prop>
 		</node>
 		<node oor:name="AppraisalInstinctTotalUpTo22" oor:op="replace">		
 			<prop oor:name="Text" oor:type="xs:string" oor:localized="true">	
 				<value>Overall, your [Pokémon] has room for improvement as far as battling goes.</value>
-			    <value xml:lang="de-DE">Overall, your [Pokémon] has room for improvement as far as battling goes.</value>
+				<value xml:lang="de-DE">Dein [Pokémon] kann sich im Kampf noch verbessern!</value>
 			</prop>
 		</node>
 		<node oor:name="AppraisalInstinctBest" oor:op="replace">		
 			<prop oor:name="Text" oor:type="xs:string" oor:localized="true">	
 				<value>Its best quality is [Stat].</value>
-			    <value xml:lang="de-DE">Its best quality is [Stat].</value>
+				<value xml:lang="de-DE">Sein [Stat]-Wert ist seine beste Eigenschaft!</value>
 			</prop>
 		</node>
 		<node oor:name="AppraisalInstinctBestToo" oor:op="replace">		
 			<prop oor:name="Text" oor:type="xs:string" oor:localized="true">	
 				<value>Its [Stat] is great, too!</value>
-			    <value xml:lang="de-DE">Its [Stat] is great, too!</value>
+				<value xml:lang="de-DE">Auch sein [Stat]-Wert ist klasse!</value>
 			</prop>
 		</node>
 		<node oor:name="AppraisalInstinctMax15" oor:op="replace">		
 			<prop oor:name="Text" oor:type="xs:string" oor:localized="true">	
 				<value>Its stats are the best I've ever seen! No doubt about it!</value>
-			    <value xml:lang="de-DE">Its stats are the best I've ever seen! No doubt about it!</value>
+				<value xml:lang="de-DE">Seine Werte sind die besten, die ich je gesehen habe!</value>
 			</prop>
 		</node>
 		<node oor:name="AppraisalInstinctMax13Or14" oor:op="replace">		
 			<prop oor:name="Text" oor:type="xs:string" oor:localized="true">	
 				<value>Its stats are really strong! Impressive.</value>
-			    <value xml:lang="de-DE">Its stats are really strong! Impressive.</value>
+				<value xml:lang="de-DE">Seine Werte sind wirklich hoch! Hut ab!</value>
 			</prop>
 		</node>
 		<node oor:name="AppraisalInstinctMax8To12" oor:op="replace">		
 			<prop oor:name="Text" oor:type="xs:string" oor:localized="true">	
 				<value>It's definitely got some good stats. Definitely!</value>
-			    <value xml:lang="de-DE">It's definitely got some good stats. Definitely!</value>
+				<value xml:lang="de-DE">Seine Werte können sich sehen lassen!</value>
 			</prop>
 		</node>
 		<node oor:name="AppraisalInstinctMaxUpTo7" oor:op="replace">		
 			<prop oor:name="Text" oor:type="xs:string" oor:localized="true">	
 				<value>Its stats are all right, but kinda basic, as far as I can see.</value>
-			    <value xml:lang="de-DE">Its stats are all right, but kinda basic, as far as I can see.</value>
+				<value xml:lang="de-DE">Seine Werte sind okay.</value>
 			</prop>
 		</node>
 	</node>
diff --git a/oxt/Addons.xcu b/oxt/Addons.xcu
index 02d7bde..a5e4a68 100644
--- a/oxt/Addons.xcu
+++ b/oxt/Addons.xcu
@@ -11,7 +11,7 @@
 				<prop oor:name="Title">
 					<value>Pokémon GO IV Calculator</value>
 					<value xml:lang="zh-TW">寶可夢 GO IV 計算機</value>
-			        <value xml:lang="de-DE">Pokémon GO IV Calculator</value>
+					<value xml:lang="de-DE">Pokémon GO IV Rechner</value>
 				</prop>
 				<node oor:name="ToolBarItems">
 					<node oor:name="m001" oor:op="replace">
@@ -27,7 +27,7 @@
 						<prop oor:name="Title" oor:type="xs:string">
 							<value>Calculates Pokémon IV</value>
 							<value xml:lang="zh-TW">計算寶可夢 IV</value>
-			                <value xml:lang="de-DE">Calculates Pokémon IV</value>
+							<value xml:lang="de-DE">Berechnet IV von Pokémon</value>
 						</prop>
 						<prop oor:name="Target" oor:type="xs:string">
 							<value>_self</value>
@@ -49,7 +49,7 @@
 					<prop oor:name="Title" oor:type="xs:string">
 						<value>Calculates Pokémon IV</value>
 						<value xml:lang="zh-TW">計算寶可夢 IV</value>
-			            <value xml:lang="de-DE">Calculates Pokémon IV</value>
+						<value xml:lang="de-DE">Berechnet IV von Pokémon</value>
 					</prop>
 					<prop oor:name="Target" oor:type="xs:string">
 						<value>_self</value>
diff --git a/oxt/Office/UI/BaseWindowState.xcu b/oxt/Office/UI/BaseWindowState.xcu
index 9ff1b11..da164f4 100644
--- a/oxt/Office/UI/BaseWindowState.xcu
+++ b/oxt/Office/UI/BaseWindowState.xcu
@@ -9,7 +9,7 @@
 				<prop oor:name="UIName" oor:type="xs:string">
 					<value>Pokémon GO IV Calculator</value>
 					<value xml:lang="zh-TW">寶可夢 GO IV 計算機</value>
-					<value xml:lang="de-DE">Pokémon GO IV Calculator</value>
+					<value xml:lang="de-DE">Pokémon GO IV Rechner</value>
 				</prop>
 			</node>
 		</node>
diff --git a/oxt/Office/UI/BasicIDEWindowState.xcu b/oxt/Office/UI/BasicIDEWindowState.xcu
index 639d74c..4ef94d4 100644
--- a/oxt/Office/UI/BasicIDEWindowState.xcu
+++ b/oxt/Office/UI/BasicIDEWindowState.xcu
@@ -9,7 +9,7 @@
 				<prop oor:name="UIName" oor:type="xs:string">
 					<value>Pokémon GO IV Calculator</value>
 					<value xml:lang="zh-TW">寶可夢 GO IV 計算機</value>
-					<value xml:lang="de-DE">Pokémon GO IV Calculator</value>
+					<value xml:lang="de-DE">Pokémon GO IV Rechner</value>
 				</prop>
 			</node>
 		</node>
diff --git a/oxt/Office/UI/CalcWindowState.xcu b/oxt/Office/UI/CalcWindowState.xcu
index 0e28e97..c145c78 100644
--- a/oxt/Office/UI/CalcWindowState.xcu
+++ b/oxt/Office/UI/CalcWindowState.xcu
@@ -9,7 +9,7 @@
 				<prop oor:name="UIName" oor:type="xs:string">
 					<value>Pokémon GO IV Calculator</value>
 					<value xml:lang="zh-TW">寶可夢 GO IV 計算機</value>
-					<value xml:lang="de-DE">Pokémon GO IV Calculator</value>
+					<value xml:lang="de-DE">Pokémon GO IV Rechner</value>
 				</prop>
 			</node>
 		</node>
diff --git a/oxt/Office/UI/DrawWindowState.xcu b/oxt/Office/UI/DrawWindowState.xcu
index 4713186..44cd82e 100644
--- a/oxt/Office/UI/DrawWindowState.xcu
+++ b/oxt/Office/UI/DrawWindowState.xcu
@@ -9,7 +9,7 @@
 				<prop oor:name="UIName" oor:type="xs:string">
 					<value>Pokémon GO IV Calculator</value>
 					<value xml:lang="zh-TW">寶可夢 GO IV 計算機</value>
-					<value xml:lang="de-DE">Pokémon GO IV Calculator</value>
+					<value xml:lang="de-DE">Pokémon GO IV Rechner</value>
 				</prop>
 			</node>
 		</node>
diff --git a/oxt/Office/UI/ImpressWindowState.xcu b/oxt/Office/UI/ImpressWindowState.xcu
index 93aea78..681713b 100644
--- a/oxt/Office/UI/ImpressWindowState.xcu
+++ b/oxt/Office/UI/ImpressWindowState.xcu
@@ -9,7 +9,7 @@
 				<prop oor:name="UIName" oor:type="xs:string">
 					<value>Pokémon GO IV Calculator</value>
 					<value xml:lang="zh-TW">寶可夢 GO IV 計算機</value>
-					<value xml:lang="de-DE">Pokémon GO IV Calculator</value>
+					<value xml:lang="de-DE">Pokémon GO IV Rechner</value>
 				</prop>
 			</node>
 		</node>
diff --git a/oxt/Office/UI/MathWindowState.xcu b/oxt/Office/UI/MathWindowState.xcu
index 4f52357..6fd2d33 100644
--- a/oxt/Office/UI/MathWindowState.xcu
+++ b/oxt/Office/UI/MathWindowState.xcu
@@ -9,7 +9,7 @@
 				<prop oor:name="UIName" oor:type="xs:string">
 					<value>Pokémon GO IV Calculator</value>
 					<value xml:lang="zh-TW">寶可夢 GO IV 計算機</value>
-					<value xml:lang="de-DE">Pokémon GO IV Calculator</value>
+					<value xml:lang="de-DE">Pokémon GO IV Rechner</value>
 				</prop>
 			</node>
 		</node>
diff --git a/oxt/Office/UI/StartModuleWindowState.xcu b/oxt/Office/UI/StartModuleWindowState.xcu
index 4d2cfed..a2f0e7e 100644
--- a/oxt/Office/UI/StartModuleWindowState.xcu
+++ b/oxt/Office/UI/StartModuleWindowState.xcu
@@ -9,7 +9,7 @@
 				<prop oor:name="UIName" oor:type="xs:string">
 					<value>Pokémon GO IV Calculator</value>
 					<value xml:lang="zh-TW">寶可夢 GO IV 計算機</value>
-					<value xml:lang="de-DE">Pokémon GO IV Calculator</value>
+					<value xml:lang="de-DE">Pokémon GO IV Rechner</value>
 				</prop>
 			</node>
 		</node>
diff --git a/oxt/Office/UI/WriterWindowState.xcu b/oxt/Office/UI/WriterWindowState.xcu
index 4d99555..e167532 100644
--- a/oxt/Office/UI/WriterWindowState.xcu
+++ b/oxt/Office/UI/WriterWindowState.xcu
@@ -9,7 +9,7 @@
 				<prop oor:name="UIName" oor:type="xs:string">
 					<value>Pokémon GO IV Calculator</value>
 					<value xml:lang="zh-TW">寶可夢 GO IV 計算機</value>
-					<value xml:lang="de-DE">Pokémon GO IV Calculator</value>
+					<value xml:lang="de-DE">Pokémon GO IV Rechner</value>
 				</prop>
 			</node>
 		</node>
diff --git a/oxt/PokemonGoIV/DialogStrings_de_DE.properties b/oxt/PokemonGoIV/DialogStrings_de_DE.properties
index 0ec72a8..525ebf4 100644
--- a/oxt/PokemonGoIV/DialogStrings_de_DE.properties
+++ b/oxt/PokemonGoIV/DialogStrings_de_DE.properties
@@ -1,170 +1,252 @@
 # Strings for Dialog Library PokemonGoIV
-1.DlgMain.Title=Pok\u00e9mon GO IV Calculator
+1.DlgMain.Title=Pok\u00e9mon GO IV Rechner
 2.DlgMain.txtPokemon.Label=~Pok\u00e9mon:
-3.DlgMain.txtCP.Label=~CP:
-4.DlgMain.txtHP.Label=~HP:
-5.DlgMain.txtStarDust.Label=S~tar dust:
-6.DlgMain.txtPlayerLevel.Label=Player ~level:
-7.DlgMain.cbxIsNew.Label=This Pok\u00e9mon has ~not been powered-up yet.
-8.DlgMain.grpAppraisals.Label=Team Leader Appraisal
-9.DlgMain.rdoTeamValor.Label=Team ~Valor
-10.DlgMain.rdoTeamMystic.Label=Team ~Mystic
-11.DlgMain.rdoTeamInstinct.Label=Team ~Instinct
-1001.lstPokemon.StringItemList=Bulbasaur
-1002.lstPokemon.StringItemList=Ivysaur
-1003.lstPokemon.StringItemList=Venusaur
-1004.lstPokemon.StringItemList=Charmander
-1005.lstPokemon.StringItemList=Charmeleon
-1006.lstPokemon.StringItemList=Charizard
-1007.lstPokemon.StringItemList=Squirtle
-1008.lstPokemon.StringItemList=Wartortle
-1009.lstPokemon.StringItemList=Blastoise
-1010.lstPokemon.StringItemList=Caterpie
-1011.lstPokemon.StringItemList=Metapod
-1012.lstPokemon.StringItemList=Butterfree
-1013.lstPokemon.StringItemList=Weedle
-1014.lstPokemon.StringItemList=Kakuna
-1015.lstPokemon.StringItemList=Beedrill
-1016.lstPokemon.StringItemList=Pidgey
-1017.lstPokemon.StringItemList=Pidgeotto
-1018.lstPokemon.StringItemList=Pidgeot
-1019.lstPokemon.StringItemList=Rattata
-1020.lstPokemon.StringItemList=Raticate
-1021.lstPokemon.StringItemList=Spearow
-1022.lstPokemon.StringItemList=Fearow
-1023.lstPokemon.StringItemList=Ekans
+3.DlgMain.txtCP.Label=~WP:
+4.DlgMain.txtHP.Label=~KP:
+5.DlgMain.txtStarDust.Label=~Sternenstaub:
+6.DlgMain.txtPlayerLevel.Label=Spieler ~Level:
+7.DlgMain.cbxIsNew.Label=Dieses Pok\u00e9mon hat noch ~kein Power-Up bekommen.
+8.DlgMain.grpAppraisals.Label=Bewertung des Teamleiters
+9.DlgMain.rdoTeamValor.Label=Team W~agemut
+10.DlgMain.rdoTeamMystic.Label=Team W~eisheit
+11.DlgMain.rdoTeamInstinct.Label=Team ~Intuition
+1001.lstPokemon.StringItemList=Bisasam
+1002.lstPokemon.StringItemList=Bisaknosp
+1003.lstPokemon.StringItemList=Bisaflor
+1004.lstPokemon.StringItemList=Glumanda
+1005.lstPokemon.StringItemList=Glutexo
+1006.lstPokemon.StringItemList=Glurak
+1007.lstPokemon.StringItemList=Schiggy
+1008.lstPokemon.StringItemList=Schillok
+1009.lstPokemon.StringItemList=Turtok
+1010.lstPokemon.StringItemList=Raupy
+1011.lstPokemon.StringItemList=Safcon
+1012.lstPokemon.StringItemList=Smettbo
+1013.lstPokemon.StringItemList=Hornliu
+1014.lstPokemon.StringItemList=Kokuna
+1015.lstPokemon.StringItemList=Bibor
+1016.lstPokemon.StringItemList=Taubsi
+1017.lstPokemon.StringItemList=Tauboga
+1018.lstPokemon.StringItemList=Tauboss
+1019.lstPokemon.StringItemList=Rattfratz
+1020.lstPokemon.StringItemList=Rattikarl
+1021.lstPokemon.StringItemList=Habitak
+1022.lstPokemon.StringItemList=Ibitak
+1023.lstPokemon.StringItemList=Rettan
 1024.lstPokemon.StringItemList=Arbok
 1025.lstPokemon.StringItemList=Pikachu
 1026.lstPokemon.StringItemList=Raichu
-1027.lstPokemon.StringItemList=Sandshrew
-1028.lstPokemon.StringItemList=Sandslash
+1027.lstPokemon.StringItemList=Sandan
+1028.lstPokemon.StringItemList=Sandamer
 1029.lstPokemon.StringItemList=Nidoran\u2640
 1030.lstPokemon.StringItemList=Nidorina
 1031.lstPokemon.StringItemList=Nidoqueen
 1032.lstPokemon.StringItemList=Nidoran\u2642
 1033.lstPokemon.StringItemList=Nidorino
 1034.lstPokemon.StringItemList=Nidoking
-1035.lstPokemon.StringItemList=Clefairy
-1036.lstPokemon.StringItemList=Clefable
+1035.lstPokemon.StringItemList=Piepi
+1036.lstPokemon.StringItemList=Pixi
 1037.lstPokemon.StringItemList=Vulpix
-1038.lstPokemon.StringItemList=Ninetales
-1039.lstPokemon.StringItemList=Jigglypuff
-1040.lstPokemon.StringItemList=Wigglytuff
+1038.lstPokemon.StringItemList=Vulnona
+1039.lstPokemon.StringItemList=Pummeluff
+1040.lstPokemon.StringItemList=Knuddeluff
 1041.lstPokemon.StringItemList=Zubat
 1042.lstPokemon.StringItemList=Golbat
-1043.lstPokemon.StringItemList=Oddish
-1044.lstPokemon.StringItemList=Gloom
-1045.lstPokemon.StringItemList=Vileplume
+1043.lstPokemon.StringItemList=Myrapla
+1044.lstPokemon.StringItemList=Duflor
+1045.lstPokemon.StringItemList=Giflor
 1046.lstPokemon.StringItemList=Paras
-1047.lstPokemon.StringItemList=Parasect
-1048.lstPokemon.StringItemList=Venonat
-1049.lstPokemon.StringItemList=Venomoth
-1050.lstPokemon.StringItemList=Diglett
-1051.lstPokemon.StringItemList=Dugtrio
-1052.lstPokemon.StringItemList=Meowth
-1053.lstPokemon.StringItemList=Persian
-1054.lstPokemon.StringItemList=Psyduck
-1055.lstPokemon.StringItemList=Golduck
-1056.lstPokemon.StringItemList=Mankey
-1057.lstPokemon.StringItemList=Primeape
-1058.lstPokemon.StringItemList=Growlithe
-1059.lstPokemon.StringItemList=Arcanine
-1060.lstPokemon.StringItemList=Poliwag
-1061.lstPokemon.StringItemList=Poliwhirl
-1062.lstPokemon.StringItemList=Poliwrath
+1047.lstPokemon.StringItemList=Parasek
+1048.lstPokemon.StringItemList=Bluzuk
+1049.lstPokemon.StringItemList=Omot
+1050.lstPokemon.StringItemList=Digda
+1051.lstPokemon.StringItemList=Digdri
+1052.lstPokemon.StringItemList=Mauzi
+1053.lstPokemon.StringItemList=Snobilikat
+1054.lstPokemon.StringItemList=Enton
+1055.lstPokemon.StringItemList=Entoron
+1056.lstPokemon.StringItemList=Menki
+1057.lstPokemon.StringItemList=Rasaff
+1058.lstPokemon.StringItemList=Fukano
+1059.lstPokemon.StringItemList=Arkani
+1060.lstPokemon.StringItemList=Quapsel
+1061.lstPokemon.StringItemList=Quaputzi
+1062.lstPokemon.StringItemList=Quappo
 1063.lstPokemon.StringItemList=Abra
 1064.lstPokemon.StringItemList=Kadabra
-1065.lstPokemon.StringItemList=Alakazam
-1066.lstPokemon.StringItemList=Machop
-1067.lstPokemon.StringItemList=Machoke
-1068.lstPokemon.StringItemList=Machamp
-1069.lstPokemon.StringItemList=Bellsprout
-1070.lstPokemon.StringItemList=Weepinbell
-1071.lstPokemon.StringItemList=Victreebel
-1072.lstPokemon.StringItemList=Tentacool
-1073.lstPokemon.StringItemList=Tentacruel
-1074.lstPokemon.StringItemList=Geodude
-1075.lstPokemon.StringItemList=Graveler
-1076.lstPokemon.StringItemList=Golem
-1077.lstPokemon.StringItemList=Ponyta
-1078.lstPokemon.StringItemList=Rapidash
-1079.lstPokemon.StringItemList=Slowpoke
-1080.lstPokemon.StringItemList=Slowbro
-1081.lstPokemon.StringItemList=Magnemite
+1065.lstPokemon.StringItemList=Simsala
+1066.lstPokemon.StringItemList=Machollo
+1067.lstPokemon.StringItemList=Maschock
+1068.lstPokemon.StringItemList=Machomei
+1069.lstPokemon.StringItemList=Knofensa
+1070.lstPokemon.StringItemList=Ultrigaria
+1071.lstPokemon.StringItemList=Sarzenia
+1072.lstPokemon.StringItemList=Tentacha
+1073.lstPokemon.StringItemList=Tentoxa
+1074.lstPokemon.StringItemList=Kleinstein
+1075.lstPokemon.StringItemList=Georok
+1076.lstPokemon.StringItemList=Geowaz
+1077.lstPokemon.StringItemList=Ponita
+1078.lstPokemon.StringItemList=Gallopa
+1079.lstPokemon.StringItemList=Flegmon
+1080.lstPokemon.StringItemList=Lahmus
+1081.lstPokemon.StringItemList=Magnetilo
 1082.lstPokemon.StringItemList=Magneton
-1083.lstPokemon.StringItemList=Farfetch'd
-1084.lstPokemon.StringItemList=Doduo
-1085.lstPokemon.StringItemList=Dodrio
-1086.lstPokemon.StringItemList=Seel
-1087.lstPokemon.StringItemList=Dewgong
-1088.lstPokemon.StringItemList=Grimer
-1089.lstPokemon.StringItemList=Muk
-1090.lstPokemon.StringItemList=Shellder
-1091.lstPokemon.StringItemList=Cloyster
-1092.lstPokemon.StringItemList=Gastly
-1093.lstPokemon.StringItemList=Haunter
+1083.lstPokemon.StringItemList=Porenta
+1084.lstPokemon.StringItemList=Dodu
+1085.lstPokemon.StringItemList=Dodri
+1086.lstPokemon.StringItemList=Jurob
+1087.lstPokemon.StringItemList=Jugong
+1088.lstPokemon.StringItemList=Sleima
+1089.lstPokemon.StringItemList=Sleimok
+1090.lstPokemon.StringItemList=Muschas
+1091.lstPokemon.StringItemList=Austos
+1092.lstPokemon.StringItemList=Nebulak
+1093.lstPokemon.StringItemList=Alpollo
 1094.lstPokemon.StringItemList=Gengar
 1095.lstPokemon.StringItemList=Onix
-1096.lstPokemon.StringItemList=Drowzee
+1096.lstPokemon.StringItemList=Traumato
 1097.lstPokemon.StringItemList=Hypno
 1098.lstPokemon.StringItemList=Krabby
 1099.lstPokemon.StringItemList=Kingler
-1100.lstPokemon.StringItemList=Voltorb
-1101.lstPokemon.StringItemList=Electrode
-1102.lstPokemon.StringItemList=Exeggcute
-1103.lstPokemon.StringItemList=Exeggutor
-1104.lstPokemon.StringItemList=Cubone
-1105.lstPokemon.StringItemList=Marowak
-1106.lstPokemon.StringItemList=Hitmonlee
-1107.lstPokemon.StringItemList=Hitmonchan
-1108.lstPokemon.StringItemList=Lickitung
-1109.lstPokemon.StringItemList=Koffing
-1110.lstPokemon.StringItemList=Weezing
-1111.lstPokemon.StringItemList=Rhyhorn
-1112.lstPokemon.StringItemList=Rhydon
-1113.lstPokemon.StringItemList=Chansey
+1100.lstPokemon.StringItemList=Voltobal
+1101.lstPokemon.StringItemList=Lektrobal
+1102.lstPokemon.StringItemList=Owei
+1103.lstPokemon.StringItemList=Kokowei
+1104.lstPokemon.StringItemList=Tragosso
+1105.lstPokemon.StringItemList=Knogga
+1106.lstPokemon.StringItemList=Kicklee
+1107.lstPokemon.StringItemList=Nockchan
+1108.lstPokemon.StringItemList=Schlurp
+1109.lstPokemon.StringItemList=Smogon
+1110.lstPokemon.StringItemList=Smogmog
+1111.lstPokemon.StringItemList=Rihorn
+1112.lstPokemon.StringItemList=Rizeros
+1113.lstPokemon.StringItemList=Chaneira
 1114.lstPokemon.StringItemList=Tangela
-1115.lstPokemon.StringItemList=Kangaskhan
-1116.lstPokemon.StringItemList=Horsea
-1117.lstPokemon.StringItemList=Seadra
-1118.lstPokemon.StringItemList=Goldeen
-1119.lstPokemon.StringItemList=Seaking
-1120.lstPokemon.StringItemList=Staryu
+1115.lstPokemon.StringItemList=Kangama
+1116.lstPokemon.StringItemList=Seeper
+1117.lstPokemon.StringItemList=Seemon
+1118.lstPokemon.StringItemList=Goldini
+1119.lstPokemon.StringItemList=Golking
+1120.lstPokemon.StringItemList=Sterndu
 1121.lstPokemon.StringItemList=Starmie
-1122.lstPokemon.StringItemList=Mr. Mime
-1123.lstPokemon.StringItemList=Scyther
-1124.lstPokemon.StringItemList=Jynx
-1125.lstPokemon.StringItemList=Electabuzz
+1122.lstPokemon.StringItemList=Pantimos
+1123.lstPokemon.StringItemList=Sichlor
+1124.lstPokemon.StringItemList=Rossana
+1125.lstPokemon.StringItemList=Elektek
 1126.lstPokemon.StringItemList=Magmar
 1127.lstPokemon.StringItemList=Pinsir
 1128.lstPokemon.StringItemList=Tauros
-1129.lstPokemon.StringItemList=Magikarp
-1130.lstPokemon.StringItemList=Gyarados
+1129.lstPokemon.StringItemList=Karpador
+1130.lstPokemon.StringItemList=Garados
 1131.lstPokemon.StringItemList=Lapras
 1132.lstPokemon.StringItemList=Ditto
-1133.lstPokemon.StringItemList=Eevee
-1134.lstPokemon.StringItemList=Vaporeon
-1135.lstPokemon.StringItemList=Jolteon
-1136.lstPokemon.StringItemList=Flareon
+1133.lstPokemon.StringItemList=Evoli
+1134.lstPokemon.StringItemList=Aquana
+1135.lstPokemon.StringItemList=Blitza
+1136.lstPokemon.StringItemList=Flamara
 1137.lstPokemon.StringItemList=Porygon
-1138.lstPokemon.StringItemList=Omanyte
-1139.lstPokemon.StringItemList=Omastar
+1138.lstPokemon.StringItemList=Amonitas
+1139.lstPokemon.StringItemList=Amoroso
 1140.lstPokemon.StringItemList=Kabuto
 1141.lstPokemon.StringItemList=Kabutops
 1142.lstPokemon.StringItemList=Aerodactyl
-1143.lstPokemon.StringItemList=Snorlax
-1144.lstPokemon.StringItemList=Articuno
+1143.lstPokemon.StringItemList=Relaxo
+1144.lstPokemon.StringItemList=Arktos
 1145.lstPokemon.StringItemList=Zapdos
-1146.lstPokemon.StringItemList=Moltres
+1146.lstPokemon.StringItemList=Lavados
 1147.lstPokemon.StringItemList=Dratini
-1148.lstPokemon.StringItemList=Dragonair
-1149.lstPokemon.StringItemList=Dragonite
-1150.lstPokemon.StringItemList=Mewtwo
+1148.lstPokemon.StringItemList=Dragonir
+1149.lstPokemon.StringItemList=Dragoran
+1150.lstPokemon.StringItemList=Mewtu
 1151.lstPokemon.StringItemList=Mew
+1152.lstPokemon.StringItemList=Endivie
+1153.lstPokemon.StringItemList=Lorblatt
+1154.lstPokemon.StringItemList=Meganie
+1155.lstPokemon.StringItemList=Feurigel
+1156.lstPokemon.StringItemList=Igelavar
+1157.lstPokemon.StringItemList=Tornupto
+1158.lstPokemon.StringItemList=Karnimani
+1159.lstPokemon.StringItemList=Tyracroc
+1160.lstPokemon.StringItemList=Impergator
+1161.lstPokemon.StringItemList=Wiesor
+1162.lstPokemon.StringItemList=Wiesenior
+1163.lstPokemon.StringItemList=Hoothoot
+1164.lstPokemon.StringItemList=Noctuh
+1165.lstPokemon.StringItemList=Ledyba
+1166.lstPokemon.StringItemList=Ledian
+1167.lstPokemon.StringItemList=Webarak
+1168.lstPokemon.StringItemList=Ariados
+1169.lstPokemon.StringItemList=Iksbat
+1170.lstPokemon.StringItemList=Lampi
+1171.lstPokemon.StringItemList=Lanturn
 1172.lstPokemon.StringItemList=Pichu
-1173.lstPokemon.StringItemList=Cleffa
-1174.lstPokemon.StringItemList=Igglybuff
+1173.lstPokemon.StringItemList=Pii
+1174.lstPokemon.StringItemList=Fluffeluff
 1175.lstPokemon.StringItemList=Togepi
 1176.lstPokemon.StringItemList=Togetic
-1238.lstPokemon.StringItemList=Smoochum
+1177.lstPokemon.StringItemList=Natu
+1178.lstPokemon.StringItemList=Xatu
+1179.lstPokemon.StringItemList=Voltilamm
+1180.lstPokemon.StringItemList=Waaty
+1181.lstPokemon.StringItemList=Ampharos
+1182.lstPokemon.StringItemList=Blubella
+1183.lstPokemon.StringItemList=Marill
+1184.lstPokemon.StringItemList=Azumarill
+1185.lstPokemon.StringItemList=Mogelbaum
+1186.lstPokemon.StringItemList=Quaxo
+1187.lstPokemon.StringItemList=Hoppspross
+1188.lstPokemon.StringItemList=Hubelupf
+1189.lstPokemon.StringItemList=Papungha
+1190.lstPokemon.StringItemList=Griffel
+1191.lstPokemon.StringItemList=Sonnkern
+1192.lstPokemon.StringItemList=Sonnflora
+1193.lstPokemon.StringItemList=Yanma
+1194.lstPokemon.StringItemList=Felino
+1195.lstPokemon.StringItemList=Morlord
+1196.lstPokemon.StringItemList=Psiana
+1197.lstPokemon.StringItemList=Nachtara
+1198.lstPokemon.StringItemList=Kramurx
+1199.lstPokemon.StringItemList=Laschoking
+1200.lstPokemon.StringItemList=Traunfugil
+1201.lstPokemon.StringItemList=Icognito
+1202.lstPokemon.StringItemList=Woingenau
+1203.lstPokemon.StringItemList=Girafarig
+1204.lstPokemon.StringItemList=Tannza
+1205.lstPokemon.StringItemList=Forstellka
+1206.lstPokemon.StringItemList=Dummisel
+1207.lstPokemon.StringItemList=Skorgla
+1208.lstPokemon.StringItemList=Stahlos
+1209.lstPokemon.StringItemList=Snubbull
+1210.lstPokemon.StringItemList=Granbull
+1211.lstPokemon.StringItemList=Baldorfish
+1212.lstPokemon.StringItemList=Scherox
+1213.lstPokemon.StringItemList=Pottrott
+1214.lstPokemon.StringItemList=Skaraborn
+1215.lstPokemon.StringItemList=Sniebel
+1216.lstPokemon.StringItemList=Teddiursa
+1217.lstPokemon.StringItemList=Ursaring
+1218.lstPokemon.StringItemList=Schneckmag
+1219.lstPokemon.StringItemList=Magcargo
+1220.lstPokemon.StringItemList=Quiekel
+1221.lstPokemon.StringItemList=Keifel
+1222.lstPokemon.StringItemList=Corasonn
+1223.lstPokemon.StringItemList=Remoraid
+1224.lstPokemon.StringItemList=Octillery
+1225.lstPokemon.StringItemList=Botogel
+1226.lstPokemon.StringItemList=Mantax
+1227.lstPokemon.StringItemList=Panzaeron
+1228.lstPokemon.StringItemList=Hunduster
+1229.lstPokemon.StringItemList=Hundemon
+1230.lstPokemon.StringItemList=Seedraking
+1231.lstPokemon.StringItemList=Phanpy
+1232.lstPokemon.StringItemList=Donphan
+1233.lstPokemon.StringItemList=Porygon2
+1234.lstPokemon.StringItemList=Damhirplex
+1235.lstPokemon.StringItemList=Farbeagle
+1236.lstPokemon.StringItemList=Rabauz
+1237.lstPokemon.StringItemList=Kapoera
+1238.lstPokemon.StringItemList=Kussilla
 1239.lstPokemon.StringItemList=Elekid
+1240.lstPokemon.StringItemList=Magby
diff --git a/oxt/PokemonGoIV/DialogStrings_en_US.properties b/oxt/PokemonGoIV/DialogStrings_en_US.properties
index 0ec72a8..228c244 100644
--- a/oxt/PokemonGoIV/DialogStrings_en_US.properties
+++ b/oxt/PokemonGoIV/DialogStrings_en_US.properties
@@ -168,3 +168,4 @@
 1176.lstPokemon.StringItemList=Togetic
 1238.lstPokemon.StringItemList=Smoochum
 1239.lstPokemon.StringItemList=Elekid
+1240.lstPokemon.StringItemList=Magby
diff --git a/oxt/PokemonGoIV/DialogStrings_zh_TW.properties b/oxt/PokemonGoIV/DialogStrings_zh_TW.properties
index fa1d90b..c9be928 100644
--- a/oxt/PokemonGoIV/DialogStrings_zh_TW.properties
+++ b/oxt/PokemonGoIV/DialogStrings_zh_TW.properties
@@ -168,3 +168,4 @@
 1176.lstPokemon.StringItemList=Togetic
 1238.lstPokemon.StringItemList=Smoochum
 1239.lstPokemon.StringItemList=Elekid
+1240.lstPokemon.StringItemList=Magby
diff --git a/oxt/PokemonGoIV/DlgMain.xdl b/oxt/PokemonGoIV/DlgMain.xdl
index 9f657ac..3b711d5 100644
--- a/oxt/PokemonGoIV/DlgMain.xdl
+++ b/oxt/PokemonGoIV/DlgMain.xdl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE dlg:window PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "dialog.dtd">
-<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="DlgMain" dlg:left="100" dlg:top="100" dlg:width="235" dlg:height="235" dlg:closeable="true" dlg:moveable="true" dlg:title="&amp;1.DlgMain.Title">
+<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="DlgMain" dlg:left="100" dlg:top="100" dlg:width="250" dlg:height="250" dlg:closeable="true" dlg:moveable="true" dlg:title="&amp;1.DlgMain.Title">
  <dlg:styles>
   <dlg:style dlg:style-id="0" dlg:border="none"/>
   <dlg:style dlg:style-id="1" dlg:background-color="0xff0000" dlg:text-color="0xffffff" dlg:font-weight="100"/>
@@ -8,8 +8,8 @@
   <dlg:style dlg:style-id="3" dlg:background-color="0xffff00"/>
  </dlg:styles>
  <dlg:bulletinboard>
-  <dlg:text dlg:id="txtPokemon" dlg:tab-index="16" dlg:left="5" dlg:top="26" dlg:width="30" dlg:height="8" dlg:value="&amp;2.DlgMain.txtPokemon.Label"/>
-  <dlg:menulist dlg:id="lstPokemon" dlg:tab-index="0" dlg:left="35" dlg:top="24" dlg:width="55" dlg:height="12" dlg:spin="true">
+  <dlg:text dlg:id="txtPokemon" dlg:tab-index="16" dlg:left="5" dlg:top="15" dlg:width="30" dlg:height="8" dlg:value="&amp;2.DlgMain.txtPokemon.Label"/>
+  <dlg:menulist dlg:id="lstPokemon" dlg:tab-index="0" dlg:left="35" dlg:top="12" dlg:width="55" dlg:height="16" dlg:spin="true" dlg:linecount="20">
    <dlg:menupopup>
     <dlg:menuitem dlg:value="&amp;1001.lstPokemon.StringItemList"/>
     <dlg:menuitem dlg:value="&amp;1002.lstPokemon.StringItemList"/>
@@ -169,20 +169,21 @@
     <dlg:menuitem dlg:value="&amp;1176.lstPokemon.StringItemList"/>
     <dlg:menuitem dlg:value="&amp;1238.lstPokemon.StringItemList"/>
     <dlg:menuitem dlg:value="&amp;1239.lstPokemon.StringItemList"/>
+		<dlg:menuitem dlg:value="&amp;1240.lstPokemon.StringItemList"/>
    </dlg:menupopup>
    <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.script:PokemonGoIV.0Main.subLstPokemonSelected?language=Basic&amp;location=application" script:language="Script"/>
   </dlg:menulist>
-  <dlg:img dlg:style-id="0" dlg:id="imgPokemon" dlg:tab-index="26" dlg:left="95" dlg:top="5" dlg:width="30" dlg:height="30"/>
-  <dlg:text dlg:id="txtCP" dlg:tab-index="17" dlg:left="5" dlg:top="41" dlg:width="15" dlg:height="8" dlg:value="&amp;3.DlgMain.txtCP.Label"/>
+  <dlg:img dlg:style-id="0" dlg:id="imgPokemon" dlg:tab-index="25" dlg:left="95" dlg:top="5" dlg:width="30" dlg:height="30"/>
+  <dlg:text dlg:id="txtCP" dlg:tab-index="17" dlg:left="5" dlg:top="42" dlg:width="15" dlg:height="8" dlg:value="&amp;3.DlgMain.txtCP.Label"/>
   <dlg:numericfield dlg:id="numCP" dlg:tab-index="1" dlg:left="20" dlg:top="39" dlg:width="20" dlg:height="12" dlg:decimal-accuracy="0" dlg:value-min="10" dlg:value-max="5000">
    <script:event script:event-name="on-textchange" script:macro-name="vnd.sun.star.script:PokemonGoIV.0Main.subBtnOKCheck?language=Basic&amp;location=application" script:language="Script"/>
   </dlg:numericfield>
-  <dlg:text dlg:id="txtHP" dlg:tab-index="18" dlg:left="50" dlg:top="41" dlg:width="15" dlg:height="8" dlg:value="&amp;4.DlgMain.txtHP.Label"/>
+  <dlg:text dlg:id="txtHP" dlg:tab-index="18" dlg:left="48" dlg:top="42" dlg:width="15" dlg:height="8" dlg:value="&amp;4.DlgMain.txtHP.Label" dlg:align="right"/>
   <dlg:numericfield dlg:id="numHP" dlg:tab-index="2" dlg:left="65" dlg:top="39" dlg:width="15" dlg:height="12" dlg:decimal-accuracy="0" dlg:value-min="10" dlg:value-max="500">
    <script:event script:event-name="on-textchange" script:macro-name="vnd.sun.star.script:PokemonGoIV.0Main.subBtnOKCheck?language=Basic&amp;location=application" script:language="Script"/>
   </dlg:numericfield>
-  <dlg:text dlg:id="txtStarDust" dlg:tab-index="19" dlg:left="90" dlg:top="41" dlg:width="30" dlg:height="8" dlg:value="&amp;5.DlgMain.txtStarDust.Label"/>
-  <dlg:menulist dlg:id="lstStarDust" dlg:tab-index="3" dlg:left="120" dlg:top="39" dlg:width="35" dlg:height="12" dlg:spin="true">
+  <dlg:text dlg:id="txtStarDust" dlg:tab-index="19" dlg:left="89" dlg:top="42" dlg:width="42" dlg:height="8" dlg:value="&amp;5.DlgMain.txtStarDust.Label" dlg:align="right"/>
+  <dlg:menulist dlg:id="lstStarDust" dlg:tab-index="3" dlg:left="132" dlg:top="39" dlg:width="35" dlg:height="16" dlg:spin="true" dlg:linecount="20">
    <dlg:menupopup>
     <dlg:menuitem dlg:value="200"/>
     <dlg:menuitem dlg:value="400"/>
@@ -207,8 +208,8 @@
    </dlg:menupopup>
    <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.script:PokemonGoIV.0Main.subBtnOKCheck?language=Basic&amp;location=application" script:language="Script"/>
   </dlg:menulist>
-  <dlg:text dlg:id="txtPlayerLevel" dlg:tab-index="20" dlg:left="165" dlg:top="41" dlg:width="35" dlg:height="8" dlg:value="&amp;6.DlgMain.txtPlayerLevel.Label"/>
-  <dlg:menulist dlg:id="lstPlayerLevel" dlg:tab-index="4" dlg:left="200" dlg:top="39" dlg:width="30" dlg:height="12" dlg:spin="true">
+  <dlg:text dlg:id="txtPlayerLevel" dlg:tab-index="20" dlg:left="170" dlg:top="42" dlg:width="42" dlg:height="8" dlg:value="&amp;6.DlgMain.txtPlayerLevel.Label" dlg:align="right"/>
+  <dlg:menulist dlg:id="lstPlayerLevel" dlg:tab-index="4" dlg:left="214" dlg:top="39" dlg:width="30" dlg:height="16" dlg:spin="true" dlg:linecount="20">
    <dlg:menupopup>
     <dlg:menuitem dlg:value="1"/>
     <dlg:menuitem dlg:value="2"/>
@@ -252,34 +253,34 @@
     <dlg:menuitem dlg:value="40"/>
    </dlg:menupopup>
   </dlg:menulist>
-  <dlg:checkbox dlg:id="cbxIsNew" dlg:tab-index="5" dlg:left="5" dlg:top="56" dlg:width="225" dlg:height="8" dlg:value="&amp;7.DlgMain.cbxIsNew.Label" dlg:checked="true"/>
-  <dlg:titledbox dlg:id="grpAppraisals" dlg:tab-index="21" dlg:left="5" dlg:top="70" dlg:width="225" dlg:height="140">
+  <dlg:checkbox dlg:id="cbxIsNew" dlg:tab-index="5" dlg:left="5" dlg:top="58" dlg:width="225" dlg:height="10" dlg:value="&amp;7.DlgMain.cbxIsNew.Label" dlg:checked="true"/>
+  <dlg:titledbox dlg:id="grpAppraisals" dlg:tab-index="21" dlg:left="5" dlg:top="75" dlg:width="240" dlg:height="150">
    <dlg:title dlg:value="&amp;8.DlgMain.grpAppraisals.Label"/>
   </dlg:titledbox>
-  <dlg:img dlg:style-id="0" dlg:id="imgTeamLogo" dlg:tab-index="25" dlg:left="10" dlg:top="80" dlg:width="30" dlg:height="30"/>
+  <dlg:img dlg:style-id="0" dlg:id="imgTeamLogo" dlg:tab-index="24" dlg:left="10" dlg:top="92" dlg:width="30" dlg:height="30"/>
   <dlg:radiogroup>
-   <dlg:radio dlg:style-id="1" dlg:id="rdoTeamValor" dlg:tab-index="6" dlg:left="45" dlg:top="101" dlg:width="50" dlg:height="8" dlg:value="&amp;9.DlgMain.rdoTeamValor.Label">
+   <dlg:radio dlg:style-id="1" dlg:id="rdoTeamValor" dlg:tab-index="6" dlg:left="45" dlg:top="90" dlg:width="60" dlg:height="10" dlg:value="&amp;9.DlgMain.rdoTeamValor.Label" dlg:valign="center">
     <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.script:PokemonGoIV.0Main.subRdoTeamValorItemChanged?language=Basic&amp;location=application" script:language="Script"/>
    </dlg:radio>
-   <dlg:radio dlg:style-id="2" dlg:id="rdoTeamMystic" dlg:tab-index="7" dlg:left="100" dlg:top="101" dlg:width="50" dlg:height="8" dlg:value="&amp;10.DlgMain.rdoTeamMystic.Label">
+   <dlg:radio dlg:style-id="2" dlg:id="rdoTeamMystic" dlg:tab-index="7" dlg:left="111" dlg:top="90" dlg:width="60" dlg:height="10" dlg:value="&amp;10.DlgMain.rdoTeamMystic.Label" dlg:valign="center">
     <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.script:PokemonGoIV.0Main.subRdoTeamMysticItemChanged?language=Basic&amp;location=application" script:language="Script"/>
    </dlg:radio>
-   <dlg:radio dlg:style-id="3" dlg:id="rdoTeamInstinct" dlg:tab-index="8" dlg:left="155" dlg:top="101" dlg:width="50" dlg:height="8" dlg:value="&amp;11.DlgMain.rdoTeamInstinct.Label">
+   <dlg:radio dlg:style-id="3" dlg:id="rdoTeamInstinct" dlg:tab-index="8" dlg:left="177" dlg:top="90" dlg:width="60" dlg:height="10" dlg:value="&amp;11.DlgMain.rdoTeamInstinct.Label" dlg:valign="center">
     <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.script:PokemonGoIV.0Main.subRdoTeamInstinctItemChanged?language=Basic&amp;location=application" script:language="Script"/>
    </dlg:radio>
   </dlg:radiogroup>
-  <dlg:img dlg:style-id="0" dlg:id="imgTeamLeader" dlg:tab-index="28" dlg:left="10" dlg:top="110" dlg:width="30" dlg:height="35"/>
-  <dlg:text dlg:id="txtLeaderAppraise" dlg:tab-index="27" dlg:left="45" dlg:top="116" dlg:width="180" dlg:height="8"/>
-  <dlg:menulist dlg:id="lstTotal" dlg:tab-index="9" dlg:left="45" dlg:top="129" dlg:width="180" dlg:height="12" dlg:spin="true"/>
-  <dlg:text dlg:id="txtBestBefore" dlg:tab-index="23" dlg:left="45" dlg:top="146" dlg:width="20" dlg:height="8"/>
-  <dlg:menulist dlg:id="lstBest" dlg:tab-index="10" dlg:left="65" dlg:top="144" dlg:width="45" dlg:height="12" dlg:spin="true">
+  <dlg:img dlg:style-id="0" dlg:id="imgTeamLeader" dlg:tab-index="27" dlg:left="10" dlg:top="125" dlg:width="30" dlg:height="35"/>
+  <dlg:text dlg:id="txtLeaderAppraise" dlg:tab-index="26" dlg:left="45" dlg:top="108" dlg:width="192" dlg:height="10"/>
+  <dlg:menulist dlg:id="lstTotal" dlg:tab-index="9" dlg:left="45" dlg:top="121" dlg:width="192" dlg:height="16" dlg:spin="true"/>
+  <dlg:text dlg:id="txtBestBefore" dlg:tab-index="22" dlg:left="45" dlg:top="147" dlg:width="20" dlg:height="10"/>
+  <dlg:menulist dlg:id="lstBest" dlg:tab-index="10" dlg:left="69" dlg:top="143" dlg:width="54" dlg:height="16" dlg:spin="true">
    <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.script:PokemonGoIV.0Main.subLstBestItemChanged?language=Basic&amp;location=application" script:language="Script"/>
   </dlg:menulist>
-  <dlg:text dlg:id="txtBestAfter" dlg:tab-index="24" dlg:left="110" dlg:top="146" dlg:width="100" dlg:height="8"/>
-  <dlg:checkbox dlg:id="cbxBest2" dlg:tab-index="11" dlg:left="45" dlg:top="161" dlg:width="180" dlg:height="8" dlg:checked="false"/>
-  <dlg:checkbox dlg:id="cbxBest3" dlg:tab-index="12" dlg:left="45" dlg:top="176" dlg:width="180" dlg:height="8" dlg:checked="false"/>
-  <dlg:menulist dlg:id="lstMax" dlg:tab-index="13" dlg:left="45" dlg:top="189" dlg:width="180" dlg:height="12" dlg:spin="true"/>
-  <dlg:button dlg:id="btnOK" dlg:tab-index="14" dlg:disabled="true" dlg:left="40" dlg:top="215" dlg:width="60" dlg:height="15" dlg:default="true" dlg:button-type="ok"/>
-  <dlg:button dlg:id="btnCancel" dlg:tab-index="15" dlg:left="135" dlg:top="215" dlg:width="60" dlg:height="15" dlg:button-type="cancel"/>
+  <dlg:text dlg:id="txtBestAfter" dlg:tab-index="23" dlg:left="125" dlg:top="147" dlg:width="112" dlg:height="10"/>
+  <dlg:checkbox dlg:id="cbxBest2" dlg:tab-index="11" dlg:left="45" dlg:top="165" dlg:width="192" dlg:height="10" dlg:checked="false"/>
+  <dlg:checkbox dlg:id="cbxBest3" dlg:tab-index="12" dlg:left="45" dlg:top="183" dlg:width="192" dlg:height="10" dlg:checked="false"/>
+  <dlg:menulist dlg:id="lstMax" dlg:tab-index="13" dlg:left="45" dlg:top="202" dlg:width="192" dlg:height="16" dlg:spin="true"/>
+  <dlg:button dlg:id="btnOK" dlg:tab-index="14" dlg:disabled="true" dlg:left="40" dlg:top="230" dlg:width="60" dlg:height="16" dlg:default="true" dlg:button-type="ok"/>
+  <dlg:button dlg:id="btnCancel" dlg:tab-index="15" dlg:left="144" dlg:top="230" dlg:width="60" dlg:height="16" dlg:button-type="cancel"/>
  </dlg:bulletinboard>
 </dlg:window>
diff --git a/oxt/description.xml b/oxt/description.xml
index 5bff29e..d47c398 100644
--- a/oxt/description.xml
+++ b/oxt/description.xml
@@ -20,7 +20,7 @@
 	<display-name>
 		<name>Pokémon GO IV Calculator</name>
 		<name lang="zh-TW">寶可夢 GO IV 計算機</name>
-		<name lang="de-DE">Pokémon GO IV Calculator</name>
+		<name lang="de-DE">Pokémon GO IV Rechner</name>
 	</display-name>
 	<icon>
 		<default xlink:href="icons/pokemongoiv.png" />
diff --git a/oxt/pkg-desc/pkg-description.de-DE.txt b/oxt/pkg-desc/pkg-description.de-DE.txt
index 4a97d56..f01d2e3 100644
--- a/oxt/pkg-desc/pkg-description.de-DE.txt
+++ b/oxt/pkg-desc/pkg-description.de-DE.txt
@@ -1,4 +1,4 @@
 PokemonGoIV - Pokémon GO IV Calculator
 Copyright (c) 2016-2017 imacat 
 
-Calculates the individual values (IVs) of the Pokémon.
+Berechnet Individuelle Werte (IVs) von Pokémon.