Feature/basic theme

fixes