Moved some stuff around
Added a new theme