diff --git a/GBAPokemonGameEditor.v12.suo b/GBAPokemonGameEditor.v12.suo
index d602c7c..74c82f8 100644
Binary files a/GBAPokemonGameEditor.v12.suo and b/GBAPokemonGameEditor.v12.suo differ
diff --git a/GBAPokemonGameEditor/AboutBox1.Designer.vb b/GBAPokemonGameEditor/AboutBox1.Designer.vb
index 4400b1a..0dbe924 100644
--- a/GBAPokemonGameEditor/AboutBox1.Designer.vb
+++ b/GBAPokemonGameEditor/AboutBox1.Designer.vb
@@ -35,16 +35,18 @@ Partial Class AboutBox1
         '
         Me.PictureBox1.Image = CType(resources.GetObject("PictureBox1.Image"), System.Drawing.Image)
         Me.PictureBox1.Location = New System.Drawing.Point(0, 0)
+        Me.PictureBox1.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.PictureBox1.Name = "PictureBox1"
-        Me.PictureBox1.Size = New System.Drawing.Size(500, 200)
+        Me.PictureBox1.Size = New System.Drawing.Size(667, 246)
         Me.PictureBox1.TabIndex = 0
         Me.PictureBox1.TabStop = False
         '
         'OKButton
         '
-        Me.OKButton.Location = New System.Drawing.Point(413, 267)
+        Me.OKButton.Location = New System.Drawing.Point(551, 329)
+        Me.OKButton.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.OKButton.Name = "OKButton"
-        Me.OKButton.Size = New System.Drawing.Size(75, 23)
+        Me.OKButton.Size = New System.Drawing.Size(100, 28)
         Me.OKButton.TabIndex = 1
         Me.OKButton.Text = "OK"
         Me.OKButton.UseVisualStyleBackColor = True
@@ -52,45 +54,49 @@ Partial Class AboutBox1
         'LabelVersion
         '
         Me.LabelVersion.AutoSize = True
-        Me.LabelVersion.Location = New System.Drawing.Point(207, 256)
+        Me.LabelVersion.Location = New System.Drawing.Point(276, 315)
+        Me.LabelVersion.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.LabelVersion.Name = "LabelVersion"
-        Me.LabelVersion.Size = New System.Drawing.Size(42, 13)
+        Me.LabelVersion.Size = New System.Drawing.Size(56, 17)
         Me.LabelVersion.TabIndex = 2
         Me.LabelVersion.Text = "Version"
         '
         'LabelCopyright
         '
         Me.LabelCopyright.AutoSize = True
-        Me.LabelCopyright.Location = New System.Drawing.Point(121, 214)
+        Me.LabelCopyright.Location = New System.Drawing.Point(161, 263)
+        Me.LabelCopyright.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.LabelCopyright.Name = "LabelCopyright"
-        Me.LabelCopyright.Size = New System.Drawing.Size(247, 13)
+        Me.LabelCopyright.Size = New System.Drawing.Size(329, 17)
         Me.LabelCopyright.TabIndex = 3
-        Me.LabelCopyright.Text = "Copyright © 2016 Gamer2020 All Rights Reserved."
+        Me.LabelCopyright.Text = "Copyright © 2017 Gamer2020 All Rights Reserved."
         '
         'Label1
         '
         Me.Label1.AutoSize = True
-        Me.Label1.Location = New System.Drawing.Point(154, 235)
+        Me.Label1.Location = New System.Drawing.Point(205, 289)
+        Me.Label1.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label1.Name = "Label1"
-        Me.Label1.Size = New System.Drawing.Size(179, 13)
+        Me.Label1.Size = New System.Drawing.Size(237, 17)
         Me.Label1.TabIndex = 4
         Me.Label1.Text = "Contact: lostatlife2020@hotmail.com"
         '
         'AboutBox1
         '
