Make custom theme more generic and easier to override. Thanks Damien Mandrioli (IBM CCLA).