Merged goodies from the DraculaFriendly version