Cleaning up theme related stuff.
Made save and save as fit better.