diff --git a/7z b/7z
index 26321c0..175bcb4 100644
--- a/7z
+++ b/7z
@@ -1,3 +1,6 @@
+---
+tags: [ compression ]
+---
 7z
 A file archiver with highest compression ratio
 
diff --git a/apk b/apk
index fc00e0a..e9474ad 100644
--- a/apk
+++ b/apk
@@ -1,3 +1,6 @@
+---
+tags: [ packaging ]
+---
 # To install a package:
 apk add <package>
 
diff --git a/apt b/apt
index 2b2234f..2f90e76 100644
--- a/apt
+++ b/apt
@@ -1,3 +1,6 @@
+---
+tags: [ packaging ]
+---
 # To find packages matching <phrase>:
 apt search <phrase>
 
diff --git a/apt-cache b/apt-cache
index 568a788..3a7103f 100644
--- a/apt-cache
+++ b/apt-cache
@@ -1,3 +1,6 @@
+---
+tags: [ packaging ]
+---
 # To find packages matching <phrase>:
 apt-cache search <phrase>
 
diff --git a/apt-get b/apt-get
index 5b4d3c5..4c95a12 100644
--- a/apt-get
+++ b/apt-get
@@ -1,3 +1,6 @@
+---
+tags: [ packaging ]
+---
 # To fetch package list:
 apt-get update
 
diff --git a/aptitude b/aptitude
index 4c11f87..2297819 100644
--- a/aptitude
+++ b/aptitude
@@ -1,3 +1,6 @@
+---
+tags: [ packaging ]
+---
 # To find packages matching <phrase>:
 aptitude search <phrase>
 
diff --git a/bower b/bower
index 116ab13..29987af 100644
--- a/bower
+++ b/bower
@@ -1,3 +1,6 @@
+---
+tags: [ packaging ]
+---
 # To install a package:
 bower install <package>
 
diff --git a/bzip2 b/bzip2
index 2b179c3..867af21 100644
--- a/bzip2
+++ b/bzip2
@@ -1,3 +1,6 @@
+---
+tags: [ compression ]
+---
 # To compress a file (foo -> foo.bz2):
 bzip2 -z foo
 
diff --git a/deb b/deb
index 97741f6..750614f 100644
--- a/deb
+++ b/deb
@@ -1,3 +1,6 @@
+---
+tags: [ packaging ]
+---
 # To extract the contents of a .deb file:
 ar vx foo.deb  # -> data.tar.gz
 tar xf data.tar.gz
diff --git a/dhclient b/dhclient
index 7bf902f..a0e80e5 100644
--- a/dhclient
+++ b/dhclient
@@ -1,3 +1,6 @@
+---
+tags: [ networking ]
+---
 # To release the current IP address:
 sudo dhclient -r
 
diff --git a/dnf b/dnf
index 7b35046..524ea0e 100644
--- a/dnf
+++ b/dnf
@@ -1,3 +1,6 @@
+---
+tags: [ packaging ]
+---
 # To install a package:
 dnf install <package>
 
diff --git a/dpkg b/dpkg
index 7839b62..af5c312 100644
--- a/dpkg
+++ b/dpkg
@@ -1,3 +1,6 @@
+---
+tags: [ packaging ]
+---
 # To install or upgrade a package:
 dpkg -i <deb-file>
 
diff --git a/gzip b/gzip
index 30dee79..4481bbd 100644
--- a/gzip
+++ b/gzip
@@ -1,3 +1,6 @@
+---
+tags: [ compression ]
+---
 # To create a *.gz compressed file
 gzip test.txt
 
diff --git a/ip b/ip
index 5e08553..4403eb3 100644
--- a/ip
+++ b/ip
@@ -1,3 +1,6 @@
+---
+tags [ networking ]
+---
 # To display all interfaces with addresses:
 ip addr
 
diff --git a/iptables b/iptables
index c332c0b..a721f33 100644
--- a/iptables
+++ b/iptables
@@ -1,3 +1,6 @@
+---
+tags [ networking ]
+---
 # To show hit for rules with auto refresh:
 watch --interval 0 'iptables -nvL | grep -v "0     0"'
 
diff --git a/iwconfig b/iwconfig
index 536c24a..55b0b67 100644
--- a/iwconfig
+++ b/iwconfig
@@ -1,3 +1,6 @@
+---
+tags [ networking ]
+---
 # To display wireless settings of the first wireless adapter:
 iwconfig wlan0
 
diff --git a/mysql b/mysql
index 73c4e40..0592fcc 100644
--- a/mysql
+++ b/mysql
@@ -1,3 +1,6 @@
+---
+tags: [ database ]
+---
 # To connect to a database:
 mysql -h <host> -u <username> -p
 
