Improve theme customizer options and resolves #53