Complete redo

New theme, delete function, minor bug fixes.