Apply recent updates from original repo
Better class naming
Fix contextual color for textarea