Fix term options for screen
Add bundles