diff --git a/svg/circle/blue/c_atm_blue.svg b/svg/circle/blue/c_atm_blue.svg
new file mode 100644
index 00000000..213e805f
--- /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_docker_blue.svg b/svg/circle/blue/c_docker_blue.svg
new file mode 100644
index 00000000..62196994
--- /dev/null
+++ b/svg/circle/blue/c_docker_blue.svg
@@ -0,0 +1,81 @@
+
+
\ No newline at end of file
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 0afb5911..00000000
--- a/svg/circle/blue/c_shield.svg
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
diff --git a/svg/circle/blue/c_virtualbox_blue.svg b/svg/circle/blue/c_virtualbox_blue.svg
new file mode 100644
index 00000000..fc335c4e
--- /dev/null
+++ b/svg/circle/blue/c_virtualbox_blue.svg
@@ -0,0 +1,45 @@
+
+
\ No newline at end of file
diff --git a/svg/circle/blue/c_vmware_blue.svg b/svg/circle/blue/c_vmware_blue.svg
new file mode 100644
index 00000000..d065819e
--- /dev/null
+++ b/svg/circle/blue/c_vmware_blue.svg
@@ -0,0 +1,45 @@
+
+
\ No newline at end of file
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 00000000..324c169c
--- /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_docker.svg b/svg/circle/gray/c_docker.svg
new file mode 100644
index 00000000..5b0a2f93
--- /dev/null
+++ b/svg/circle/gray/c_docker.svg
@@ -0,0 +1,81 @@
+
+
\ 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_virtualbox.svg b/svg/circle/gray/c_virtualbox.svg
new file mode 100644
index 00000000..3f4af27a
--- /dev/null
+++ b/svg/circle/gray/c_virtualbox.svg
@@ -0,0 +1,45 @@
+
+
\ No newline at end of file
diff --git a/svg/circle/gray/c_vmware.svg b/svg/circle/gray/c_vmware.svg
new file mode 100644
index 00000000..e63db9f1
--- /dev/null
+++ b/svg/circle/gray/c_vmware.svg
@@ -0,0 +1,45 @@
+
+
\ No newline at end of file
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 00000000..d8a545ca
--- /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_docker_green.svg b/svg/circle/green/c_docker_green.svg
new file mode 100644
index 00000000..b984c4b0
--- /dev/null
+++ b/svg/circle/green/c_docker_green.svg
@@ -0,0 +1,81 @@
+
+
\ 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_virtualbox_green.svg b/svg/circle/green/c_virtualbox_green.svg
new file mode 100644
index 00000000..d22c279f
--- /dev/null
+++ b/svg/circle/green/c_virtualbox_green.svg
@@ -0,0 +1,45 @@
+
+
\ No newline at end of file
diff --git a/svg/circle/green/c_vmware_green.svg b/svg/circle/green/c_vmware_green.svg
new file mode 100644
index 00000000..746b81a9
--- /dev/null
+++ b/svg/circle/green/c_vmware_green.svg
@@ -0,0 +1,45 @@
+
+
\ No newline at end of file
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 00000000..67fba029
--- /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_docker_red.svg b/svg/circle/red/c_docker_red.svg
new file mode 100644
index 00000000..1cda1c1e
--- /dev/null
+++ b/svg/circle/red/c_docker_red.svg
@@ -0,0 +1,81 @@
+
+
\ 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_virtualbox_red.svg b/svg/circle/red/c_virtualbox_red.svg
new file mode 100644
index 00000000..136a436e
--- /dev/null
+++ b/svg/circle/red/c_virtualbox_red.svg
@@ -0,0 +1,45 @@
+
+
\ No newline at end of file
diff --git a/svg/circle/red/c_vmware_red.svg b/svg/circle/red/c_vmware_red.svg
new file mode 100644
index 00000000..13d57015
--- /dev/null
+++ b/svg/circle/red/c_vmware_red.svg
@@ -0,0 +1,45 @@
+
+
\ No newline at end of file
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 00000000..3679de93
--- /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_docker_blue.svg b/svg/square/blue/sq_docker_blue.svg
new file mode 100644
index 00000000..d0d41ba2
--- /dev/null
+++ b/svg/square/blue/sq_docker_blue.svg
@@ -0,0 +1,79 @@
+
+
\ 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/blue/sq_virtualbox_blue.svg b/svg/square/blue/sq_virtualbox_blue.svg
new file mode 100644
index 00000000..60cbdad2
--- /dev/null
+++ b/svg/square/blue/sq_virtualbox_blue.svg
@@ -0,0 +1,43 @@
+
+
\ No newline at end of file
diff --git a/svg/square/blue/sq_vmware_blue.svg b/svg/square/blue/sq_vmware_blue.svg
new file mode 100644
index 00000000..59fe9242
--- /dev/null
+++ b/svg/square/blue/sq_vmware_blue.svg
@@ -0,0 +1,43 @@
+
+
\ No newline at end of file
diff --git a/svg/square/gray/sq_atm.svg b/svg/square/gray/sq_atm.svg
new file mode 100644
index 00000000..32c88a3b
--- /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_docker.svg b/svg/square/gray/sq_docker.svg
new file mode 100644
index 00000000..8da830c9
--- /dev/null
+++ b/svg/square/gray/sq_docker.svg
@@ -0,0 +1,79 @@
+
+
\ No newline at end of file
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/gray/sq_virtualbox.svg b/svg/square/gray/sq_virtualbox.svg
new file mode 100644
index 00000000..4524a55b
--- /dev/null
+++ b/svg/square/gray/sq_virtualbox.svg
@@ -0,0 +1,43 @@
+
+
\ No newline at end of file
diff --git a/svg/square/gray/sq_vmware.svg b/svg/square/gray/sq_vmware.svg
new file mode 100644
index 00000000..d8b02826
--- /dev/null
+++ b/svg/square/gray/sq_vmware.svg
@@ -0,0 +1,43 @@
+
+
\ No newline at end of file
diff --git a/svg/square/green/.DS_Store b/svg/square/green/.DS_Store
deleted file mode 100644
index 560f9549..00000000
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 00000000..2e583ddc
--- /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_docker_green.svg b/svg/square/green/sq_docker_green.svg
new file mode 100644
index 00000000..f738bf12
--- /dev/null
+++ b/svg/square/green/sq_docker_green.svg
@@ -0,0 +1,79 @@
+
+
\ No newline at end of file
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/green/sq_virtualbox_green.svg b/svg/square/green/sq_virtualbox_green.svg
new file mode 100644
index 00000000..9b506c8f
--- /dev/null
+++ b/svg/square/green/sq_virtualbox_green.svg
@@ -0,0 +1,43 @@
+
+
\ No newline at end of file
diff --git a/svg/square/green/sq_vmware_green.svg b/svg/square/green/sq_vmware_green.svg
new file mode 100644
index 00000000..4cbda809
--- /dev/null
+++ b/svg/square/green/sq_vmware_green.svg
@@ -0,0 +1,43 @@
+
+
\ No newline at end of file
diff --git a/svg/square/red/sq_atm_red.svg b/svg/square/red/sq_atm_red.svg
new file mode 100644
index 00000000..754e2f98
--- /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_docker_red.svg b/svg/square/red/sq_docker_red.svg
new file mode 100644
index 00000000..189ce892
--- /dev/null
+++ b/svg/square/red/sq_docker_red.svg
@@ -0,0 +1,79 @@
+
+
\ 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
diff --git a/svg/square/red/sq_virtualbox_red.svg b/svg/square/red/sq_virtualbox_red.svg
new file mode 100644
index 00000000..42c1b812
--- /dev/null
+++ b/svg/square/red/sq_virtualbox_red.svg
@@ -0,0 +1,43 @@
+
+
\ No newline at end of file
diff --git a/svg/square/red/sq_vmware_red.svg b/svg/square/red/sq_vmware_red.svg
new file mode 100644
index 00000000..850fd7f1
--- /dev/null
+++ b/svg/square/red/sq_vmware_red.svg
@@ -0,0 +1,43 @@
+
+
\ No newline at end of file