diff --git a/DS_Map/DSPRE.csproj b/DS_Map/DSPRE.csproj
index 2ddf6d7..ad51070 100644
--- a/DS_Map/DSPRE.csproj
+++ b/DS_Map/DSPRE.csproj
@@ -182,10 +182,10 @@
     <Compile Include="EventFileImport.designer.cs">
       <DependentUpon>EventFileImport.cs</DependentUpon>
     </Compile>
-    <Compile Include="EvolutionsEditor.cs">
+    <Compile Include="Editors\EvolutionsEditor.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="EvolutionsEditor.designer.cs">
+    <Compile Include="Editors\EvolutionsEditor.designer.cs">
       <DependentUpon>EvolutionsEditor.cs</DependentUpon>
     </Compile>
     <Compile Include="ExtensionMethods.cs" />
@@ -196,29 +196,29 @@
     <Compile Include="InputComboBox.cs">
       <SubType>Component</SubType>
     </Compile>
-    <Compile Include="LearnsetEditor.cs">
+    <Compile Include="Editors\LearnsetEditor.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="LearnsetEditor.designer.cs">
+    <Compile Include="Editors\LearnsetEditor.designer.cs">
       <DependentUpon>LearnsetEditor.cs</DependentUpon>
     </Compile>
     <Compile Include="MessageEnc\EncryptText.cs" />
-    <Compile Include="OverlayEditor.cs">
+    <Compile Include="Editors\OverlayEditor.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="OverlayEditor.Designer.cs">
+    <Compile Include="Editors\OverlayEditor.Designer.cs">
       <DependentUpon>OverlayEditor.cs</DependentUpon>
     </Compile>
-    <Compile Include="PersonalDataEditor.cs">
+    <Compile Include="Editors\PersonalDataEditor.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="PersonalDataEditor.designer.cs">
+    <Compile Include="Editors\PersonalDataEditor.designer.cs">
       <DependentUpon>PersonalDataEditor.cs</DependentUpon>
     </Compile>
-    <Compile Include="PokemonEditor.cs">
+    <Compile Include="Editors\PokemonEditor.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="PokemonEditor.Designer.cs">
+    <Compile Include="Editors\PokemonEditor.Designer.cs">
       <DependentUpon>PokemonEditor.cs</DependentUpon>
     </Compile>
     <Compile Include="Properties\Resources.Designer.cs">
@@ -270,7 +270,9 @@
     <Compile Include="ROMFiles\SafariZoneObjectRequirement.cs" />
     <Compile Include="ROMFiles\ScriptAction.cs" />
     <Compile Include="ROMFiles\ScriptActionContainer.cs" />
+    <Compile Include="ROMFiles\ScriptCommand.cs" />
     <Compile Include="ROMFiles\ScriptCommandContainer.cs" />
+    <Compile Include="ROMFiles\ScriptFile.cs" />
     <Compile Include="ROMFiles\ScriptReference.cs" />
     <Compile Include="ROMFiles\SpeciesFile.cs" />
     <Compile Include="ROMFiles\TrainerFile.cs" />
@@ -281,14 +283,13 @@
     <Compile Include="PatchToolboxDialog.Designer.cs">
       <DependentUpon>PatchToolboxDialog.cs</DependentUpon>
     </Compile>
-    <Compile Include="BuildingEditor.cs">
+    <Compile Include="Editors\BuildingEditor.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="BuildingEditor.Designer.cs">
+    <Compile Include="Editors\BuildingEditor.Designer.cs">
       <DependentUpon>BuildingEditor.cs</DependentUpon>
     </Compile>
     <Compile Include="RomInfo.cs" />
-    <Compile Include="ROMFiles\ScriptCommand.cs" />
     <Compile Include="ScintillaUtils\HotKeyManager.cs" />
     <Compile Include="ScintillaUtils\ScriptTooltip.cs">
       <SubType>Form</SubType>
