31 files changed, 5 insertions, 21 deletions
diff --git a/src/main/resources/base/config/items.json b/src/main/resources/base/config/items.json
index bd453c5..6753a8f 100644
--- a/src/main/resources/base/config/items.json
+++ b/src/main/resources/base/config/items.json
@@ -61,17 +61,17 @@
     },
     "Heating or Cooling Arrangements": {
         "905Exchanger": {
-            "name": "905Exchanger",
+            "name": "Exchanger",
             "icon": ".\\Heating or Cooling Arrangements\\905Exchanger.png",
             "class": "Heating or Cooling Arrangements",
-            "object": "905Exchanger",
+            "object": "Exchanger",
             "args": []
         },
         "907Kettle Reboiler": {
-            "name": "907Kettle Reboiler",
+            "name": "Kettle Reboiler",
             "icon": ".\\Heating or Cooling Arrangements\\907Kettle Reboiler.png",
             "class": "Heating or Cooling Arrangements",
-            "object": "907KettleReboiler",
+            "object": "KettleReboiler",
             "args": []
         },
         "Exchanger": {
@@ -165,7 +165,7 @@
             "args": []
         },
         "Ejector(Vapor Service)": {
-            "name": "Ejector(Vapor Service)",
+            "name": "EjectorVapor Service",
             "icon": ".\\Pumps\\Ejector(Vapor Service).png",
             "class": "Pumps",
             "object": "EjectorVaporService",
@@ -224,21 +224,5 @@
             "object": "FloatingRoofTank",
             "args": []
         }
-    },
-    "Valves": {
-        "Gate Valve": {
-            "name": "Gate Valve",
-            "icon": ".\\Valves\\Gate Valve.png",
-            "class": "Valves",
-            "object": "GateValve",
-            "args": []
-        },
-        "Globe Valve": {
-            "name": "Globe Valve",
-            "icon": ".\\Valves\\Globe Valve.png",
-            "class": "Valves",
-            "object": "GlobeValve",
-            "args": []
-        }
     }
 }
 \ No newline at end of file