-        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(8.0!, 16.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(500, 300)
+        Me.ClientSize = New System.Drawing.Size(667, 369)
         Me.Controls.Add(Me.Label1)
         Me.Controls.Add(Me.LabelCopyright)
         Me.Controls.Add(Me.LabelVersion)
         Me.Controls.Add(Me.OKButton)
         Me.Controls.Add(Me.PictureBox1)
         Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog
+        Me.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
         Me.MaximizeBox = False
         Me.MinimizeBox = False
         Me.Name = "AboutBox1"
-        Me.Padding = New System.Windows.Forms.Padding(9)
+        Me.Padding = New System.Windows.Forms.Padding(12, 11, 12, 11)
         Me.ShowInTaskbar = False
         Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent
         Me.Text = "AboutBox1"
diff --git a/GBAPokemonGameEditor/GBAPokemonGameEditor.vbproj b/GBAPokemonGameEditor/GBAPokemonGameEditor.vbproj
index 65286b3..b8a7797 100644
--- a/GBAPokemonGameEditor/GBAPokemonGameEditor.vbproj
+++ b/GBAPokemonGameEditor/GBAPokemonGameEditor.vbproj
@@ -31,7 +31,7 @@
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.htm</WebPage>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>3.7.0.0</ApplicationVersion>
+    <ApplicationVersion>3.8.0.0</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>true</BootstrapperEnabled>
diff --git a/GBAPokemonGameEditor/MainFrm.Designer.vb b/GBAPokemonGameEditor/MainFrm.Designer.vb
index 54df5bd..c025e9c 100644
--- a/GBAPokemonGameEditor/MainFrm.Designer.vb
+++ b/GBAPokemonGameEditor/MainFrm.Designer.vb
@@ -59,6 +59,7 @@ Partial Class MainFrm
         Me.Button36 = New System.Windows.Forms.Button()
         Me.TabControl1 = New System.Windows.Forms.TabControl()
         Me.TabPage2 = New System.Windows.Forms.TabPage()
+        Me.Button12 = New System.Windows.Forms.Button()
         Me.Button11 = New System.Windows.Forms.Button()
         Me.Button10 = New System.Windows.Forms.Button()
         Me.Button2 = New System.Windows.Forms.Button()
@@ -85,7 +86,6 @@ Partial Class MainFrm
         Me.Button1 = New System.Windows.Forms.Button()
         Me.GroupBox1 = New System.Windows.Forms.GroupBox()
         Me.Label1 = New System.Windows.Forms.Label()
-        Me.Button12 = New System.Windows.Forms.Button()
         Me.MenuStrip1.SuspendLayout()
         Me.GroupBox4.SuspendLayout()
         Me.TabControl1.SuspendLayout()
@@ -116,18 +116,18 @@ Partial Class MainFrm
         'OpenToolStripMenuItem
         '
         Me.OpenToolStripMenuItem.Name = "OpenToolStripMenuItem"
-        Me.OpenToolStripMenuItem.Size = New System.Drawing.Size(181, 26)
+        Me.OpenToolStripMenuItem.Size = New System.Drawing.Size(120, 26)
         Me.OpenToolStripMenuItem.Text = "&Open"
         '
         'ToolStripMenuItem2
         '
         Me.ToolStripMenuItem2.Name = "ToolStripMenuItem2"
-        Me.ToolStripMenuItem2.Size = New System.Drawing.Size(178, 6)
+        Me.ToolStripMenuItem2.Size = New System.Drawing.Size(117, 6)
         '
         'ExitToolStripMenuItem
         '
         Me.ExitToolStripMenuItem.Name = "ExitToolStripMenuItem"
-        Me.ExitToolStripMenuItem.Size = New System.Drawing.Size(181, 26)
+        Me.ExitToolStripMenuItem.Size = New System.Drawing.Size(120, 26)
         Me.ExitToolStripMenuItem.Text = "E&xit"
         '
         'SettingsToolStripMenuItem
@@ -192,9 +192,9 @@ Partial Class MainFrm
         '
         Me.GroupBox4.Controls.Add(Me.Label2)
         Me.GroupBox4.Location = New System.Drawing.Point(16, 33)
-        Me.GroupBox4.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.GroupBox4.Margin = New System.Windows.Forms.Padding(4)
         Me.GroupBox4.Name = "GroupBox4"
-        Me.GroupBox4.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.GroupBox4.Padding = New System.Windows.Forms.Padding(4)
         Me.GroupBox4.Size = New System.Drawing.Size(337, 78)
         Me.GroupBox4.TabIndex = 10
         Me.GroupBox4.TabStop = False
@@ -211,7 +211,7 @@ Partial Class MainFrm
         'Button4
         '
         Me.Button4.Location = New System.Drawing.Point(361, 39)
-        Me.Button4.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.Button4.Margin = New System.Windows.Forms.Padding(4)
         Me.Button4.Name = "Button4"
         Me.Button4.Size = New System.Drawing.Size(221, 64)
         Me.Button4.TabIndex = 1
@@ -226,7 +226,7 @@ Partial Class MainFrm
         '
         Me.Button5.Enabled = False
         Me.Button5.Location = New System.Drawing.Point(3, 7)
-        Me.Button5.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.Button5.Margin = New System.Windows.Forms.Padding(4)
         Me.Button5.Name = "Button5"
         Me.Button5.Size = New System.Drawing.Size(108, 68)
         Me.Button5.TabIndex = 14
@@ -237,7 +237,7 @@ Partial Class MainFrm
         '
         Me.Button6.Enabled = False
         Me.Button6.Location = New System.Drawing.Point(120, 7)
-        Me.Button6.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.Button6.Margin = New System.Windows.Forms.Padding(4)
         Me.Button6.Name = "Button6"
         Me.Button6.Size = New System.Drawing.Size(108, 68)
         Me.Button6.TabIndex = 15
@@ -248,7 +248,7 @@ Partial Class MainFrm
         '
         Me.Button7.Enabled = False
         Me.Button7.Location = New System.Drawing.Point(236, 7)
-        Me.Button7.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.Button7.Margin = New System.Windows.Forms.Padding(4)
         Me.Button7.Name = "Button7"
         Me.Button7.Size = New System.Drawing.Size(108, 68)
         Me.Button7.TabIndex = 16
@@ -260,7 +260,7 @@ Partial Class MainFrm
         '
         Me.Button24.Enabled = False
         Me.Button24.Location = New System.Drawing.Point(3, 84)
-        Me.Button24.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.Button24.Margin = New System.Windows.Forms.Padding(4)
         Me.Button24.Name = "Button24"
         Me.Button24.Size = New System.Drawing.Size(108, 68)
         Me.Button24.TabIndex = 34
@@ -272,7 +272,7 @@ Partial Class MainFrm
         '
         Me.Button25.Enabled = False
         Me.Button25.Location = New System.Drawing.Point(352, 7)
-        Me.Button25.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.Button25.Margin = New System.Windows.Forms.Padding(4)
         Me.Button25.Name = "Button25"
         Me.Button25.Size = New System.Drawing.Size(108, 68)
         Me.Button25.TabIndex = 35
@@ -283,7 +283,7 @@ Partial Class MainFrm
         '
         Me.Button26.Enabled = False
         Me.Button26.Location = New System.Drawing.Point(468, 7)
-        Me.Button26.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.Button26.Margin = New System.Windows.Forms.Padding(4)
         Me.Button26.Name = "Button26"
         Me.Button26.Size = New System.Drawing.Size(105, 68)
         Me.Button26.TabIndex = 36
@@ -294,7 +294,7 @@ Partial Class MainFrm
         '
         Me.Button27.Enabled = False
         Me.Button27.Location = New System.Drawing.Point(4, 9)
-        Me.Button27.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.Button27.Margin = New System.Windows.Forms.Padding(4)
         Me.Button27.Name = "Button27"
         Me.Button27.Size = New System.Drawing.Size(108, 68)
         Me.Button27.TabIndex = 37
@@ -305,7 +305,7 @@ Partial Class MainFrm
         '
         Me.Button28.Enabled = False
         Me.Button28.Location = New System.Drawing.Point(120, 9)
-        Me.Button28.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.Button28.Margin = New System.Windows.Forms.Padding(4)
         Me.Button28.Name = "Button28"
         Me.Button28.Size = New System.Drawing.Size(108, 68)
         Me.Button28.TabIndex = 38
@@ -316,7 +316,7 @@ Partial Class MainFrm
         '
         Me.Button29.Enabled = False
         Me.Button29.Location = New System.Drawing.Point(236, 9)
-        Me.Button29.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.Button29.Margin = New System.Windows.Forms.Padding(4)
         Me.Button29.Name = "Button29"
         Me.Button29.Size = New System.Drawing.Size(108, 68)
         Me.Button29.TabIndex = 39
@@ -327,7 +327,7 @@ Partial Class MainFrm
         '
         Me.Button30.Enabled = False
         Me.Button30.Location = New System.Drawing.Point(352, 9)
-        Me.Button30.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.Button30.Margin = New System.Windows.Forms.Padding(4)
         Me.Button30.Name = "Button30"
         Me.Button30.Size = New System.Drawing.Size(108, 68)
         Me.Button30.TabIndex = 40
@@ -338,7 +338,7 @@ Partial Class MainFrm
         '
         Me.Button31.Enabled = False
         Me.Button31.Location = New System.Drawing.Point(468, 9)
-        Me.Button31.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.Button31.Margin = New System.Windows.Forms.Padding(4)
         Me.Button31.Name = "Button31"
         Me.Button31.Size = New System.Drawing.Size(105, 68)
         Me.Button31.TabIndex = 41
@@ -349,7 +349,7 @@ Partial Class MainFrm
         '
         Me.Button32.Enabled = False
         Me.Button32.Location = New System.Drawing.Point(120, 84)
-        Me.Button32.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.Button32.Margin = New System.Windows.Forms.Padding(4)
         Me.Button32.Name = "Button32"
         Me.Button32.Size = New System.Drawing.Size(108, 68)
         Me.Button32.TabIndex = 42
@@ -360,7 +360,7 @@ Partial Class MainFrm
         '
         Me.Button33.Enabled = False
         Me.Button33.Location = New System.Drawing.Point(236, 84)
-        Me.Button33.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.Button33.Margin = New System.Windows.Forms.Padding(4)
         Me.Button33.Name = "Button33"
         Me.Button33.Size = New System.Drawing.Size(108, 68)
         Me.Button33.TabIndex = 43
@@ -371,7 +371,7 @@ Partial Class MainFrm
         '
         Me.Button34.Enabled = False
         Me.Button34.Location = New System.Drawing.Point(352, 84)
-        Me.Button34.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.Button34.Margin = New System.Windows.Forms.Padding(4)
         Me.Button34.Name = "Button34"
         Me.Button34.Size = New System.Drawing.Size(108, 68)
         Me.Button34.TabIndex = 44
@@ -382,7 +382,7 @@ Partial Class MainFrm
         '
         Me.Button35.Enabled = False
         Me.Button35.Location = New System.Drawing.Point(468, 84)
-        Me.Button35.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.Button35.Margin = New System.Windows.Forms.Padding(4)
         Me.Button35.Name = "Button35"
         Me.Button35.Size = New System.Drawing.Size(105, 68)
         Me.Button35.TabIndex = 45
@@ -393,7 +393,7 @@ Partial Class MainFrm
         '
         Me.Button36.Enabled = False
         Me.Button36.Location = New System.Drawing.Point(3, 159)
-        Me.Button36.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.Button36.Margin = New System.Windows.Forms.Padding(4)
         Me.Button36.Name = "Button36"
         Me.Button36.Size = New System.Drawing.Size(107, 68)
         Me.Button36.TabIndex = 46
@@ -406,7 +406,7 @@ Partial Class MainFrm
         Me.TabControl1.Controls.Add(Me.TabPage3)
         Me.TabControl1.Controls.Add(Me.TabPage1)
         Me.TabControl1.Location = New System.Drawing.Point(8, 118)
-        Me.TabControl1.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.TabControl1.Margin = New System.Windows.Forms.Padding(4)
         Me.TabControl1.Name = "TabControl1"
         Me.TabControl1.SelectedIndex = 0
         Me.TabControl1.Size = New System.Drawing.Size(592, 343)
@@ -430,19 +430,30 @@ Partial Class MainFrm
         Me.TabPage2.Controls.Add(Me.Button32)
         Me.TabPage2.Controls.Add(Me.Button26)
         Me.TabPage2.Location = New System.Drawing.Point(4, 25)
-        Me.TabPage2.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.TabPage2.Margin = New System.Windows.Forms.Padding(4)
         Me.TabPage2.Name = "TabPage2"
-        Me.TabPage2.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.TabPage2.Padding = New System.Windows.Forms.Padding(4)
         Me.TabPage2.Size = New System.Drawing.Size(584, 314)
         Me.TabPage2.TabIndex = 1
         Me.TabPage2.Text = "Internal Programs"
         Me.TabPage2.UseVisualStyleBackColor = True
         '
+        'Button12
+        '
+        Me.Button12.Enabled = False
+        Me.Button12.Location = New System.Drawing.Point(468, 159)
+        Me.Button12.Margin = New System.Windows.Forms.Padding(4)
+        Me.Button12.Name = "Button12"
+        Me.Button12.Size = New System.Drawing.Size(105, 68)
+        Me.Button12.TabIndex = 50
+        Me.Button12.Text = "Trainer Editor"
+        Me.Button12.UseVisualStyleBackColor = True
+        '
         'Button11
         '
         Me.Button11.Enabled = False
         Me.Button11.Location = New System.Drawing.Point(352, 159)
-        Me.Button11.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.Button11.Margin = New System.Windows.Forms.Padding(4)
         Me.Button11.Name = "Button11"
         Me.Button11.Size = New System.Drawing.Size(108, 68)
         Me.Button11.TabIndex = 49
@@ -453,7 +464,7 @@ Partial Class MainFrm
         '
         Me.Button10.Enabled = False
         Me.Button10.Location = New System.Drawing.Point(236, 159)
-        Me.Button10.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.Button10.Margin = New System.Windows.Forms.Padding(4)
         Me.Button10.Name = "Button10"
         Me.Button10.Size = New System.Drawing.Size(108, 68)
         Me.Button10.TabIndex = 48
@@ -464,7 +475,7 @@ Partial Class MainFrm
         '
         Me.Button2.Enabled = False
         Me.Button2.Location = New System.Drawing.Point(120, 159)
-        Me.Button2.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.Button2.Margin = New System.Windows.Forms.Padding(4)
         Me.Button2.Name = "Button2"
         Me.Button2.Size = New System.Drawing.Size(108, 68)
         Me.Button2.TabIndex = 47
@@ -494,7 +505,7 @@ Partial Class MainFrm
         Me.TabPage3.Controls.Add(Me.Button30)
         Me.TabPage3.Controls.Add(Me.Button31)
         Me.TabPage3.Location = New System.Drawing.Point(4, 25)
-        Me.TabPage3.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.TabPage3.Margin = New System.Windows.Forms.Padding(4)
         Me.TabPage3.Name = "TabPage3"
         Me.TabPage3.Size = New System.Drawing.Size(584, 314)
         Me.TabPage3.TabIndex = 2
@@ -505,7 +516,7 @@ Partial Class MainFrm
         '
         Me.Button47.Enabled = False
         Me.Button47.Location = New System.Drawing.Point(4, 234)
-        Me.Button47.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.Button47.Margin = New System.Windows.Forms.Padding(4)
         Me.Button47.Name = "Button47"
         Me.Button47.Size = New System.Drawing.Size(108, 68)
         Me.Button47.TabIndex = 52
@@ -516,7 +527,7 @@ Partial Class MainFrm
         '
         Me.Button48.Enabled = False
         Me.Button48.Location = New System.Drawing.Point(120, 234)
-        Me.Button48.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.Button48.Margin = New System.Windows.Forms.Padding(4)
         Me.Button48.Name = "Button48"
         Me.Button48.Size = New System.Drawing.Size(108, 68)
         Me.Button48.TabIndex = 53
@@ -527,7 +538,7 @@ Partial Class MainFrm
         '
         Me.Button49.Enabled = False
         Me.Button49.Location = New System.Drawing.Point(236, 234)
-        Me.Button49.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.Button49.Margin = New System.Windows.Forms.Padding(4)
         Me.Button49.Name = "Button49"
         Me.Button49.Size = New System.Drawing.Size(108, 68)
         Me.Button49.TabIndex = 54
@@ -538,7 +549,7 @@ Partial Class MainFrm
         '
         Me.Button50.Enabled = False
         Me.Button50.Location = New System.Drawing.Point(352, 234)
-        Me.Button50.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.Button50.Margin = New System.Windows.Forms.Padding(4)
         Me.Button50.Name = "Button50"
         Me.Button50.Size = New System.Drawing.Size(108, 68)
         Me.Button50.TabIndex = 55
@@ -549,7 +560,7 @@ Partial Class MainFrm
         '
         Me.Button51.Enabled = False
         Me.Button51.Location = New System.Drawing.Point(468, 234)
-        Me.Button51.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.Button51.Margin = New System.Windows.Forms.Padding(4)
         Me.Button51.Name = "Button51"
         Me.Button51.Size = New System.Drawing.Size(105, 68)
         Me.Button51.TabIndex = 56
@@ -560,7 +571,7 @@ Partial Class MainFrm
         '
         Me.Button42.Enabled = False
         Me.Button42.Location = New System.Drawing.Point(4, 159)
-        Me.Button42.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.Button42.Margin = New System.Windows.Forms.Padding(4)
         Me.Button42.Name = "Button42"
         Me.Button42.Size = New System.Drawing.Size(108, 68)
         Me.Button42.TabIndex = 47
@@ -571,7 +582,7 @@ Partial Class MainFrm
         '
         Me.Button43.Enabled = False
         Me.Button43.Location = New System.Drawing.Point(120, 159)
-        Me.Button43.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.Button43.Margin = New System.Windows.Forms.Padding(4)
         Me.Button43.Name = "Button43"
         Me.Button43.Size = New System.Drawing.Size(108, 68)
         Me.Button43.TabIndex = 48
@@ -582,7 +593,7 @@ Partial Class MainFrm
         '
         Me.Button44.Enabled = False
         Me.Button44.Location = New System.Drawing.Point(236, 159)
-        Me.Button44.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.Button44.Margin = New System.Windows.Forms.Padding(4)
         Me.Button44.Name = "Button44"
         Me.Button44.Size = New System.Drawing.Size(108, 68)
         Me.Button44.TabIndex = 49
@@ -593,7 +604,7 @@ Partial Class MainFrm
         '
         Me.Button45.Enabled = False
         Me.Button45.Location = New System.Drawing.Point(352, 159)
-        Me.Button45.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.Button45.Margin = New System.Windows.Forms.Padding(4)
         Me.Button45.Name = "Button45"
         Me.Button45.Size = New System.Drawing.Size(108, 68)
         Me.Button45.TabIndex = 50
@@ -604,7 +615,7 @@ Partial Class MainFrm
         '
         Me.Button46.Enabled = False
         Me.Button46.Location = New System.Drawing.Point(468, 159)
-        Me.Button46.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.Button46.Margin = New System.Windows.Forms.Padding(4)
         Me.Button46.Name = "Button46"
         Me.Button46.Size = New System.Drawing.Size(105, 68)
         Me.Button46.TabIndex = 51
@@ -615,7 +626,7 @@ Partial Class MainFrm
         '
         Me.Button37.Enabled = False
         Me.Button37.Location = New System.Drawing.Point(4, 84)
-        Me.Button37.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.Button37.Margin = New System.Windows.Forms.Padding(4)
         Me.Button37.Name = "Button37"
         Me.Button37.Size = New System.Drawing.Size(108, 68)
         Me.Button37.TabIndex = 42
@@ -626,7 +637,7 @@ Partial Class MainFrm
         '
         Me.Button38.Enabled = False
         Me.Button38.Location = New System.Drawing.Point(120, 84)
-        Me.Button38.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.Button38.Margin = New System.Windows.Forms.Padding(4)
         Me.Button38.Name = "Button38"
         Me.Button38.Size = New System.Drawing.Size(108, 68)
         Me.Button38.TabIndex = 43
@@ -637,7 +648,7 @@ Partial Class MainFrm
         '
         Me.Button39.Enabled = False
         Me.Button39.Location = New System.Drawing.Point(236, 84)
-        Me.Button39.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.Button39.Margin = New System.Windows.Forms.Padding(4)
         Me.Button39.Name = "Button39"
         Me.Button39.Size = New System.Drawing.Size(108, 68)
         Me.Button39.TabIndex = 44
@@ -648,7 +659,7 @@ Partial Class MainFrm
         '
         Me.Button40.Enabled = False
         Me.Button40.Location = New System.Drawing.Point(352, 84)
-        Me.Button40.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.Button40.Margin = New System.Windows.Forms.Padding(4)
         Me.Button40.Name = "Button40"
         Me.Button40.Size = New System.Drawing.Size(108, 68)
         Me.Button40.TabIndex = 45
@@ -659,7 +670,7 @@ Partial Class MainFrm
         '
         Me.Button41.Enabled = False
         Me.Button41.Location = New System.Drawing.Point(468, 84)
-        Me.Button41.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.Button41.Margin = New System.Windows.Forms.Padding(4)
         Me.Button41.Name = "Button41"
         Me.Button41.Size = New System.Drawing.Size(105, 68)
         Me.Button41.TabIndex = 46
@@ -673,9 +684,9 @@ Partial Class MainFrm
         Me.TabPage1.Controls.Add(Me.Button3)
         Me.TabPage1.Controls.Add(Me.Button1)
         Me.TabPage1.Location = New System.Drawing.Point(4, 25)
-        Me.TabPage1.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.TabPage1.Margin = New System.Windows.Forms.Padding(4)
         Me.TabPage1.Name = "TabPage1"
-        Me.TabPage1.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.TabPage1.Padding = New System.Windows.Forms.Padding(4)
         Me.TabPage1.Size = New System.Drawing.Size(584, 314)
         Me.TabPage1.TabIndex = 0
         Me.TabPage1.Text = "Patchers and Expanders"
@@ -685,7 +696,7 @@ Partial Class MainFrm
         '
         Me.Button9.Enabled = False
         Me.Button9.Location = New System.Drawing.Point(236, 7)
-        Me.Button9.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.Button9.Margin = New System.Windows.Forms.Padding(4)
         Me.Button9.Name = "Button9"
         Me.Button9.Size = New System.Drawing.Size(108, 68)
         Me.Button9.TabIndex = 36
@@ -696,7 +707,7 @@ Partial Class MainFrm
         '
         Me.Button8.Enabled = False
         Me.Button8.Location = New System.Drawing.Point(4, 84)
-        Me.Button8.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.Button8.Margin = New System.Windows.Forms.Padding(4)
         Me.Button8.Name = "Button8"
         Me.Button8.Size = New System.Drawing.Size(108, 68)
         Me.Button8.TabIndex = 35
@@ -708,7 +719,7 @@ Partial Class MainFrm
         '
         Me.Button3.Enabled = False
         Me.Button3.Location = New System.Drawing.Point(120, 7)
-        Me.Button3.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.Button3.Margin = New System.Windows.Forms.Padding(4)
         Me.Button3.Name = "Button3"
         Me.Button3.Size = New System.Drawing.Size(108, 68)
         Me.Button3.TabIndex = 16
@@ -719,7 +730,7 @@ Partial Class MainFrm
         '
         Me.Button1.Enabled = False
         Me.Button1.Location = New System.Drawing.Point(4, 7)
-        Me.Button1.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.Button1.Margin = New System.Windows.Forms.Padding(4)
         Me.Button1.Name = "Button1"
         Me.Button1.Size = New System.Drawing.Size(108, 68)
         Me.Button1.TabIndex = 15
@@ -730,9 +741,9 @@ Partial Class MainFrm
         '
         Me.GroupBox1.Controls.Add(Me.Label1)
         Me.GroupBox1.Location = New System.Drawing.Point(16, 469)
-        Me.GroupBox1.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.GroupBox1.Margin = New System.Windows.Forms.Padding(4)
         Me.GroupBox1.Name = "GroupBox1"
-        Me.GroupBox1.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.GroupBox1.Padding = New System.Windows.Forms.Padding(4)
         Me.GroupBox1.Size = New System.Drawing.Size(577, 46)
         Me.GroupBox1.TabIndex = 48
         Me.GroupBox1.TabStop = False
@@ -745,18 +756,7 @@ Partial Class MainFrm
         Me.Label1.Name = "Label1"
         Me.Label1.Size = New System.Drawing.Size(333, 17)
         Me.Label1.TabIndex = 0
-        Me.Label1.Text = "Copyright © 2016 Gamer2020 All Rights Reserved. "
-        '
-        'Button12
-        '
-        Me.Button12.Enabled = False
-        Me.Button12.Location = New System.Drawing.Point(468, 159)
-        Me.Button12.Margin = New System.Windows.Forms.Padding(4)
-        Me.Button12.Name = "Button12"
-        Me.Button12.Size = New System.Drawing.Size(105, 68)
-        Me.Button12.TabIndex = 50
-        Me.Button12.Text = "Trainer Editor"
-        Me.Button12.UseVisualStyleBackColor = True
+        Me.Label1.Text = "Copyright © 2017 Gamer2020 All Rights Reserved. "
         '
         'MainFrm
         '
@@ -772,7 +772,7 @@ Partial Class MainFrm
         Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle
         Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
         Me.MainMenuStrip = Me.MenuStrip1
-        Me.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4)
+        Me.Margin = New System.Windows.Forms.Padding(4)
         Me.MaximizeBox = False
         Me.Name = "MainFrm"
         Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
