Big overhaul, ran theme check plugin, made code & style fixes throughout