added theme checking
handle numpad enter as return