@@ -304,29 +305,28 @@
     <Compile Include="SettingsWindow.Designer.cs">
       <DependentUpon>SettingsWindow.cs</DependentUpon>
     </Compile>
-    <Compile Include="SpawnEditor.cs">
+    <Compile Include="Editors\SpawnEditor.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="SpawnEditor.Designer.cs">
+    <Compile Include="Editors\SpawnEditor.Designer.cs">
       <DependentUpon>SpawnEditor.cs</DependentUpon>
     </Compile>
     <Compile Include="UniqueList.cs" />
-    <Compile Include="WildEditorHGSS.cs">
+    <Compile Include="Editors\WildEditorHGSS.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="WildEditorHGSS.Designer.cs">
+    <Compile Include="Editors\WildEditorHGSS.Designer.cs">
       <DependentUpon>WildEditorHGSS.cs</DependentUpon>
     </Compile>
-    <Compile Include="WildEditorDPPt.cs">
+    <Compile Include="Editors\WildEditorDPPt.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="WildEditorDPPt.Designer.cs">
+    <Compile Include="Editors\WildEditorDPPt.Designer.cs">
       <DependentUpon>WildEditorDPPt.cs</DependentUpon>
     </Compile>
     <Compile Include="ROMFiles\EncounterFile.cs" />
     <Compile Include="ROMFiles\TextArchive.cs" />
     <Compile Include="ROMFiles\MapHeader.cs" />
-    <Compile Include="ROMFiles\ScriptFile.cs" />
     <Compile Include="ROMFiles\GameMatrix.cs" />
     <Compile Include="ROMFiles\EventFile.cs" />
     <Compile Include="LibNDSFormats\bytearrayoutputstream.cs" />
@@ -425,22 +425,22 @@
     <EmbeddedResource Include="EventFileImport.resx">
       <DependentUpon>EventFileImport.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="EvolutionsEditor.resx">
+    <EmbeddedResource Include="Editors\EvolutionsEditor.resx">
       <DependentUpon>EvolutionsEditor.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="HeaderSearch.resx">
       <DependentUpon>HeaderSearch.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="LearnsetEditor.resx">
+    <EmbeddedResource Include="Editors\LearnsetEditor.resx">
       <DependentUpon>LearnsetEditor.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="OverlayEditor.resx">
+    <EmbeddedResource Include="Editors\OverlayEditor.resx">
       <DependentUpon>OverlayEditor.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="PersonalDataEditor.resx">
+    <EmbeddedResource Include="Editors\PersonalDataEditor.resx">
       <DependentUpon>PersonalDataEditor.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="PokemonEditor.resx">
+    <EmbeddedResource Include="Editors\PokemonEditor.resx">
       <DependentUpon>PokemonEditor.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Resources\ROMToolboxDB\BDHCAMPatchDB.resx">
@@ -456,16 +456,16 @@
     <EmbeddedResource Include="PatchToolboxDialog.resx">
       <DependentUpon>PatchToolboxDialog.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="BuildingEditor.resx">
+    <EmbeddedResource Include="Editors\BuildingEditor.resx">
       <DependentUpon>BuildingEditor.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="ScintillaUtils\ScriptTooltip.resx">
       <DependentUpon>ScriptTooltip.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="SpawnEditor.resx">
+    <EmbeddedResource Include="Editors\SpawnEditor.resx">
       <DependentUpon>SpawnEditor.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="WildEditorHGSS.resx">
+    <EmbeddedResource Include="Editors\WildEditorHGSS.resx">
       <DependentUpon>WildEditorHGSS.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Main Window.resx">
@@ -478,7 +478,7 @@
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
     <EmbeddedResource Include="Resources\writeText.resx" />
-    <EmbeddedResource Include="WildEditorDPPt.resx">
+    <EmbeddedResource Include="Editors\WildEditorDPPt.resx">
       <DependentUpon>WildEditorDPPt.cs</DependentUpon>
     </EmbeddedResource>
     <None Include="Properties\Settings.settings">
