Added some theme stuff, messed around with more stuff in the fragments