diff --git a/src/main/resources/base/toolbar/Compressors/Centrifugal Compressor.png b/src/main/resources/base/toolbar/Compressors/Centrifugal Compressor.png
index 29c417f..81780ce 100644
--- a/src/main/resources/base/toolbar/Compressors/Centrifugal Compressor.png
+++ b/src/main/resources/base/toolbar/Compressors/Centrifugal Compressor.png
diff --git a/src/main/resources/base/toolbar/Compressors/Ejector Compressor.png b/src/main/resources/base/toolbar/Compressors/Ejector Compressor.png
index c1d0486..4035d40 100644
--- a/src/main/resources/base/toolbar/Compressors/Ejector Compressor.png
+++ b/src/main/resources/base/toolbar/Compressors/Ejector Compressor.png
diff --git a/src/main/resources/base/toolbar/Compressors/Fan.png b/src/main/resources/base/toolbar/Compressors/Fan.png
index 38ecb21..b4dee52 100644
--- a/src/main/resources/base/toolbar/Compressors/Fan.png
+++ b/src/main/resources/base/toolbar/Compressors/Fan.png
diff --git a/src/main/resources/base/toolbar/Compressors/Positive Displacement Compressor.png b/src/main/resources/base/toolbar/Compressors/Positive Displacement Compressor.png
index 6f7be8f..f99340c 100644
--- a/src/main/resources/base/toolbar/Compressors/Positive Displacement Compressor.png
+++ b/src/main/resources/base/toolbar/Compressors/Positive Displacement Compressor.png
diff --git a/src/main/resources/base/toolbar/Compressors/Reciprocating Compressor.png b/src/main/resources/base/toolbar/Compressors/Reciprocating Compressor.png
index f3f284c..08d82a3 100644
--- a/src/main/resources/base/toolbar/Compressors/Reciprocating Compressor.png
+++ b/src/main/resources/base/toolbar/Compressors/Reciprocating Compressor.png
diff --git a/src/main/resources/base/toolbar/Compressors/Turbine.png b/src/main/resources/base/toolbar/Compressors/Turbine.png
index c2acd75..1570528 100644
--- a/src/main/resources/base/toolbar/Compressors/Turbine.png
+++ b/src/main/resources/base/toolbar/Compressors/Turbine.png
diff --git a/src/main/resources/base/toolbar/Furnaces and Boilers/Oil Gas or Pulverized Fuel Furnace.png b/src/main/resources/base/toolbar/Furnaces and Boilers/Oil Gas or Pulverized Fuel Furnace.png
index f2f1c7d..4a114c2 100644
--- a/src/main/resources/base/toolbar/Furnaces and Boilers/Oil Gas or Pulverized Fuel Furnace.png
+++ b/src/main/resources/base/toolbar/Furnaces and Boilers/Oil Gas or Pulverized Fuel Furnace.png
diff --git a/src/main/resources/base/toolbar/Furnaces and Boilers/Solid Fuel Furnace.png b/src/main/resources/base/toolbar/Furnaces and Boilers/Solid Fuel Furnace.png
index e5e97c1..a134c72 100644
--- a/src/main/resources/base/toolbar/Furnaces and Boilers/Solid Fuel Furnace.png
+++ b/src/main/resources/base/toolbar/Furnaces and Boilers/Solid Fuel Furnace.png
diff --git a/src/main/resources/base/toolbar/Heating or Cooling Arrangements/905Exchanger.png b/src/main/resources/base/toolbar/Heating or Cooling Arrangements/905Exchanger.png
index 2e0c546..d0383d3 100644
--- a/src/main/resources/base/toolbar/Heating or Cooling Arrangements/905Exchanger.png
+++ b/src/main/resources/base/toolbar/Heating or Cooling Arrangements/905Exchanger.png
diff --git a/src/main/resources/base/toolbar/Heating or Cooling Arrangements/907Kettle Reboiler.png b/src/main/resources/base/toolbar/Heating or Cooling Arrangements/907Kettle Reboiler.png
index dcb2789..8dbcf4a 100644
--- a/src/main/resources/base/toolbar/Heating or Cooling Arrangements/907Kettle Reboiler.png
+++ b/src/main/resources/base/toolbar/Heating or Cooling Arrangements/907Kettle Reboiler.png
diff --git a/src/main/resources/base/toolbar/Heating or Cooling Arrangements/Exchanger.png b/src/main/resources/base/toolbar/Heating or Cooling Arrangements/Exchanger.png
index 13493f9..f044df6 100644
--- a/src/main/resources/base/toolbar/Heating or Cooling Arrangements/Exchanger.png
+++ b/src/main/resources/base/toolbar/Heating or Cooling Arrangements/Exchanger.png
diff --git a/src/main/resources/base/toolbar/Heating or Cooling Arrangements/Heat Exchanger.png b/src/main/resources/base/toolbar/Heating or Cooling Arrangements/Heat Exchanger.png
index 4183d4b..c59c237 100644
--- a/src/main/resources/base/toolbar/Heating or Cooling Arrangements/Heat Exchanger.png
+++ b/src/main/resources/base/toolbar/Heating or Cooling Arrangements/Heat Exchanger.png
diff --git a/src/main/resources/base/toolbar/Heating or Cooling Arrangements/Immersion Coil.png b/src/main/resources/base/toolbar/Heating or Cooling Arrangements/Immersion Coil.png
index 35bd22d..8dd7b58 100644
--- a/src/main/resources/base/toolbar/Heating or Cooling Arrangements/Immersion Coil.png
+++ b/src/main/resources/base/toolbar/Heating or Cooling Arrangements/Immersion Coil.png
diff --git a/src/main/resources/base/toolbar/Heating or Cooling Arrangements/Kettle Reboiler.png b/src/main/resources/base/toolbar/Heating or Cooling Arrangements/Kettle Reboiler.png
index 3fc7bd0..e2d0f1f 100644
--- a/src/main/resources/base/toolbar/Heating or Cooling Arrangements/Kettle Reboiler.png
+++ b/src/main/resources/base/toolbar/Heating or Cooling Arrangements/Kettle Reboiler.png
diff --git a/src/main/resources/base/toolbar/Piping/Inflow Line.png b/src/main/resources/base/toolbar/Piping/Inflow Line.png
index 123a2b0..b710b99 100644
--- a/src/main/resources/base/toolbar/Piping/Inflow Line.png
+++ b/src/main/resources/base/toolbar/Piping/Inflow Line.png
diff --git a/src/main/resources/base/toolbar/Piping/Outflow Line.png b/src/main/resources/base/toolbar/Piping/Outflow Line.png
index 0e1d2ee..245b959 100644
--- a/src/main/resources/base/toolbar/Piping/Outflow Line.png
+++ b/src/main/resources/base/toolbar/Piping/Outflow Line.png
diff --git a/src/main/resources/base/toolbar/Process Vessels/Horizontal Vessel.png b/src/main/resources/base/toolbar/Process Vessels/Horizontal Vessel.png
index e0ea727..b196a1b 100644
--- a/src/main/resources/base/toolbar/Process Vessels/Horizontal Vessel.png
+++ b/src/main/resources/base/toolbar/Process Vessels/Horizontal Vessel.png
diff --git a/src/main/resources/base/toolbar/Process Vessels/Packed Vessel.png b/src/main/resources/base/toolbar/Process Vessels/Packed Vessel.png
index 78e32a9..6800f61 100644
--- a/src/main/resources/base/toolbar/Process Vessels/Packed Vessel.png
+++ b/src/main/resources/base/toolbar/Process Vessels/Packed Vessel.png
diff --git a/src/main/resources/base/toolbar/Process Vessels/Trays or plates.png b/src/main/resources/base/toolbar/Process Vessels/Trays or plates.png
index 1cb1119..70e5615 100644
--- a/src/main/resources/base/toolbar/Process Vessels/Trays or plates.png
+++ b/src/main/resources/base/toolbar/Process Vessels/Trays or plates.png
diff --git a/src/main/resources/base/toolbar/Process Vessels/Vertical Vessel.png b/src/main/resources/base/toolbar/Process Vessels/Vertical Vessel.png
index 25b7539..cdba66f 100644
--- a/src/main/resources/base/toolbar/Process Vessels/Vertical Vessel.png
+++ b/src/main/resources/base/toolbar/Process Vessels/Vertical Vessel.png
diff --git a/src/main/resources/base/toolbar/Pumps/Blowing Egg.png b/src/main/resources/base/toolbar/Pumps/Blowing Egg.png
index 25d0ad3..f23f389 100644
--- a/src/main/resources/base/toolbar/Pumps/Blowing Egg.png
+++ b/src/main/resources/base/toolbar/Pumps/Blowing Egg.png
diff --git a/src/main/resources/base/toolbar/Pumps/Duplex Pump.png b/src/main/resources/base/toolbar/Pumps/Duplex Pump.png
index 7b230aa..9b95b49 100644
--- a/src/main/resources/base/toolbar/Pumps/Duplex Pump.png
+++ b/src/main/resources/base/toolbar/Pumps/Duplex Pump.png
diff --git a/src/main/resources/base/toolbar/Pumps/Ejector(Vapor Service).png b/src/main/resources/base/toolbar/Pumps/Ejector(Vapor Service).png
index bc9b9fb..fedef5d 100644
--- a/src/main/resources/base/toolbar/Pumps/Ejector(Vapor Service).png
+++ b/src/main/resources/base/toolbar/Pumps/Ejector(Vapor Service).png
diff --git a/src/main/resources/base/toolbar/Pumps/Hand Pump with Drum.png b/src/main/resources/base/toolbar/Pumps/Hand Pump with Drum.png
index 11a84c6..e6b44bd 100644
--- a/src/main/resources/base/toolbar/Pumps/Hand Pump with Drum.png
+++ b/src/main/resources/base/toolbar/Pumps/Hand Pump with Drum.png
diff --git a/src/main/resources/base/toolbar/Pumps/Plunger Pump.png b/src/main/resources/base/toolbar/Pumps/Plunger Pump.png
index 5112bca..c59c521 100644
--- a/src/main/resources/base/toolbar/Pumps/Plunger Pump.png
+++ b/src/main/resources/base/toolbar/Pumps/Plunger Pump.png
diff --git a/src/main/resources/base/toolbar/Pumps/Proportioning Pump.png b/src/main/resources/base/toolbar/Pumps/Proportioning Pump.png
index f027301..b3d869e 100644
--- a/src/main/resources/base/toolbar/Pumps/Proportioning Pump.png
+++ b/src/main/resources/base/toolbar/Pumps/Proportioning Pump.png
diff --git a/src/main/resources/base/toolbar/Pumps/Reciprocating Pump.png b/src/main/resources/base/toolbar/Pumps/Reciprocating Pump.png
index f6e4507..f066dbd 100644
--- a/src/main/resources/base/toolbar/Pumps/Reciprocating Pump.png
+++ b/src/main/resources/base/toolbar/Pumps/Reciprocating Pump.png
diff --git a/src/main/resources/base/toolbar/Separators/Separators for Liquids, Decanter.png b/src/main/resources/base/toolbar/Separators/Separators for Liquids, Decanter.png
index 927aa93..a16456c 100644
--- a/src/main/resources/base/toolbar/Separators/Separators for Liquids, Decanter.png
+++ b/src/main/resources/base/toolbar/Separators/Separators for Liquids, Decanter.png
diff --git a/src/main/resources/base/toolbar/Storage Vessels Tanks/Fixed Roof Tank.png b/src/main/resources/base/toolbar/Storage Vessels Tanks/Fixed Roof Tank.png
index 85b832f..35e08ee 100644
--- a/src/main/resources/base/toolbar/Storage Vessels Tanks/Fixed Roof Tank.png
+++ b/src/main/resources/base/toolbar/Storage Vessels Tanks/Fixed Roof Tank.png
diff --git a/src/main/resources/base/toolbar/Storage Vessels Tanks/Floating Roof Tank.png b/src/main/resources/base/toolbar/Storage Vessels Tanks/Floating Roof Tank.png
index d38fa0c..23e8d47 100644
--- a/src/main/resources/base/toolbar/Storage Vessels Tanks/Floating Roof Tank.png
+++ b/src/main/resources/base/toolbar/Storage Vessels Tanks/Floating Roof Tank.png