Comprehensive expansion and modification of the joinery