Added keyword functionality and themeing