Add support for #1283, refactor fabric8 theme accordingly