Custom theme
Rework draft