Updated with SASS theme