some more bugs, reskin, attempt at theming, etc