diff --git a/gamedir/Data/TableData/AmmoStrings.xml b/gamedir/Data/TableData/AmmoStrings.xml
index 9e487a1e2..a5b542498 100644
--- a/gamedir/Data/TableData/AmmoStrings.xml
+++ b/gamedir/Data/TableData/AmmoStrings.xml
@@ -10,70 +10,87 @@ Attribute Field Reference:
 -->
 <AMMOLIST>
 	<AMMO>
+		<uiIndex>0</uiIndex>
 		<AmmoCaliber>0</AmmoCaliber>
 		<BRCaliber>0</BRCaliber>
 	</AMMO>
 	<AMMO>
+		<uiIndex>1</uiIndex>
 		<AmmoCaliber>.38 Spc</AmmoCaliber>
 		<BRCaliber>.38 Spc</BRCaliber>
 	</AMMO>
 	<AMMO>
+		<uiIndex>2</uiIndex>
 		<AmmoCaliber>9x19mm</AmmoCaliber>
 		<BRCaliber>9x19mm</BRCaliber>
 	</AMMO>
 	<AMMO>
+		<uiIndex>3</uiIndex>
 		<AmmoCaliber>.45 ACP</AmmoCaliber>
 		<BRCaliber>.45 ACP</BRCaliber>
 	</AMMO>
 	<AMMO>
+		<uiIndex>4</uiIndex>
 		<AmmoCaliber>.357 Mag</AmmoCaliber>
 		<BRCaliber>.357 Mag</BRCaliber>
 	</AMMO>
 	<AMMO>
+		<uiIndex>5</uiIndex>
 		<AmmoCaliber>12 gauge</AmmoCaliber>
 		<BRCaliber>12 gauge</BRCaliber>
 	</AMMO>
 	<AMMO>
+		<uiIndex>6</uiIndex>
 		<AmmoCaliber>CAWS</AmmoCaliber>
 		<BRCaliber>CAWS</BRCaliber>
 	</AMMO>
 	<AMMO>
+		<uiIndex>7</uiIndex>
 		<AmmoCaliber>5.45x39mm</AmmoCaliber>
 		<BRCaliber>5.45x39mm</BRCaliber>
 	</AMMO>
 	<AMMO>
+		<uiIndex>8</uiIndex>
 		<AmmoCaliber>5.56x45mm</AmmoCaliber>
 		<BRCaliber>5.56x45mm</BRCaliber>
 	</AMMO>
 	<AMMO>
+		<uiIndex>9</uiIndex>
 		<AmmoCaliber>7.62x51mm</AmmoCaliber>
 		<BRCaliber>7.62x51mm</BRCaliber>
 	</AMMO>
 	<AMMO>
+		<uiIndex>10</uiIndex>
 		<AmmoCaliber>7.62x39mm</AmmoCaliber>
 		<BRCaliber>7.62x39mm</BRCaliber>
 	</AMMO>
 	<AMMO>
+		<uiIndex>11</uiIndex>
 		<AmmoCaliber>4.7x33mm</AmmoCaliber>
 		<BRCaliber>4.7x33mm</BRCaliber>
 	</AMMO>
 	<AMMO>
+		<uiIndex>12</uiIndex>
 		<AmmoCaliber>5.7x28mm</AmmoCaliber>
 		<BRCaliber>5.7x28mm</BRCaliber>
 	</AMMO>
 	<AMMO>
+		<uiIndex>13</uiIndex>
 		<AmmoCaliber>Monster</AmmoCaliber>
 		<BRCaliber>Monster</BRCaliber>
 	</AMMO>
 	<AMMO>
+		<uiIndex>14</uiIndex>
 		<AmmoCaliber>Rocket</AmmoCaliber>
 		<BRCaliber>Rocket</BRCaliber>
 	</AMMO>
 	<AMMO>
+		<uiIndex>15</uiIndex>
 		<AmmoCaliber>Dart</AmmoCaliber>
 		<BRCaliber>Dart</BRCaliber>
 	</AMMO>
 	<AMMO>
+		<uiIndex>16</uiIndex>
 		<AmmoCaliber>flame</AmmoCaliber>
 		<BRCaliber>flame</BRCaliber>
 	</AMMO>
