Revert "Revert "Updated with theme""

This reverts commit 54ad343c87abd9932556c0f25dc32f2e9e1dd334.