Rebuilt KeywordSwapDialog, removed unneeded library