updated with more uikits