Added ms to Themes and fixed trailer saving
Merge pull request #86 from msavazzi/master

Added ms to Themes and fixed trailer saving