Fixed & Moved theme/settings to package form. Much neater.