diff --git a/scripts/script.db b/scripts/script.db
index 54bc1633b..6b8a0d2af 100644
--- a/scripts/script.db
+++ b/scripts/script.db
@@ -1,116 +1,56 @@
-Entry { category = "discovery", filename = "asn-query.nse" }
-Entry { category = "external", filename = "asn-query.nse" }
-Entry { category = "default", filename = "auth-owners.nse" }
-Entry { category = "safe", filename = "auth-owners.nse" }
-Entry { category = "malware", filename = "auth-spoof.nse" }
-Entry { category = "discovery", filename = "banner.nse" }
-Entry { category = "safe", filename = "banner.nse" }
-Entry { category = "discovery", filename = "daytime.nse" }
-Entry { category = "external", filename = "dns-random-srcport.nse" }
-Entry { category = "intrusive", filename = "dns-random-srcport.nse" }
-Entry { category = "external", filename = "dns-random-txid.nse" }
-Entry { category = "intrusive", filename = "dns-random-txid.nse" }
-Entry { category = "default", filename = "dns-recursion.nse" }
-Entry { category = "intrusive", filename = "dns-recursion.nse" }
-Entry { category = "default", filename = "dns-zone-transfer.nse" }
-Entry { category = "discovery", filename = "dns-zone-transfer.nse" }
-Entry { category = "intrusive", filename = "dns-zone-transfer.nse" }
-Entry { category = "default", filename = "finger.nse" }
-Entry { category = "discovery", filename = "finger.nse" }
-Entry { category = "auth", filename = "ftp-anon.nse" }
-Entry { category = "default", filename = "ftp-anon.nse" }
-Entry { category = "safe", filename = "ftp-anon.nse" }
-Entry { category = "default", filename = "ftp-bounce.nse" }
-Entry { category = "intrusive", filename = "ftp-bounce.nse" }
-Entry { category = "auth", filename = "ftp-brute.nse" }
-Entry { category = "intrusive", filename = "ftp-brute.nse" }
-Entry { category = "default", filename = "html-title.nse" }
-Entry { category = "discovery", filename = "html-title.nse" }
-Entry { category = "safe", filename = "html-title.nse" }
-Entry { category = "auth", filename = "http-auth.nse" }
-Entry { category = "default", filename = "http-auth.nse" }
-Entry { category = "intrusive", filename = "http-auth.nse" }
-Entry { category = "default", filename = "http-open-proxy.nse" }
-Entry { category = "discovery", filename = "http-open-proxy.nse" }
-Entry { category = "external", filename = "http-open-proxy.nse" }
-Entry { category = "intrusive", filename = "http-open-proxy.nse" }
-Entry { category = "intrusive", filename = "http-passwd.nse" }
-Entry { category = "vuln", filename = "http-passwd.nse" }
-Entry { category = "discovery", filename = "http-trace.nse" }
-Entry { category = "version", filename = "iax2-version.nse" }
-Entry { category = "default", filename = "irc-info.nse" }
-Entry { category = "discovery", filename = "irc-info.nse" }
-Entry { category = "default", filename = "ms-sql-info.nse" }
-Entry { category = "discovery", filename = "ms-sql-info.nse" }
-Entry { category = "intrusive", filename = "ms-sql-info.nse" }
-Entry { category = "default", filename = "mysql-info.nse" }
-Entry { category = "discovery", filename = "mysql-info.nse" }
-Entry { category = "safe", filename = "mysql-info.nse" }
-Entry { category = "default", filename = "nbstat.nse" }
-Entry { category = "discovery", filename = "nbstat.nse" }
-Entry { category = "safe", filename = "nbstat.nse" }
-Entry { category = "default", filename = "p2p-conficker.nse" }
-Entry { category = "safe", filename = "p2p-conficker.nse" }
-Entry { category = "auth", filename = "pop3-brute.nse" }
-Entry { category = "intrusive", filename = "pop3-brute.nse" }
-Entry { category = "default", filename = "pop3-capabilities.nse" }
-Entry { category = "version", filename = "pptp-version.nse" }
-Entry { category = "default", filename = "realvnc-auth-bypass.nse" }
-Entry { category = "vuln", filename = "realvnc-auth-bypass.nse" }
-Entry { category = "default", filename = "robots.txt.nse" }
-Entry { category = "discovery", filename = "robots.txt.nse" }
-Entry { category = "safe", filename = "robots.txt.nse" }
-Entry { category = "default", filename = "rpcinfo.nse" }
-Entry { category = "discovery", filename = "rpcinfo.nse" }
-Entry { category = "safe", filename = "rpcinfo.nse" }
-Entry { category = "version", filename = "skypev2-version.nse" }
-Entry { category = "auth", filename = "smb-brute.nse" }
-Entry { category = "intrusive", filename = "smb-brute.nse" }
-Entry { category = "intrusive", filename = "smb-check-vulns.nse" }
-Entry { category = "discovery", filename = "smb-enum-domains.nse" }
-Entry { category = "intrusive", filename = "smb-enum-domains.nse" }
-Entry { category = "discovery", filename = "smb-enum-processes.nse" }
-Entry { category = "intrusive", filename = "smb-enum-processes.nse" }
-Entry { category = "discovery", filename = "smb-enum-sessions.nse" }
-Entry { category = "intrusive", filename = "smb-enum-sessions.nse" }
-Entry { category = "discovery", filename = "smb-enum-shares.nse" }
-Entry { category = "intrusive", filename = "smb-enum-shares.nse" }
-Entry { category = "discovery", filename = "smb-enum-users.nse" }
-Entry { category = "intrusive", filename = "smb-enum-users.nse" }
-Entry { category = "default", filename = "smb-os-discovery.nse" }
-Entry { category = "discovery", filename = "smb-os-discovery.nse" }
-Entry { category = "safe", filename = "smb-os-discovery.nse" }
-Entry { category = "intrusive", filename = "smb-pwdump.nse" }
-Entry { category = "discovery", filename = "smb-security-mode.nse" }
-Entry { category = "safe", filename = "smb-security-mode.nse" }
-Entry { category = "discovery", filename = "smb-server-stats.nse" }
-Entry { category = "intrusive", filename = "smb-server-stats.nse" }
-Entry { category = "discovery", filename = "smb-system-info.nse" }
-Entry { category = "intrusive", filename = "smb-system-info.nse" }
-Entry { category = "default", filename = "smtp-commands.nse" }
-Entry { category = "discovery", filename = "smtp-commands.nse" }
-Entry { category = "safe", filename = "smtp-commands.nse" }
-Entry { category = "demo", filename = "smtp-open-relay.nse" }
-Entry { category = "malware", filename = "smtp-strangeport.nse" }
-Entry { category = "discovery", filename = "sniffer-detect.nse" }
-Entry { category = "auth", filename = "snmp-brute.nse" }
-Entry { category = "intrusive", filename = "snmp-brute.nse" }
-Entry { category = "default", filename = "snmp-sysdescr.nse" }
-Entry { category = "discovery", filename = "snmp-sysdescr.nse" }
-Entry { category = "safe", filename = "snmp-sysdescr.nse" }
-Entry { category = "intrusive", filename = "sql-injection.nse" }
-Entry { category = "vuln", filename = "sql-injection.nse" }
-Entry { category = "default", filename = "ssh-hostkey.nse" }
-Entry { category = "intrusive", filename = "ssh-hostkey.nse" }
-Entry { category = "safe", filename = "ssh-hostkey.nse" }
-Entry { category = "default", filename = "sshv1.nse" }
-Entry { category = "safe", filename = "sshv1.nse" }
-Entry { category = "default", filename = "sslv2.nse" }
-Entry { category = "safe", filename = "sslv2.nse" }
-Entry { category = "auth", filename = "telnet-brute.nse" }
-Entry { category = "intrusive", filename = "telnet-brute.nse" }
-Entry { category = "default", filename = "upnp-info.nse" }
-Entry { category = "safe", filename = "upnp-info.nse" }
-Entry { category = "discovery", filename = "whois.nse" }
-Entry { category = "external", filename = "whois.nse" }
-Entry { category = "safe", filename = "whois.nse" }
+Entry { filename = "asn-query.nse", categories = { "discovery", "external", } }
+Entry { filename = "auth-owners.nse", categories = { "default", "safe", } }
+Entry { filename = "auth-spoof.nse", categories = { "malware", } }
+Entry { filename = "banner.nse", categories = { "discovery", "safe", } }
+Entry { filename = "daytime.nse", categories = { "discovery", } }
+Entry { filename = "dns-random-srcport.nse", categories = { "external", "intrusive", } }
+Entry { filename = "dns-random-txid.nse", categories = { "external", "intrusive", } }
+Entry { filename = "dns-recursion.nse", categories = { "default", "intrusive", } }
+Entry { filename = "dns-zone-transfer.nse", categories = { "default", "discovery", "intrusive", } }
+Entry { filename = "finger.nse", categories = { "default", "discovery", } }
+Entry { filename = "ftp-anon.nse", categories = { "auth", "default", "safe", } }
+Entry { filename = "ftp-bounce.nse", categories = { "default", "intrusive", } }
+Entry { filename = "ftp-brute.nse", categories = { "auth", "intrusive", } }
+Entry { filename = "html-title.nse", categories = { "default", "discovery", "safe", } }
+Entry { filename = "http-auth.nse", categories = { "auth", "default", "intrusive", } }
+Entry { filename = "http-open-proxy.nse", categories = { "default", "discovery", "external", "intrusive", } }
+Entry { filename = "http-passwd.nse", categories = { "intrusive", "vuln", } }
+Entry { filename = "http-trace.nse", categories = { "discovery", } }
+Entry { filename = "iax2-version.nse", categories = { "version", } }
+Entry { filename = "irc-info.nse", categories = { "default", "discovery", } }
+Entry { filename = "ms-sql-info.nse", categories = { "default", "discovery", "intrusive", } }
+Entry { filename = "mysql-info.nse", categories = { "default", "discovery", "safe", } }
+Entry { filename = "nbstat.nse", categories = { "default", "discovery", "safe", } }
+Entry { filename = "p2p-conficker.nse", categories = { "default", "safe", } }
+Entry { filename = "pop3-brute.nse", categories = { "auth", "intrusive", } }
+Entry { filename = "pop3-capabilities.nse", categories = { "default", } }
+Entry { filename = "pptp-version.nse", categories = { "version", } }
+Entry { filename = "realvnc-auth-bypass.nse", categories = { "default", "vuln", } }
+Entry { filename = "robots.txt.nse", categories = { "default", "discovery", "safe", } }
+Entry { filename = "rpcinfo.nse", categories = { "default", "discovery", "safe", } }
+Entry { filename = "skypev2-version.nse", categories = { "version", } }
+Entry { filename = "smb-brute.nse", categories = { "auth", "intrusive", } }
+Entry { filename = "smb-check-vulns.nse", categories = { "intrusive", } }
+Entry { filename = "smb-enum-domains.nse", categories = { "discovery", "intrusive", } }
+Entry { filename = "smb-enum-processes.nse", categories = { "discovery", "intrusive", } }
+Entry { filename = "smb-enum-sessions.nse", categories = { "discovery", "intrusive", } }
+Entry { filename = "smb-enum-shares.nse", categories = { "discovery", "intrusive", } }
+Entry { filename = "smb-enum-users.nse", categories = { "discovery", "intrusive", } }
+Entry { filename = "smb-os-discovery.nse", categories = { "default", "discovery", "safe", } }
+Entry { filename = "smb-pwdump.nse", categories = { "intrusive", } }
+Entry { filename = "smb-security-mode.nse", categories = { "discovery", "safe", } }
+Entry { filename = "smb-server-stats.nse", categories = { "discovery", "intrusive", } }
+Entry { filename = "smb-system-info.nse", categories = { "discovery", "intrusive", } }
+Entry { filename = "smtp-commands.nse", categories = { "default", "discovery", "safe", } }
+Entry { filename = "smtp-open-relay.nse", categories = { "demo", } }
+Entry { filename = "smtp-strangeport.nse", categories = { "malware", } }
+Entry { filename = "sniffer-detect.nse", categories = { "discovery", } }
+Entry { filename = "snmp-brute.nse", categories = { "auth", "intrusive", } }
+Entry { filename = "snmp-sysdescr.nse", categories = { "default", "discovery", "safe", } }
+Entry { filename = "sql-injection.nse", categories = { "intrusive", "vuln", } }
+Entry { filename = "ssh-hostkey.nse", categories = { "default", "intrusive", "safe", } }
+Entry { filename = "sshv1.nse", categories = { "default", "safe", } }
+Entry { filename = "sslv2.nse", categories = { "default", "safe", } }
+Entry { filename = "telnet-brute.nse", categories = { "auth", "intrusive", } }
+Entry { filename = "upnp-info.nse", categories = { "default", "safe", } }
+Entry { filename = "whois.nse", categories = { "discovery", "external", "safe", } }