diff --git a/mysqldump b/mysqldump
index 7c32024..3396787 100644
--- a/mysqldump
+++ b/mysqldump
@@ -1,3 +1,6 @@
+---
+tags: [ database ]
+---
 # To dump a database to a file (Note that your password will appear in your command history!):
 mysqldump -u<username> -p<password> <database> > db.sql
 
diff --git a/nc b/nc
index 3e6996b..9147bcb 100644
--- a/nc
+++ b/nc
@@ -1,3 +1,6 @@
+---
+tags [ networking ]
+---
 # To open a TCP connection from <src-port> to <dest-port> of <dest-host>, with a timeout of <seconds>
 nc -p <src-port> -w <seconds> <dest-host> <dest-port>
 
diff --git a/ncat b/ncat
index cde25ba..c9d6fd0 100644
--- a/ncat
+++ b/ncat
@@ -1,3 +1,6 @@
+---
+tags [ networking ]
+---
 # Connect mode (ncat is client) | default port is 31337
 ncat <host> [<port>]
 
diff --git a/netstat b/netstat
index fea5538..4d7a3aa 100644
--- a/netstat
+++ b/netstat
@@ -1,3 +1,6 @@
+---
+tags [ networking ]
+---
 # WARNING ! netstat is deprecated. Look below.
 
 # To view which users/processes are listening to which ports:
diff --git a/nmap b/nmap
index 0232bf1..312c996 100644
--- a/nmap
+++ b/nmap
@@ -1,3 +1,6 @@
+---
+tags [ networking ]
+---
 # Single target scan:
 nmap [target]
 
diff --git a/nmcli b/nmcli
index 29ede6e..f290520 100644
--- a/nmcli
+++ b/nmcli
@@ -1,3 +1,6 @@
+---
+tags [ networking ]
+---
 # Connect to a wireless access point - Parameters:
 # 	<wiface> -- the name of your wireless interface
 #	<ssid> -- the SSID of the access point
diff --git a/npm b/npm
index 41ab39c..55c0253 100644
--- a/npm
+++ b/npm
@@ -1,3 +1,6 @@
+---
+tags: [ packaging ]
+---
 # Every command shown here can be used with the `-g` switch for global scope
 
 # To install a package in the current directory:
diff --git a/pacman b/pacman
index 97d9136..105dd8e 100644
--- a/pacman
+++ b/pacman
@@ -1,3 +1,6 @@
+---
+tags: [ packaging ]
+---
 # To search for a package:
 pacman -Ss <package>...
 
diff --git a/ping b/ping
index 6ebb347..32c8c34 100644
--- a/ping
+++ b/ping
@@ -1,3 +1,6 @@
+---
+tags [ networking ]
+---
 # To ping <host> with 15 packets:
 ping -c 15 <host>
 
diff --git a/ping6 b/ping6
index 735cdb8..e2515a6 100644
--- a/ping6
+++ b/ping6
@@ -1,2 +1,5 @@
+---
+tags [ networking ]
+---
 # To Get all ipv6 neighbors via broadcast ping:
 ping6 -I eth0 ff02::1
diff --git a/pip b/pip
index 23544bb..a1e1dcc 100644
--- a/pip
+++ b/pip
@@ -1,3 +1,6 @@
+---
+tags: [ packaging ]
+---
 # To search for a package:
 pip search <package>
 
diff --git a/pkgtools b/pkgtools
index 066a5c8..1865337 100644
--- a/pkgtools
+++ b/pkgtools
@@ -1,3 +1,6 @@
+---
+tags: [ packaging ]
+---
 # To create a Slackware package from a structured directory and sub-tree:
 cd <dir>
 su - c 'makepkg --linkadd y --chown n $foo-1.0.3-x86_64-1_tag.tgz'
diff --git a/psql b/psql
index 7a9dc5e..771c7fc 100644
--- a/psql
+++ b/psql
@@ -1,3 +1,6 @@
+---
+tags [ database ]
+---
 # psql is the PostgreSQL terminal interface. The following commands were tested on version 9.5.
 # Connection options:
 # -U username (if not specified current OS user is used).
diff --git a/route b/route
index eac7860..1184f02 100644
--- a/route
+++ b/route
@@ -1,3 +1,6 @@
+---
+tags [ networking ]
+---
 # To display routing table IP addresses instead of host names:
 route -n
 
diff --git a/rpm b/rpm
index 4b971f3..4c55508 100644
--- a/rpm
+++ b/rpm
@@ -1,3 +1,6 @@
+---
+tags: [ packaging ]
+---
 # To install a package:
 rpm -ivh <rpm>
 
