Re-design keyword system