diff --git a/GBAPokemonGameEditor/My Project/AssemblyInfo.vb b/GBAPokemonGameEditor/My Project/AssemblyInfo.vb
index d64628f..45eed6c 100644
--- a/GBAPokemonGameEditor/My Project/AssemblyInfo.vb	
+++ b/GBAPokemonGameEditor/My Project/AssemblyInfo.vb	
@@ -12,7 +12,7 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyDescription("")> 
 <Assembly: AssemblyCompany("Gamer2020")> 
 <Assembly: AssemblyProduct("Pokemon Game Editor")>
-<Assembly: AssemblyCopyright("Copyright © 2016 Gamer2020 All Rights Reserved.")>
+<Assembly: AssemblyCopyright("Copyright © 2017 Gamer2020 All Rights Reserved.")> 
 <Assembly: AssemblyTrademark("")> 
 
 <Assembly: ComVisible(False)>
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("3.7.0.0")>
-<Assembly: AssemblyFileVersion("3.7.0.0")>
+<Assembly: AssemblyVersion("3.8.0.0")> 
+<Assembly: AssemblyFileVersion("3.8.0.0")> 
diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.application b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.application
index 3a18567..2bab9ec 100644
--- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.application
+++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.application
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xrml="urn:mpeg:mpeg21:2003:01-REL-R-NS" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
-  <assemblyIdentity name="PokemonGameEditor.application" version="3.7.0.0" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" xmlns="urn:schemas-microsoft-com:asm.v1" />
+  <assemblyIdentity name="PokemonGameEditor.application" version="3.8.0.0" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" xmlns="urn:schemas-microsoft-com:asm.v1" />
   <description asmv2:publisher="PokemonGameEditor" asmv2:product="PokemonGameEditor" xmlns="urn:schemas-microsoft-com:asm.v1" />
   <deployment install="true" mapFileExtensions="true">
     <deploymentProvider codebase="http://gamer2020.0xrh.net/programs/GBAPokemonGameEditor/PokemonGameEditor.application" />