diff --git a/rpm2cpio b/rpm2cpio
index 99319f2..04ec007 100644
--- a/rpm2cpio
+++ b/rpm2cpio
@@ -1,3 +1,6 @@
+---
+tags: [ packaging ]
+---
 # To list contents of an RPM:
 rpm2cpio <rpm-file> | cpio -vt
 
diff --git a/snap b/snap
index ca5205b..bcad6fa 100644
--- a/snap
+++ b/snap
@@ -1,3 +1,6 @@
+---
+tags: [ packaging ]
+---
 # To find <package>:
 snap find <package>
 
diff --git a/socat b/socat
index 939141f..97ea3bc 100644
--- a/socat
+++ b/socat
@@ -1,3 +1,6 @@
+---
+tags [ networking ]
+---
 # socat connect to http-server (port 80 on 'butzel.info')
 socat TCP4:butzel.info:80 -
 
diff --git a/sockstat b/sockstat
index 21594fd..064c57f 100644
--- a/sockstat
+++ b/sockstat
@@ -1,2 +1,5 @@
+---
+tags [ networking ]
+---
 # To view which users/processes are listening to which ports:
 sudo sockstat -l
diff --git a/sport b/sport
index ea50cae..1b1627c 100644
--- a/sport
+++ b/sport
@@ -1,3 +1,6 @@
+---
+tags [ packaging ]
+---
 # To sync to newest slackbuild.org tree:
 sport r
 
diff --git a/sqlite3 b/sqlite3
index aa7c56d..46f385c 100644
--- a/sqlite3
+++ b/sqlite3
@@ -1,3 +1,6 @@
+---
+tags: [ database ]
+---
 # to create database and launch interactive shell:
 sqlite3 <database>
 
diff --git a/sqlmap b/sqlmap
index 92287c5..aa704cb 100644
--- a/sqlmap
+++ b/sqlmap
@@ -1,3 +1,6 @@
+---
+tags: [ database ]
+---
 # Test URL and POST data and return database banner (if possible)
 ./sqlmap.py --url="<url>" --data="<post-data>" --banner
 
diff --git a/ss b/ss
index c09ace4..d8a5f62 100644
--- a/ss
+++ b/ss
@@ -1,3 +1,6 @@
+---
+tags [ networking ]
+---
 Args
 -4/-6 list ipv4/ipv6 sockets
 -n numeric addresses instead of hostnames
diff --git a/ssh b/ssh
index d8e14e9..62521a3 100644
--- a/ssh
+++ b/ssh
@@ -1,3 +1,6 @@
+---
+tags [ ssh ]
+---
 # To ssh via pem file (which normally needs 0600 permissions):
 ssh -i <pemfile> <user>@<host>
 
diff --git a/ssh-copy-id b/ssh-copy-id
index f744d94..7b2d24c 100644
--- a/ssh-copy-id
+++ b/ssh-copy-id
@@ -1,3 +1,6 @@
+---
+tags [ ssh ]
+---
 # To copy a key to a remote host:
 ssh-copy-id <user>@<host>
 
diff --git a/ssh-keygen b/ssh-keygen
index 87f15cd..31153a9 100644
--- a/ssh-keygen
+++ b/ssh-keygen
@@ -1,3 +1,6 @@
+---
+tags [ ssh ]
+---
 # To generate an SSH key:
 ssh-keygen -t rsa
 
diff --git a/tar b/tar
index 41173b2..9021d29 100644
--- a/tar
+++ b/tar
@@ -1,3 +1,6 @@
+---
+tags: [ compression ]
+---
 # To extract an uncompressed archive:
 tar -xvf /path/to/foo.tar
 
diff --git a/unzip b/unzip
index 51ebdbf..5b5454a 100644
--- a/unzip
+++ b/unzip
@@ -1,3 +1,6 @@
+---
+tags: [ compression ]
+---
 # To extract an archive:
 unzip <archive>
 
diff --git a/urpm b/urpm
index 8ca2103..61b2064 100644
--- a/urpm
+++ b/urpm
@@ -1,3 +1,6 @@
+---
+tags: [ packaging ]
+---
 # To search (fuzzy) <package>:
 urpmq -Y <package>
 
diff --git a/yaourt b/yaourt
index fce10a0..4d742f2 100644
--- a/yaourt
+++ b/yaourt
@@ -1,3 +1,6 @@
+---
+tags: [ packaging ]
+---
 # All pacman commands are working the same way with yaourt.
 # Just check the pacman cheatsheet.
 # For instance, to install a package: 
diff --git a/yum b/yum
index b2c222c..b86ed33 100644
--- a/yum
+++ b/yum
@@ -1,3 +1,6 @@
+---
+tags: [ packaging ]
+---
 # To install the latest version of a package:
 yum install <package>