Rebase core handlers + Fix array merging (everywhere) + Fix box classes + Fix class aliases