Webkitext refactoring