almost done with theme
some more stuff