Updated theme to fit my needs