@@ -10,13 +10,13 @@
   </compatibleFrameworks>
   <dependency>
     <dependentAssembly dependencyType="install" codebase="PokemonGameEditor.exe.manifest" size="4714">
-      <assemblyIdentity name="PokemonGameEditor.exe" version="3.7.0.0" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
+      <assemblyIdentity name="PokemonGameEditor.exe" version="3.8.0.0" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>qBYJ1Qbh9KnbSH2FyJz+ZiZFimSfvuPQHOyL73AnrsQ=</dsig:DigestValue>
+        <dsig:DigestValue>xd50aTWRTRGUVR/smbYM5VR7xVADbJqpcwGRx2aRAfI=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe
index e5ee4d9..a79b164 100644
Binary files a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe and b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe differ
diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe.manifest b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe.manifest
index a62e261..8c0c933 100644
--- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe.manifest
+++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe.manifest
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
-  <asmv1:assemblyIdentity name="PokemonGameEditor.exe" version="3.7.0.0" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
+  <asmv1:assemblyIdentity name="PokemonGameEditor.exe" version="3.8.0.0" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
   <description asmv2:iconFile="icon.ico" xmlns="urn:schemas-microsoft-com:asm.v1" />
   <application />
   <entryPoint>
-    <assemblyIdentity name="PokemonGameEditor" version="3.7.0.0" language="neutral" processorArchitecture="msil" />
+    <assemblyIdentity name="PokemonGameEditor" version="3.8.0.0" language="neutral" processorArchitecture="msil" />
     <commandLine file="PokemonGameEditor.exe" parameters="" />
   </entryPoint>
   <trustInfo>
