More updates for Textbox including updates needed for the Textbox/themes.