Extracted theme to separate repo