improve pb theme

This reverts commit 3cc8c87ce8c61d52e5c8992b28880f0d5dc5a0ff.