Yet improving theme api