diff --git a/PokemonGoIV/0Main.vb b/PokemonGoIV/0Main.vb
index de8e044..258f3b3 100644
--- a/PokemonGoIV/0Main.vb
+++ b/PokemonGoIV/0Main.vb
@@ -160,419 +160,8 @@ Function fnAskParam As aFindIVParam
 	fnAskParam = aQuery
 End Function
 
-' fnAskParam: Asks the users for the parameters for the Pokémon.
-Function fnAskParam0 As aFindIVParam
-	Dim oDialog As Object, oDialogModel As Object
-	Dim oTextModel As Object, oListModel As Object
-	Dim oNumericModel As Object, oCheckBoxModel As Object
-	Dim oGroupModel As Object, oRadioModel As Object
-	Dim oButtonModel As Object, oListener As Object
-	Dim mListItems () As String, sTemp As String
-	Dim nI As Integer, nCount As Integer
-	Dim bIsBestAttack As Boolean, bIsBestDefense As Boolean
-	Dim bIsBestHP As Boolean
-	Dim aQuery As New aFindIVParam
-	
-	' Creates a dialog
-	oDialogModel = CreateUnoService ( _
-		"com.sun.star.awt.UnoControlDialogModel")
-	oDialogModel.setPropertyValue ("PositionX", 100)
-	oDialogModel.setPropertyValue ("PositionY", 100)
-	oDialogModel.setPropertyValue ("Height", 185)
-	oDialogModel.setPropertyValue ("Width", 220)
-	oDialogModel.setPropertyValue ("Title", "Pokémon GO IV Calculator")
-	
-	' Adds a text label for the Pokémon list.
-	oTextModel = oDialogModel.createInstance ( _
-		"com.sun.star.awt.UnoControlFixedTextModel")
-	oTextModel.setPropertyValue ("PositionX", 5)
-	oTextModel.setPropertyValue ("PositionY", 6)
-	oTextModel.setPropertyValue ("Height", 8)
-	oTextModel.setPropertyValue ("Width", 30)
-	oTextModel.setPropertyValue ("Label", "~Pokémon:")
-	oDialogModel.insertByName ("txtPokemon", oTextModel)
-	
-	' Adds the Pokémon list.
-	subReadBaseStats
-	ReDim mListItems (UBound (maBaseStats)) As String
-	For nI = 0 To UBound (maBaseStats)
-		mListItems (nI) = maBaseStats (nI).sPokemon
-	Next nI
-	oListModel = oDialogModel.createInstance ( _
-		"com.sun.star.awt.UnoControlListBoxModel")
-	oListModel.setPropertyValue ("PositionX", 35)
-	oListModel.setPropertyValue ("PositionY", 4)
-	oListModel.setPropertyValue ("Height", 12)
-	oListModel.setPropertyValue ("Width", 50)
-	oListModel.setPropertyValue ("TabIndex", 0)
-	oListModel.setPropertyValue ("Dropdown", True)
-	oListModel.setPropertyValue ("StringItemList", mListItems)
-	oDialogModel.insertByName ("lstPokemon", oListModel)
-	
-	' Adds a text label for the CP field.
-	oTextModel = oDialogModel.createInstance ( _
-		"com.sun.star.awt.UnoControlFixedTextModel")
-	oTextModel.setPropertyValue ("PositionX", 5)
-	oTextModel.setPropertyValue ("PositionY", 21)
-	oTextModel.setPropertyValue ("Height", 8)
-	oTextModel.setPropertyValue ("Width", 15)
-	oTextModel.setPropertyValue ("Label", "~CP:")
-	oDialogModel.insertByName ("txtCP", oTextModel)
-	
-	' Adds the CP field.
-	oNumericModel = oDialogModel.createInstance ( _
-		"com.sun.star.awt.UnoControlNumericFieldModel")
-	oNumericModel.setPropertyValue ("PositionX", 20)
-	oNumericModel.setPropertyValue ("PositionY", 19)
-	oNumericModel.setPropertyValue ("Height", 12)
-	oNumericModel.setPropertyValue ("Width", 20)
-	oNumericModel.setPropertyValue ("DecimalAccuracy", 0)
-	oDialogModel.insertByName ("numCP", oNumericModel)
-	
-	' Adds a text label for the HP field.
-	oTextModel = oDialogModel.createInstance ( _
-		"com.sun.star.awt.UnoControlFixedTextModel")
-	oTextModel.setPropertyValue ("PositionX", 50)
-	oTextModel.setPropertyValue ("PositionY", 21)
-	oTextModel.setPropertyValue ("Height", 8)
-	oTextModel.setPropertyValue ("Width", 15)
-	oTextModel.setPropertyValue ("Label", "~HP:")
-	oDialogModel.insertByName ("txtHP", oTextModel)
-	
-	' Adds the HP field.
-	oNumericModel = oDialogModel.createInstance ( _
-		"com.sun.star.awt.UnoControlNumericFieldModel")
-	oNumericModel.setPropertyValue ("PositionX", 65)
-	oNumericModel.setPropertyValue ("PositionY", 19)
-	oNumericModel.setPropertyValue ("Height", 12)
-	oNumericModel.setPropertyValue ("Width", 15)
-	oNumericModel.setPropertyValue ("DecimalAccuracy", 0)
-	oDialogModel.insertByName ("numHP", oNumericModel)
-	
-	' Adds a text label for the star dust field.
-	oTextModel = oDialogModel.createInstance ( _
-		"com.sun.star.awt.UnoControlFixedTextModel")
-	oTextModel.setPropertyValue ("PositionX", 90)
-	oTextModel.setPropertyValue ("PositionY", 21)
-	oTextModel.setPropertyValue ("Height", 8)
-	oTextModel.setPropertyValue ("Width", 30)
-	oTextModel.setPropertyValue ("Label", "S~tar dust:")
-	oDialogModel.insertByName ("txtStarDust", oTextModel)
-	
-	' Adds the star dust field.
-	subReadStarDust
-	sTemp = " "
-	ReDim mListItems () As String
-	nCount = -1
-	For nI = 1 To UBound (mStarDust)
-		If InStr (sTemp, " " & CStr (mStarDust (nI)) & " ") = 0 Then
-			nCount = nCount + 1
-			ReDim Preserve mListItems (nCount) As String
-			mListItems (nCount) = CStr (mStarDust (nI))
-			sTemp = sTemp & CStr (mStarDust (nI)) & " "
-		End If
-	Next nI
-	oListModel = oDialogModel.createInstance ( _
-		"com.sun.star.awt.UnoControlListBoxModel")
-	oListModel.setPropertyValue ("PositionX", 120)
-	oListModel.setPropertyValue ("PositionY", 19)
-	oListModel.setPropertyValue ("Height", 12)
-	oListModel.setPropertyValue ("Width", 30)
-	oListModel.setPropertyValue ("Dropdown", True)
-	oListModel.setPropertyValue ("StringItemList", mListItems)
-	oDialogModel.insertByName ("lstStarDust", oListModel)
-	
-	' Adds a text label for the player level field.
-	oTextModel = oDialogModel.createInstance ( _
-		"com.sun.star.awt.UnoControlFixedTextModel")
-	oTextModel.setPropertyValue ("PositionX", 160)
-	oTextModel.setPropertyValue ("PositionY", 21)
-	oTextModel.setPropertyValue ("Height", 8)
-	oTextModel.setPropertyValue ("Width", 35)
-	oTextModel.setPropertyValue ("Label", "Player ~level:")
-	oDialogModel.insertByName ("txtPlayerLevel", oTextModel)
-	
-	' Adds the player level field.
-	ReDim mListItems (39) As String
-	For nI = 0 To UBound (mListItems)
-		mListItems (nI) = CStr (nI + 1)
-	Next nI
-	oListModel = oDialogModel.createInstance ( _
-		"com.sun.star.awt.UnoControlListBoxModel")
-	oListModel.setPropertyValue ("PositionX", 195)
-	oListModel.setPropertyValue ("PositionY", 19)
-	oListModel.setPropertyValue ("Height", 12)
-	oListModel.setPropertyValue ("Width", 20)
-	oListModel.setPropertyValue ("Dropdown", True)
-	oListModel.setPropertyValue ("StringItemList", mListItems)
-	oDialogModel.insertByName ("lstPlayerLevel", oListModel)
-	
-	' Adds the whether powered-up check box.
-	oCheckBoxModel = oDialogModel.createInstance ( _
-		"com.sun.star.awt.UnoControlCheckBoxModel")
-	oCheckBoxModel.setPropertyValue ("PositionX", 5)
-	oCheckBoxModel.setPropertyValue ("PositionY", 36)
-	oCheckBoxModel.setPropertyValue ("Height", 8)
-	oCheckBoxModel.setPropertyValue ("Width", 210)
-	oCheckBoxModel.setPropertyValue ("Label", _
-		"This Pokémon is ~newly-caught and was not powered-up yet.")
-	oCheckBoxModel.setPropertyValue ("State", 1)
-	oDialogModel.insertByName ("cbxIsNew", oCheckBoxModel)
-	
-	' Adds a group for the appraisals
-	oGroupModel = oDialogModel.createInstance ( _
-		"com.sun.star.awt.UnoControlGroupBoxModel")
-	oGroupModel.setPropertyValue ("PositionX", 5)
-	oGroupModel.setPropertyValue ("PositionY", 50)
-	oGroupModel.setPropertyValue ("Height", 110)
-	oGroupModel.setPropertyValue ("Width", 210)
-	oGroupModel.setPropertyValue ("Label", "Team Leader Apprasal")
-	oDialogModel.insertByName ("grpApprasals", oGroupModel)
-	
-	' Adds a text label for the team.
-	oTextModel = oDialogModel.createInstance ( _
-		"com.sun.star.awt.UnoControlFixedTextModel")
-	oTextModel.setPropertyValue ("PositionX", 10)
-	oTextModel.setPropertyValue ("PositionY", 66)
-	oTextModel.setPropertyValue ("Height", 8)
-	oTextModel.setPropertyValue ("Width", 20)
-	oTextModel.setPropertyValue ("Label", "Team:")
-	oDialogModel.insertByName ("txtTeam", oTextModel)
-	
-	' Adds the red team radio button.
-	oRadioModel = oDialogModel.createInstance ( _
-		"com.sun.star.awt.UnoControlRadioButtonModel")
-	oRadioModel.setPropertyValue ("PositionX", 30)
-	oRadioModel.setPropertyValue ("PositionY", 66)
-	oRadioModel.setPropertyValue ("Height", 8)
-	oRadioModel.setPropertyValue ("Width", 25)
-	oRadioModel.setPropertyValue ("Label", "~Valor")
-	oRadioModel.setPropertyValue ("TextColor", RGB (255, 255, 255))
-	oRadioModel.setPropertyValue ("BackgroundColor", RGB (255, 0, 0))
-	oDialogModel.insertByName ("rdoTeamRed", oRadioModel)
-	
-	' Adds the blue team radio button.
-	oRadioModel = oDialogModel.createInstance ( _
-		"com.sun.star.awt.UnoControlRadioButtonModel")
-	oRadioModel.setPropertyValue ("PositionX", 60)
-	oRadioModel.setPropertyValue ("PositionY", 66)
-	oRadioModel.setPropertyValue ("Height", 8)
-	oRadioModel.setPropertyValue ("Width", 30)
-	oRadioModel.setPropertyValue ("Label", "~Mystic")
-	oRadioModel.setPropertyValue ("TextColor", RGB (255, 255, 255))
-	oRadioModel.setPropertyValue ("BackgroundColor", RGB (0, 0, 255))
-	oDialogModel.insertByName ("rdoTeamBlue", oRadioModel)
-	
-	' Adds the yellow team radio button.
-	oRadioModel = oDialogModel.createInstance ( _
-		"com.sun.star.awt.UnoControlRadioButtonModel")
-	oRadioModel.setPropertyValue ("PositionX", 95)
-	oRadioModel.setPropertyValue ("PositionY", 66)
-	oRadioModel.setPropertyValue ("Height", 8)
-	oRadioModel.setPropertyValue ("Width", 30)
-	oRadioModel.setPropertyValue ("Label", "~Instinct")
-	oRadioModel.setPropertyValue ("BackgroundColor", RGB (255, 255, 0))
-	oDialogModel.insertByName ("rdoTeamYellow", oRadioModel)
-	
-	' Adds the first appraisal list.
-	oListModel = oDialogModel.createInstance ( _
-		"com.sun.star.awt.UnoControlListBoxModel")
-	oListModel.setPropertyValue ("PositionX", 10)
-	oListModel.setPropertyValue ("PositionY", 79)
-	oListModel.setPropertyValue ("Height", 12)
-	oListModel.setPropertyValue ("Width", 200)
-	oListModel.setPropertyValue ("Dropdown", True)
-	oDialogModel.insertByName ("lstApprasal1", oListModel)
-	
-	' Adds a text label before the best stat.
-	oTextModel = oDialogModel.createInstance ( _
-		"com.sun.star.awt.UnoControlFixedTextModel")
-	oTextModel.setPropertyValue ("PositionX", 10)
-	oTextModel.setPropertyValue ("PositionY", 96)
-	oTextModel.setPropertyValue ("Height", 8)
-	oTextModel.setPropertyValue ("Width", 20)
-	oDialogModel.insertByName ("txtBestBefore", oTextModel)
-	
-	' Adds the best stat field.
-	oListModel = oDialogModel.createInstance ( _
-		"com.sun.star.awt.UnoControlListBoxModel")
-	oListModel.setPropertyValue ("PositionX", 30)
-	oListModel.setPropertyValue ("PositionY", 94)
-	oListModel.setPropertyValue ("Height", 12)
-	oListModel.setPropertyValue ("Width", 35)
-	oListModel.setPropertyValue ("Dropdown", True)
-	oDialogModel.insertByName ("lstBest", oListModel)
-	
-	' Adds a text label after the best stat.
-	oTextModel = oDialogModel.createInstance ( _
-		"com.sun.star.awt.UnoControlFixedTextModel")
-	oTextModel.setPropertyValue ("PositionX", 65)
-	oTextModel.setPropertyValue ("PositionY", 96)
-	oTextModel.setPropertyValue ("Height", 8)
-	oTextModel.setPropertyValue ("Width", 100)
-	oDialogModel.insertByName ("txtBestAfter", oTextModel)
-	
-	' Adds the second best stat check box.
-	oCheckBoxModel = oDialogModel.createInstance ( _
-		"com.sun.star.awt.UnoControlCheckBoxModel")
-	oCheckBoxModel.setPropertyValue ("PositionX", 10)
-	oCheckBoxModel.setPropertyValue ("PositionY", 111)
-	oCheckBoxModel.setPropertyValue ("Height", 8)
-	oCheckBoxModel.setPropertyValue ("Width", 200)
-	oDialogModel.insertByName ("cbxBest2", oCheckBoxModel)
-	
-	' Adds the third best stat check box.
-	oCheckBoxModel = oDialogModel.createInstance ( _
-		"com.sun.star.awt.UnoControlCheckBoxModel")
-	oCheckBoxModel.setPropertyValue ("PositionX", 10)
-	oCheckBoxModel.setPropertyValue ("PositionY", 126)
-	oCheckBoxModel.setPropertyValue ("Height", 8)
-	oCheckBoxModel.setPropertyValue ("Width", 200)
-	oDialogModel.insertByName ("cbxBest3", oCheckBoxModel)
-	
-	' Adds the second appraisal list.
-	oListModel = oDialogModel.createInstance ( _
-		"com.sun.star.awt.UnoControlListBoxModel")
-	oListModel.setPropertyValue ("PositionX", 10)
-	oListModel.setPropertyValue ("PositionY", 139)
-	oListModel.setPropertyValue ("Height", 12)
-	oListModel.setPropertyValue ("Width", 200)
-	oListModel.setPropertyValue ("Dropdown", True)
-	oDialogModel.insertByName ("lstApprasal2", oListModel)
-	
-	' Adds the OK button.
-	oButtonModel = oDialogModel.createInstance ( _
-		"com.sun.star.awt.UnoControlButtonModel")
-	oButtonModel.setPropertyValue ("PositionX", 35)
-	oButtonModel.setPropertyValue ("PositionY", 165)
-	oButtonModel.setPropertyValue ("Height", 15)
-	oButtonModel.setPropertyValue ("Width", 60)
-	oButtonModel.setPropertyValue ("PushButtonType", _
-		com.sun.star.awt.PushButtonType.OK)
-	oButtonModel.setPropertyValue ("DefaultButton", True)
-	oButtonModel.setPropertyValue ("Enabled", False)
-	oDialogModel.insertByName ("btnOK", oButtonModel)
-	
-	' Adds the cancel button.
-	oButtonModel = oDialogModel.createInstance ( _
-		"com.sun.star.awt.UnoControlButtonModel")
-	oButtonModel.setPropertyValue ("PositionX", 125)
-	oButtonModel.setPropertyValue ("PositionY", 165)
-	oButtonModel.setPropertyValue ("Height", 15)
-	oButtonModel.setPropertyValue ("Width", 60)
-	oButtonModel.setPropertyValue ("PushButtonType", _
-		com.sun.star.awt.PushButtonType.CANCEL)
-	oDialogModel.insertByName ("btnCancel", oButtonModel)
-	
-	' Adds the dialog model to the control and runs it.
-	oDialog = CreateUnoService ("com.sun.star.awt.UnoControlDialog")
-	oDialog.setModel (oDialogModel)
-	oDialog.setVisible (True)
-	oDialog.getControl ("lstPokemon").setFocus
-	oListener = CreateUnoListener ("subBtnOKCheck_", _
-		"com.sun.star.awt.XItemListener")
-	oDialog.getControl ("lstPokemon").addItemListener (oListener)
-	oListener = CreateUnoListener ("subBtnOKCheck_", _
-		"com.sun.star.awt.XTextListener")
-	oDialog.getControl ("numCP").addTextListener (oListener)
-	oListener = CreateUnoListener ("subBtnOKCheck_", _
-		"com.sun.star.awt.XTextListener")
-	oDialog.getControl ("numHP").addTextListener (oListener)
-	oListener = CreateUnoListener ("subBtnOKCheck_", _
-		"com.sun.star.awt.XItemListener")
-	oDialog.getControl ("lstStarDust").addItemListener (oListener)
-	oListener = CreateUnoListener ("subRdoTeamRedItemChanged_", _
-		"com.sun.star.awt.XItemListener")
-	oDialog.getControl ("rdoTeamRed").addItemListener (oListener)
-	oListener = CreateUnoListener ("subRdoTeamBlueItemChanged_", _
-		"com.sun.star.awt.XItemListener")
-	oDialog.getControl ("rdoTeamBlue").addItemListener (oListener)
-	oListener = CreateUnoListener ("subRdoTeamYellowItemChanged_", _
-		"com.sun.star.awt.XItemListener")
-	oDialog.getControl ("rdoTeamYellow").addItemListener (oListener)
-	oListener = CreateUnoListener ("subLstBestItemChanged_", _
-		"com.sun.star.awt.XItemListener")
-	oDialog.getControl ("lstBest").addItemListener (oListener)
-	oDialog.getControl ("lstApprasal1").setVisible (False)
-	oDialog.getControl ("txtBestBefore").setVisible (False)
-	oDialog.getControl ("lstBest").setVisible (False)
-	oDialog.getControl ("txtBestAfter").setVisible (False)
-	oDialog.getControl ("cbxBest2").setVisible (False)
-	oDialog.getControl ("cbxBest3").setVisible (False)
-	oDialog.getControl ("lstApprasal2").setVisible (False)
-	If oDialog.execute = 0 Then
-		aQuery.bIsCancelled = True
-		fnAskParam0 = aQuery
-		Exit Function
-	End If
-	
-	With aQuery
-		.sPokemon = oDialog.getControl ("lstPokemon").getSelectedItem
-		.nCP = oDialog.getControl ("numCP").getValue
-		.nHP = oDialog.getControl ("numHP").getValue
-		.nStarDust = CInt (oDialog.getControl ("lstStarDust").getSelectedItem)
-		.nPlayerLevel = CInt (oDialog.getControl ("lstPlayerLevel").getSelectedItem)
-		.nAppraisal1 = oDialog.getControl ("lstApprasal1").getSelectedItemPos + 1
-		.nAppraisal2 = oDialog.getControl ("lstApprasal2").getSelectedItemPos + 1
-		.bIsCancelled = False
-	End With
-	If oDialog.getControl ("cbxIsNew").getState = 1 Then
-		aQuery.bIsNew = True
-	Else
-		aQuery.bIsNew = False
-	End If
-	
-	' The best stats
-	bIsBestAttack = False
-	bIsBestDefense = False
-	bIsBestHP = False
-	If oDialog.getControl ("lstBest").getSelectedItem = "Attack" Then
-		bIsBestAttack = True
-		If oDialog.getControl ("cbxBest2").getState = 1 Then
-			bIsBestDefense = True
-		End If
-		If oDialog.getControl ("cbxBest3").getState = 1 Then
-			bIsBestHP = True
-		End If
-	End If
-	If oDialog.getControl ("lstBest").getSelectedItem = "Defense" Then
-		bIsBestDefense = True
-		If oDialog.getControl ("cbxBest2").getState = 1 Then
-			bIsBestAttack = True
-		End If
-		If oDialog.getControl ("cbxBest3").getState = 1 Then
-			bIsBestHP = True
-		End If
-	End If
-	If oDialog.getControl ("lstBest").getSelectedItem = "HP" Then
-		bIsBestHP = True
-		If oDialog.getControl ("cbxBest2").getState = 1 Then
-			bIsBestAttack = True
-		End If
-		If oDialog.getControl ("cbxBest3").getState = 1 Then
-			bIsBestDefense = True
-		End If
-	End If
-	aQuery.sBest = ""
-	If bIsBestAttack Then
-		aQuery.sBest = aQuery.sBest & "Atk "
-	End If
-	If bIsBestDefense Then
-		aQuery.sBest = aQuery.sBest & "Def "
-	End If
-	If bIsBestHP Then
-		aQuery.sBest = aQuery.sBest & "Sta "
-	End If
-	
-	fnAskParam0 = aQuery
-End Function
-
-' subBtnOKCheck_disposing: Dummy for the listener.
-Sub subBtnOKCheck_disposing (oEvent As object)
-End Sub
-
-' subBtnOKCheck_itemStateChanged: When the Pokémon or star dust is selected.
-Sub subBtnOKCheck_itemStateChanged (oEvent As object)
+' subBtnOKCheck: Checks whether Pokémon, CP, HP and star dust are all filled.
+Sub subBtnOKCheck (oEvent As object)
 	Dim oDialog As Object
 	Dim oPokemon As Object, oCP As Object
 	Dim oHP As Object, oStarDust As Object, oOK As Object
