Implement Majoo theme, small fixes