Fixes Single Asset Downloads

Performing theme-manipulate download filename would create the file but wouldn't actually pull the data down. This fixes that issue.

Also includes patches to remove a bit of code duplication.