added HTCGenericRIL for correct STK handling (2/2)
Changes to include Stk and Theme engine stuff