added themes and simplified sass organization