changed highlighting, updated js, raw