Separated Themes to different projects and lots of improvements