AnnoDesigner · FroggieFrog · Jul 18, 2022 · Jul 4, 2022 · Jul 5, 2022 · Jul 7, 2022
diff --git a/AnnoDesigner.Core/Extensions/StringExtensions.cs b/AnnoDesigner.Core/Extensions/StringExtensions.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using AnnoDesigner.Core.Presets.Models;
 
 namespace AnnoDesigner.Core.Extensions
 {
@@ -54,6 +55,38 @@ public static bool IsPartOf(this string s, IEnumerable<string> tokens)
             return false;
         }
 
+        // This checker is made so it is a 100% sure same Identifiers in name and length of the string.
+        // i discovered that .Contains .startWith and .IsPartOff was not good enough to check this.
+        // (11-06-2022)
+        public static bool IsMatch(this string IdentifierToCheck, List<IBuildingInfo> buildingsToCheck)
+        {
+            foreach (var building in buildingsToCheck)
+            {
+                var match = building.Identifier.StartsWith(IdentifierToCheck);
+                var isSameLenght = building.Identifier.Length;
+                if (match && (IdentifierToCheck.Length == isSameLenght))
+                {
+                    return true;
+                } 
+            }
+
+            return false;
+        }
+        public static bool IsMatchString(this string IdentifierToCheck, List<string> StringListtoCheck)
+        {
+            foreach (var StringValeu in StringListtoCheck)
+            {
+                var match = StringValeu.StartsWith(IdentifierToCheck);
+                var isSameLenght = StringValeu.Length;
+                if (match && (IdentifierToCheck.Length == isSameLenght))
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
         public static string FirstCharToUpper(this string input)
         {
             if (string.IsNullOrWhiteSpace(input))

diff --git a/AnnoDesigner.Core/Presets/Models/BuildingInfo.cs b/AnnoDesigner.Core/Presets/Models/BuildingInfo.cs
@@ -41,7 +41,7 @@ public class BuildingInfo : IBuildingInfo
         public string Identifier { get; set; }
 
         /// <summary>
-        /// The name of the iconof this building.
+        /// The name of the icon of this building.
         /// </summary>
         [DataMember(Order = 4)]
         public string IconFileName { get; set; }
@@ -100,15 +100,22 @@ public class BuildingInfo : IBuildingInfo
         [DataMember(Order = 13)]
         public GridDirection Direction { get; set; } = GridDirection.Down;
 
+        /// <summary>
+        /// Game Unit ID number (GUID)
+        /// This is brought in because it is need for Convert tool Anno1800SavegameVisualizer: game saves -> .ad layout files (by DuxVitae) 31-05-2022
+        /// is only need in the presets, not in the ad files it self
+        /// /// </summary>
+        [DataMember(Order = 14)]
+        public int Guid { get; set; }
+
         /// <summary>
         /// The localized names of this building.
         /// </summary>
         [DataMember(Order = 99)]
         public SerializableDictionary<string> Localization { get; set; }
 
+
         // technical information
-        //[DataMember(Name = "GUID")]
-        //public int Guid { get; set; }
         //[DataMember(Name = ".ifo")]
         //public int IfoFile { get; set; }
 

diff --git a/AnnoDesigner.Core/Presets/Models/IBuildingInfo.cs b/AnnoDesigner.Core/Presets/Models/IBuildingInfo.cs
@@ -16,6 +16,7 @@ public interface IBuildingInfo
         bool Borderless { get; set; }
         bool Road { get; set; }
         SerializableDictionary<string> Localization { get; set; }
+        int Guid { get; set; }
         double BlockedAreaLength { get; set; }
         double BlockedAreaWidth { get; set; }
         GridDirection Direction { get; set; }

diff --git a/AnnoDesigner/ViewModels/PresetsTreeViewModel.cs b/AnnoDesigner/ViewModels/PresetsTreeViewModel.cs
@@ -173,8 +173,7 @@ public void LoadItems(BuildingPresets buildingPresets)
 
             //prepare data
             var headerAnno2205 = "(A6) Anno 2205";
-
-            var excludedTemplates = new[] { "Ark", "Harbour", "OrnamentBuilding" };
+            var excludedTemplates = new[] { "Ark", "DefColFace", "RoofColDef", "RoofColFace" }; //Removed "Harbour" and "OrnamentBuilding" missing buidlings in those 2 Template Groups (18-06-2022)
             var excludedFactions = new[] { "third party", "Facility Modules" };
 
             var filteredBuildingList = buildingPresets.Buildings

diff --git a/AnnoDesigner/icons/A6_Bioenhancers.png b/AnnoDesigner/icons/A6_Bioenhancers.png
diff --git a/AnnoDesigner/icons/A6_Biopolymer.png b/AnnoDesigner/icons/A6_Biopolymer.png
diff --git a/AnnoDesigner/icons/A6_Bioresin.png b/AnnoDesigner/icons/A6_Bioresin.png
diff --git a/AnnoDesigner/icons/A6_Canned Food.png b/AnnoDesigner/icons/A6_Canned Food.png
diff --git a/AnnoDesigner/icons/A6_Community Center.png b/AnnoDesigner/icons/A6_Community Center.png
diff --git a/AnnoDesigner/icons/A6_Construct-O-Bots.png b/AnnoDesigner/icons/A6_Construct-O-Bots.png
diff --git a/AnnoDesigner/icons/A6_Fusion Power Cells.png b/AnnoDesigner/icons/A6_Fusion Power Cells.png
diff --git a/AnnoDesigner/icons/A6_Fusion Reactor.png b/AnnoDesigner/icons/A6_Fusion Reactor.png
diff --git a/AnnoDesigner/icons/A6_Gas Power Station.png b/AnnoDesigner/icons/A6_Gas Power Station.png
diff --git a/AnnoDesigner/icons/A6_HQ Intersection.png b/AnnoDesigner/icons/A6_HQ Intersection.png
diff --git a/AnnoDesigner/icons/A6_HQ Terminal 1.png b/AnnoDesigner/icons/A6_HQ Terminal 1.png
diff --git a/AnnoDesigner/icons/A6_HQ Terminal 2.png b/AnnoDesigner/icons/A6_HQ Terminal 2.png
diff --git a/AnnoDesigner/icons/A6_HQ Wing 1.png b/AnnoDesigner/icons/A6_HQ Wing 1.png
diff --git a/AnnoDesigner/icons/A6_HQ Wing 2.png b/AnnoDesigner/icons/A6_HQ Wing 2.png
diff --git a/AnnoDesigner/icons/A6_Health Center.png b/AnnoDesigner/icons/A6_Health Center.png
diff --git a/AnnoDesigner/icons/A6_Infodrome.png b/AnnoDesigner/icons/A6_Infodrome.png
diff --git a/AnnoDesigner/icons/A6_Intelliwear.png b/AnnoDesigner/icons/A6_Intelliwear.png
diff --git a/AnnoDesigner/icons/A6_Large Shield Generator.png b/AnnoDesigner/icons/A6_Large Shield Generator.png
diff --git a/AnnoDesigner/icons/A6_Lunar Lunch.png b/AnnoDesigner/icons/A6_Lunar Lunch.png
diff --git a/AnnoDesigner/icons/A6_Luxury Food.png b/AnnoDesigner/icons/A6_Luxury Food.png
diff --git a/AnnoDesigner/icons/A6_Metal Foam.png b/AnnoDesigner/icons/A6_Metal Foam.png
diff --git a/AnnoDesigner/icons/A6_Metro Station.png b/AnnoDesigner/icons/A6_Metro Station.png
diff --git a/AnnoDesigner/icons/A6_Moon Crops.png b/AnnoDesigner/icons/A6_Moon Crops.png
diff --git a/AnnoDesigner/icons/A6_Multispec Prisms.png b/AnnoDesigner/icons/A6_Multispec Prisms.png
diff --git a/AnnoDesigner/icons/A6_Neuro Implants.png b/AnnoDesigner/icons/A6_Neuro Implants.png
diff --git a/AnnoDesigner/icons/A6_Quantum Computers.png b/AnnoDesigner/icons/A6_Quantum Computers.png
diff --git a/AnnoDesigner/icons/A6_Qubit Processors.png b/AnnoDesigner/icons/A6_Qubit Processors.png
diff --git a/AnnoDesigner/icons/A6_Soy Beans.png b/AnnoDesigner/icons/A6_Soy Beans.png
diff --git a/AnnoDesigner/icons/A6_Synaptic Circuits.png b/AnnoDesigner/icons/A6_Synaptic Circuits.png
diff --git a/AnnoDesigner/icons/A6_Synthcells.png b/AnnoDesigner/icons/A6_Synthcells.png
diff --git a/AnnoDesigner/icons/A6_Titanium Plating.png b/AnnoDesigner/icons/A6_Titanium Plating.png
diff --git a/AnnoDesigner/icons/A6_Transportation Center (Arctic).png b/AnnoDesigner/icons/A6_Transportation Center (Arctic).png
diff --git a/AnnoDesigner/icons/A6_Transportation Center (Lunar).png b/AnnoDesigner/icons/A6_Transportation Center (Lunar).png
diff --git a/AnnoDesigner/icons/A6_Transportation Center (Temperate).png b/AnnoDesigner/icons/A6_Transportation Center (Temperate).png
diff --git a/AnnoDesigner/icons/A6_Wind Park.png b/AnnoDesigner/icons/A6_Wind Park.png
diff --git a/AnnoDesigner/icons/A6_aerogel_module.png b/AnnoDesigner/icons/A6_aerogel_module.png
diff --git a/AnnoDesigner/icons/A6_algae_module.png b/AnnoDesigner/icons/A6_algae_module.png
diff --git a/AnnoDesigner/icons/A6_androids_module.png b/AnnoDesigner/icons/A6_androids_module.png
diff --git a/AnnoDesigner/icons/A6_beef_module.png b/AnnoDesigner/icons/A6_beef_module.png
diff --git a/AnnoDesigner/icons/A6_bio_enhancers_module.png b/AnnoDesigner/icons/A6_bio_enhancers_module.png
diff --git a/AnnoDesigner/icons/A6_biocatalysts_4_module.png b/AnnoDesigner/icons/A6_biocatalysts_4_module.png
diff --git a/AnnoDesigner/icons/A6_biocomposites_module.png b/AnnoDesigner/icons/A6_biocomposites_module.png
diff --git a/AnnoDesigner/icons/A6_bioresigns_module.png b/AnnoDesigner/icons/A6_bioresigns_module.png
diff --git a/AnnoDesigner/icons/A6_canned_food_module.png b/AnnoDesigner/icons/A6_canned_food_module.png
diff --git a/AnnoDesigner/icons/A6_deep_water_corals_module.png b/AnnoDesigner/icons/A6_deep_water_corals_module.png
diff --git a/AnnoDesigner/icons/A6_deuterium_module.png b/AnnoDesigner/icons/A6_deuterium_module.png
diff --git a/AnnoDesigner/icons/A6_empty_module.png b/AnnoDesigner/icons/A6_empty_module.png
diff --git a/AnnoDesigner/icons/A6_fish_module.png b/AnnoDesigner/icons/A6_fish_module.png
diff --git a/AnnoDesigner/icons/A6_fruit_drink_module.png b/AnnoDesigner/icons/A6_fruit_drink_module.png
diff --git a/AnnoDesigner/icons/A6_fruit_module.png b/AnnoDesigner/icons/A6_fruit_module.png
diff --git a/AnnoDesigner/icons/A6_fusion_accumulators_module.png b/AnnoDesigner/icons/A6_fusion_accumulators_module.png
diff --git a/AnnoDesigner/icons/A6_fusion_power_plant_module.png b/AnnoDesigner/icons/A6_fusion_power_plant_module.png
diff --git a/AnnoDesigner/icons/A6_gas_power_plant_module.png b/AnnoDesigner/icons/A6_gas_power_plant_module.png
diff --git a/AnnoDesigner/icons/A6_gravity_generators_module.png b/AnnoDesigner/icons/A6_gravity_generators_module.png
diff --git a/AnnoDesigner/icons/A6_intelli_clothes_module.png b/AnnoDesigner/icons/A6_intelli_clothes_module.png
diff --git a/AnnoDesigner/icons/A6_luxury_food_module.png b/AnnoDesigner/icons/A6_luxury_food_module.png
diff --git a/AnnoDesigner/icons/A6_medibots_module.png b/AnnoDesigner/icons/A6_medibots_module.png
diff --git a/AnnoDesigner/icons/A6_metal_foam_module.png b/AnnoDesigner/icons/A6_metal_foam_module.png
diff --git a/AnnoDesigner/icons/A6_methan_clathrate_module.png b/AnnoDesigner/icons/A6_methan_clathrate_module.png
diff --git a/AnnoDesigner/icons/A6_microchips_module.png b/AnnoDesigner/icons/A6_microchips_module.png
diff --git a/AnnoDesigner/icons/A6_moon_crops_module.png b/AnnoDesigner/icons/A6_moon_crops_module.png
diff --git a/AnnoDesigner/icons/A6_moss_2_module.png b/AnnoDesigner/icons/A6_moss_2_module.png
diff --git a/AnnoDesigner/icons/A6_multispectral_prisms_module.png b/AnnoDesigner/icons/A6_multispectral_prisms_module.png
diff --git a/AnnoDesigner/icons/A6_nanowave_sensors_module.png b/AnnoDesigner/icons/A6_nanowave_sensors_module.png
diff --git a/AnnoDesigner/icons/A6_natural_gas_module.png b/AnnoDesigner/icons/A6_natural_gas_module.png
diff --git a/AnnoDesigner/icons/A6_natural_space_food_module.png b/AnnoDesigner/icons/A6_natural_space_food_module.png
diff --git a/AnnoDesigner/icons/A6_neuro_implants_2_module.png b/AnnoDesigner/icons/A6_neuro_implants_2_module.png
diff --git a/AnnoDesigner/icons/A6_oxygen-48_module.png b/AnnoDesigner/icons/A6_oxygen-48_module.png
diff --git a/AnnoDesigner/icons/A6_oxygen.png b/AnnoDesigner/icons/A6_oxygen.png
diff --git a/AnnoDesigner/icons/A6_plant_fibres_module.png b/AnnoDesigner/icons/A6_plant_fibres_module.png
diff --git a/AnnoDesigner/icons/A6_quantum_computers_module.png b/AnnoDesigner/icons/A6_quantum_computers_module.png
diff --git a/AnnoDesigner/icons/A6_qubit_processors_module.png b/AnnoDesigner/icons/A6_qubit_processors_module.png
diff --git a/AnnoDesigner/icons/A6_recreation_4.png b/AnnoDesigner/icons/A6_recreation_4.png
diff --git a/AnnoDesigner/icons/A6_rejuvenators_module.png b/AnnoDesigner/icons/A6_rejuvenators_module.png
diff --git a/AnnoDesigner/icons/A6_replicators_module.png b/AnnoDesigner/icons/A6_replicators_module.png
diff --git a/AnnoDesigner/icons/A6_rice_dish_module.png b/AnnoDesigner/icons/A6_rice_dish_module.png
diff --git a/AnnoDesigner/icons/A6_robots_module.png b/AnnoDesigner/icons/A6_robots_module.png
diff --git a/AnnoDesigner/icons/A6_smart_drones_module.png b/AnnoDesigner/icons/A6_smart_drones_module.png
diff --git a/AnnoDesigner/icons/A6_soy_beans_module.png b/AnnoDesigner/icons/A6_soy_beans_module.png
diff --git a/AnnoDesigner/icons/A6_starbig.png b/AnnoDesigner/icons/A6_starbig.png
diff --git a/AnnoDesigner/icons/A6_stimulants_module.png b/AnnoDesigner/icons/A6_stimulants_module.png
diff --git a/AnnoDesigner/icons/A6_super_alloys_module.png b/AnnoDesigner/icons/A6_super_alloys_module.png
diff --git a/AnnoDesigner/icons/A6_super_coolants_module.png b/AnnoDesigner/icons/A6_super_coolants_module.png
diff --git a/AnnoDesigner/icons/A6_synaptic_circuits_module.png b/AnnoDesigner/icons/A6_synaptic_circuits_module.png
diff --git a/AnnoDesigner/icons/A6_synth_cells_module.png b/AnnoDesigner/icons/A6_synth_cells_module.png
diff --git a/AnnoDesigner/icons/A6_thermal_wear_module.png b/AnnoDesigner/icons/A6_thermal_wear_module.png
diff --git a/AnnoDesigner/icons/A6_tidal_power_station_module.png b/AnnoDesigner/icons/A6_tidal_power_station_module.png
diff --git a/AnnoDesigner/icons/A6_titan_plating_module.png b/AnnoDesigner/icons/A6_titan_plating_module.png
diff --git a/AnnoDesigner/icons/A6_water_module.png b/AnnoDesigner/icons/A6_water_module.png
diff --git a/AnnoDesigner/icons/A6_windpark_module.png b/AnnoDesigner/icons/A6_windpark_module.png
diff --git a/AnnoDesigner/icons/A6_wine_module.png b/AnnoDesigner/icons/A6_wine_module.png
diff --git a/AnnoDesigner/icons/A6_wool_module.png b/AnnoDesigner/icons/A6_wool_module.png
diff --git a/AnnoDesigner/icons/A7_2x2_01.png b/AnnoDesigner/icons/A7_2x2_01.png
diff --git a/AnnoDesigner/icons/A7_2x2_02.png b/AnnoDesigner/icons/A7_2x2_02.png
diff --git a/AnnoDesigner/icons/A7_Bank.png b/AnnoDesigner/icons/A7_Bank.png
diff --git a/AnnoDesigner/icons/A7_Beer.png b/AnnoDesigner/icons/A7_Beer.png
diff --git a/AnnoDesigner/icons/A7_Brass.png b/AnnoDesigner/icons/A7_Brass.png
diff --git a/AnnoDesigner/icons/A7_Bread.png b/AnnoDesigner/icons/A7_Bread.png
diff --git a/AnnoDesigner/icons/A7_Bricks.png b/AnnoDesigner/icons/A7_Bricks.png
diff --git a/AnnoDesigner/icons/A7_Caoutchouc.png b/AnnoDesigner/icons/A7_Caoutchouc.png
diff --git a/AnnoDesigner/icons/A7_Cement.png b/AnnoDesigner/icons/A7_Cement.png
diff --git a/AnnoDesigner/icons/A7_Champagne.png b/AnnoDesigner/icons/A7_Champagne.png
diff --git a/AnnoDesigner/icons/A7_Chassis.png b/AnnoDesigner/icons/A7_Chassis.png
diff --git a/AnnoDesigner/icons/A7_Chocolate.png b/AnnoDesigner/icons/A7_Chocolate.png
diff --git a/AnnoDesigner/icons/A7_Church.png b/AnnoDesigner/icons/A7_Church.png
diff --git a/AnnoDesigner/icons/A7_Cigars.png b/AnnoDesigner/icons/A7_Cigars.png
diff --git a/AnnoDesigner/icons/A7_Clay.png b/AnnoDesigner/icons/A7_Clay.png
diff --git a/AnnoDesigner/icons/A7_Cocoa.png b/AnnoDesigner/icons/A7_Cocoa.png
diff --git a/AnnoDesigner/icons/A7_Copper.png b/AnnoDesigner/icons/A7_Copper.png
diff --git a/AnnoDesigner/icons/A7_Corn.png b/AnnoDesigner/icons/A7_Corn.png
diff --git a/AnnoDesigner/icons/A7_Cotton.png b/AnnoDesigner/icons/A7_Cotton.png
diff --git a/AnnoDesigner/icons/A7_Depot.png b/AnnoDesigner/icons/A7_Depot.png
diff --git a/AnnoDesigner/icons/A7_Dynamite.png b/AnnoDesigner/icons/A7_Dynamite.png
diff --git a/AnnoDesigner/icons/A7_Felt.png b/AnnoDesigner/icons/A7_Felt.png
diff --git a/AnnoDesigner/icons/A7_Fish.png b/AnnoDesigner/icons/A7_Fish.png
diff --git a/AnnoDesigner/icons/A7_Flour.png b/AnnoDesigner/icons/A7_Flour.png
diff --git a/AnnoDesigner/icons/A7_Glass.png b/AnnoDesigner/icons/A7_Glass.png
diff --git a/AnnoDesigner/icons/A7_Glasses.png b/AnnoDesigner/icons/A7_Glasses.png
diff --git a/AnnoDesigner/icons/A7_Gold.png b/AnnoDesigner/icons/A7_Gold.png
diff --git a/AnnoDesigner/icons/A7_Grapes.png b/AnnoDesigner/icons/A7_Grapes.png
diff --git a/AnnoDesigner/icons/A7_Hops.png b/AnnoDesigner/icons/A7_Hops.png
diff --git a/AnnoDesigner/icons/A7_Hospital.png b/AnnoDesigner/icons/A7_Hospital.png
diff --git a/AnnoDesigner/icons/A7_Iron.png b/AnnoDesigner/icons/A7_Iron.png
diff --git a/AnnoDesigner/icons/A7_Malt.png b/AnnoDesigner/icons/A7_Malt.png
diff --git a/AnnoDesigner/icons/A7_Marketplace.png b/AnnoDesigner/icons/A7_Marketplace.png
diff --git a/AnnoDesigner/icons/A7_Museum.png b/AnnoDesigner/icons/A7_Museum.png
diff --git a/AnnoDesigner/icons/A7_Oil.png b/AnnoDesigner/icons/A7_Oil.png
diff --git a/AnnoDesigner/icons/A7_Pearls.png b/AnnoDesigner/icons/A7_Pearls.png
diff --git a/AnnoDesigner/icons/A7_Pier.png b/AnnoDesigner/icons/A7_Pier.png
diff --git a/AnnoDesigner/icons/A7_Pigs.png b/AnnoDesigner/icons/A7_Pigs.png
diff --git a/AnnoDesigner/icons/A7_Potatoes.png b/AnnoDesigner/icons/A7_Potatoes.png
diff --git a/AnnoDesigner/icons/A7_Pub.png b/AnnoDesigner/icons/A7_Pub.png
diff --git a/AnnoDesigner/icons/A7_School.png b/AnnoDesigner/icons/A7_School.png
diff --git a/AnnoDesigner/icons/A7_Steel.png b/AnnoDesigner/icons/A7_Steel.png
diff --git a/AnnoDesigner/icons/A7_Sugar.png b/AnnoDesigner/icons/A7_Sugar.png
diff --git a/AnnoDesigner/icons/A7_Tallow.png b/AnnoDesigner/icons/A7_Tallow.png
diff --git a/AnnoDesigner/icons/A7_Tobacco.png b/AnnoDesigner/icons/A7_Tobacco.png
diff --git a/AnnoDesigner/icons/A7_University.png b/AnnoDesigner/icons/A7_University.png
diff --git a/AnnoDesigner/icons/A7_Warehouse.png b/AnnoDesigner/icons/A7_Warehouse.png
diff --git a/AnnoDesigner/icons/A7_Weapons.png b/AnnoDesigner/icons/A7_Weapons.png
diff --git a/AnnoDesigner/icons/A7_Wool.png b/AnnoDesigner/icons/A7_Wool.png
diff --git a/AnnoDesigner/icons/A7_Zoo.png b/AnnoDesigner/icons/A7_Zoo.png
diff --git a/AnnoDesigner/icons/A7_advanced_weaponry.png b/AnnoDesigner/icons/A7_advanced_weaponry.png
diff --git a/AnnoDesigner/icons/A7_agerian_book.png b/AnnoDesigner/icons/A7_agerian_book.png
diff --git a/AnnoDesigner/icons/A7_airship_hangar.png b/AnnoDesigner/icons/A7_airship_hangar.png
diff --git a/AnnoDesigner/icons/A7_airship_landing_plattform.png b/AnnoDesigner/icons/A7_airship_landing_plattform.png
diff --git a/AnnoDesigner/icons/A7_alpaca_wool.png b/AnnoDesigner/icons/A7_alpaca_wool.png
diff --git a/AnnoDesigner/icons/A7_ammonia.png b/AnnoDesigner/icons/A7_ammonia.png
diff --git a/AnnoDesigner/icons/A7_amusement_park_ornament.png b/AnnoDesigner/icons/A7_amusement_park_ornament.png
diff --git a/AnnoDesigner/icons/A7_anarchist.png b/AnnoDesigner/icons/A7_anarchist.png
diff --git a/AnnoDesigner/icons/A7_aqua_well.png b/AnnoDesigner/icons/A7_aqua_well.png
diff --git a/AnnoDesigner/icons/A7_archway_clock.png b/AnnoDesigner/icons/A7_archway_clock.png
diff --git a/AnnoDesigner/icons/A7_archway_flag.png b/AnnoDesigner/icons/A7_archway_flag.png
diff --git a/AnnoDesigner/icons/A7_archway_lamp.png b/AnnoDesigner/icons/A7_archway_lamp.png
diff --git a/AnnoDesigner/icons/A7_atole.png b/AnnoDesigner/icons/A7_atole.png
diff --git a/AnnoDesigner/icons/A7_attack_mode.png b/AnnoDesigner/icons/A7_attack_mode.png
diff --git a/AnnoDesigner/icons/A7_attraction_booth_01.png b/AnnoDesigner/icons/A7_attraction_booth_01.png
diff --git a/AnnoDesigner/icons/A7_attraction_booth_02.png b/AnnoDesigner/icons/A7_attraction_booth_02.png
diff --git a/AnnoDesigner/icons/A7_autumn_barrel_table.png b/AnnoDesigner/icons/A7_autumn_barrel_table.png
diff --git a/AnnoDesigner/icons/A7_autumn_bonfire.png b/AnnoDesigner/icons/A7_autumn_bonfire.png
diff --git a/AnnoDesigner/icons/A7_autumn_cider_stall.png b/AnnoDesigner/icons/A7_autumn_cider_stall.png
diff --git a/AnnoDesigner/icons/A7_autumn_gate_01.png b/AnnoDesigner/icons/A7_autumn_gate_01.png
diff --git a/AnnoDesigner/icons/A7_autumn_gate_02.png b/AnnoDesigner/icons/A7_autumn_gate_02.png
diff --git a/AnnoDesigner/icons/A7_autumn_pumpkin_competition.png b/AnnoDesigner/icons/A7_autumn_pumpkin_competition.png
diff --git a/AnnoDesigner/icons/A7_autumn_wagon_01.png b/AnnoDesigner/icons/A7_autumn_wagon_01.png
diff --git a/AnnoDesigner/icons/A7_autumn_wagon_02.png b/AnnoDesigner/icons/A7_autumn_wagon_02.png
diff --git a/AnnoDesigner/icons/A7_balloon_seller.png b/AnnoDesigner/icons/A7_balloon_seller.png
diff --git a/AnnoDesigner/icons/A7_banana.png b/AnnoDesigner/icons/A7_banana.png
diff --git a/AnnoDesigner/icons/A7_bankerlamp.png b/AnnoDesigner/icons/A7_bankerlamp.png
diff --git a/AnnoDesigner/icons/A7_bar.png b/AnnoDesigner/icons/A7_bar.png
diff --git a/AnnoDesigner/icons/A7_barrel_organ_player.png b/AnnoDesigner/icons/A7_barrel_organ_player.png
diff --git a/AnnoDesigner/icons/A7_barrels.png b/AnnoDesigner/icons/A7_barrels.png
diff --git a/AnnoDesigner/icons/A7_basin.png b/AnnoDesigner/icons/A7_basin.png
diff --git a/AnnoDesigner/icons/A7_bazaar.png b/AnnoDesigner/icons/A7_bazaar.png
diff --git a/AnnoDesigner/icons/A7_beams.png b/AnnoDesigner/icons/A7_beams.png
diff --git a/AnnoDesigner/icons/A7_bear_fur.png b/AnnoDesigner/icons/A7_bear_fur.png
diff --git a/AnnoDesigner/icons/A7_bear_fur_brown.png b/AnnoDesigner/icons/A7_bear_fur_brown.png
diff --git a/AnnoDesigner/icons/A7_bear_trap.png b/AnnoDesigner/icons/A7_bear_trap.png
diff --git a/AnnoDesigner/icons/A7_beef.png b/AnnoDesigner/icons/A7_beef.png
diff --git a/AnnoDesigner/icons/A7_beef_potatoes.png b/AnnoDesigner/icons/A7_beef_potatoes.png
diff --git a/AnnoDesigner/icons/A7_beer_2.png b/AnnoDesigner/icons/A7_beer_2.png
diff --git a/AnnoDesigner/icons/A7_beeswax.png b/AnnoDesigner/icons/A7_beeswax.png
diff --git a/AnnoDesigner/icons/A7_benches.png b/AnnoDesigner/icons/A7_benches.png
diff --git a/AnnoDesigner/icons/A7_beta_reward_2x2.png b/AnnoDesigner/icons/A7_beta_reward_2x2.png
diff --git a/AnnoDesigner/icons/A7_billard.png b/AnnoDesigner/icons/A7_billard.png
diff --git a/AnnoDesigner/icons/A7_botanic_garden.png b/AnnoDesigner/icons/A7_botanic_garden.png
diff --git a/AnnoDesigner/icons/A7_botanic_garden_module.png b/AnnoDesigner/icons/A7_botanic_garden_module.png
diff --git a/AnnoDesigner/icons/A7_botanica_blueflower.png b/AnnoDesigner/icons/A7_botanica_blueflower.png
diff --git a/AnnoDesigner/icons/A7_botanica_darkpinkflower.png b/AnnoDesigner/icons/A7_botanica_darkpinkflower.png
diff --git a/AnnoDesigner/icons/A7_botanica_hedgespath.png b/AnnoDesigner/icons/A7_botanica_hedgespath.png
diff --git a/AnnoDesigner/icons/A7_botanica_labybrinth.png b/AnnoDesigner/icons/A7_botanica_labybrinth.png
diff --git a/AnnoDesigner/icons/A7_botanica_orangeflower.png b/AnnoDesigner/icons/A7_botanica_orangeflower.png
diff --git a/AnnoDesigner/icons/A7_botanica_pinkflower.png b/AnnoDesigner/icons/A7_botanica_pinkflower.png
diff --git a/AnnoDesigner/icons/A7_botanica_purpleflower.png b/AnnoDesigner/icons/A7_botanica_purpleflower.png
diff --git a/AnnoDesigner/icons/A7_botanica_redandwhiteflower.png b/AnnoDesigner/icons/A7_botanica_redandwhiteflower.png
diff --git a/AnnoDesigner/icons/A7_botanica_treesculptures.png b/AnnoDesigner/icons/A7_botanica_treesculptures.png
diff --git a/AnnoDesigner/icons/A7_botanica_whiteflower.png b/AnnoDesigner/icons/A7_botanica_whiteflower.png
diff --git a/AnnoDesigner/icons/A7_botanica_yellowflower.png b/AnnoDesigner/icons/A7_botanica_yellowflower.png
diff --git a/AnnoDesigner/icons/A7_bowler_hat.png b/AnnoDesigner/icons/A7_bowler_hat.png
diff --git a/AnnoDesigner/icons/A7_box_arena.png b/AnnoDesigner/icons/A7_box_arena.png
diff --git a/AnnoDesigner/icons/A7_brass_tube.png b/AnnoDesigner/icons/A7_brass_tube.png
diff --git a/AnnoDesigner/icons/A7_brick_road.png b/AnnoDesigner/icons/A7_brick_road.png
diff --git a/AnnoDesigner/icons/A7_brick_street_africa.png b/AnnoDesigner/icons/A7_brick_street_africa.png
diff --git a/AnnoDesigner/icons/A7_bubble_gum.png b/AnnoDesigner/icons/A7_bubble_gum.png
diff --git a/AnnoDesigner/icons/A7_burrito.png b/AnnoDesigner/icons/A7_burrito.png
diff --git a/AnnoDesigner/icons/A7_bus_stop.png b/AnnoDesigner/icons/A7_bus_stop.png
diff --git a/AnnoDesigner/icons/A7_bush01.png b/AnnoDesigner/icons/A7_bush01.png
diff --git a/AnnoDesigner/icons/A7_bush02.png b/AnnoDesigner/icons/A7_bush02.png
diff --git a/AnnoDesigner/icons/A7_bush03.png b/AnnoDesigner/icons/A7_bush03.png
diff --git a/AnnoDesigner/icons/A7_bush04.png b/AnnoDesigner/icons/A7_bush04.png
diff --git a/AnnoDesigner/icons/A7_bush05.png b/AnnoDesigner/icons/A7_bush05.png
diff --git a/AnnoDesigner/icons/A7_bush_01.png b/AnnoDesigner/icons/A7_bush_01.png
diff --git a/AnnoDesigner/icons/A7_bush_02.png b/AnnoDesigner/icons/A7_bush_02.png
diff --git a/AnnoDesigner/icons/A7_cabaret.png b/AnnoDesigner/icons/A7_cabaret.png
diff --git a/AnnoDesigner/icons/A7_caffee.png b/AnnoDesigner/icons/A7_caffee.png
diff --git a/AnnoDesigner/icons/A7_camera.png b/AnnoDesigner/icons/A7_camera.png
diff --git a/AnnoDesigner/icons/A7_canal.png b/AnnoDesigner/icons/A7_canal.png
diff --git a/AnnoDesigner/icons/A7_canal_bridge_large.png b/AnnoDesigner/icons/A7_canal_bridge_large.png
diff --git a/AnnoDesigner/icons/A7_canal_bridge_medium.png b/AnnoDesigner/icons/A7_canal_bridge_medium.png
diff --git a/AnnoDesigner/icons/A7_canal_bridge_small.png b/AnnoDesigner/icons/A7_canal_bridge_small.png
diff --git a/AnnoDesigner/icons/A7_canals.png b/AnnoDesigner/icons/A7_canals.png
diff --git a/AnnoDesigner/icons/A7_candles.png b/AnnoDesigner/icons/A7_candles.png
diff --git a/AnnoDesigner/icons/A7_cane_sugar_1.png b/AnnoDesigner/icons/A7_cane_sugar_1.png
diff --git a/AnnoDesigner/icons/A7_canned_food.png b/AnnoDesigner/icons/A7_canned_food.png
diff --git a/AnnoDesigner/icons/A7_canned_goulash.png b/AnnoDesigner/icons/A7_canned_goulash.png
diff --git a/AnnoDesigner/icons/A7_canopy.png b/AnnoDesigner/icons/A7_canopy.png
diff --git a/AnnoDesigner/icons/A7_canteen.png b/AnnoDesigner/icons/A7_canteen.png
diff --git a/AnnoDesigner/icons/A7_carbon_filament.png b/AnnoDesigner/icons/A7_carbon_filament.png
diff --git a/AnnoDesigner/icons/A7_castaway.png b/AnnoDesigner/icons/A7_castaway.png
diff --git a/AnnoDesigner/icons/A7_cattle.png b/AnnoDesigner/icons/A7_cattle.png
diff --git a/AnnoDesigner/icons/A7_celebration_ornament_01.png b/AnnoDesigner/icons/A7_celebration_ornament_01.png
diff --git a/AnnoDesigner/icons/A7_celluloid.png b/AnnoDesigner/icons/A7_celluloid.png
diff --git a/AnnoDesigner/icons/A7_cellulose.png b/AnnoDesigner/icons/A7_cellulose.png
diff --git a/AnnoDesigner/icons/A7_ceramics.png b/AnnoDesigner/icons/A7_ceramics.png
diff --git a/AnnoDesigner/icons/A7_cereals_2.png b/AnnoDesigner/icons/A7_cereals_2.png
diff --git a/AnnoDesigner/icons/A7_charity_tree.png b/AnnoDesigner/icons/A7_charity_tree.png
diff --git a/AnnoDesigner/icons/A7_cherry_tree_01.png b/AnnoDesigner/icons/A7_cherry_tree_01.png
diff --git a/AnnoDesigner/icons/A7_cherry_tree_02.png b/AnnoDesigner/icons/A7_cherry_tree_02.png
diff --git a/AnnoDesigner/icons/A7_cherry_wood.png b/AnnoDesigner/icons/A7_cherry_wood.png
diff --git a/AnnoDesigner/icons/A7_chesterfield.png b/AnnoDesigner/icons/A7_chesterfield.png
diff --git a/AnnoDesigner/icons/A7_christmas_carousel.png b/AnnoDesigner/icons/A7_christmas_carousel.png
diff --git a/AnnoDesigner/icons/A7_christmas_park_props_system_02_corner.png b/AnnoDesigner/icons/A7_christmas_park_props_system_02_corner.png
diff --git a/AnnoDesigner/icons/A7_christmas_park_props_system_02_cross.png b/AnnoDesigner/icons/A7_christmas_park_props_system_02_cross.png
diff --git a/AnnoDesigner/icons/A7_christmas_park_props_system_02_end.png b/AnnoDesigner/icons/A7_christmas_park_props_system_02_end.png
diff --git a/AnnoDesigner/icons/A7_christmas_park_props_system_02_gap.png b/AnnoDesigner/icons/A7_christmas_park_props_system_02_gap.png
diff --git a/AnnoDesigner/icons/A7_christmas_park_props_system_02_straight.png b/AnnoDesigner/icons/A7_christmas_park_props_system_02_straight.png
diff --git a/AnnoDesigner/icons/A7_christmas_park_props_system_02_t.png b/AnnoDesigner/icons/A7_christmas_park_props_system_02_t.png
diff --git a/AnnoDesigner/icons/A7_christmas_park_props_system_corner.png b/AnnoDesigner/icons/A7_christmas_park_props_system_corner.png
diff --git a/AnnoDesigner/icons/A7_christmas_park_props_system_cross.png b/AnnoDesigner/icons/A7_christmas_park_props_system_cross.png
diff --git a/AnnoDesigner/icons/A7_christmas_park_props_system_end.png b/AnnoDesigner/icons/A7_christmas_park_props_system_end.png
diff --git a/AnnoDesigner/icons/A7_christmas_park_props_system_gap.png b/AnnoDesigner/icons/A7_christmas_park_props_system_gap.png
diff --git a/AnnoDesigner/icons/A7_christmas_park_props_system_straight.png b/AnnoDesigner/icons/A7_christmas_park_props_system_straight.png
diff --git a/AnnoDesigner/icons/A7_christmas_park_props_system_t.png b/AnnoDesigner/icons/A7_christmas_park_props_system_t.png
diff --git a/AnnoDesigner/icons/A7_christmas_props_lightpost_01.png b/AnnoDesigner/icons/A7_christmas_props_lightpost_01.png
diff --git a/AnnoDesigner/icons/A7_christmas_props_lightpost_02.png b/AnnoDesigner/icons/A7_christmas_props_lightpost_02.png
diff --git a/AnnoDesigner/icons/A7_christmas_props_presents.png b/AnnoDesigner/icons/A7_christmas_props_presents.png
diff --git a/AnnoDesigner/icons/A7_christmas_props_snowman.png b/AnnoDesigner/icons/A7_christmas_props_snowman.png
diff --git a/AnnoDesigner/icons/A7_christmas_stand_01.png b/AnnoDesigner/icons/A7_christmas_stand_01.png
diff --git a/AnnoDesigner/icons/A7_christmas_stand_02.png b/AnnoDesigner/icons/A7_christmas_stand_02.png
diff --git a/AnnoDesigner/icons/A7_christmas_stand_03.png b/AnnoDesigner/icons/A7_christmas_stand_03.png
diff --git a/AnnoDesigner/icons/A7_christmas_tree_big.png b/AnnoDesigner/icons/A7_christmas_tree_big.png
diff --git a/AnnoDesigner/icons/A7_christmas_tree_small.png b/AnnoDesigner/icons/A7_christmas_tree_small.png
diff --git a/AnnoDesigner/icons/A7_cinamon.png b/AnnoDesigner/icons/A7_cinamon.png
diff --git a/AnnoDesigner/icons/A7_citrus.png b/AnnoDesigner/icons/A7_citrus.png
diff --git a/AnnoDesigner/icons/A7_city_1x1_01.png b/AnnoDesigner/icons/A7_city_1x1_01.png
diff --git a/AnnoDesigner/icons/A7_city_1x1_02.png b/AnnoDesigner/icons/A7_city_1x1_02.png
diff --git a/AnnoDesigner/icons/A7_city_1x1_03.png b/AnnoDesigner/icons/A7_city_1x1_03.png
diff --git a/AnnoDesigner/icons/A7_city_2x2_02.png b/AnnoDesigner/icons/A7_city_2x2_02.png
diff --git a/AnnoDesigner/icons/A7_city_2x2_03.png b/AnnoDesigner/icons/A7_city_2x2_03.png
diff --git a/AnnoDesigner/icons/A7_city_2x2_04.png b/AnnoDesigner/icons/A7_city_2x2_04.png
diff --git a/AnnoDesigner/icons/A7_city_3x3_02.png b/AnnoDesigner/icons/A7_city_3x3_02.png
diff --git a/AnnoDesigner/icons/A7_city_3x3_03.png b/AnnoDesigner/icons/A7_city_3x3_03.png
diff --git a/AnnoDesigner/icons/A7_city_ornament_base.png b/AnnoDesigner/icons/A7_city_ornament_base.png
diff --git a/AnnoDesigner/icons/A7_city_ornament_club_base.png b/AnnoDesigner/icons/A7_city_ornament_club_base.png
diff --git a/AnnoDesigner/icons/A7_city_ornament_large.png b/AnnoDesigner/icons/A7_city_ornament_large.png
diff --git a/AnnoDesigner/icons/A7_city_ornament_medium.png b/AnnoDesigner/icons/A7_city_ornament_medium.png
diff --git a/AnnoDesigner/icons/A7_city_ornament_small.png b/AnnoDesigner/icons/A7_city_ornament_small.png
diff --git a/AnnoDesigner/icons/A7_clock_01.png b/AnnoDesigner/icons/A7_clock_01.png
diff --git a/AnnoDesigner/icons/A7_clock_02.png b/AnnoDesigner/icons/A7_clock_02.png
diff --git a/AnnoDesigner/icons/A7_cloth.png b/AnnoDesigner/icons/A7_cloth.png
diff --git a/AnnoDesigner/icons/A7_clothesline.png b/AnnoDesigner/icons/A7_clothesline.png
diff --git a/AnnoDesigner/icons/A7_club_house.png b/AnnoDesigner/icons/A7_club_house.png
diff --git a/AnnoDesigner/icons/A7_clubrewards_pond_2x2.png b/AnnoDesigner/icons/A7_clubrewards_pond_2x2.png
diff --git a/AnnoDesigner/icons/A7_clubrewards_statue_1x2.png b/AnnoDesigner/icons/A7_clubrewards_statue_1x2.png
diff --git a/AnnoDesigner/icons/A7_coal.png b/AnnoDesigner/icons/A7_coal.png
diff --git a/AnnoDesigner/icons/A7_coal_2.png b/AnnoDesigner/icons/A7_coal_2.png
diff --git a/AnnoDesigner/icons/A7_coal_burn.png b/AnnoDesigner/icons/A7_coal_burn.png
diff --git a/AnnoDesigner/icons/A7_coal_habour.png b/AnnoDesigner/icons/A7_coal_habour.png
diff --git a/AnnoDesigner/icons/A7_coal_storage.png b/AnnoDesigner/icons/A7_coal_storage.png
diff --git a/AnnoDesigner/icons/A7_coconut.png b/AnnoDesigner/icons/A7_coconut.png
diff --git a/AnnoDesigner/icons/A7_coconut_palm_trees.png b/AnnoDesigner/icons/A7_coconut_palm_trees.png
diff --git a/AnnoDesigner/icons/A7_coffe_cup.png b/AnnoDesigner/icons/A7_coffe_cup.png
diff --git a/AnnoDesigner/icons/A7_coffee_beans.png b/AnnoDesigner/icons/A7_coffee_beans.png
diff --git a/AnnoDesigner/icons/A7_cognac.png b/AnnoDesigner/icons/A7_cognac.png
diff --git a/AnnoDesigner/icons/A7_col_park_props_1x1_20.png b/AnnoDesigner/icons/A7_col_park_props_1x1_20.png
diff --git a/AnnoDesigner/icons/A7_col_park_props_1x1_21.png b/AnnoDesigner/icons/A7_col_park_props_1x1_21.png