diff --git a/DS_Map/BuildingEditor.Designer.cs b/DS_Map/Editors/BuildingEditor.Designer.cs
similarity index 100%
rename from DS_Map/BuildingEditor.Designer.cs
rename to DS_Map/Editors/BuildingEditor.Designer.cs
diff --git a/DS_Map/BuildingEditor.cs b/DS_Map/Editors/BuildingEditor.cs
similarity index 100%
rename from DS_Map/BuildingEditor.cs
rename to DS_Map/Editors/BuildingEditor.cs
diff --git a/DS_Map/BuildingEditor.resx b/DS_Map/Editors/BuildingEditor.resx
similarity index 100%
rename from DS_Map/BuildingEditor.resx
rename to DS_Map/Editors/BuildingEditor.resx
diff --git a/DS_Map/EvolutionsEditor.cs b/DS_Map/Editors/EvolutionsEditor.cs
similarity index 100%
rename from DS_Map/EvolutionsEditor.cs
rename to DS_Map/Editors/EvolutionsEditor.cs
diff --git a/DS_Map/EvolutionsEditor.designer.cs b/DS_Map/Editors/EvolutionsEditor.designer.cs
similarity index 100%
rename from DS_Map/EvolutionsEditor.designer.cs
rename to DS_Map/Editors/EvolutionsEditor.designer.cs
diff --git a/DS_Map/EvolutionsEditor.resx b/DS_Map/Editors/EvolutionsEditor.resx
similarity index 100%
rename from DS_Map/EvolutionsEditor.resx
rename to DS_Map/Editors/EvolutionsEditor.resx
diff --git a/DS_Map/LearnsetEditor.Designer.cs b/DS_Map/Editors/LearnsetEditor.Designer.cs
similarity index 100%
rename from DS_Map/LearnsetEditor.Designer.cs
rename to DS_Map/Editors/LearnsetEditor.Designer.cs
diff --git a/DS_Map/LearnsetEditor.cs b/DS_Map/Editors/LearnsetEditor.cs
similarity index 100%
rename from DS_Map/LearnsetEditor.cs
rename to DS_Map/Editors/LearnsetEditor.cs
diff --git a/DS_Map/LearnsetEditor.resx b/DS_Map/Editors/LearnsetEditor.resx
similarity index 100%
rename from DS_Map/LearnsetEditor.resx
rename to DS_Map/Editors/LearnsetEditor.resx
diff --git a/DS_Map/OverlayEditor.Designer.cs b/DS_Map/Editors/OverlayEditor.Designer.cs
similarity index 100%
rename from DS_Map/OverlayEditor.Designer.cs
rename to DS_Map/Editors/OverlayEditor.Designer.cs
diff --git a/DS_Map/OverlayEditor.cs b/DS_Map/Editors/OverlayEditor.cs
similarity index 100%
rename from DS_Map/OverlayEditor.cs
rename to DS_Map/Editors/OverlayEditor.cs
diff --git a/DS_Map/OverlayEditor.resx b/DS_Map/Editors/OverlayEditor.resx
similarity index 100%
rename from DS_Map/OverlayEditor.resx
rename to DS_Map/Editors/OverlayEditor.resx
diff --git a/DS_Map/PersonalDataEditor.Designer.cs b/DS_Map/Editors/PersonalDataEditor.Designer.cs
similarity index 100%
rename from DS_Map/PersonalDataEditor.Designer.cs
rename to DS_Map/Editors/PersonalDataEditor.Designer.cs
diff --git a/DS_Map/PersonalDataEditor.cs b/DS_Map/Editors/PersonalDataEditor.cs
similarity index 100%
rename from DS_Map/PersonalDataEditor.cs
rename to DS_Map/Editors/PersonalDataEditor.cs
diff --git a/DS_Map/PersonalDataEditor.resx b/DS_Map/Editors/PersonalDataEditor.resx
similarity index 100%
rename from DS_Map/PersonalDataEditor.resx
rename to DS_Map/Editors/PersonalDataEditor.resx
diff --git a/DS_Map/PokemonEditor.Designer.cs b/DS_Map/Editors/PokemonEditor.Designer.cs
similarity index 100%
rename from DS_Map/PokemonEditor.Designer.cs
rename to DS_Map/Editors/PokemonEditor.Designer.cs
diff --git a/DS_Map/PokemonEditor.cs b/DS_Map/Editors/PokemonEditor.cs
similarity index 100%
rename from DS_Map/PokemonEditor.cs
rename to DS_Map/Editors/PokemonEditor.cs
diff --git a/DS_Map/PokemonEditor.resx b/DS_Map/Editors/PokemonEditor.resx
similarity index 100%
rename from DS_Map/PokemonEditor.resx
rename to DS_Map/Editors/PokemonEditor.resx
diff --git a/DS_Map/SpawnEditor.Designer.cs b/DS_Map/Editors/SpawnEditor.Designer.cs
similarity index 100%
rename from DS_Map/SpawnEditor.Designer.cs
rename to DS_Map/Editors/SpawnEditor.Designer.cs
diff --git a/DS_Map/SpawnEditor.cs b/DS_Map/Editors/SpawnEditor.cs
similarity index 100%
rename from DS_Map/SpawnEditor.cs
rename to DS_Map/Editors/SpawnEditor.cs
diff --git a/DS_Map/SpawnEditor.resx b/DS_Map/Editors/SpawnEditor.resx
similarity index 100%
rename from DS_Map/SpawnEditor.resx
rename to DS_Map/Editors/SpawnEditor.resx
diff --git a/DS_Map/WildEditorDPPt.Designer.cs b/DS_Map/Editors/WildEditorDPPt.Designer.cs
similarity index 100%
rename from DS_Map/WildEditorDPPt.Designer.cs
rename to DS_Map/Editors/WildEditorDPPt.Designer.cs
diff --git a/DS_Map/WildEditorDPPt.cs b/DS_Map/Editors/WildEditorDPPt.cs
similarity index 100%
rename from DS_Map/WildEditorDPPt.cs
rename to DS_Map/Editors/WildEditorDPPt.cs
diff --git a/DS_Map/WildEditorDPPt.resx b/DS_Map/Editors/WildEditorDPPt.resx
similarity index 100%
rename from DS_Map/WildEditorDPPt.resx
rename to DS_Map/Editors/WildEditorDPPt.resx
diff --git a/DS_Map/WildEditorHGSS.Designer.cs b/DS_Map/Editors/WildEditorHGSS.Designer.cs
similarity index 100%
rename from DS_Map/WildEditorHGSS.Designer.cs
rename to DS_Map/Editors/WildEditorHGSS.Designer.cs
diff --git a/DS_Map/WildEditorHGSS.cs b/DS_Map/Editors/WildEditorHGSS.cs
similarity index 100%
rename from DS_Map/WildEditorHGSS.cs
rename to DS_Map/Editors/WildEditorHGSS.cs
diff --git a/DS_Map/WildEditorHGSS.resx b/DS_Map/Editors/WildEditorHGSS.resx
similarity index 100%
rename from DS_Map/WildEditorHGSS.resx
rename to DS_Map/Editors/WildEditorHGSS.resx
diff --git a/DS_Map/Main Window.cs b/DS_Map/Main Window.cs
index ba2227d..f62623c 100644
--- a/DS_Map/Main Window.cs	
+++ b/DS_Map/Main Window.cs	
@@ -4404,7 +4404,36 @@ namespace DSPRE {
                     textBrush = new SolidBrush(Color.White);
                     textFont = new Font("Arial", 9.0f);
                     break;
+                case 0x6:
+                    paintPen = new Pen(Color.FromArgb(128, Color.YellowGreen));
+                    paintBrush = new SolidBrush(Color.FromArgb(128, Color.YellowGreen));
+                    textBrush = new SolidBrush(Color.White);
+                    textFont = new Font("Arial", 9.0f);
+                    break;
+                case 0x7:
+                    paintPen = new Pen(Color.FromArgb(128, Color.DarkGreen));
+                    paintBrush = new SolidBrush(Color.FromArgb(128, Color.DarkGreen));
+                    textBrush = new SolidBrush(Color.White);
+                    textFont = new Font("Arial", 9.0f);
+                    break;
                 case 0x8:
+                    paintPen = new Pen(Color.FromArgb(128, Color.BurlyWood));
+                    paintBrush = new SolidBrush(Color.FromArgb(128, Color.BurlyWood));
+                    textBrush = new SolidBrush(Color.White);
+                    textFont = new Font("Arial", 8.65f);
+                    break;
+                case 0x9:
+                    paintPen = new Pen(Color.FromArgb(128, Color.SlateBlue));
+                    paintBrush = new SolidBrush(Color.FromArgb(128, Color.SlateBlue));
+                    textBrush = new SolidBrush(Color.White);
+                    textFont = new Font("Arial", 9.0f);
+                    break;
+                case 0xA:
+                    paintPen = new Pen(Color.FromArgb(128, Color.Tomato));
+                    paintBrush = new SolidBrush(Color.FromArgb(128, Color.Tomato));
+                    textBrush = new SolidBrush(Color.White);
+                    textFont = new Font("Arial", 9.0f);
+                    break;
                 case 0xC:
                     paintPen = new Pen(Color.FromArgb(Transparency, Color.BurlyWood));
                     paintBrush = new SolidBrush(Color.FromArgb(Transparency, Color.BurlyWood));
diff --git a/DS_Map/Resources/PokeDatabase.cs b/DS_Map/Resources/PokeDatabase.cs
index 3755729..a5d0418 100644
--- a/DS_Map/Resources/PokeDatabase.cs
+++ b/DS_Map/Resources/PokeDatabase.cs
@@ -665,8 +665,11 @@ namespace DSPRE.Resources {
                 [0x00] = "[00] None",
                 [0x02] = "[02] Tall Grass (Wild)",
                 [0x03] = "[03] Very Tall Grass (Wild)",
-                [0x06] = "[06] Tree Headbutt (HGSS)",
+                [0x06] = "[06] Headbutt - No Encounter",
+                [0x07] = "[07] Headbutt - Common Encounter",
                 [0x08] = "[08] Cave Floor",
+                [0x09] = "[09] Headbutt - Rare Encounter",
+                [0x0A] = "[0A] Headbutt - Special Encounter",
                 [0x0B] = "[0B] Old Château floor",
                 [0x0C] = "[0C] Ground Mountain",
                 [0x10] = "[10] River Water (Wild)",
@@ -1490,6 +1493,11 @@ namespace DSPRE.Resources {
                     [new List<uint> { 208 }] = (Color.ForestGreen, Color.White),
                     [new List<uint> { 209 }] = (Color.SteelBlue, Color.White),
                     [new List<uint> { 210 }] = (Color.Sienna, Color.White),
+                    [new List<uint> { 767 }] = (Color.SteelBlue, Color.White),
+                    [new List<uint> { 821 }] = (Color.SteelBlue, Color.White),
+                    [new List<uint> { 823 }] = (Color.ForestGreen, Color.White),
+                    [new List<uint> { 824 }] = (Color.ForestGreen, Color.White),
+                    [new List<uint> { 825 }] = (Color.SteelBlue, Color.White),
                     [new List<uint> { GameMatrix.EMPTY }] = (Color.Black, Color.White)
                 };
                 public static Dictionary<List<uint>, (Color back, Color fore)> GenericMatrixColorsDict = new Dictionary<List<uint>, (Color back, Color fore)> {