fix script errors
Add theme setting to storage