As the remove default theme still needs some time I wanted these changes not to be obsolete and pulled them from the original MR