Selecting none and use theme mod so themes can change
Comment cleanup