squashed commits from theme's parent repo