@@ -44,13 +44,13 @@
   </dependency>
   <dependency>
     <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="PokemonGameEditor.exe" size="2132992">
-      <assemblyIdentity name="PokemonGameEditor" version="3.7.0.0" language="neutral" processorArchitecture="msil" />
+      <assemblyIdentity name="PokemonGameEditor" version="3.8.0.0" language="neutral" processorArchitecture="msil" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>sf+OCyODPMew10CWgM5ZGHYEB3TevWWsekewwJxIcB8=</dsig:DigestValue>
+        <dsig:DigestValue>/EOBJtiqvTjj+BrKFAp/wGP2ypb7Xry95eyGQdXf/iY=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.pdb b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.pdb
index b53f680..10cbb35 100644
Binary files a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.pdb and b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.pdb differ
diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.application b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.application
index 3a18567..2bab9ec 100644
--- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.application
+++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.application
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xrml="urn:mpeg:mpeg21:2003:01-REL-R-NS" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
-  <assemblyIdentity name="PokemonGameEditor.application" version="3.7.0.0" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" xmlns="urn:schemas-microsoft-com:asm.v1" />
+  <assemblyIdentity name="PokemonGameEditor.application" version="3.8.0.0" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" xmlns="urn:schemas-microsoft-com:asm.v1" />
   <description asmv2:publisher="PokemonGameEditor" asmv2:product="PokemonGameEditor" xmlns="urn:schemas-microsoft-com:asm.v1" />
   <deployment install="true" mapFileExtensions="true">
     <deploymentProvider codebase="http://gamer2020.0xrh.net/programs/GBAPokemonGameEditor/PokemonGameEditor.application" />
