Merged branches & setup theming