New update to generic theme

Sorry for not making more commits...