@@ -10,13 +10,13 @@
   </compatibleFrameworks>
   <dependency>
     <dependentAssembly dependencyType="install" codebase="PokemonGameEditor.exe.manifest" size="4714">
-      <assemblyIdentity name="PokemonGameEditor.exe" version="3.7.0.0" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
+      <assemblyIdentity name="PokemonGameEditor.exe" version="3.8.0.0" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>qBYJ1Qbh9KnbSH2FyJz+ZiZFimSfvuPQHOyL73AnrsQ=</dsig:DigestValue>
+        <dsig:DigestValue>xd50aTWRTRGUVR/smbYM5VR7xVADbJqpcwGRx2aRAfI=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe.manifest b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe.manifest
index a62e261..8c0c933 100644
--- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe.manifest
+++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe.manifest
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
-  <asmv1:assemblyIdentity name="PokemonGameEditor.exe" version="3.7.0.0" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
+  <asmv1:assemblyIdentity name="PokemonGameEditor.exe" version="3.8.0.0" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
   <description asmv2:iconFile="icon.ico" xmlns="urn:schemas-microsoft-com:asm.v1" />
   <application />
   <entryPoint>
-    <assemblyIdentity name="PokemonGameEditor" version="3.7.0.0" language="neutral" processorArchitecture="msil" />
+    <assemblyIdentity name="PokemonGameEditor" version="3.8.0.0" language="neutral" processorArchitecture="msil" />
     <commandLine file="PokemonGameEditor.exe" parameters="" />
   </entryPoint>
   <trustInfo>
