Update for loki

Inlucde updates for loki from rmcc and change DPI to 380 (personal preference)