Feature/theme makeover