Merged CH Extras into main theme