[Issue #188] [MC] fixes merge conflicts with Projects_Theme