updated theme from Richard