@@ -594,6 +183,38 @@ Sub subBtnOKCheck_itemStateChanged (oEvent As object)
 	End If
 End Sub
 
+' subLstPokemonSelected: When the Pokémon is selected.
+Sub subLstPokemonSelected (oEvent As object)
+	Dim oDialog As Object, sPokemon As String
+	Dim oImageModel As Object, sImageId As String
+	
+	oDialog = oEvent.Source.getContext
+	
+	sPokemon = oDialog.getControl ("lstPokemon").getSelectedItem
+	sImageId = ""
+	If sPokemon = "Farfetch'd" Then
+		sImageId = "PokemonFarfetchd"
+	End If
+	If sPokemon = "Nidoran♀" Then
+		sImageId = "PokemonNidoranFemale"
+	End If
+	If sPokemon = "Nidoran♂" Then
+		sImageId = "PokemonNidoranMale"
+	End If
+	If sPokemon = "Mr. Mime" Then
+		sImageId = "PokemonMrMime"
+	End If
+	If sImageId = "" Then
+		sImageId = "Pokemon" & sPokemon
+	End If
+	
+	oImageModel = oDialog.getControl ("imgPokemon").getModel
+	oImageModel.setPropertyValue ("ImageURL", _
+		fnGetImageUrl (sImageId))
+	
+	subBtnOKCheck (oEvent)
+End Sub
+
 ' subBtnOKCheck_textChanged: When the CP or HP is filled
 Sub subBtnOKCheck_textChanged (oEvent As object)
 	subBtnOKCheck_itemStateChanged (oEvent)
