diff --git a/images/apple.png b/images/apple.png
index b9d6d09..aaeae0b 100644
Binary files a/images/apple.png and b/images/apple.png differ
diff --git a/images/burp.png b/images/burp.png
index 08d256b..d52f96e 100644
Binary files a/images/burp.png and b/images/burp.png differ
diff --git a/images/chrome.png b/images/chrome.png
index 13eda4a..59180f0 100644
Binary files a/images/chrome.png and b/images/chrome.png differ
diff --git a/images/firefox.png b/images/firefox.png
index e4ac8fc..b5b94a0 100644
Binary files a/images/firefox.png and b/images/firefox.png differ
diff --git a/images/linux.png b/images/linux.png
index c87fb60..7e54907 100644
Binary files a/images/linux.png and b/images/linux.png differ
diff --git a/images/safari.png b/images/safari.png
index 5d75a38..bc90710 100644
Binary files a/images/safari.png and b/images/safari.png differ
diff --git a/images/windows.png b/images/windows.png
index 5cd706a..e8c3161 100644
Binary files a/images/windows.png and b/images/windows.png differ
diff --git a/images/zap.png b/images/zap.png
index 4269509..2b5e3f1 100644
Binary files a/images/zap.png and b/images/zap.png differ
diff --git a/scripts/erb.rb b/scripts/erb.rb
index bc7abf2..feae345 100644
--- a/scripts/erb.rb
+++ b/scripts/erb.rb
@@ -23,10 +23,17 @@ def generate_badge array
             badge = badge + "![zap](./images/zap.png)"
         end
     }
-    
     return badge
 end
 
+def generate_tags array
+    tags = ""
+    array.each { |t|
+        tags = tags + "`#{t}` "
+    }
+    return tags
+end
+
 template = %q{
 <h1 align="center">
 <br>
@@ -98,6 +105,7 @@ Dir.entries("./weapons/").each do | name |
                 popularity = "![](https://img.shields.io/github/stars/#{split_result[1]})"
             end
             badge = generate_badge(data['platform'])
+            badge = generate_tags(data['tags'])
             line = "|#{data['type']}|#{name}|#{data['description']}|#{badge}|#{popularity}|"
             case data['category'] 
             when 'tool'