merge latest layout+theming