updated theme widgets
updated theme widgets
merge