@@ -44,13 +44,13 @@
   </dependency>
   <dependency>
     <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="PokemonGameEditor.exe" size="2132992">
-      <assemblyIdentity name="PokemonGameEditor" version="3.7.0.0" language="neutral" processorArchitecture="msil" />
+      <assemblyIdentity name="PokemonGameEditor" version="3.8.0.0" language="neutral" processorArchitecture="msil" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>sf+OCyODPMew10CWgM5ZGHYEB3TevWWsekewwJxIcB8=</dsig:DigestValue>
+        <dsig:DigestValue>/EOBJtiqvTjj+BrKFAp/wGP2ypb7Xry95eyGQdXf/iY=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
diff --git a/GBAPokemonGameEditor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache b/GBAPokemonGameEditor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache
index ca5ba6d..0b247cc 100644
Binary files a/GBAPokemonGameEditor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache and b/GBAPokemonGameEditor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache differ
diff --git a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.FileListAbsolute.txt b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.FileListAbsolute.txt
index a3814bb..d26e506 100644
--- a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.FileListAbsolute.txt
+++ b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.FileListAbsolute.txt
@@ -221,3 +221,4 @@ D:\Github\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor
 D:\Github\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.exe
 D:\Github\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.xml
 D:\Github\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\PokemonGameEditor.pdb
+D:\Github\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\GBAPokemonGameEditor.vbprojResolveAssemblyReference.cache
diff --git a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.GenerateResource.Cache b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.GenerateResource.Cache
index a89b27a..bdaceea 100644
Binary files a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.GenerateResource.Cache and b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.GenerateResource.Cache differ
diff --git a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbprojResolveAssemblyReference.cache b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbprojResolveAssemblyReference.cache
new file mode 100644
index 0000000..3e73083
Binary files /dev/null and b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbprojResolveAssemblyReference.cache differ
diff --git a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.application b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.application
index 3a18567..2bab9ec 100644
--- a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.application
+++ b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.application
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xrml="urn:mpeg:mpeg21:2003:01-REL-R-NS" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
-  <assemblyIdentity name="PokemonGameEditor.application" version="3.7.0.0" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" xmlns="urn:schemas-microsoft-com:asm.v1" />
+  <assemblyIdentity name="PokemonGameEditor.application" version="3.8.0.0" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" xmlns="urn:schemas-microsoft-com:asm.v1" />
   <description asmv2:publisher="PokemonGameEditor" asmv2:product="PokemonGameEditor" xmlns="urn:schemas-microsoft-com:asm.v1" />
   <deployment install="true" mapFileExtensions="true">
     <deploymentProvider codebase="http://gamer2020.0xrh.net/programs/GBAPokemonGameEditor/PokemonGameEditor.application" />
@@ -10,13 +10,13 @@
   </compatibleFrameworks>
   <dependency>
     <dependentAssembly dependencyType="install" codebase="PokemonGameEditor.exe.manifest" size="4714">
-      <assemblyIdentity name="PokemonGameEditor.exe" version="3.7.0.0" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
+      <assemblyIdentity name="PokemonGameEditor.exe" version="3.8.0.0" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>qBYJ1Qbh9KnbSH2FyJz+ZiZFimSfvuPQHOyL73AnrsQ=</dsig:DigestValue>
+        <dsig:DigestValue>xd50aTWRTRGUVR/smbYM5VR7xVADbJqpcwGRx2aRAfI=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
diff --git a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe
index e5ee4d9..a79b164 100644
Binary files a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe and b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe differ
diff --git a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe.manifest b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe.manifest
index a62e261..8c0c933 100644
--- a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe.manifest
+++ b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe.manifest
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
-  <asmv1:assemblyIdentity name="PokemonGameEditor.exe" version="3.7.0.0" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
+  <asmv1:assemblyIdentity name="PokemonGameEditor.exe" version="3.8.0.0" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
   <description asmv2:iconFile="icon.ico" xmlns="urn:schemas-microsoft-com:asm.v1" />
   <application />
   <entryPoint>
-    <assemblyIdentity name="PokemonGameEditor" version="3.7.0.0" language="neutral" processorArchitecture="msil" />
+    <assemblyIdentity name="PokemonGameEditor" version="3.8.0.0" language="neutral" processorArchitecture="msil" />
     <commandLine file="PokemonGameEditor.exe" parameters="" />
   </entryPoint>
   <trustInfo>
@@ -44,13 +44,13 @@
   </dependency>
   <dependency>
     <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="PokemonGameEditor.exe" size="2132992">
