moving themes to end so service restart will work