Renamings, shuffling stuff over to WIDGET-OPTIONS