Unit cleanup and apply theme