Going the CLI approach this time
Some changes in the themes definition