Theme working, lots of errors solved