-      <assemblyIdentity name="PokemonGameEditor" version="3.7.0.0" language="neutral" processorArchitecture="msil" />
+      <assemblyIdentity name="PokemonGameEditor" version="3.8.0.0" language="neutral" processorArchitecture="msil" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>sf+OCyODPMew10CWgM5ZGHYEB3TevWWsekewwJxIcB8=</dsig:DigestValue>
+        <dsig:DigestValue>/EOBJtiqvTjj+BrKFAp/wGP2ypb7Xry95eyGQdXf/iY=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
diff --git a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb
index b53f680..10cbb35 100644
Binary files a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb and b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb differ
diff --git a/LICENSE b/LICENSE
index ff155ec..e39de09 100644
--- a/LICENSE
+++ b/LICENSE
@@ -4,7 +4,7 @@ This is the license agreement for the program Pokemon Game Editor. By using the
 
 2. This program has undergone testing and it is in a working condition but you alone are responsible for what this program does to your computer, files, and anything that results from the program's use.
 
-3. The creators of this program have no obligation to offer support of any kind for this program. Any support offered is done as a courtesy with no standard expentancy of quality. Support is currently offered through the Github page.
+3. The creators of this program have no obligation to offer support of any kind for this program. Any support offered is done as a courtesy with no standard expentancy of quality. Support is currently offered through the Github page and no where else.
 
 4. This is a free program. If you paid for it you have been ripped off and should try to get your money back.
 
diff --git a/README.md b/README.md
index 8d31c0c..ec7d12b 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,3 @@
-Please use the lastest beta!
-=================
-
 ![alt tag](https://raw.githubusercontent.com/Gamer2020/PokemonGameEditor/master/Screenshots/PGEBANNER.png)
 
 Pokemon Game Editor, commonly know as PGE, is an all in one tool started in 2010 by Gamer2020 for hacking the Game Boy Advanced Pokemon games. The program continues to evolve over the years and has had 60,000+ downloads. It has even inspired several copycat programs hence the slogan "Accept no Imitations!" was adopted. The program is currently developed in VB.Net with Visual Studio 2013.
@@ -91,11 +88,11 @@ Pokedex List Editor.
 
 Pokemon Cry Exporting.
 
+Trainer Editor.
+
 Planned Features A.K.A TODO List
 =========================
 
-Trainer Editor (Started)
-
 Pokemon Cry Importing
 
 OW Editor
@@ -142,7 +139,7 @@ Gamer2020
 
 Issues
 =================
-Running added programs on Linux not implemented yet and possibly won't be for a while.
+Running added programs on Linux not implemented yet and possibly won't be for a while. Also keep in kind that the program hasn't been tested under Linux in a long time.
 
 Credits
 =================
@@ -189,6 +186,8 @@ doom-desire
 
 DizzyEggg
 
+KDSKardabox
+
 EddyHg80
 
 Downloads
diff --git a/roms.ini b/roms.ini
index c96cc12..bdcaffc 100644
--- a/roms.ini
+++ b/roms.ini
@@ -560,11 +560,11 @@ ItemAnimationTable=45FD54
 TrainerTable=23EAC8
 NumberOfTrainers=742
 TrainerClasses=23E558
-NumberOfTrainerClasses=6B
+NumberOfTrainerClasses=107
 TrainerImageTable=23957C
 NumberOfTrainerImages=147
 TrainerPaletteTable=239A1C
-TrainerClassMoney=24F220
+TrainerMoneyTable=24F220
 DexSizeTrainerSprite=135
 TradeData=26CF8C
 NumberOfTrades=9
@@ -745,11 +745,11 @@ HabitatTable=0
 TrainerTable=23EACC
 NumberOfTrainers=742
 TrainerClasses=23E534
-NumberOfTrainerClasses=6B
+NumberOfTrainerClasses=107
 TrainerImageTable=239558
 NumberOfTrainerImages=147
 TrainerPaletteTable=2399F8
-TrainerClassMoney=24F1FC
+TrainerMoneyTable=24F1FC
 
 [BPEE]
 ROMName=Pokémon Emerald (English)
@@ -1009,12 +1009,40 @@ Evolution12Param=level
 Evolution13Param=evolvesbutnoparms
 Evolution14Param=level
 Evolution15Param=evolvesbasedonvalue
+EvolutionName16=Knows Move
+Evolution16Param=attack
+EvolutionName17=In certain map
+Evolution17Param=mapname
+EvolutionName18=Level-up at day
+Evolution18Param=level
+EvolutionName19=Level-up at night
+Evolution19Param=level
+EvolutionName20=Holding item at day
+Evolution20Param=item
+EvolutionName21=Holding item at night
+Evolution21Param=item
+EvolutionName22=Level-up if male
+Evolution22Param=level
+EvolutionName23=Level-up if female
+Evolution23Param=level
+EvolutionName24=Level-up if raining
+Evolution24Param=level
+EvolutionName25=Specific Pokemon in party
+Evolution25Param=species
+EvolutionName26=Level-up if pokemon with type in party
+Evolution26Param=bankandmap
+EvolutionName27=Using item if male
+Evolution27Param=item
+EvolutionName28=Using item if female
+Evolution28Param=item
 EvolutionName252=Wish Mega Evolution
 Evolution252Param=attack
 EvolutionName251=Mega Evolution
 Evolution251Param=item
 EvolutionName255=Revert Megas
 Evolution255Param=evolvesbutnoparms
+EvolutionName253=Primal Reversion
+Evolution253Param=evolvesbasedonvalue
 EggMoveTable=32ADD8
 EggMoveTableLimiter=70464
 TrainerTable=310030
@@ -1024,6 +1052,7 @@ NumberOfTrainerClasses=66
 TrainerImageTable=305654
 NumberOfTrainerImages=92
 TrainerPaletteTable=30593C
+TrainerMoneyTable=31AEB8
 DexSizeTrainerSprite=71
 TradeData=338ED0
 NumberOfTrades=4