make theme image saving not a subtask