Changed: GCI to RAW and touch/lcd to watch library