improve material theme

currently its not backward-compatible