Added basic theme & pack support