diff --git a/gamedir/Data/TableData/ExplosionData.xml b/gamedir/Data/TableData/ExplosionData.xml
index 58fb165db..d2fad9894 100644
--- a/gamedir/Data/TableData/ExplosionData.xml
+++ b/gamedir/Data/TableData/ExplosionData.xml
@@ -1,13 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <EXPDATALIST xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<EXPDATA>
+		<uiIndex>0</uiIndex>
+		<name>None</name>
 		<TransKeyFrame>0</TransKeyFrame>
 		<DamageKeyFrame>0</DamageKeyFrame>
 		<ExplosionSoundID>61</ExplosionSoundID>
 		<AltExplosionSoundID>285</AltExplosionSoundID>
+		<BlastFilename />
 		<BlastSpeed>0</BlastSpeed>
 	</EXPDATA>
 	<EXPDATA>
+		<uiIndex>1</uiIndex>
+		<name>Standard</name>
 		<TransKeyFrame>17</TransKeyFrame>
 		<DamageKeyFrame>3</DamageKeyFrame>
 		<ExplosionSoundID>61</ExplosionSoundID>
@@ -16,6 +21,8 @@
 		<BlastSpeed>80</BlastSpeed>
 	</EXPDATA>
 	<EXPDATA>
+		<uiIndex>2</uiIndex>
+		<name>Large</name>
 		<TransKeyFrame>28</TransKeyFrame>
 		<DamageKeyFrame>5</DamageKeyFrame>
 		<ExplosionSoundID>286</ExplosionSoundID>
@@ -24,6 +31,8 @@
 		<BlastSpeed>80</BlastSpeed>
 	</EXPDATA>
 	<EXPDATA>
+		<uiIndex>3</uiIndex>
+		<name>Extra Large</name>
 		<TransKeyFrame>24</TransKeyFrame>
 		<DamageKeyFrame>5</DamageKeyFrame>
 		<ExplosionSoundID>286</ExplosionSoundID>
@@ -32,6 +41,8 @@
 		<BlastSpeed>80</BlastSpeed>
 	</EXPDATA>
 	<EXPDATA>
+		<uiIndex>4</uiIndex>
+		<name>Stun</name>
 		<TransKeyFrame>1</TransKeyFrame>
 		<DamageKeyFrame>5</DamageKeyFrame>
 		<ExplosionSoundID>61</ExplosionSoundID>
@@ -40,6 +51,8 @@
 		<BlastSpeed>20</BlastSpeed>
 	</EXPDATA>
 	<EXPDATA>
+		<uiIndex>5</uiIndex>
+		<name>Underwater</name>
 		<TransKeyFrame>1</TransKeyFrame>
 		<DamageKeyFrame>18</DamageKeyFrame>
 		<ExplosionSoundID>248</ExplosionSoundID>
@@ -48,6 +61,8 @@
 		<BlastSpeed>80</BlastSpeed>
 	</EXPDATA>
 	<EXPDATA>
+		<uiIndex>6</uiIndex>
+		<name>Tear Gas</name>
 		<TransKeyFrame>1</TransKeyFrame>
 		<DamageKeyFrame>18</DamageKeyFrame>
 		<ExplosionSoundID>248</ExplosionSoundID>
@@ -56,6 +71,8 @@
 		<BlastSpeed>80</BlastSpeed>
 	</EXPDATA>
 	<EXPDATA>
+		<uiIndex>7</uiIndex>
+		<name>Smoke</name>
 		<TransKeyFrame>1</TransKeyFrame>
 		<DamageKeyFrame>18</DamageKeyFrame>
 		<ExplosionSoundID>248</ExplosionSoundID>
@@ -64,6 +81,8 @@
 		<BlastSpeed>80</BlastSpeed>
 	</EXPDATA>
 	<EXPDATA>
+		<uiIndex>8</uiIndex>
+		<name>Mustard Gas</name>
 		<TransKeyFrame>1</TransKeyFrame>
 		<DamageKeyFrame>18</DamageKeyFrame>
 		<ExplosionSoundID>248</ExplosionSoundID>
@@ -72,6 +91,8 @@
 		<BlastSpeed>80</BlastSpeed>
 	</EXPDATA>
 	<EXPDATA>
+		<uiIndex>9</uiIndex>
+		<name>Flame</name>
 		<TransKeyFrame>1</TransKeyFrame>
 		<DamageKeyFrame>18</DamageKeyFrame>
 		<ExplosionSoundID>286</ExplosionSoundID>
@@ -80,6 +101,8 @@
 		<BlastSpeed>80</BlastSpeed>
 	</EXPDATA>
 	<EXPDATA>
