Where is the switch for the trunk lid that senses if it's open or not?
Often after I open the trunk and close it the trunk light doesn't switch off and when I press the lock button the car beeps twice.

Also the trunk takes a bit of force to close

I have played with another's members trunk that did not close. There was something weird going on with the rest of his car. At least u got it to close and lock without having to slam it for times.
The is adjustment in the lower part of the catch. On the boot lip. They are usually as tight as heel and hard to move.
If you are going to have a play. Remove the plastics and Mark where the catch is now. In case you make it worse.
Not sure where the switch is. It may be part of the catch.

Switch is a negative ground switch on the boot latch, you will see a wire going to the latch itself

Maybe check the state of the wiring loom on the side of the boot lid right hand hinge. Mine had cracked through the insulation on some of the wires where it is continually bent backwards and forwards during opening and closing. I cut out a very short length of the damaged wires, reterminated them and routed the cabling to support the area that had been subjected to the most bending and moved a loom clip to provide bending over a longer length of the loom, rather that just concentrated in a small length.

Ken

I fixed a KH with this problem today. Light closing it would either not close the lock or when it did close, not enough to switch the boot light off. Loosened the catch (the part on the body, not the boot) and knocked it up a bit. Mission success