Refactor CSS and redo the custom theme option block