More fabric8 theme work