safestrap theme updates based on TWRP changes

Change-Id: Ic6b84d491a9f0825b02b1a941183c3e9c61f32c0