theme: updating theme and making conf consistent