@@ -613,7 +234,7 @@ Sub subRdoTeamRedItemChanged_itemStateChanged (oEvent As object)
 	
 	oImageModel = oDialog.getControl ("imgTeam").getModel
 	oImageModel.setPropertyValue ("ImageURL", _
-	    fnGetImageUrl ("TeamValor"))
+		fnGetImageUrl ("TeamValor"))
 	
 	mItems = Array ( _
 		"Overall, your [Pokémon] simply amazes me. It can accomplish anything!", _
@@ -676,7 +297,7 @@ Sub subRdoTeamBlueItemChanged_itemStateChanged (oEvent As object)
 	
 	oImageModel = oDialog.getControl ("imgTeam").getModel
 	oImageModel.setPropertyValue ("ImageURL", _
-	    fnGetImageUrl ("TeamMystic"))
+		fnGetImageUrl ("TeamMystic"))
 	
 	mItems = Array ( _
 		"Overall, your [Pokémon] is a wonder! What a breathtaking Pokémon!", _
@@ -739,7 +360,7 @@ Sub subRdoTeamYellowItemChanged_itemStateChanged (oEvent As object)
 	
 	oImageModel = oDialog.getControl ("imgTeam").getModel
 	oImageModel.setPropertyValue ("ImageURL", _
-	    fnGetImageUrl ("TeamInstinct"))
+		fnGetImageUrl ("TeamInstinct"))
 	
 	mItems = Array ( _
 		"Overall, your [Pokémon] looks like it can really battle with the best of them!", _
diff --git a/oxt/AddonConfiguration.xcu b/oxt/AddonConfiguration.xcu
index 1488dfe..207f0a6 100644
--- a/oxt/AddonConfiguration.xcu
+++ b/oxt/AddonConfiguration.xcu
@@ -54,6 +54,761 @@
 				<value>%origin%/icons/team-instinct.png</value>
 			</prop>
 		</node>
+		<node oor:name="PokemonBulbasaur" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/bulbasaur-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonIvysaur" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/ivysaur-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonVenusaur" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/venusaur-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonCharmander" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/charmander-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonCharmeleon" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/charmeleon-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonCharizard" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/charizard-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonSquirtle" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/squirtle-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonWartortle" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/wartortle-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonBlastoise" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/blastoise-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonCaterpie" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/caterpie-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonMetapod" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/metapod-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonButterfree" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/butterfree-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonWeedle" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/weedle-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonKakuna" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/kakuna-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonBeedrill" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/beedrill-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonPidgey" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/pidgey-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonPidgeotto" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/pidgeotto-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonPidgeot" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/pidgeot-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonRattata" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/rattata-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonRaticate" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/raticate-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonSpearow" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/spearow-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonFearow" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/fearow-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonEkans" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/ekans-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonArbok" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/arbok-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonPikachu" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/pikachu-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonRaichu" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/raichu-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonSandshrew" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/sandshrew-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonSandslash" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/sandslash-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonNidoranFemale" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/nidoran-female-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonNidorina" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/nidorina-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonNidoqueen" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/nidoqueen-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonNidoranMale" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/nidoran-male-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonNidorino" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/nidorino-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonNidoking" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/nidoking-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonClefairy" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/clefairy-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonClefable" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/clefable-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonVulpix" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/vulpix-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonNinetales" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/ninetales-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonJigglypuff" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/jigglypuff-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonWigglytuff" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/wigglytuff-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonZubat" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/zubat-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonGolbat" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/golbat-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonOddish" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/oddish-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonGloom" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/gloom-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonVileplume" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/vileplume-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonParas" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/paras-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonParasect" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/parasect-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonVenonat" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/venonat-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonVenomoth" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/venomoth-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonDiglett" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/diglett-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonDugtrio" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/dugtrio-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonMeowth" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/meowth-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonPersian" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/persian-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonPsyduck" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/psyduck-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonGolduck" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/golduck-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonMankey" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/mankey-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonPrimeape" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/primeape-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonGrowlithe" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/growlithe-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonArcanine" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/arcanine-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonPoliwag" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/poliwag-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonPoliwhirl" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/poliwhirl-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonPoliwrath" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/poliwrath-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonAbra" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/abra-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonKadabra" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/kadabra-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonAlakazam" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/alakazam-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonMachop" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/machop-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonMachoke" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/machoke-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonMachamp" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/machamp-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonBellsprout" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/bellsprout-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonWeepinbell" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/weepinbell-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonVictreebel" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/victreebel-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonTentacool" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/tentacool-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonTentacruel" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/tentacruel-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonGeodude" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/geodude-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonGraveler" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/graveler-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonGolem" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/golem-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonPonyta" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/ponyta-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonRapidash" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/rapidash-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonSlowpoke" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/slowpoke-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonSlowbro" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/slowbro-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonMagnemite" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/magnemite-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonMagneton" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/magneton-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonFarfetchd" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/farfetchd-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonDoduo" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/doduo-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonDodrio" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/dodrio-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonSeel" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/seel-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonDewgong" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/dewgong-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonGrimer" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/grimer-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonMuk" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/muk-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonShellder" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/shellder-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonCloyster" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/cloyster-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonGastly" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/gastly-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonHaunter" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/haunter-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonGengar" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/gengar-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonOnix" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/onix-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonDrowzee" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/drowzee-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonHypno" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/hypno-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonKrabby" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/krabby-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonKingler" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/kingler-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonVoltorb" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/voltorb-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonElectrode" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/electrode-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonExeggcute" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/exeggcute-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonExeggutor" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/exeggutor-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonCubone" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/cubone-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonMarowak" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/marowak-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonHitmonlee" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/hitmonlee-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonHitmonchan" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/hitmonchan-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonLickitung" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/lickitung-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonKoffing" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/koffing-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonWeezing" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/weezing-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonRhyhorn" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/rhyhorn-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonRhydon" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/rhydon-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonChansey" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/chansey-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonTangela" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/tangela-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonKangaskhan" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/kangaskhan-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonHorsea" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/horsea-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonSeadra" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/seadra-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonGoldeen" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/goldeen-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonSeaking" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/seaking-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonStaryu" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/staryu-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonStarmie" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/starmie-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonMrMime" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/mr-mime-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonScyther" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/scyther-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonJynx" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/jynx-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonElectabuzz" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/electabuzz-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonMagmar" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/magmar-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonPinsir" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/pinsir-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonTauros" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/tauros-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonMagikarp" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/magikarp-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonGyarados" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/gyarados-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonLapras" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/lapras-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonDitto" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/ditto-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonEevee" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/eevee-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonVaporeon" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/vaporeon-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonJolteon" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/jolteon-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonFlareon" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/flareon-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonPorygon" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/porygon-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonOmanyte" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/omanyte-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonOmastar" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/omastar-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonKabuto" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/kabuto-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonKabutops" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/kabutops-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonAerodactyl" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/aerodactyl-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonSnorlax" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/snorlax-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonArticuno" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/articuno-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonZapdos" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/zapdos-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonMoltres" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/moltres-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonDratini" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/dratini-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonDragonair" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/dragonair-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonDragonite" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/dragonite-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonMewtwo" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/mewtwo-pokemon-go.png</value>
+			</prop>
+		</node>
+		<node oor:name="PokemonMew" oor:op="replace">
+			<prop oor:name="Url" oor:type="xs:string" oor:localized="true">
+				<value>%origin%/icons/pokemons/mew-pokemon-go.png</value>
+			</prop>
+		</node>
 	</node>
 	
 <!--  Localized messages -->	
diff --git a/oxt/PokemonGoIV/0Main.xba b/oxt/PokemonGoIV/0Main.xba
index a7f17d6..d9b7e0b 100644
--- a/oxt/PokemonGoIV/0Main.xba
+++ b/oxt/PokemonGoIV/0Main.xba
@@ -162,419 +162,8 @@ Function fnAskParam As aFindIVParam
 	fnAskParam = aQuery
 End Function
 
-&apos; fnAskParam: Asks the users for the parameters for the Pokémon.
-Function fnAskParam0 As aFindIVParam
-	Dim oDialog As Object, oDialogModel As Object
-	Dim oTextModel As Object, oListModel As Object
-	Dim oNumericModel As Object, oCheckBoxModel As Object
-	Dim oGroupModel As Object, oRadioModel As Object
-	Dim oButtonModel As Object, oListener As Object
-	Dim mListItems () As String, sTemp As String
-	Dim nI As Integer, nCount As Integer
-	Dim bIsBestAttack As Boolean, bIsBestDefense As Boolean
-	Dim bIsBestHP As Boolean
-	Dim aQuery As New aFindIVParam
-	
-	&apos; Creates a dialog
-	oDialogModel = CreateUnoService ( _
-		&quot;com.sun.star.awt.UnoControlDialogModel&quot;)
-	oDialogModel.setPropertyValue (&quot;PositionX&quot;, 100)
-	oDialogModel.setPropertyValue (&quot;PositionY&quot;, 100)
-	oDialogModel.setPropertyValue (&quot;Height&quot;, 185)
-	oDialogModel.setPropertyValue (&quot;Width&quot;, 220)
-	oDialogModel.setPropertyValue (&quot;Title&quot;, &quot;Pokémon GO IV Calculator&quot;)
-	
-	&apos; Adds a text label for the Pokémon list.
-	oTextModel = oDialogModel.createInstance ( _
-		&quot;com.sun.star.awt.UnoControlFixedTextModel&quot;)
-	oTextModel.setPropertyValue (&quot;PositionX&quot;, 5)
-	oTextModel.setPropertyValue (&quot;PositionY&quot;, 6)
-	oTextModel.setPropertyValue (&quot;Height&quot;, 8)
-	oTextModel.setPropertyValue (&quot;Width&quot;, 30)
-	oTextModel.setPropertyValue (&quot;Label&quot;, &quot;~Pokémon:&quot;)
-	oDialogModel.insertByName (&quot;txtPokemon&quot;, oTextModel)
-	
-	&apos; Adds the Pokémon list.
-	subReadBaseStats
-	ReDim mListItems (UBound (maBaseStats)) As String
-	For nI = 0 To UBound (maBaseStats)
-		mListItems (nI) = maBaseStats (nI).sPokemon
-	Next nI
-	oListModel = oDialogModel.createInstance ( _
-		&quot;com.sun.star.awt.UnoControlListBoxModel&quot;)
-	oListModel.setPropertyValue (&quot;PositionX&quot;, 35)
-	oListModel.setPropertyValue (&quot;PositionY&quot;, 4)
-	oListModel.setPropertyValue (&quot;Height&quot;, 12)
-	oListModel.setPropertyValue (&quot;Width&quot;, 50)
-	oListModel.setPropertyValue (&quot;TabIndex&quot;, 0)
-	oListModel.setPropertyValue (&quot;Dropdown&quot;, True)
-	oListModel.setPropertyValue (&quot;StringItemList&quot;, mListItems)
-	oDialogModel.insertByName (&quot;lstPokemon&quot;, oListModel)
-	
-	&apos; Adds a text label for the CP field.
-	oTextModel = oDialogModel.createInstance ( _
-		&quot;com.sun.star.awt.UnoControlFixedTextModel&quot;)
-	oTextModel.setPropertyValue (&quot;PositionX&quot;, 5)
-	oTextModel.setPropertyValue (&quot;PositionY&quot;, 21)
-	oTextModel.setPropertyValue (&quot;Height&quot;, 8)
-	oTextModel.setPropertyValue (&quot;Width&quot;, 15)
-	oTextModel.setPropertyValue (&quot;Label&quot;, &quot;~CP:&quot;)
-	oDialogModel.insertByName (&quot;txtCP&quot;, oTextModel)
-	
-	&apos; Adds the CP field.
-	oNumericModel = oDialogModel.createInstance ( _
-		&quot;com.sun.star.awt.UnoControlNumericFieldModel&quot;)
-	oNumericModel.setPropertyValue (&quot;PositionX&quot;, 20)
-	oNumericModel.setPropertyValue (&quot;PositionY&quot;, 19)
-	oNumericModel.setPropertyValue (&quot;Height&quot;, 12)
-	oNumericModel.setPropertyValue (&quot;Width&quot;, 20)
-	oNumericModel.setPropertyValue (&quot;DecimalAccuracy&quot;, 0)
-	oDialogModel.insertByName (&quot;numCP&quot;, oNumericModel)
-	
-	&apos; Adds a text label for the HP field.
-	oTextModel = oDialogModel.createInstance ( _
-		&quot;com.sun.star.awt.UnoControlFixedTextModel&quot;)
-	oTextModel.setPropertyValue (&quot;PositionX&quot;, 50)
-	oTextModel.setPropertyValue (&quot;PositionY&quot;, 21)
-	oTextModel.setPropertyValue (&quot;Height&quot;, 8)
-	oTextModel.setPropertyValue (&quot;Width&quot;, 15)
-	oTextModel.setPropertyValue (&quot;Label&quot;, &quot;~HP:&quot;)
-	oDialogModel.insertByName (&quot;txtHP&quot;, oTextModel)
-	
-	&apos; Adds the HP field.
-	oNumericModel = oDialogModel.createInstance ( _
-		&quot;com.sun.star.awt.UnoControlNumericFieldModel&quot;)
-	oNumericModel.setPropertyValue (&quot;PositionX&quot;, 65)
-	oNumericModel.setPropertyValue (&quot;PositionY&quot;, 19)
-	oNumericModel.setPropertyValue (&quot;Height&quot;, 12)
-	oNumericModel.setPropertyValue (&quot;Width&quot;, 15)
-	oNumericModel.setPropertyValue (&quot;DecimalAccuracy&quot;, 0)
-	oDialogModel.insertByName (&quot;numHP&quot;, oNumericModel)
-	
-	&apos; Adds a text label for the star dust field.
-	oTextModel = oDialogModel.createInstance ( _
-		&quot;com.sun.star.awt.UnoControlFixedTextModel&quot;)
-	oTextModel.setPropertyValue (&quot;PositionX&quot;, 90)
-	oTextModel.setPropertyValue (&quot;PositionY&quot;, 21)
-	oTextModel.setPropertyValue (&quot;Height&quot;, 8)
-	oTextModel.setPropertyValue (&quot;Width&quot;, 30)
-	oTextModel.setPropertyValue (&quot;Label&quot;, &quot;S~tar dust:&quot;)
-	oDialogModel.insertByName (&quot;txtStarDust&quot;, oTextModel)
-	
-	&apos; Adds the star dust field.
-	subReadStarDust
-	sTemp = &quot; &quot;
-	ReDim mListItems () As String
-	nCount = -1
-	For nI = 1 To UBound (mStarDust)
-		If InStr (sTemp, &quot; &quot; &amp; CStr (mStarDust (nI)) &amp; &quot; &quot;) = 0 Then
-			nCount = nCount + 1
-			ReDim Preserve mListItems (nCount) As String
-			mListItems (nCount) = CStr (mStarDust (nI))
-			sTemp = sTemp &amp; CStr (mStarDust (nI)) &amp; &quot; &quot;
-		End If
-	Next nI
-	oListModel = oDialogModel.createInstance ( _
-		&quot;com.sun.star.awt.UnoControlListBoxModel&quot;)
-	oListModel.setPropertyValue (&quot;PositionX&quot;, 120)
-	oListModel.setPropertyValue (&quot;PositionY&quot;, 19)
-	oListModel.setPropertyValue (&quot;Height&quot;, 12)
-	oListModel.setPropertyValue (&quot;Width&quot;, 30)
-	oListModel.setPropertyValue (&quot;Dropdown&quot;, True)
-	oListModel.setPropertyValue (&quot;StringItemList&quot;, mListItems)
-	oDialogModel.insertByName (&quot;lstStarDust&quot;, oListModel)
-	
-	&apos; Adds a text label for the player level field.
-	oTextModel = oDialogModel.createInstance ( _
-		&quot;com.sun.star.awt.UnoControlFixedTextModel&quot;)
-	oTextModel.setPropertyValue (&quot;PositionX&quot;, 160)
-	oTextModel.setPropertyValue (&quot;PositionY&quot;, 21)
-	oTextModel.setPropertyValue (&quot;Height&quot;, 8)
-	oTextModel.setPropertyValue (&quot;Width&quot;, 35)
-	oTextModel.setPropertyValue (&quot;Label&quot;, &quot;Player ~level:&quot;)
-	oDialogModel.insertByName (&quot;txtPlayerLevel&quot;, oTextModel)
-	
-	&apos; Adds the player level field.
-	ReDim mListItems (39) As String
-	For nI = 0 To UBound (mListItems)
-		mListItems (nI) = CStr (nI + 1)
-	Next nI
-	oListModel = oDialogModel.createInstance ( _
-		&quot;com.sun.star.awt.UnoControlListBoxModel&quot;)
-	oListModel.setPropertyValue (&quot;PositionX&quot;, 195)
-	oListModel.setPropertyValue (&quot;PositionY&quot;, 19)
-	oListModel.setPropertyValue (&quot;Height&quot;, 12)
-	oListModel.setPropertyValue (&quot;Width&quot;, 20)
-	oListModel.setPropertyValue (&quot;Dropdown&quot;, True)
-	oListModel.setPropertyValue (&quot;StringItemList&quot;, mListItems)
-	oDialogModel.insertByName (&quot;lstPlayerLevel&quot;, oListModel)
-	
-	&apos; Adds the whether powered-up check box.
-	oCheckBoxModel = oDialogModel.createInstance ( _
-		&quot;com.sun.star.awt.UnoControlCheckBoxModel&quot;)
-	oCheckBoxModel.setPropertyValue (&quot;PositionX&quot;, 5)
-	oCheckBoxModel.setPropertyValue (&quot;PositionY&quot;, 36)
-	oCheckBoxModel.setPropertyValue (&quot;Height&quot;, 8)
-	oCheckBoxModel.setPropertyValue (&quot;Width&quot;, 210)
-	oCheckBoxModel.setPropertyValue (&quot;Label&quot;, _
-		&quot;This Pokémon is ~newly-caught and was not powered-up yet.&quot;)
-	oCheckBoxModel.setPropertyValue (&quot;State&quot;, 1)
-	oDialogModel.insertByName (&quot;cbxIsNew&quot;, oCheckBoxModel)
-	
-	&apos; Adds a group for the appraisals
-	oGroupModel = oDialogModel.createInstance ( _
-		&quot;com.sun.star.awt.UnoControlGroupBoxModel&quot;)
-	oGroupModel.setPropertyValue (&quot;PositionX&quot;, 5)
-	oGroupModel.setPropertyValue (&quot;PositionY&quot;, 50)
-	oGroupModel.setPropertyValue (&quot;Height&quot;, 110)
-	oGroupModel.setPropertyValue (&quot;Width&quot;, 210)
-	oGroupModel.setPropertyValue (&quot;Label&quot;, &quot;Team Leader Apprasal&quot;)
-	oDialogModel.insertByName (&quot;grpApprasals&quot;, oGroupModel)
-	
-	&apos; Adds a text label for the team.
-	oTextModel = oDialogModel.createInstance ( _
-		&quot;com.sun.star.awt.UnoControlFixedTextModel&quot;)
-	oTextModel.setPropertyValue (&quot;PositionX&quot;, 10)
-	oTextModel.setPropertyValue (&quot;PositionY&quot;, 66)
-	oTextModel.setPropertyValue (&quot;Height&quot;, 8)
-	oTextModel.setPropertyValue (&quot;Width&quot;, 20)
-	oTextModel.setPropertyValue (&quot;Label&quot;, &quot;Team:&quot;)
-	oDialogModel.insertByName (&quot;txtTeam&quot;, oTextModel)
-	
-	&apos; Adds the red team radio button.
-	oRadioModel = oDialogModel.createInstance ( _
-		&quot;com.sun.star.awt.UnoControlRadioButtonModel&quot;)
-	oRadioModel.setPropertyValue (&quot;PositionX&quot;, 30)
-	oRadioModel.setPropertyValue (&quot;PositionY&quot;, 66)
-	oRadioModel.setPropertyValue (&quot;Height&quot;, 8)
-	oRadioModel.setPropertyValue (&quot;Width&quot;, 25)
-	oRadioModel.setPropertyValue (&quot;Label&quot;, &quot;~Valor&quot;)
-	oRadioModel.setPropertyValue (&quot;TextColor&quot;, RGB (255, 255, 255))
-	oRadioModel.setPropertyValue (&quot;BackgroundColor&quot;, RGB (255, 0, 0))
-	oDialogModel.insertByName (&quot;rdoTeamRed&quot;, oRadioModel)
-	
-	&apos; Adds the blue team radio button.
-	oRadioModel = oDialogModel.createInstance ( _
-		&quot;com.sun.star.awt.UnoControlRadioButtonModel&quot;)
-	oRadioModel.setPropertyValue (&quot;PositionX&quot;, 60)
-	oRadioModel.setPropertyValue (&quot;PositionY&quot;, 66)
-	oRadioModel.setPropertyValue (&quot;Height&quot;, 8)
-	oRadioModel.setPropertyValue (&quot;Width&quot;, 30)
-	oRadioModel.setPropertyValue (&quot;Label&quot;, &quot;~Mystic&quot;)
-	oRadioModel.setPropertyValue (&quot;TextColor&quot;, RGB (255, 255, 255))
-	oRadioModel.setPropertyValue (&quot;BackgroundColor&quot;, RGB (0, 0, 255))
-	oDialogModel.insertByName (&quot;rdoTeamBlue&quot;, oRadioModel)
-	
-	&apos; Adds the yellow team radio button.
-	oRadioModel = oDialogModel.createInstance ( _
-		&quot;com.sun.star.awt.UnoControlRadioButtonModel&quot;)
-	oRadioModel.setPropertyValue (&quot;PositionX&quot;, 95)
-	oRadioModel.setPropertyValue (&quot;PositionY&quot;, 66)
-	oRadioModel.setPropertyValue (&quot;Height&quot;, 8)
-	oRadioModel.setPropertyValue (&quot;Width&quot;, 30)
-	oRadioModel.setPropertyValue (&quot;Label&quot;, &quot;~Instinct&quot;)
-	oRadioModel.setPropertyValue (&quot;BackgroundColor&quot;, RGB (255, 255, 0))
-	oDialogModel.insertByName (&quot;rdoTeamYellow&quot;, oRadioModel)
-	
-	&apos; Adds the first appraisal list.
-	oListModel = oDialogModel.createInstance ( _
-		&quot;com.sun.star.awt.UnoControlListBoxModel&quot;)
-	oListModel.setPropertyValue (&quot;PositionX&quot;, 10)
-	oListModel.setPropertyValue (&quot;PositionY&quot;, 79)
-	oListModel.setPropertyValue (&quot;Height&quot;, 12)
-	oListModel.setPropertyValue (&quot;Width&quot;, 200)
-	oListModel.setPropertyValue (&quot;Dropdown&quot;, True)
-	oDialogModel.insertByName (&quot;lstApprasal1&quot;, oListModel)
-	
-	&apos; Adds a text label before the best stat.
-	oTextModel = oDialogModel.createInstance ( _
-		&quot;com.sun.star.awt.UnoControlFixedTextModel&quot;)
-	oTextModel.setPropertyValue (&quot;PositionX&quot;, 10)
-	oTextModel.setPropertyValue (&quot;PositionY&quot;, 96)
-	oTextModel.setPropertyValue (&quot;Height&quot;, 8)
-	oTextModel.setPropertyValue (&quot;Width&quot;, 20)
-	oDialogModel.insertByName (&quot;txtBestBefore&quot;, oTextModel)
-	
-	&apos; Adds the best stat field.
-	oListModel = oDialogModel.createInstance ( _
-		&quot;com.sun.star.awt.UnoControlListBoxModel&quot;)
-	oListModel.setPropertyValue (&quot;PositionX&quot;, 30)
-	oListModel.setPropertyValue (&quot;PositionY&quot;, 94)
-	oListModel.setPropertyValue (&quot;Height&quot;, 12)
-	oListModel.setPropertyValue (&quot;Width&quot;, 35)
-	oListModel.setPropertyValue (&quot;Dropdown&quot;, True)
-	oDialogModel.insertByName (&quot;lstBest&quot;, oListModel)
-	
-	&apos; Adds a text label after the best stat.
-	oTextModel = oDialogModel.createInstance ( _
-		&quot;com.sun.star.awt.UnoControlFixedTextModel&quot;)
-	oTextModel.setPropertyValue (&quot;PositionX&quot;, 65)
-	oTextModel.setPropertyValue (&quot;PositionY&quot;, 96)
-	oTextModel.setPropertyValue (&quot;Height&quot;, 8)
-	oTextModel.setPropertyValue (&quot;Width&quot;, 100)
-	oDialogModel.insertByName (&quot;txtBestAfter&quot;, oTextModel)
-	
-	&apos; Adds the second best stat check box.
-	oCheckBoxModel = oDialogModel.createInstance ( _
-		&quot;com.sun.star.awt.UnoControlCheckBoxModel&quot;)
-	oCheckBoxModel.setPropertyValue (&quot;PositionX&quot;, 10)
-	oCheckBoxModel.setPropertyValue (&quot;PositionY&quot;, 111)
-	oCheckBoxModel.setPropertyValue (&quot;Height&quot;, 8)
-	oCheckBoxModel.setPropertyValue (&quot;Width&quot;, 200)
-	oDialogModel.insertByName (&quot;cbxBest2&quot;, oCheckBoxModel)
-	
-	&apos; Adds the third best stat check box.
-	oCheckBoxModel = oDialogModel.createInstance ( _
-		&quot;com.sun.star.awt.UnoControlCheckBoxModel&quot;)
-	oCheckBoxModel.setPropertyValue (&quot;PositionX&quot;, 10)
-	oCheckBoxModel.setPropertyValue (&quot;PositionY&quot;, 126)
-	oCheckBoxModel.setPropertyValue (&quot;Height&quot;, 8)
-	oCheckBoxModel.setPropertyValue (&quot;Width&quot;, 200)
-	oDialogModel.insertByName (&quot;cbxBest3&quot;, oCheckBoxModel)
-	
-	&apos; Adds the second appraisal list.
-	oListModel = oDialogModel.createInstance ( _
-		&quot;com.sun.star.awt.UnoControlListBoxModel&quot;)
-	oListModel.setPropertyValue (&quot;PositionX&quot;, 10)
-	oListModel.setPropertyValue (&quot;PositionY&quot;, 139)
-	oListModel.setPropertyValue (&quot;Height&quot;, 12)
-	oListModel.setPropertyValue (&quot;Width&quot;, 200)
-	oListModel.setPropertyValue (&quot;Dropdown&quot;, True)
-	oDialogModel.insertByName (&quot;lstApprasal2&quot;, oListModel)
-	
-	&apos; Adds the OK button.
-	oButtonModel = oDialogModel.createInstance ( _
-		&quot;com.sun.star.awt.UnoControlButtonModel&quot;)
-	oButtonModel.setPropertyValue (&quot;PositionX&quot;, 35)
-	oButtonModel.setPropertyValue (&quot;PositionY&quot;, 165)
-	oButtonModel.setPropertyValue (&quot;Height&quot;, 15)
-	oButtonModel.setPropertyValue (&quot;Width&quot;, 60)
-	oButtonModel.setPropertyValue (&quot;PushButtonType&quot;, _
-		com.sun.star.awt.PushButtonType.OK)
-	oButtonModel.setPropertyValue (&quot;DefaultButton&quot;, True)
-	oButtonModel.setPropertyValue (&quot;Enabled&quot;, False)
-	oDialogModel.insertByName (&quot;btnOK&quot;, oButtonModel)
-	
-	&apos; Adds the cancel button.
-	oButtonModel = oDialogModel.createInstance ( _
-		&quot;com.sun.star.awt.UnoControlButtonModel&quot;)
-	oButtonModel.setPropertyValue (&quot;PositionX&quot;, 125)
-	oButtonModel.setPropertyValue (&quot;PositionY&quot;, 165)
-	oButtonModel.setPropertyValue (&quot;Height&quot;, 15)
-	oButtonModel.setPropertyValue (&quot;Width&quot;, 60)
-	oButtonModel.setPropertyValue (&quot;PushButtonType&quot;, _
-		com.sun.star.awt.PushButtonType.CANCEL)
-	oDialogModel.insertByName (&quot;btnCancel&quot;, oButtonModel)
-	
-	&apos; Adds the dialog model to the control and runs it.
-	oDialog = CreateUnoService (&quot;com.sun.star.awt.UnoControlDialog&quot;)
-	oDialog.setModel (oDialogModel)
-	oDialog.setVisible (True)
-	oDialog.getControl (&quot;lstPokemon&quot;).setFocus
-	oListener = CreateUnoListener (&quot;subBtnOKCheck_&quot;, _
-		&quot;com.sun.star.awt.XItemListener&quot;)
-	oDialog.getControl (&quot;lstPokemon&quot;).addItemListener (oListener)
-	oListener = CreateUnoListener (&quot;subBtnOKCheck_&quot;, _
-		&quot;com.sun.star.awt.XTextListener&quot;)
-	oDialog.getControl (&quot;numCP&quot;).addTextListener (oListener)
-	oListener = CreateUnoListener (&quot;subBtnOKCheck_&quot;, _
-		&quot;com.sun.star.awt.XTextListener&quot;)
-	oDialog.getControl (&quot;numHP&quot;).addTextListener (oListener)
-	oListener = CreateUnoListener (&quot;subBtnOKCheck_&quot;, _
-		&quot;com.sun.star.awt.XItemListener&quot;)
-	oDialog.getControl (&quot;lstStarDust&quot;).addItemListener (oListener)
-	oListener = CreateUnoListener (&quot;subRdoTeamRedItemChanged_&quot;, _
-		&quot;com.sun.star.awt.XItemListener&quot;)
-	oDialog.getControl (&quot;rdoTeamRed&quot;).addItemListener (oListener)
-	oListener = CreateUnoListener (&quot;subRdoTeamBlueItemChanged_&quot;, _
-		&quot;com.sun.star.awt.XItemListener&quot;)
-	oDialog.getControl (&quot;rdoTeamBlue&quot;).addItemListener (oListener)
-	oListener = CreateUnoListener (&quot;subRdoTeamYellowItemChanged_&quot;, _
-		&quot;com.sun.star.awt.XItemListener&quot;)
-	oDialog.getControl (&quot;rdoTeamYellow&quot;).addItemListener (oListener)
-	oListener = CreateUnoListener (&quot;subLstBestItemChanged_&quot;, _
-		&quot;com.sun.star.awt.XItemListener&quot;)
-	oDialog.getControl (&quot;lstBest&quot;).addItemListener (oListener)
-	oDialog.getControl (&quot;lstApprasal1&quot;).setVisible (False)
-	oDialog.getControl (&quot;txtBestBefore&quot;).setVisible (False)
-	oDialog.getControl (&quot;lstBest&quot;).setVisible (False)
-	oDialog.getControl (&quot;txtBestAfter&quot;).setVisible (False)
-	oDialog.getControl (&quot;cbxBest2&quot;).setVisible (False)
-	oDialog.getControl (&quot;cbxBest3&quot;).setVisible (False)
-	oDialog.getControl (&quot;lstApprasal2&quot;).setVisible (False)
-	If oDialog.execute = 0 Then
-		aQuery.bIsCancelled = True
-		fnAskParam0 = aQuery
-		Exit Function
-	End If
-	
-	With aQuery
-		.sPokemon = oDialog.getControl (&quot;lstPokemon&quot;).getSelectedItem
-		.nCP = oDialog.getControl (&quot;numCP&quot;).getValue
-		.nHP = oDialog.getControl (&quot;numHP&quot;).getValue
-		.nStarDust = CInt (oDialog.getControl (&quot;lstStarDust&quot;).getSelectedItem)
-		.nPlayerLevel = CInt (oDialog.getControl (&quot;lstPlayerLevel&quot;).getSelectedItem)
-		.nAppraisal1 = oDialog.getControl (&quot;lstApprasal1&quot;).getSelectedItemPos + 1
-		.nAppraisal2 = oDialog.getControl (&quot;lstApprasal2&quot;).getSelectedItemPos + 1
-		.bIsCancelled = False
-	End With
-	If oDialog.getControl (&quot;cbxIsNew&quot;).getState = 1 Then
-		aQuery.bIsNew = True
-	Else
-		aQuery.bIsNew = False
-	End If
-	
-	&apos; The best stats
-	bIsBestAttack = False
-	bIsBestDefense = False
-	bIsBestHP = False
-	If oDialog.getControl (&quot;lstBest&quot;).getSelectedItem = &quot;Attack&quot; Then
-		bIsBestAttack = True
-		If oDialog.getControl (&quot;cbxBest2&quot;).getState = 1 Then
-			bIsBestDefense = True
-		End If
-		If oDialog.getControl (&quot;cbxBest3&quot;).getState = 1 Then
-			bIsBestHP = True
-		End If
-	End If
-	If oDialog.getControl (&quot;lstBest&quot;).getSelectedItem = &quot;Defense&quot; Then
-		bIsBestDefense = True
-		If oDialog.getControl (&quot;cbxBest2&quot;).getState = 1 Then
-			bIsBestAttack = True
-		End If
-		If oDialog.getControl (&quot;cbxBest3&quot;).getState = 1 Then
-			bIsBestHP = True
-		End If
-	End If
-	If oDialog.getControl (&quot;lstBest&quot;).getSelectedItem = &quot;HP&quot; Then
-		bIsBestHP = True
-		If oDialog.getControl (&quot;cbxBest2&quot;).getState = 1 Then
-			bIsBestAttack = True
-		End If
-		If oDialog.getControl (&quot;cbxBest3&quot;).getState = 1 Then
-			bIsBestDefense = True
-		End If
-	End If
-	aQuery.sBest = &quot;&quot;
-	If bIsBestAttack Then
-		aQuery.sBest = aQuery.sBest &amp; &quot;Atk &quot;
-	End If
-	If bIsBestDefense Then
-		aQuery.sBest = aQuery.sBest &amp; &quot;Def &quot;
-	End If
-	If bIsBestHP Then
-		aQuery.sBest = aQuery.sBest &amp; &quot;Sta &quot;
-	End If
-	
-	fnAskParam0 = aQuery
-End Function
-
-&apos; subBtnOKCheck_disposing: Dummy for the listener.
-Sub subBtnOKCheck_disposing (oEvent As object)
-End Sub
-
-&apos; subBtnOKCheck_itemStateChanged: When the Pokémon or star dust is selected.
-Sub subBtnOKCheck_itemStateChanged (oEvent As object)
+&apos; subBtnOKCheck: Checks whether Pokémon, CP, HP and star dust are all filled.
+Sub subBtnOKCheck (oEvent As object)
 	Dim oDialog As Object
 	Dim oPokemon As Object, oCP As Object
 	Dim oHP As Object, oStarDust As Object, oOK As Object
@@ -596,6 +185,38 @@ Sub subBtnOKCheck_itemStateChanged (oEvent As object)
 	End If
 End Sub
 
+&apos; subLstPokemonSelected: When the Pokémon is selected.
+Sub subLstPokemonSelected (oEvent As object)
+	Dim oDialog As Object, sPokemon As String
+	Dim oImageModel As Object, sImageId As String
+	
+	oDialog = oEvent.Source.getContext
+	
+	sPokemon = oDialog.getControl (&quot;lstPokemon&quot;).getSelectedItem
+	sImageId = &quot;&quot;
+	If sPokemon = &quot;Farfetch&apos;d&quot; Then
+		sImageId = &quot;PokemonFarfetchd&quot;
+	End If
+	If sPokemon = &quot;Nidoran♀&quot; Then
+		sImageId = &quot;PokemonNidoranFemale&quot;
+	End If
+	If sPokemon = &quot;Nidoran♂&quot; Then
+		sImageId = &quot;PokemonNidoranMale&quot;
+	End If
+	If sPokemon = &quot;Mr. Mime&quot; Then
+		sImageId = &quot;PokemonMrMime&quot;
+	End If
+	If sImageId = &quot;&quot; Then
+		sImageId = &quot;Pokemon&quot; &amp; sPokemon
+	End If
+	
+	oImageModel = oDialog.getControl (&quot;imgPokemon&quot;).getModel
+	oImageModel.setPropertyValue (&quot;ImageURL&quot;, _
+		fnGetImageUrl (sImageId))
+	
+	subBtnOKCheck (oEvent)
+End Sub
+
 &apos; subBtnOKCheck_textChanged: When the CP or HP is filled
 Sub subBtnOKCheck_textChanged (oEvent As object)
 	subBtnOKCheck_itemStateChanged (oEvent)
@@ -615,7 +236,7 @@ Sub subRdoTeamRedItemChanged_itemStateChanged (oEvent As object)
 	
 	oImageModel = oDialog.getControl (&quot;imgTeam&quot;).getModel
 	oImageModel.setPropertyValue (&quot;ImageURL&quot;, _
-	    fnGetImageUrl (&quot;TeamValor&quot;))
+		fnGetImageUrl (&quot;TeamValor&quot;))
 	
 	mItems = Array ( _
 		&quot;Overall, your [Pokémon] simply amazes me. It can accomplish anything!&quot;, _
@@ -678,7 +299,7 @@ Sub subRdoTeamBlueItemChanged_itemStateChanged (oEvent As object)
 	
 	oImageModel = oDialog.getControl (&quot;imgTeam&quot;).getModel
 	oImageModel.setPropertyValue (&quot;ImageURL&quot;, _
-	    fnGetImageUrl (&quot;TeamMystic&quot;))
+		fnGetImageUrl (&quot;TeamMystic&quot;))
 	
 	mItems = Array ( _
 		&quot;Overall, your [Pokémon] is a wonder! What a breathtaking Pokémon!&quot;, _
@@ -741,7 +362,7 @@ Sub subRdoTeamYellowItemChanged_itemStateChanged (oEvent As object)
 	
 	oImageModel = oDialog.getControl (&quot;imgTeam&quot;).getModel
 	oImageModel.setPropertyValue (&quot;ImageURL&quot;, _
-	    fnGetImageUrl (&quot;TeamInstinct&quot;))
+		fnGetImageUrl (&quot;TeamInstinct&quot;))
 	
 	mItems = Array ( _
 		&quot;Overall, your [Pokémon] looks like it can really battle with the best of them!&quot;, _
diff --git a/oxt/PokemonGoIV/DialogStrings_en_US.properties b/oxt/PokemonGoIV/DialogStrings_en_US.properties
index 2820e17..fb69cda 100644
--- a/oxt/PokemonGoIV/DialogStrings_en_US.properties
+++ b/oxt/PokemonGoIV/DialogStrings_en_US.properties
@@ -1,8 +1,8 @@
 # Strings for Dialog Library PokemonGoIV
 2.DlgMain.HelpText=
-3.DlgMain.Title=Pok\u00e9mon GO IV Calculator
+3.DlgMain.Title=Pok\u00c3\u00a9mon GO IV Calculator
 22.DlgMain.txtPokemon.HelpText=
-23.DlgMain.txtPokemon.Label=~Pok\u00e9mon:
+23.DlgMain.txtPokemon.Label=~Pok\u00c3\u00a9mon:
 26.DlgMain.txtCP.HelpText=
 27.DlgMain.txtCP.Label=~CP:
 28.DlgMain.numCP.HelpText=
@@ -14,7 +14,7 @@
 40.DlgMain.txtPlayerLevel.HelpText=
 41.DlgMain.txtPlayerLevel.Label=Player ~level:
 46.DlgMain.cbxIsNew.HelpText=
-47.DlgMain.cbxIsNew.Label=This Pok\u00e9mon has not been powered-up yet.
+47.DlgMain.cbxIsNew.Label=This Pok\u00c3\u00a9mon is ~newly-caught and was not powered-up yet.
 50.DlgMain.grpApprasals.HelpText=
 51.DlgMain.grpApprasals.Label=Team Leader Apprasal
 85.DlgMain.btnOK.HelpText=
@@ -39,5 +39,3 @@
 195.DlgMain.txtBestAfter.HelpText=
 201.DlgMain.cbxBest2.HelpText=
 203.DlgMain.cbxBest3.HelpText=
-205.DlgMain.imgTeam.HelpText=
-207.DlgMain.imgTeam.HelpText=
diff --git a/oxt/PokemonGoIV/DialogStrings_zh_TW.properties b/oxt/PokemonGoIV/DialogStrings_zh_TW.properties
index a420a33..4820686 100644
--- a/oxt/PokemonGoIV/DialogStrings_zh_TW.properties
+++ b/oxt/PokemonGoIV/DialogStrings_zh_TW.properties
@@ -14,7 +14,7 @@
 40.DlgMain.txtPlayerLevel.HelpText=
 41.DlgMain.txtPlayerLevel.Label=\u73a9\u5bb6\u7b49\u7d1a(~L)\uff1a
 46.DlgMain.cbxIsNew.HelpText=
-47.DlgMain.cbxIsNew.Label=\u9019\u96bb\u5bf6\u53ef\u5922\u9084\u6c92\u5f37\u5316\u904e(~N)\u3002
+47.DlgMain.cbxIsNew.Label=\u6211\u525b\u6293\u5230\u9019\u96bb\u5bf6\u53ef\u5922\uff0c\u9084\u6c92\u5f37\u5316\u904e(~N)\u3002
 50.DlgMain.grpApprasals.HelpText=
 51.DlgMain.grpApprasals.Label=\u968a\u9577\u8a55\u50f9
 85.DlgMain.btnOK.HelpText=
@@ -39,5 +39,3 @@
 195.DlgMain.txtBestAfter.HelpText=
 201.DlgMain.cbxBest2.HelpText=
 203.DlgMain.cbxBest3.HelpText=
-205.DlgMain.imgTeam.HelpText=
-207.DlgMain.imgTeam.HelpText=
diff --git a/oxt/PokemonGoIV/DlgMain.xdl b/oxt/PokemonGoIV/DlgMain.xdl
index 2c6439d..3eba39f 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="188" dlg:top="92" dlg:width="220" dlg:height="185" dlg:help-text="&amp;2.DlgMain.HelpText" dlg:closeable="true" dlg:moveable="true" dlg:title="&amp;3.DlgMain.Title">
+<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="DlgMain" dlg:left="188" dlg:top="92" dlg:width="220" dlg:height="215" dlg:help-text="&amp;2.DlgMain.HelpText" dlg:closeable="true" dlg:moveable="true" dlg:title="&amp;3.DlgMain.Title">
  <dlg:styles>
   <dlg:style dlg:style-id="0" dlg:background-color="0xff0000" dlg:text-color="0xffffff" dlg:font-weight="100"/>
   <dlg:style dlg:style-id="1" dlg:background-color="0xff" dlg:text-color="0xffffff"/>
@@ -8,8 +8,8 @@
   <dlg:style dlg:style-id="3" dlg:border="none"/>
  </dlg:styles>
  <dlg:bulletinboard>
-  <dlg:text dlg:id="txtPokemon" dlg:tab-index="16" dlg:left="5" dlg:top="6" dlg:width="30" dlg:height="8" dlg:help-text="&amp;22.DlgMain.txtPokemon.HelpText" dlg:value="&amp;23.DlgMain.txtPokemon.Label"/>
-  <dlg:menulist dlg:id="lstPokemon" dlg:tab-index="0" dlg:left="35" dlg:top="4" dlg:width="50" dlg:height="12" dlg:help-text="&amp;171.DlgMain.lstPokemon.HelpText" dlg:spin="true">
+  <dlg:text dlg:id="txtPokemon" dlg:tab-index="16" dlg:left="5" dlg:top="21" dlg:width="30" dlg:height="8" dlg:help-text="&amp;22.DlgMain.txtPokemon.HelpText" dlg:value="&amp;23.DlgMain.txtPokemon.Label"/>
+  <dlg:menulist dlg:id="lstPokemon" dlg:tab-index="0" dlg:left="35" dlg:top="19" dlg:width="50" dlg:height="12" dlg:help-text="&amp;171.DlgMain.lstPokemon.HelpText" dlg:spin="true">
    <dlg:menupopup>
     <dlg:menuitem dlg:value="Bulbasaur"/>
     <dlg:menuitem dlg:value="Ivysaur"/>
@@ -132,8 +132,7 @@
     <dlg:menuitem dlg:value="Seaking"/>
     <dlg:menuitem dlg:value="Staryu"/>
     <dlg:menuitem dlg:value="Starmie"/>
-    <dlg:menuitem dlg:value="Mr."/>
-    <dlg:menuitem dlg:value="Mime"/>
+    <dlg:menuitem dlg:value="Mr. Mime"/>
     <dlg:menuitem dlg:value="Scyther"/>
     <dlg:menuitem dlg:value="Jynx"/>
     <dlg:menuitem dlg:value="Electabuzz"/>
@@ -164,18 +163,18 @@
     <dlg:menuitem dlg:value="Mewtwo"/>
     <dlg:menuitem dlg:value="Mew"/>
    </dlg:menupopup>
-   <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.script:PokemonGoIV.0Main.subBtnOKCheck_itemStateChanged?language=Basic&amp;location=application" script:language="Script"/>
+   <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:text dlg:id="txtCP" dlg:tab-index="17" dlg:left="5" dlg:top="21" dlg:width="15" dlg:height="8" dlg:help-text="&amp;26.DlgMain.txtCP.HelpText" dlg:value="&amp;27.DlgMain.txtCP.Label"/>
-  <dlg:numericfield dlg:id="numCP" dlg:tab-index="1" dlg:left="20" dlg:top="19" dlg:width="20" dlg:height="12" dlg:help-text="&amp;28.DlgMain.numCP.HelpText" 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_textChanged?language=Basic&amp;location=application" script:language="Script"/>
+  <dlg:text dlg:id="txtCP" dlg:tab-index="17" dlg:left="5" dlg:top="36" dlg:width="15" dlg:height="8" dlg:help-text="&amp;26.DlgMain.txtCP.HelpText" dlg:value="&amp;27.DlgMain.txtCP.Label"/>
+  <dlg:numericfield dlg:id="numCP" dlg:tab-index="1" dlg:left="20" dlg:top="34" dlg:width="20" dlg:height="12" dlg:help-text="&amp;28.DlgMain.numCP.HelpText" 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="21" dlg:width="15" dlg:height="8" dlg:help-text="&amp;29.DlgMain.txtHP.HelpText" dlg:value="&amp;30.DlgMain.txtHP.Label"/>
-  <dlg:numericfield dlg:id="numHP" dlg:tab-index="2" dlg:left="65" dlg:top="19" dlg:width="15" dlg:height="12" dlg:help-text="&amp;31.DlgMain.numHP.HelpText" dlg:decimal-accuracy="0" dlg:value-min="0" dlg:value-max="200">
-   <script:event script:event-name="on-textchange" script:macro-name="vnd.sun.star.script:PokemonGoIV.0Main.subBtnOKCheck_textChanged?language=Basic&amp;location=application" script:language="Script"/>
+  <dlg:text dlg:id="txtHP" dlg:tab-index="18" dlg:left="50" dlg:top="36" dlg:width="15" dlg:height="8" dlg:help-text="&amp;29.DlgMain.txtHP.HelpText" dlg:value="&amp;30.DlgMain.txtHP.Label"/>
+  <dlg:numericfield dlg:id="numHP" dlg:tab-index="2" dlg:left="65" dlg:top="34" dlg:width="15" dlg:height="12" dlg:help-text="&amp;31.DlgMain.numHP.HelpText" dlg:decimal-accuracy="0" dlg:value-min="0" dlg:value-max="200">
+   <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="21" dlg:width="30" dlg:height="8" dlg:help-text="&amp;32.DlgMain.txtStarDust.HelpText" dlg:value="&amp;33.DlgMain.txtStarDust.Label"/>
-  <dlg:menulist dlg:id="lstStarDust" dlg:tab-index="3" dlg:left="120" dlg:top="19" dlg:width="30" dlg:height="12" dlg:help-text="&amp;162.DlgMain.lstStarDust.HelpText" dlg:spin="true">
+  <dlg:text dlg:id="txtStarDust" dlg:tab-index="19" dlg:left="90" dlg:top="36" dlg:width="30" dlg:height="8" dlg:help-text="&amp;32.DlgMain.txtStarDust.HelpText" dlg:value="&amp;33.DlgMain.txtStarDust.Label"/>
+  <dlg:menulist dlg:id="lstStarDust" dlg:tab-index="3" dlg:left="120" dlg:top="34" dlg:width="30" dlg:height="12" dlg:help-text="&amp;162.DlgMain.lstStarDust.HelpText" dlg:spin="true">
    <dlg:menupopup>
     <dlg:menuitem dlg:value="200"/>
     <dlg:menuitem dlg:value="400"/>
@@ -198,10 +197,10 @@
     <dlg:menuitem dlg:value="9000"/>
     <dlg:menuitem dlg:value="10000"/>
    </dlg:menupopup>
-   <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.script:PokemonGoIV.0Main.subBtnOKCheck_itemStateChanged?language=Basic&amp;location=application" script:language="Script"/>
+   <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="160" dlg:top="21" dlg:width="35" dlg:height="8" dlg:help-text="&amp;40.DlgMain.txtPlayerLevel.HelpText" dlg:value="&amp;41.DlgMain.txtPlayerLevel.Label"/>
-  <dlg:menulist dlg:id="lstPlayerLevel" dlg:tab-index="4" dlg:left="195" dlg:top="19" dlg:width="20" dlg:height="12" dlg:help-text="&amp;163.DlgMain.lstPlayerLevel.HelpText" dlg:spin="true">
+  <dlg:text dlg:id="txtPlayerLevel" dlg:tab-index="20" dlg:left="160" dlg:top="36" dlg:width="35" dlg:height="8" dlg:help-text="&amp;40.DlgMain.txtPlayerLevel.HelpText" dlg:value="&amp;41.DlgMain.txtPlayerLevel.Label"/>
+  <dlg:menulist dlg:id="lstPlayerLevel" dlg:tab-index="4" dlg:left="195" dlg:top="34" dlg:width="20" dlg:height="12" dlg:help-text="&amp;163.DlgMain.lstPlayerLevel.HelpText" dlg:spin="true">
    <dlg:menupopup>
     <dlg:menuitem dlg:value="1"/>
     <dlg:menuitem dlg:value="2"/>
@@ -245,33 +244,34 @@
     <dlg:menuitem dlg:value="40"/>
    </dlg:menupopup>
   </dlg:menulist>
-  <dlg:checkbox dlg:id="cbxIsNew" dlg:tab-index="5" dlg:left="5" dlg:top="36" dlg:width="210" dlg:height="8" dlg:help-text="&amp;46.DlgMain.cbxIsNew.HelpText" dlg:value="&amp;47.DlgMain.cbxIsNew.Label" dlg:checked="true"/>
-  <dlg:titledbox dlg:id="grpApprasals" dlg:tab-index="21" dlg:left="5" dlg:top="50" dlg:width="210" dlg:height="110" dlg:help-text="&amp;50.DlgMain.grpApprasals.HelpText">
+  <dlg:checkbox dlg:id="cbxIsNew" dlg:tab-index="5" dlg:left="5" dlg:top="51" dlg:width="210" dlg:height="8" dlg:help-text="&amp;46.DlgMain.cbxIsNew.HelpText" dlg:value="&amp;47.DlgMain.cbxIsNew.Label" dlg:checked="true"/>
+  <dlg:titledbox dlg:id="grpApprasals" dlg:tab-index="21" dlg:left="5" dlg:top="65" dlg:width="210" dlg:height="125" dlg:help-text="&amp;50.DlgMain.grpApprasals.HelpText">
    <dlg:title dlg:value="&amp;51.DlgMain.grpApprasals.Label"/>
   </dlg:titledbox>
-  <dlg:text dlg:id="txtTeam" dlg:tab-index="22" dlg:left="10" dlg:top="66" dlg:width="20" dlg:height="8" dlg:help-text="&amp;180.DlgMain.txtTeam.HelpText" dlg:value="&amp;181.DlgMain.txtTeam.Label"/>
+  <dlg:text dlg:id="txtTeam" dlg:tab-index="22" dlg:left="10" dlg:top="96" dlg:width="20" dlg:height="8" dlg:help-text="&amp;180.DlgMain.txtTeam.HelpText" dlg:value="&amp;181.DlgMain.txtTeam.Label"/>
   <dlg:radiogroup>
-   <dlg:radio dlg:style-id="0" dlg:id="rdoTeamRed" dlg:tab-index="6" dlg:left="30" dlg:top="66" dlg:width="25" dlg:height="8" dlg:help-text="&amp;182.DlgMain.rdoTeamRed.HelpText" dlg:value="&amp;183.DlgMain.rdoTeamRed.Label">
+   <dlg:radio dlg:style-id="0" dlg:id="rdoTeamRed" dlg:tab-index="6" dlg:left="30" dlg:top="96" dlg:width="25" dlg:height="8" dlg:help-text="&amp;182.DlgMain.rdoTeamRed.HelpText" dlg:value="&amp;183.DlgMain.rdoTeamRed.Label">
     <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.script:PokemonGoIV.0Main.subRdoTeamRedItemChanged_itemStateChanged?language=Basic&amp;location=application" script:language="Script"/>
    </dlg:radio>
-   <dlg:radio dlg:style-id="1" dlg:id="rdoTeamBlue" dlg:tab-index="7" dlg:left="60" dlg:top="66" dlg:width="30" dlg:height="8" dlg:help-text="&amp;184.DlgMain.rdoTeamBlue.HelpText" dlg:value="&amp;185.DlgMain.rdoTeamBlue.Label">
+   <dlg:radio dlg:style-id="1" dlg:id="rdoTeamBlue" dlg:tab-index="7" dlg:left="60" dlg:top="96" dlg:width="30" dlg:height="8" dlg:help-text="&amp;184.DlgMain.rdoTeamBlue.HelpText" dlg:value="&amp;185.DlgMain.rdoTeamBlue.Label">
     <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.script:PokemonGoIV.0Main.subRdoTeamBlueItemChanged_itemStateChanged?language=Basic&amp;location=application" script:language="Script"/>
    </dlg:radio>
-   <dlg:radio dlg:style-id="2" dlg:id="rdoTeamYellow" dlg:tab-index="8" dlg:left="95" dlg:top="66" dlg:width="30" dlg:height="8" dlg:help-text="&amp;186.DlgMain.rdoTeamYellow.HelpText" dlg:value="&amp;187.DlgMain.rdoTeamYellow.Label">
+   <dlg:radio dlg:style-id="2" dlg:id="rdoTeamYellow" dlg:tab-index="8" dlg:left="95" dlg:top="96" dlg:width="30" dlg:height="8" dlg:help-text="&amp;186.DlgMain.rdoTeamYellow.HelpText" dlg:value="&amp;187.DlgMain.rdoTeamYellow.Label">
     <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.script:PokemonGoIV.0Main.subRdoTeamYellowItemChanged_itemStateChanged?language=Basic&amp;location=application" script:language="Script"/>
    </dlg:radio>
   </dlg:radiogroup>
-  <dlg:img dlg:style-id="3" dlg:id="imgTeam" dlg:tab-index="25" dlg:left="130" dlg:top="55" dlg:width="20" dlg:height="20" dlg:help-text="&amp;207.DlgMain.imgTeam.HelpText"/>
-  <dlg:menulist dlg:id="lstApprasal1" dlg:tab-index="9" dlg:left="10" dlg:top="79" dlg:width="200" dlg:height="12" dlg:help-text="&amp;164.DlgMain.lstApprasal1.HelpText" dlg:spin="true"/>
-  <dlg:text dlg:id="txtBestBefore" dlg:tab-index="23" dlg:left="10" dlg:top="96" dlg:width="20" dlg:height="8" dlg:help-text="&amp;194.DlgMain.txtBestBefore.HelpText"/>
-  <dlg:menulist dlg:id="lstBest" dlg:tab-index="10" dlg:left="30" dlg:top="94" dlg:width="35" dlg:height="12" dlg:help-text="&amp;193.DlgMain.lstBest.HelpText" dlg:spin="true">
+  <dlg:img dlg:style-id="3" dlg:id="imgTeam" dlg:tab-index="25" dlg:left="180" dlg:top="75" dlg:width="30" dlg:height="30" dlg:help-text="&amp;207.DlgMain.imgTeam.HelpText"/>
+  <dlg:menulist dlg:id="lstApprasal1" dlg:tab-index="9" dlg:left="10" dlg:top="109" dlg:width="200" dlg:height="12" dlg:help-text="&amp;164.DlgMain.lstApprasal1.HelpText" dlg:spin="true"/>
+  <dlg:text dlg:id="txtBestBefore" dlg:tab-index="23" dlg:left="10" dlg:top="126" dlg:width="20" dlg:height="8" dlg:help-text="&amp;194.DlgMain.txtBestBefore.HelpText"/>
+  <dlg:menulist dlg:id="lstBest" dlg:tab-index="10" dlg:left="30" dlg:top="124" dlg:width="35" dlg:height="12" dlg:help-text="&amp;193.DlgMain.lstBest.HelpText" dlg:spin="true">
    <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.script:PokemonGoIV.0Main.subLstBestItemChanged_itemStateChanged?language=Basic&amp;location=application" script:language="Script"/>
   </dlg:menulist>
-  <dlg:text dlg:id="txtBestAfter" dlg:tab-index="24" dlg:left="65" dlg:top="96" dlg:width="100" dlg:height="8" dlg:help-text="&amp;195.DlgMain.txtBestAfter.HelpText"/>
-  <dlg:checkbox dlg:id="cbxBest2" dlg:tab-index="11" dlg:left="10" dlg:top="111" dlg:width="200" dlg:height="8" dlg:help-text="&amp;201.DlgMain.cbxBest2.HelpText" dlg:checked="false"/>
-  <dlg:checkbox dlg:id="cbxBest3" dlg:tab-index="12" dlg:left="10" dlg:top="126" dlg:width="200" dlg:height="8" dlg:help-text="&amp;203.DlgMain.cbxBest3.HelpText" dlg:checked="false"/>
-  <dlg:menulist dlg:id="lstApprasal2" dlg:tab-index="13" dlg:left="10" dlg:top="139" dlg:width="200" dlg:height="12" dlg:help-text="&amp;165.DlgMain.lstApprasal2.HelpText" dlg:spin="true"/>
-  <dlg:button dlg:id="btnOK" dlg:tab-index="14" dlg:disabled="true" dlg:left="35" dlg:top="165" dlg:width="60" dlg:height="15" dlg:help-text="&amp;85.DlgMain.btnOK.HelpText" dlg:default="true" dlg:button-type="ok"/>
-  <dlg:button dlg:id="btnCancel" dlg:tab-index="15" dlg:left="125" dlg:top="165" dlg:width="60" dlg:height="15" dlg:help-text="&amp;87.DlgMain.btnCancel.HelpText" dlg:button-type="cancel"/>
+  <dlg:text dlg:id="txtBestAfter" dlg:tab-index="24" dlg:left="65" dlg:top="126" dlg:width="100" dlg:height="8" dlg:help-text="&amp;195.DlgMain.txtBestAfter.HelpText"/>
+  <dlg:checkbox dlg:id="cbxBest2" dlg:tab-index="11" dlg:left="10" dlg:top="141" dlg:width="200" dlg:height="8" dlg:help-text="&amp;201.DlgMain.cbxBest2.HelpText" dlg:checked="false"/>
+  <dlg:checkbox dlg:id="cbxBest3" dlg:tab-index="12" dlg:left="10" dlg:top="156" dlg:width="200" dlg:height="8" dlg:help-text="&amp;203.DlgMain.cbxBest3.HelpText" dlg:checked="false"/>
+  <dlg:menulist dlg:id="lstApprasal2" dlg:tab-index="13" dlg:left="10" dlg:top="169" dlg:width="200" dlg:height="12" dlg:help-text="&amp;165.DlgMain.lstApprasal2.HelpText" dlg:spin="true"/>
+  <dlg:button dlg:id="btnOK" dlg:tab-index="14" dlg:disabled="true" dlg:left="35" dlg:top="195" dlg:width="60" dlg:height="15" dlg:help-text="&amp;85.DlgMain.btnOK.HelpText" dlg:default="true" dlg:button-type="ok"/>
+  <dlg:button dlg:id="btnCancel" dlg:tab-index="15" dlg:left="125" dlg:top="195" dlg:width="60" dlg:height="15" dlg:help-text="&amp;87.DlgMain.btnCancel.HelpText" dlg:button-type="cancel"/>
+  <dlg:img dlg:style-id="3" dlg:id="imgPokemon" dlg:tab-index="26" dlg:left="90" dlg:top="0" dlg:width="30" dlg:height="30" dlg:help-text="&amp;209.DlgMain.imgPokemon.HelpText"/>
  </dlg:bulletinboard>
-</dlg:window>
\ No newline at end of file
+</dlg:window>
diff --git a/oxt/icons/team-instinct.png b/oxt/icons/team-instinct.png
index 20e24e5..2d9fd61 100644
Binary files a/oxt/icons/team-instinct.png and b/oxt/icons/team-instinct.png differ
diff --git a/oxt/icons/team-mystic.png b/oxt/icons/team-mystic.png
index 628f9db..e1e1392 100644
Binary files a/oxt/icons/team-mystic.png and b/oxt/icons/team-mystic.png differ
diff --git a/oxt/icons/team-valor.png b/oxt/icons/team-valor.png
index f7ef094..0319e92 100644
Binary files a/oxt/icons/team-valor.png and b/oxt/icons/team-valor.png differ