updated with theme, need to add chagnes to font color