improve CSS and add additional theme options