diff --git a/svg/circle/blue/c_atm_blue.svg b/svg/circle/blue/c_atm_blue.svg
new file mode 100644
index 0000000..213e805
--- /dev/null
+++ b/svg/circle/blue/c_atm_blue.svg
@@ -0,0 +1,42 @@
+
+
\ No newline at end of file
diff --git a/svg/circle/blue/c_bug.svg b/svg/circle/blue/c_bug_blue.svg
similarity index 100%
rename from svg/circle/blue/c_bug.svg
rename to svg/circle/blue/c_bug_blue.svg
diff --git a/svg/circle/blue/c_inspect3_blue.svg b/svg/circle/blue/c_inspect2_blue.svg
similarity index 100%
rename from svg/circle/blue/c_inspect3_blue.svg
rename to svg/circle/blue/c_inspect2_blue.svg
diff --git a/svg/circle/blue/c_server-cluster_blue.svg b/svg/circle/blue/c_server_cluster_blue.svg
similarity index 100%
rename from svg/circle/blue/c_server-cluster_blue.svg
rename to svg/circle/blue/c_server_cluster_blue.svg
diff --git a/svg/circle/blue/c_shield.svg b/svg/circle/blue/c_shield.svg
deleted file mode 100644
index 0afb591..0000000
--- a/svg/circle/blue/c_shield.svg
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
diff --git a/svg/circle/blue/c_wireless_blue.svg b/svg/circle/blue/c_wifi_blue.svg
similarity index 100%
rename from svg/circle/blue/c_wireless_blue.svg
rename to svg/circle/blue/c_wifi_blue.svg
diff --git a/svg/circle/gray/c_atm.svg b/svg/circle/gray/c_atm.svg
new file mode 100644
index 0000000..324c169
--- /dev/null
+++ b/svg/circle/gray/c_atm.svg
@@ -0,0 +1,42 @@
+
+
\ No newline at end of file
diff --git a/svg/circle/gray/c_inspect3.svg b/svg/circle/gray/c_inspect2.svg
similarity index 100%
rename from svg/circle/gray/c_inspect3.svg
rename to svg/circle/gray/c_inspect2.svg
diff --git a/svg/circle/gray/c_server-cluster.svg b/svg/circle/gray/c_server_cluster.svg
similarity index 100%
rename from svg/circle/gray/c_server-cluster.svg
rename to svg/circle/gray/c_server_cluster.svg
diff --git a/svg/circle/gray/c_wireless.svg b/svg/circle/gray/c_wifi.svg
similarity index 100%
rename from svg/circle/gray/c_wireless.svg
rename to svg/circle/gray/c_wifi.svg
diff --git a/svg/circle/green/c_atm_green.svg b/svg/circle/green/c_atm_green.svg
new file mode 100644
index 0000000..d8a545c
--- /dev/null
+++ b/svg/circle/green/c_atm_green.svg
@@ -0,0 +1,42 @@
+
+
\ No newline at end of file
diff --git a/svg/circle/green/c_inspect3_green.svg b/svg/circle/green/c_inspect2_green.svg
similarity index 100%
rename from svg/circle/green/c_inspect3_green.svg
rename to svg/circle/green/c_inspect2_green.svg
diff --git a/svg/circle/green/c_server-cluster_green.svg b/svg/circle/green/c_server_cluster_green.svg
similarity index 100%
rename from svg/circle/green/c_server-cluster_green.svg
rename to svg/circle/green/c_server_cluster_green.svg
diff --git a/svg/circle/green/c_wireless_green.svg b/svg/circle/green/c_wifi_green.svg
similarity index 100%
rename from svg/circle/green/c_wireless_green.svg
rename to svg/circle/green/c_wifi_green.svg
diff --git a/svg/circle/red/c_atm_red.svg b/svg/circle/red/c_atm_red.svg
new file mode 100644
index 0000000..67fba02
--- /dev/null
+++ b/svg/circle/red/c_atm_red.svg
@@ -0,0 +1,42 @@
+
+
\ No newline at end of file
diff --git a/svg/circle/red/c_inspect3_red.svg b/svg/circle/red/c_inspect2_red.svg
similarity index 100%
rename from svg/circle/red/c_inspect3_red.svg
rename to svg/circle/red/c_inspect2_red.svg
diff --git a/svg/circle/red/c_server-cluster_red.svg b/svg/circle/red/c_server_cluster_red.svg
similarity index 100%
rename from svg/circle/red/c_server-cluster_red.svg
rename to svg/circle/red/c_server_cluster_red.svg
diff --git a/svg/circle/red/c_wireless_red.svg b/svg/circle/red/c_wifi_red.svg
similarity index 100%
rename from svg/circle/red/c_wireless_red.svg
rename to svg/circle/red/c_wifi_red.svg
diff --git a/svg/naked/server-cluster.svg b/svg/naked/server_cluster.svg
similarity index 100%
rename from svg/naked/server-cluster.svg
rename to svg/naked/server_cluster.svg
diff --git a/svg/square/blue/sq_atm_blue.svg b/svg/square/blue/sq_atm_blue.svg
new file mode 100644
index 0000000..3679de9
--- /dev/null
+++ b/svg/square/blue/sq_atm_blue.svg
@@ -0,0 +1,40 @@
+
+
\ No newline at end of file
diff --git a/svg/square/blue/sq_servercluster_blue.svg b/svg/square/blue/sq_server_cluster_blue.svg
similarity index 100%
rename from svg/square/blue/sq_servercluster_blue.svg
rename to svg/square/blue/sq_server_cluster_blue.svg
diff --git a/svg/square/gray/sq_atm.svg b/svg/square/gray/sq_atm.svg
new file mode 100644
index 0000000..32c88a3
--- /dev/null
+++ b/svg/square/gray/sq_atm.svg
@@ -0,0 +1,40 @@
+
+
\ No newline at end of file
diff --git a/svg/square/gray/sq_cloud.svg b/svg/square/gray/sq_cloud.svg
index d1cb76b..cabc946 100644
--- a/svg/square/gray/sq_cloud.svg
+++ b/svg/square/gray/sq_cloud.svg
@@ -2,29 +2,17 @@
diff --git a/svg/square/gray/sq_servercluster.svg b/svg/square/gray/sq_server_cluster.svg
similarity index 100%
rename from svg/square/gray/sq_servercluster.svg
rename to svg/square/gray/sq_server_cluster.svg
diff --git a/svg/square/green/.DS_Store b/svg/square/green/.DS_Store
deleted file mode 100644
index 560f954..0000000
Binary files a/svg/square/green/.DS_Store and /dev/null differ
diff --git a/svg/square/green/sq_atm_green.svg b/svg/square/green/sq_atm_green.svg
new file mode 100644
index 0000000..2e583dd
--- /dev/null
+++ b/svg/square/green/sq_atm_green.svg
@@ -0,0 +1,40 @@
+
+
\ No newline at end of file
diff --git a/svg/square/green/sq_cloud_green.svg b/svg/square/green/sq_cloud_green.svg
index e1665ef..7b78bdc 100644
--- a/svg/square/green/sq_cloud_green.svg
+++ b/svg/square/green/sq_cloud_green.svg
@@ -2,29 +2,17 @@
diff --git a/svg/square/green/sq_servercluster_green.svg b/svg/square/green/sq_server_cluster_green.svg
similarity index 100%
rename from svg/square/green/sq_servercluster_green.svg
rename to svg/square/green/sq_server_cluster_green.svg
diff --git a/svg/square/red/sq_atm_red.svg b/svg/square/red/sq_atm_red.svg
new file mode 100644
index 0000000..754e2f9
--- /dev/null
+++ b/svg/square/red/sq_atm_red.svg
@@ -0,0 +1,40 @@
+
+
\ No newline at end of file
diff --git a/svg/square/red/sq_servercluster_red.svg b/svg/square/red/sq_server_cluster_red.svg
similarity index 100%
rename from svg/square/red/sq_servercluster_red.svg
rename to svg/square/red/sq_server_cluster_red.svg