diff --git a/.gitignore b/.gitignore
index 22b230f..311dc58 100644
--- a/.gitignore
+++ b/.gitignore
@@ -236,3 +236,4 @@ _Pvt_Extensions
 .fake/
 
 .idea/
+.DS_Store
diff --git a/WC3Tool/EventTool.Designer.cs b/WC3Tool/EventTool.Designer.cs
index a4f2bf3..a455657 100644
--- a/WC3Tool/EventTool.Designer.cs
+++ b/WC3Tool/EventTool.Designer.cs
@@ -6,7 +6,7 @@
  * 
  * To change this template use Tools | Options | Coding | Edit Standard Headers.
  */
-namespace WC3_TOOL
+namespace WC3Tool
 {
 	partial class EventTool
 	{
diff --git a/WC3Tool/EventTool.cs b/WC3Tool/EventTool.cs
index 5b9d50c..90e8111 100644
--- a/WC3Tool/EventTool.cs
+++ b/WC3Tool/EventTool.cs
@@ -12,7 +12,7 @@ using System.Windows.Forms;
 using System.Reflection;
 using System.Resources;
 
-namespace WC3_TOOL
+namespace WC3Tool
 {
 	/// <summary>
 	/// Description of EventTool.
@@ -30,7 +30,7 @@ namespace WC3_TOOL
 			// TODO: Add constructor code after the InitializeComponent() call.
 			//
 		}
-		ResourceManager Tickets = new ResourceManager("WC3_tool.WC3.Tickets", Assembly.GetExecutingAssembly());
+		ResourceManager Tickets = new ResourceManager("WC3Tool.WC3.Tickets", Assembly.GetExecutingAssembly());
 		public string savfilter = "RAW Save file|*.sav;*sa1;*sa2|All Files (*.*)|*.*";
 		public string wc3filter = "Wonder Card file|*.wc3|All Files (*.*)|*.*";
 		public string wcnfilter = "Wonder News file|*.wn3|All Files (*.*)|*.*";
diff --git a/WC3Tool/MainScreen.Designer.cs b/WC3Tool/MainScreen.Designer.cs
index b93a2ef..9f78ab3 100644
--- a/WC3Tool/MainScreen.Designer.cs
+++ b/WC3Tool/MainScreen.Designer.cs
@@ -6,7 +6,7 @@
  * 
  * To change this template use Tools | Options | Coding | Edit Standard Headers.
  */
-namespace WC3_TOOL
+namespace WC3Tool
 {
 	partial class MainScreen
 	{
diff --git a/WC3Tool/MainScreen.cs b/WC3Tool/MainScreen.cs
index cd1f16d..63db309 100644
--- a/WC3Tool/MainScreen.cs
+++ b/WC3Tool/MainScreen.cs
@@ -10,7 +10,7 @@ using System;
 using System.Windows.Forms;
 using System.Reflection;
 
-namespace WC3_TOOL
+namespace WC3Tool
 {
 	/// <summary>
 	/// Description of MainScreen.
diff --git a/WC3Tool/Program.cs b/WC3Tool/Program.cs
index bfb586e..b7dd8a1 100644
--- a/WC3Tool/Program.cs
+++ b/WC3Tool/Program.cs
@@ -9,7 +9,7 @@
 using System;
 using System.Windows.Forms;
 
-namespace WC3_TOOL
+namespace WC3Tool
 {
 	/// <summary>
 	/// Class with program entry point.
diff --git a/WC3Tool/WC3/Decor_editor.Designer.cs b/WC3Tool/WC3/Decor_editor.Designer.cs
index 032019d..a35ff73 100644
--- a/WC3Tool/WC3/Decor_editor.Designer.cs
+++ b/WC3Tool/WC3/Decor_editor.Designer.cs
@@ -6,7 +6,7 @@
  * 
  * To change this template use Tools | Options | Coding | Edit Standard Headers.
  */
-namespace WC3_TOOL
+namespace WC3Tool
 {
 	partial class Decor_editor
 	{
diff --git a/WC3Tool/WC3/Decor_editor.cs b/WC3Tool/WC3/Decor_editor.cs
index 74798bb..ac9d94a 100644
--- a/WC3Tool/WC3/Decor_editor.cs
+++ b/WC3Tool/WC3/Decor_editor.cs
@@ -10,7 +10,7 @@ using System;
 using System.Windows.Forms;
 
 
-namespace WC3_TOOL
+namespace WC3Tool
 {
 	/// <summary>
 	/// Description of Decor_editor.
diff --git a/WC3Tool/WC3/ECB.cs b/WC3Tool/WC3/ECB.cs
index 4b5c7f2..1f76e0e 100644
--- a/WC3Tool/WC3/ECB.cs
+++ b/WC3Tool/WC3/ECB.cs
@@ -9,7 +9,7 @@
 using System;
 using System.Linq;
 
-namespace WC3_TOOL
+namespace WC3Tool
 {
 	/// <summary>
 	/// Description of ECB.
diff --git a/WC3Tool/WC3/ECB_editor.Designer.cs b/WC3Tool/WC3/ECB_editor.Designer.cs
index 07f71a7..a323e9e 100644
--- a/WC3Tool/WC3/ECB_editor.Designer.cs
+++ b/WC3Tool/WC3/ECB_editor.Designer.cs
@@ -6,7 +6,7 @@
  * 
  * To change this template use Tools | Options | Coding | Edit Standard Headers.
  */
-namespace WC3_TOOL
+namespace WC3Tool
 {
 	partial class ECB_editor
 	{
diff --git a/WC3Tool/WC3/ECB_editor.cs b/WC3Tool/WC3/ECB_editor.cs
index b280891..6b3828a 100644
--- a/WC3Tool/WC3/ECB_editor.cs
+++ b/WC3Tool/WC3/ECB_editor.cs
@@ -9,7 +9,7 @@
 using System;
 using System.Windows.Forms;
 
-namespace WC3_TOOL
+namespace WC3Tool
 {
 	/// <summary>
 	/// Description of ECB_editor.
diff --git a/WC3Tool/WC3/ECT.cs b/WC3Tool/WC3/ECT.cs
index 2acc300..d4e15af 100644
--- a/WC3Tool/WC3/ECT.cs
+++ b/WC3Tool/WC3/ECT.cs
@@ -9,7 +9,7 @@
 using System;
 using System.Linq;
 
-namespace WC3_TOOL
+namespace WC3Tool
 {
 	/// <summary>
 	/// Description of ECT.
diff --git a/WC3Tool/WC3/ECT_editor.Designer.cs b/WC3Tool/WC3/ECT_editor.Designer.cs
index 3f7c89c..665049c 100644
--- a/WC3Tool/WC3/ECT_editor.Designer.cs
+++ b/WC3Tool/WC3/ECT_editor.Designer.cs
@@ -6,7 +6,7 @@
  * 
  * To change this template use Tools | Options | Coding | Edit Standard Headers.
  */
-namespace WC3_TOOL
+namespace WC3Tool
 {
 	partial class ECT_editor
 	{
diff --git a/WC3Tool/WC3/ECT_editor.cs b/WC3Tool/WC3/ECT_editor.cs
index d18794b..6a88942 100644
--- a/WC3Tool/WC3/ECT_editor.cs
+++ b/WC3Tool/WC3/ECT_editor.cs
@@ -10,7 +10,7 @@ using System;
 using System.Linq;
 using System.Windows.Forms;
 
-namespace WC3_TOOL
+namespace WC3Tool
 {
 	/// <summary>
 	/// Description of ECT_editor.
diff --git a/WC3Tool/WC3/ECT_editor_text.cs b/WC3Tool/WC3/ECT_editor_text.cs
index 4704a03..a3ebaa6 100644
--- a/WC3Tool/WC3/ECT_editor_text.cs
+++ b/WC3Tool/WC3/ECT_editor_text.cs
@@ -7,7 +7,7 @@
  * To change this template use Tools | Options | Coding | Edit Standard Headers.
  */
 
-namespace WC3_TOOL
+namespace WC3Tool
 {
 	/// <summary>
 	/// Description of ECT_editor_text.
diff --git a/WC3Tool/WC3/ECT_pkedit.Designer.cs b/WC3Tool/WC3/ECT_pkedit.Designer.cs
index 65fbf2a..c95120d 100644
--- a/WC3Tool/WC3/ECT_pkedit.Designer.cs
+++ b/WC3Tool/WC3/ECT_pkedit.Designer.cs
@@ -6,7 +6,7 @@
  * 
  * To change this template use Tools | Options | Coding | Edit Standard Headers.
  */
-namespace WC3_TOOL
+namespace WC3Tool
 {
 	partial class ECT_pkedit
 	{
diff --git a/WC3Tool/WC3/ECT_pkedit.cs b/WC3Tool/WC3/ECT_pkedit.cs
index 6a3677d..4891421 100644
--- a/WC3Tool/WC3/ECT_pkedit.cs
+++ b/WC3Tool/WC3/ECT_pkedit.cs
@@ -10,7 +10,7 @@ using System;
 using System.Linq;
 using System.Windows.Forms;
 
-namespace WC3_TOOL
+namespace WC3Tool
 {
 	/// <summary>
 	/// Description of ECT_pkedit.
diff --git a/WC3Tool/WC3/FILEIO.cs b/WC3Tool/WC3/FILEIO.cs
index 78eda3a..babefff 100644
--- a/WC3Tool/WC3/FILEIO.cs
+++ b/WC3Tool/WC3/FILEIO.cs
@@ -11,7 +11,7 @@ using System;
 using System.Windows.Forms;
 using System.IO;
 
-namespace WC3_TOOL
+namespace WC3Tool
 {
 	/// <summary>
 	/// Description of FILEIO.
diff --git a/WC3Tool/WC3/ME3.cs b/WC3Tool/WC3/ME3.cs
index 3d9fdb1..e7dfe93 100644
--- a/WC3Tool/WC3/ME3.cs
+++ b/WC3Tool/WC3/ME3.cs
@@ -10,7 +10,7 @@ using System;
 using System.Linq;
 using System.Windows.Forms;
 
-namespace WC3_TOOL
+namespace WC3Tool
 {
 	/// <summary>
 	/// Description of ME3.
diff --git a/WC3Tool/WC3/ME3_editor.Designer.cs b/WC3Tool/WC3/ME3_editor.Designer.cs
index d8fb81b..5738b0b 100644
--- a/WC3Tool/WC3/ME3_editor.Designer.cs
+++ b/WC3Tool/WC3/ME3_editor.Designer.cs
@@ -6,7 +6,7 @@
  * 
  * To change this template use Tools | Options | Coding | Edit Standard Headers.
  */
-namespace WC3_TOOL
+namespace WC3Tool
 {
 	partial class ME3_editor
 	{
diff --git a/WC3Tool/WC3/ME3_editor.cs b/WC3Tool/WC3/ME3_editor.cs
index 0fc539f..d519605 100644
--- a/WC3Tool/WC3/ME3_editor.cs
+++ b/WC3Tool/WC3/ME3_editor.cs
@@ -9,7 +9,7 @@
 using System;
 using System.Windows.Forms;
 
-namespace WC3_TOOL
+namespace WC3Tool
 {
 	/// <summary>
 	/// Description of ME3_editor.
diff --git a/WC3Tool/WC3/SAV3.cs b/WC3Tool/WC3/SAV3.cs
index 773e32c..a2fc9d7 100644
--- a/WC3Tool/WC3/SAV3.cs
+++ b/WC3Tool/WC3/SAV3.cs
@@ -10,7 +10,7 @@ using System;
 using System.Linq;
 using System.Windows.Forms;
 
-namespace WC3_TOOL
+namespace WC3Tool
 {
 	/// <summary>
 	/// Description of SAV3.
diff --git a/WC3Tool/WC3/TV.cs b/WC3Tool/WC3/TV.cs
index a372807..6c952c6 100644
--- a/WC3Tool/WC3/TV.cs
+++ b/WC3Tool/WC3/TV.cs
@@ -9,7 +9,7 @@
 using System;
 using System.Linq;
 
-namespace WC3_TOOL
+namespace WC3Tool
 {
 	public class TV_EVENTS
 	{
diff --git a/WC3Tool/WC3/TV_editor.Designer.cs b/WC3Tool/WC3/TV_editor.Designer.cs
index b01fc67..af26a0d 100644
--- a/WC3Tool/WC3/TV_editor.Designer.cs
+++ b/WC3Tool/WC3/TV_editor.Designer.cs
@@ -6,7 +6,7 @@
  * 
  * To change this template use Tools | Options | Coding | Edit Standard Headers.
  */
-namespace WC3_TOOL
+namespace WC3Tool
 {
 	partial class TV_editor
 	{
diff --git a/WC3Tool/WC3/TV_editor.cs b/WC3Tool/WC3/TV_editor.cs
index 574615f..e4eadb9 100644
--- a/WC3Tool/WC3/TV_editor.cs
+++ b/WC3Tool/WC3/TV_editor.cs
@@ -9,7 +9,7 @@
 using System;
 using System.Windows.Forms;
 
-namespace WC3_TOOL
+namespace WC3Tool
 {
 	/// <summary>
 	/// Description of TV_editor.
diff --git a/WC3Tool/WC3/WC3_editor.Designer.cs b/WC3Tool/WC3/WC3_editor.Designer.cs
index 2d1bec7..d0caf9a 100644
--- a/WC3Tool/WC3/WC3_editor.Designer.cs
+++ b/WC3Tool/WC3/WC3_editor.Designer.cs
@@ -6,7 +6,7 @@
  * 
  * To change this template use Tools | Options | Coding | Edit Standard Headers.
  */
-namespace WC3_TOOL
+namespace WC3Tool
 {
 	partial class WC3_editor
 	{
diff --git a/WC3Tool/WC3/WC3_editor.cs b/WC3Tool/WC3/WC3_editor.cs
index 838fa84..ff52093 100644
--- a/WC3Tool/WC3/WC3_editor.cs
+++ b/WC3Tool/WC3/WC3_editor.cs
@@ -12,7 +12,7 @@ using System.Windows.Forms;
 using System.Reflection;
 using System.Resources;
 
-namespace WC3_TOOL
+namespace WC3Tool
 {
 	/// <summary>
 	/// Description of MainForm.
@@ -299,8 +299,8 @@ namespace WC3_TOOL
 		{
 			drawCard();
 		}
-		ResourceManager resources = new ResourceManager("WC3_TOOL.WC3.Image.Cards", Assembly.GetExecutingAssembly());
-		ResourceManager resources2 = new ResourceManager("WC3_TOOL.WC3.Image.Icons", Assembly.GetExecutingAssembly());
+		ResourceManager resources = new ResourceManager("WC3Tool.WC3.Image.Cards", Assembly.GetExecutingAssembly());
+		ResourceManager resources2 = new ResourceManager("WC3Tool.WC3.Image.Icons", Assembly.GetExecutingAssembly());
 		Image bitmap2;
 		Image bitmap;
 		void drawCard()
diff --git a/WC3Tool/WC3/WC3_editor_givegg.Designer.cs b/WC3Tool/WC3/WC3_editor_givegg.Designer.cs
index 2aaddf2..f92fe72 100644
--- a/WC3Tool/WC3/WC3_editor_givegg.Designer.cs
+++ b/WC3Tool/WC3/WC3_editor_givegg.Designer.cs
@@ -6,7 +6,7 @@
  * 
  * To change this template use Tools | Options | Coding | Edit Standard Headers.
  */
-namespace WC3_TOOL
+namespace WC3Tool
 {
 	partial class WC3_editor_givegg
 	{
diff --git a/WC3Tool/WC3/WC3_editor_givegg.cs b/WC3Tool/WC3/WC3_editor_givegg.cs
index af40460..e5d2894 100644
--- a/WC3Tool/WC3/WC3_editor_givegg.cs
+++ b/WC3Tool/WC3/WC3_editor_givegg.cs
@@ -12,7 +12,7 @@ using System.Windows.Forms;
 using System.Reflection;
 using System.Resources;
 
-namespace WC3_TOOL
+namespace WC3Tool
 {
 	/// <summary>
 	/// Description of WC3_editor_givegg.
@@ -70,7 +70,7 @@ Bitmap bitmap = (Bitmap)ResourceManager.GetObject("Image");
 					break;
 			}
 			//MessageBox.Show("ROM_"+game+"_GiveEgg_"+lang);
-			ResourceManager EggScripts = new ResourceManager("WC3_tool.WC3.GiveEggOrg", Assembly.GetExecutingAssembly());
+			ResourceManager EggScripts = new ResourceManager("WC3Tool.WC3.GiveEggOrg", Assembly.GetExecutingAssembly());
 			byte[] egg_script = (byte[]) EggScripts.GetObject("ROM_"+game+"_GiveEgg_"+lang);
 			//byte[] egg_script = (byte[]) EggScripts.GetObject("ROM_FR_GiveEgg_Esp");
 			
diff --git a/WC3Tool/WC3/WC3_editor_giveggExt.Designer.cs b/WC3Tool/WC3/WC3_editor_giveggExt.Designer.cs
index 1e7b8a6..c75c2bc 100644
--- a/WC3Tool/WC3/WC3_editor_giveggExt.Designer.cs
+++ b/WC3Tool/WC3/WC3_editor_giveggExt.Designer.cs
@@ -6,7 +6,7 @@
  * 
  * To change this template use Tools | Options | Coding | Edit Standard Headers.
  */
-namespace WC3_TOOL
+namespace WC3Tool
 {
 	partial class WC3_editor_giveggExt
 	{
diff --git a/WC3Tool/WC3/WC3_editor_giveggExt.cs b/WC3Tool/WC3/WC3_editor_giveggExt.cs
index 0c0bffa..14b0330 100644
--- a/WC3Tool/WC3/WC3_editor_giveggExt.cs
+++ b/WC3Tool/WC3/WC3_editor_giveggExt.cs
@@ -12,7 +12,7 @@ using System.Windows.Forms;
 using System.Reflection;
 using System.Resources;
 
-namespace WC3_TOOL
+namespace WC3Tool
 {
 	/// <summary>
 	/// Description of WC3_editor_givegg.
@@ -73,7 +73,7 @@ Bitmap bitmap = (Bitmap)ResourceManager.GetObject("Image");
 					break;
 			}
 			//MessageBox.Show("ROM_"+game+"_GiveEgg_"+lang);
-			ResourceManager EggScripts = new ResourceManager("WC3_tool.WC3.GiveEggOrg", Assembly.GetExecutingAssembly());
+			ResourceManager EggScripts = new ResourceManager("WC3Tool.WC3.GiveEggOrg", Assembly.GetExecutingAssembly());
 			byte[] egg_script;
 			
 			if (killscript.Checked)
diff --git a/WC3Tool/WC3/WCN_editor.Designer.cs b/WC3Tool/WC3/WCN_editor.Designer.cs
index 170ea16..c4053a4 100644
--- a/WC3Tool/WC3/WCN_editor.Designer.cs
+++ b/WC3Tool/WC3/WCN_editor.Designer.cs
@@ -6,7 +6,7 @@
  * 
  * To change this template use Tools | Options | Coding | Edit Standard Headers.
  */
-namespace WC3_TOOL
+namespace WC3Tool
 {
 	partial class WCN_editor
 	{
diff --git a/WC3Tool/WC3/WCN_editor.cs b/WC3Tool/WC3/WCN_editor.cs
index 5fd3cbd..09e7be8 100644
--- a/WC3Tool/WC3/WCN_editor.cs
+++ b/WC3Tool/WC3/WCN_editor.cs
@@ -12,7 +12,7 @@ using System.Windows.Forms;
 using System.Reflection;
 using System.Resources;
 
-namespace WC3_TOOL
+namespace WC3Tool
 {
 	/// <summary>
 	/// Description of MainForm.
@@ -155,11 +155,11 @@ namespace WC3_TOOL
 		{
 	
 		}
-		ResourceManager resources = new ResourceManager("WC3_TOOL.WC3.Image.Cards", Assembly.GetExecutingAssembly());
+		ResourceManager resources = new ResourceManager("WC3Tool.WC3.Image.Cards", Assembly.GetExecutingAssembly());
 		Image bitmap;
 		void drawCard()
 		{
-			//ResourceManager resources = new ResourceManager("WC3_TOOL.WC3.Image.Cards", Assembly.GetExecutingAssembly());
+			//ResourceManager resources = new ResourceManager("WC3Tool.WC3.Image.Cards", Assembly.GetExecutingAssembly());
 			bitmap = (Image)resources.GetObject("News_"+colorbox.SelectedIndex);
 			GFX.DrawImage(bitmap, 500, 140+26, 260, 140);
 			GFX.DrawImage(bitmap, 500, 140, 260, 140);
diff --git a/WC3Tool/WC3/wc3.cs b/WC3Tool/WC3/wc3.cs
index 5f55f54..1bc52d2 100644
--- a/WC3Tool/WC3/wc3.cs
+++ b/WC3Tool/WC3/wc3.cs
@@ -10,7 +10,7 @@ using System;
 using System.Linq;
 using System.Windows.Forms;
 
-namespace WC3_TOOL
+namespace WC3Tool
 {
 	/// <summary>
 	/// Description of wc3.