Finish up and fix #1299 for fabric8 and Red Hat themes