final 1

fixed nearly everything. need to add themes
final 2

themes added and errors fixed