The article critically reviews the Incongruity Theory of Humor reaching the conclusion that it has to be essentially restructured. Leaving aside the question of scope, it is shown that the theory is inadequate even for those cases for which it is thought to be especially well suited – that it cannot account either for the pleasurable effect of jokes or for aesthetic pleasure. I argue that it is the resolution of the incongruity rather than its mere apprehension, which is that source of the amusement or aesthetic delight. Once the theory is thus restructured, the Superiority Theory of Humor and the Relief Theory can be seen as supplementary to it.