+		<uiIndex>10</uiIndex>
+		<name>Molotov Flame</name>
 		<TransKeyFrame>1</TransKeyFrame>
 		<DamageKeyFrame>18</DamageKeyFrame>
 		<ExplosionSoundID>325</ExplosionSoundID>
diff --git a/gamedir/Data/TableData/German.AmmoStrings.xml b/gamedir/Data/TableData/German.AmmoStrings.xml
index 7ebdaae00..d8bc9bc45 100644
--- a/gamedir/Data/TableData/German.AmmoStrings.xml
+++ b/gamedir/Data/TableData/German.AmmoStrings.xml
@@ -1,69 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
 <AMMOLIST>
 	<AMMO>
+		<uiIndex>0</uiIndex>
 		<AmmoCaliber>0</AmmoCaliber>
 		<BRCaliber>0</BRCaliber>
 	</AMMO>
 	<AMMO>
+		<uiIndex>1</uiIndex>
 		<AmmoCaliber>.38 S&amp;W</AmmoCaliber>
 		<BRCaliber>.38 S&amp;W</BRCaliber>
 	</AMMO>
 	<AMMO>
+		<uiIndex>2</uiIndex>
 		<AmmoCaliber>9x19mm</AmmoCaliber>
 		<BRCaliber>9x19mm</BRCaliber>
 	</AMMO>
 	<AMMO>
+		<uiIndex>3</uiIndex>
 		<AmmoCaliber>.45 ACP</AmmoCaliber>
 		<BRCaliber>.45 ACP</BRCaliber>
 	</AMMO>
 	<AMMO>
+		<uiIndex>4</uiIndex>
 		<AmmoCaliber>.357 MAG</AmmoCaliber>
 		<BRCaliber>.357 MAG</BRCaliber>
 	</AMMO>
 	<AMMO>
+		<uiIndex>5</uiIndex>
 		<AmmoCaliber>Kal. 12/70</AmmoCaliber>
 		<BRCaliber>Kal. 12/70</BRCaliber>
 	</AMMO>
 	<AMMO>
+		<uiIndex>6</uiIndex>
 		<AmmoCaliber>CAWS</AmmoCaliber>
 		<BRCaliber>CAWS</BRCaliber>
 	</AMMO>
 	<AMMO>
+		<uiIndex>7</uiIndex>
 		<AmmoCaliber>5.45x39mm</AmmoCaliber>
 		<BRCaliber>5.45x39mm</BRCaliber>
 	</AMMO>
 	<AMMO>
+		<uiIndex>8</uiIndex>
 		<AmmoCaliber>5.56x45mm</AmmoCaliber>
 		<BRCaliber>5.56x45mm</BRCaliber>
 	</AMMO>
 	<AMMO>
+		<uiIndex>9</uiIndex>
 		<AmmoCaliber>7.62x51mm</AmmoCaliber>
 		<BRCaliber>7.62x51mm</BRCaliber>
 	</AMMO>
 	<AMMO>
+		<uiIndex>10</uiIndex>
 		<AmmoCaliber>7.62x39mm</AmmoCaliber>
 		<BRCaliber>7.62x39mm</BRCaliber>
 	</AMMO>
 	<AMMO>
+		<uiIndex>11</uiIndex>
 		<AmmoCaliber>4.73x33mm</AmmoCaliber>
 		<BRCaliber>4.73x33mm</BRCaliber>
 	</AMMO>
 	<AMMO>
+		<uiIndex>12</uiIndex>
 		<AmmoCaliber>5.7x28mm</AmmoCaliber>
 		<BRCaliber>5.7x28mm</BRCaliber>
 	</AMMO>
 	<AMMO>
+		<uiIndex>13</uiIndex>
 		<AmmoCaliber>Monster</AmmoCaliber>
 		<BRCaliber>Monster</BRCaliber>
 	</AMMO>
 	<AMMO>
+		<uiIndex>14</uiIndex>
 		<AmmoCaliber>Rakete</AmmoCaliber>
 		<BRCaliber>Rakete</BRCaliber>
 	</AMMO>
 	<AMMO>
+		<uiIndex>15</uiIndex>
 		<AmmoCaliber>Pfeil</AmmoCaliber>
 		<BRCaliber>Pfeil</BRCaliber>
 	</AMMO>
 	<AMMO>
