Themeing + more bug fixes + back button