Touch Wake implementation

(Code cleanup by AndiP)