+		<uiIndex>16</uiIndex>
 		<AmmoCaliber>Flammenw.</AmmoCaliber>
 		<BRCaliber>Flammenw.</BRCaliber>
 	</AMMO>
diff --git a/gamedir/Data/TableData/Russian.AmmoStrings.xml b/gamedir/Data/TableData/Russian.AmmoStrings.xml
index a314da624..5b038f7cf 100644
--- a/gamedir/Data/TableData/Russian.AmmoStrings.xml
+++ b/gamedir/Data/TableData/Russian.AmmoStrings.xml
@@ -1,70 +1,87 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <AMMOLIST xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<AMMO>
+		<uiIndex>0</uiIndex>
 		<AmmoCaliber>0</AmmoCaliber>
 		<BRCaliber>0</BRCaliber>
 	</AMMO>
 	<AMMO>
+		<uiIndex>1</uiIndex>
 		<AmmoCaliber>.38 Spc</AmmoCaliber>
 		<BRCaliber>.38 Spc</BRCaliber>
 	</AMMO>
 	<AMMO>
+		<uiIndex>2</uiIndex>
 		<AmmoCaliber>9x19mm</AmmoCaliber>
 		<BRCaliber>9x19mm</BRCaliber>
 	</AMMO>
 	<AMMO>
+		<uiIndex>3</uiIndex>
 		<AmmoCaliber>.45 ACP</AmmoCaliber>
 		<BRCaliber>.45 ACP</BRCaliber>
 	</AMMO>
 	<AMMO>
+		<uiIndex>4</uiIndex>
 		<AmmoCaliber>.357 Mag</AmmoCaliber>
 		<BRCaliber>.357 Mag</BRCaliber>
 	</AMMO>
 	<AMMO>
+		<uiIndex>5</uiIndex>
 		<AmmoCaliber>12 gauge</AmmoCaliber>
 		<BRCaliber>12 gauge</BRCaliber>
 	</AMMO>
 	<AMMO>
+		<uiIndex>6</uiIndex>
 		<AmmoCaliber>CAWS</AmmoCaliber>
 		<BRCaliber>CAWS</BRCaliber>
 	</AMMO>
 	<AMMO>
+		<uiIndex>7</uiIndex>
 		<AmmoCaliber>5.45x39mm</AmmoCaliber>
 		<BRCaliber>5.45x39mm</BRCaliber>
 	</AMMO>
 	<AMMO>
+		<uiIndex>8</uiIndex>
 		<AmmoCaliber>5.56x45mm</AmmoCaliber>
 		<BRCaliber>5.56x45mm</BRCaliber>
 	</AMMO>
 	<AMMO>
+		<uiIndex>9</uiIndex>
 		<AmmoCaliber>7.62x51mm</AmmoCaliber>
 		<BRCaliber>7.62x51mm</BRCaliber>
 	</AMMO>
 	<AMMO>
+		<uiIndex>10</uiIndex>
 		<AmmoCaliber>7.62x39mm</AmmoCaliber>
 		<BRCaliber>7.62x39mm</BRCaliber>
 	</AMMO>
 	<AMMO>
+		<uiIndex>11</uiIndex>
 		<AmmoCaliber>4.7x33mm</AmmoCaliber>
 		<BRCaliber>4.7x33mm</BRCaliber>
 	</AMMO>
 	<AMMO>
+		<uiIndex>12</uiIndex>
 		<AmmoCaliber>5.7x28mm</AmmoCaliber>
 		<BRCaliber>5.7x28mm</BRCaliber>
 	</AMMO>
 	<AMMO>
+		<uiIndex>13</uiIndex>
 		<AmmoCaliber>Monster</AmmoCaliber>
 		<BRCaliber>Monster</BRCaliber>
 	</AMMO>
 	<AMMO>
+		<uiIndex>14</uiIndex>
 		<AmmoCaliber>Rocket</AmmoCaliber>
 		<BRCaliber>Rocket</BRCaliber>
 	</AMMO>
 	<AMMO>
+		<uiIndex>15</uiIndex>
 		<AmmoCaliber>Dart</AmmoCaliber>
 		<BRCaliber>Dart</BRCaliber>
 	</AMMO>
 	<AMMO>
+		<uiIndex>16</uiIndex>
 		<AmmoCaliber>flame</AmmoCaliber>
 		<BRCaliber>flame</BRCaliber>
 	</AMMO>