-\usepackage{booktabs} % For nicer looking tables
-\usepackage[dvipdfm]{hyperref} % For a clickable toc and nice autorefs
+\usepackage{tabu} % For nicer automatic spanning tables
+\usepackage{float} % For better table and figure placement
+\usepackage[all]{xypic} % For nice diagrams
+\usepackage{listings} % For source code listings