diff --git a/navigation.md b/navigation.md
index fe5abbb..00ef3ab 100644
--- a/navigation.md
+++ b/navigation.md
@@ -18,14 +18,15 @@
   * [Forensics](forensics/index.md)
   * [Reporting Tools](reporting/index.md)
   * [System Services](systemservices/index.md)
-  
+
 [Tools]()
+
   * [Tools](tools/index.md)
 
 [References]()
 
   * [temp](references/temp.md)
- 
+
 [Links](links.md)
 
 [gimmick:themechooser](Wiki Theme)
diff --git a/tools/index.md b/tools/index.md
index 3a0867a..699b488 100644
--- a/tools/index.md
+++ b/tools/index.md
@@ -1 +1,292 @@
-Fill me out!
+# Full list of Kali tools:
+
+List
+-----------
+
+* [0trace.md](../tools/0trace.md)
+* [CAT.md](../tools/CAT.md)
+* [UATester.md](../tools/UATester.md)
+* [_template.md](../tools/_template.md)
+* [acccheck.md](../tools/acccheck.md)
+* [ace.md](../tools/ace.md)
+* [affcat.md](../tools/affcat.md)
+* [affcompare.md](../tools/affcompare.md)
+* [affconvert.md](../tools/affconvert.md)
+* [affcopy.md](../tools/affcopy.md)
+* [affcrypto.md](../tools/affcrypto.md)
+* [affdiskprint.md](../tools/affdiskprint.md)
+* [affinfo.md](../tools/affinfo.md)
+* [affsign.md](../tools/affsign.md)
+* [affstats.md](../tools/affstats.md)
+* [affuse.md](../tools/affuse.md)
+* [affverify.md](../tools/affverify.md)
+* [affxml.md](../tools/affxml.md)
+* [alive6.md](../tools/alive6.md)
+* [apache-users.md](../tools/apache-users.md)
+* [apktool.md](../tools/apktool.md)
+* [arduino.md](../tools/arduino.md)
+* [arping.md](../tools/arping.md)
+* [autopsy.md](../tools/autopsy.md)
+* [bbqsql.md](../tools/bbqsql.md)
+* [bed.md](../tools/bed.md)
+* [binwalk.md](../tools/binwalk.md)
+* [blindelephant.md](../tools/blindelephant.md)
+* [blkcalc.md](../tools/blkcalc.md)
+* [blkcat.md](../tools/blkcat.md)
+* [blkls.md](../tools/blkls.md)
+* [blkstat.md](../tools/blkstat.md)
+* [braa.md](../tools/braa.md)
+* [bulk_extractor.md](../tools/bulk_extractor.md)
+* [burpsuite.md](../tools/burpsuite.md)
+* [cachedump.md](../tools/cachedump.md)
+* [cadaver.md](../tools/cadaver.md)
+* [casefile.md](../tools/casefile.md)
+* [cdpsnarf.md](../tools/cdpsnarf.md)
+* [cge.md](../tools/cge.md)
+* [chkrootkit.md](../tools/chkrootkit.md)
+* [chntpw.md](../tools/chntpw.md)
+* [cisco-torch.md](../tools/cisco-torch.md)
+* [cmospwd.md](../tools/cmospwd.md)
+* [copy-router-config.md](../tools/copy-router-config.md)
+* [cowpatty.md](../tools/cowpatty.md)
+* [creepy.md](../tools/creepy.md)
+* [crunch.md](../tools/crunch.md)
+* [cutycapt.md](../tools/cutycapt.md)
+* [cymothoa.md](../tools/cymothoa.md)
+* [davtest.md](../tools/davtest.md)
+* [dbpwaudit.md](../tools/dbpwaudit.md)
+* [dc3dd.md](../tools/dc3dd.md)
+* [dcfldd.md](../tools/dcfldd.md)
+* [ddrescue.md](../tools/ddrescue.md)
+* [deblaze.md](../tools/deblaze.md)
+* [detect-new-ipv6.md](../tools/detect-new-ipv6.md)
+* [detect_sniffer6.md](../tools/detect_sniffer6.md)
+* [dex2jar.md](../tools/dex2jar.md)
+* [dff-gui.md](../tools/dff-gui.md)
+* [dff.md](../tools/dff.md)
+* [dictstat.md](../tools/dictstat.md)
+* [dirb.md](../tools/dirb.md)
+* [dirbuster.md](../tools/dirbuster.md)
+* [dmitry.md](../tools/dmitry.md)
+* [dnmap-client.md](../tools/dnmap-client.md)
+* [dnmap-server.md](../tools/dnmap-server.md)
+* [dnsdict6.md](../tools/dnsdict6.md)
+* [dnsenum.md](../tools/dnsenum.md)
+* [dnsmap.md](../tools/dnsmap.md)
+* [dnsrecon.md](../tools/dnsrecon.md)
+* [dnsrevenum6.md](../tools/dnsrevenum6.md)
+* [dnstracer.md](../tools/dnstracer.md)
+* [dnswalk.md](../tools/dnswalk.md)
+* [dradis.md](../tools/dradis.md)
+* [dsniff.md](../tools/dsniff.md)
+* [eapmd5pass.md](../tools/eapmd5pass.md)
+* [enumiax.md](../tools/enumiax.md)
+* [ettercap.md](../tools/ettercap.md)
+* [ewfacquire.md](../tools/ewfacquire.md)
+* [ewfacquirestream.md](../tools/ewfacquirestream.md)
+* [ewfexport.md](../tools/ewfexport.md)
+* [ewfinfo.md](../tools/ewfinfo.md)
+* [ewfverify.md](../tools/ewfverify.md)
+* [extundelete.md](../tools/extundelete.md)
+* [fcrackzip.md](../tools/fcrackzip.md)
+* [ffind.md](../tools/ffind.md)
+* [fierce.md](../tools/fierce.md)
+* [fimap.md](../tools/fimap.md)
+* [flasm.md](../tools/flasm.md)
+* [fls.md](../tools/fls.md)
+* [foremost.md](../tools/foremost.md)
+* [fping.md](../tools/fping.md)
+* [fragroute.md](../tools/fragroute.md)
+* [fragrouter.md](../tools/fragrouter.md)
+* [fsstat.md](../tools/fsstat.md)
+* [ftest.md](../tools/ftest.md)
+* [fuzz_ip6.md](../tools/fuzz_ip6.md)
+* [galleta.md](../tools/galleta.md)
+* [generic_chunked.md](../tools/generic_chunked.md)
+* [generic_listen_tcp.md](../tools/generic_listen_tcp.md)
+* [generic_send_tcp.md](../tools/generic_send_tcp.md)
+* [generic_send_udp.md](../tools/generic_send_udp.md)
+* [giskismet.md](../tools/giskismet.md)
+* [gnu-radio-companion.md](../tools/gnu-radio-companion.md)
+* [golismero.md](../tools/golismero.md)
+* [gqrx.md](../tools/gqrx.md)
+* [gr-scan.md](../tools/gr-scan.md)
+* [grabber.md](../tools/grabber.md)
+* [gsd.md](../tools/gsd.md)
+* [guymager.md](../tools/guymager.md)
+* [hash-identifier.md](../tools/hash-identifier.md)
+* [hashcat.md](../tools/hashcat.md)
+* [hexinject.md](../tools/hexinject.md)
+* [hexorbase.md](../tools/hexorbase.md)
+* [hfind.md](../tools/hfind.md)
+* [hping3.md](../tools/hping3.md)
+* [icat-sleuthkit.md](../tools/icat-sleuthkit.md)
+* [ikescan.md](../tools/ikescan.md)
+* [img_cat.md](../tools/img_cat.md)
+* [img_stat.md](../tools/img_stat.md)
+* [implementation6.md](../tools/implementation6.md)
+* [implementation6d.md](../tools/implementation6d.md)
+* [index.md](../tools/index.md)
+* [intrace.md](../tools/intrace.md)
+* [inverse_lookup6.md](../tools/inverse_lookup6.md)
+* [irpass-ass.md](../tools/irpass-ass.md)
+* [irpass-cdp.md](../tools/irpass-cdp.md)
+* [istat.md](../tools/istat.md)
+* [javasnoop.md](../tools/javasnoop.md)
+* [jcat.md](../tools/jcat.md)
+* [jigsaw.md](../tools/jigsaw.md)
+* [jls.md](../tools/jls.md)
+* [john.md](../tools/john.md)
+* [joomscan.md](../tools/joomscan.md)
+* [keepnote.md](../tools/keepnote.md)
+* [kismet.md](../tools/kismet.md)
+* [lbd.md](../tools/lbd.md)
+* [lsadump.md](../tools/lsadump.md)
+* [lynis.md](../tools/lynis.md)
+* [mactime-sleuthkit.md](../tools/mactime-sleuthkit.md)
+* [magicrescue.md](../tools/magicrescue.md)
+* [maltego.md](../tools/maltego.md)
+* [maskgen.md](../tools/maskgen.md)
+* [md5deep.md](../tools/md5deep.md)
+* [mdb-dump.md](../tools/mdb-dump.md)
+* [mdb-export.md](../tools/mdb-export.md)
+* [mdb-parsecsv.md](../tools/mdb-parsecsv.md)
+* [mdb-sql.md](../tools/mdb-sql.md)
+* [mdb-tables.md](../tools/mdb-tables.md)
+* [mdk3.md](../tools/mdk3.md)
+* [merge-router-config.md](../tools/merge-router-config.md)
+* [metagoofil.md](../tools/metagoofil.md)
+* [mfcuk.md](../tools/mfcuk.md)
+* [miranda.md](../tools/miranda.md)
+* [missidentify.md](../tools/missidentify.md)
+* [mmcat.md](../tools/mmcat.md)
+* [mmls.md](../tools/mmls.md)
+* [mmstat.md](../tools/mmstat.md)
+* [nbtscan.md](../tools/nbtscan.md)
+* [ncat.md](../tools/ncat.md)
+* [netdiscover.md](../tools/netdiscover.md)
+* [netmask.md](../tools/netmask.md)
+* [nikto.md](../tools/nikto.md)
+* [nmap.md](../tools/nmap.md)
+* [oclhashcat.md](../tools/oclhashcat.md)
+* [ocs.md](../tools/ocs.md)
+* [ohrwurm.md](../tools/ohrwurm.md)
+* [ollydbg.md](../tools/ollydbg.md)
+* [onesixtyone.md](../tools/onesixtyone.md)
+* [openvas-check-setup.md](../tools/openvas-check-setup.md)
+* [openvas-feed-update.md](../tools/openvas-feed-update.md)
+* [openvas-setup.md](../tools/openvas-setup.md)
+* [openvas-start.md](../tools/openvas-start.md)
+* [openvas-stop.md](../tools/openvas-stop.md)
+* [ophcrack-cli.md](../tools/ophcrack-cli.md)
+* [ophcrack.md](../tools/ophcrack.md)
+* [oscanner.md](../tools/oscanner.md)
+* [owasp-zap.md](../tools/owasp-zap.md)
+* [p0f.md](../tools/p0f.md)
+* [padbuster.md](../tools/padbuster.md)
+* [paros.md](../tools/paros.md)
+* [pasco.md](../tools/pasco.md)
+* [passive_discovery6.md](../tools/passive_discovery6.md)
+* [pdf-parser.md](../tools/pdf-parser.md)
+* [pdgmail.md](../tools/pdgmail.md)
+* [peepdf.md](../tools/peepdf.md)
+* [pev.md](../tools/pev.md)
+* [plecost.md](../tools/plecost.md)
+* [policygen.md](../tools/policygen.md)
+* [powerfuzzer.md](../tools/powerfuzzer.md)
+* [powersploit.md](../tools/powersploit.md)
+* [proxystrike.md](../tools/proxystrike.md)
+* [pwdump.md](../tools/pwdump.md)
+* [pyrit.md](../tools/pyrit.md)
+* [rabin2.md](../tools/rabin2.md)
+* [radare2.md](../tools/radare2.md)
+* [ragg2.md](../tools/ragg2.md)
+* [rahash2.md](../tools/rahash2.md)
+* [rainbowcrack.md](../tools/rainbowcrack.md)
+* [rasm2.md](../tools/rasm2.md)
+* [rax2.md](../tools/rax2.md)
+* [rcracki_mt.md](../tools/rcracki_mt.md)
+* [readpst.md](../tools/readpst.md)
+* [reaver.md](../tools/reaver.md)
+* [recordmydesktop.md](../tools/recordmydesktop.md)
+* [recoverjpeg.md](../tools/recoverjpeg.md)
+* [recstudio.md](../tools/recstudio.md)
+* [reglookup.md](../tools/reglookup.md)
+* [regripper.md](../tools/regripper.md)
+* [rifiuti.md](../tools/rifiuti.md)
+* [rifiuti2.md](../tools/rifiuti2.md)
+* [rsmangler.md](../tools/rsmangler.md)
+* [rtl_adsb.md](../tools/rtl_adsb.md)
+* [rtl_fm.md](../tools/rtl_fm.md)
+* [rtl_tcp.md](../tools/rtl_tcp.md)
+* [rtl_test.md](../tools/rtl_test.md)
+* [safecopy.md](../tools/safecopy.md)
+* [samdump2.md](../tools/samdump2.md)
+* [scalpel.md](../tools/scalpel.md)
+* [scrounge-ntfs.md](../tools/scrounge-ntfs.md)
+* [sfuzz.md](../tools/sfuzz.md)
+* [sidguess.md](../tools/sidguess.md)
+* [siege.md](../tools/siege.md)
+* [sigfind.md](../tools/sigfind.md)
+* [siparmyknife.md](../tools/siparmyknife.md)
+* [sipcrack.md](../tools/sipcrack.md)
+* [skipfish.md](../tools/skipfish.md)
+* [smtp-user-enum.md](../tools/smtp-user-enum.md)
+* [snmpcheck.md](../tools/snmpcheck.md)
+* [socat.md](../tools/socat.md)
+* [sorter.md](../tools/sorter.md)
+* [sqldict.md](../tools/sqldict.md)
+* [sqlmap.md](../tools/sqlmap.md)
+* [sqlninja.md](../tools/sqlninja.md)
+* [sqlsus.md](../tools/sqlsus.md)
+* [srch_strings.md](../tools/srch_strings.md)
+* [sslcaudit.md](../tools/sslcaudit.md)
+* [ssldump.md](../tools/ssldump.md)
+* [sslh.md](../tools/sslh.md)
+* [sslscan.md](../tools/sslscan.md)
+* [sslsniff.md](../tools/sslsniff.md)
+* [sslstrip.md](../tools/sslstrip.md)
+* [sslyze.md](../tools/sslyze.md)
+* [stunnel4.md](../tools/stunnel4.md)
+* [swaks.md](../tools/swaks.md)
+* [tcpflow.md](../tools/tcpflow.md)
+* [thc-hydra.md](../tools/thc-hydra.md)
+* [thc-pptp-bruter.md](../tools/thc-pptp-bruter.md)
+* [thc-ssl-dos.md](../tools/thc-ssl-dos.md)
+* [thcping6.md](../tools/thcping6.md)
+* [theharvester.md](../tools/theharvester.md)
+* [tlssled.md](../tools/tlssled.md)
+* [tnscmd10g.md](../tools/tnscmd10g.md)
+* [trace6.md](../tools/trace6.md)
+* [truecrack.md](../tools/truecrack.md)
+* [truecrypt.md](../tools/truecrypt.md)
+* [tsk_comparedir.md](../tools/tsk_comparedir.md)
+* [tsk_gettimes.md](../tools/tsk_gettimes.md)
+* [tsk_loaddb.md](../tools/tsk_loaddb.md)
+* [tsk_recover.md](../tools/tsk_recover.md)
+* [twofi.md](../tools/twofi.md)
+* [u3-pwn.md](../tools/u3-pwn.md)
+* [unix-privesc-check.md](../tools/unix-privesc-check.md)
+* [urlcrazy.md](../tools/urlcrazy.md)
+* [vega.md](../tools/vega.md)
+* [vinetto.md](../tools/vinetto.md)
+* [volafox.md](../tools/volafox.md)
+* [volatility.md](../tools/volatility.md)
+* [w3af.md](../tools/w3af.md)
+* [wafw00f.md](../tools/wafw00f.md)
+* [wapti.md](../tools/wapti.md)
+* [webscarab.md](../tools/webscarab.md)
+* [webshag-gui.md](../tools/webshag-gui.md)
+* [webslayer.md](../tools/webslayer.md)
+* [websploit.md](../tools/websploit.md)
+* [weevely.md](../tools/weevely.md)
+* [wfuzz.md](../tools/wfuzz.md)
+* [whatweb.md](../tools/whatweb.md)
+* [wifite.md](../tools/wifite.md)
+* [wireshark.md](../tools/wireshark.md)
+* [wol-e.md](../tools/wol-e.md)
+* [wpscan.md](../tools/wpscan.md)
+* [xprobe2.md](../tools/xprobe2.md)
+* [xsser.md](../tools/xsser.md)
+* [yersinia.md](../tools/yersinia.md)
+* [zenmap.md](../tools/zenmap.md)