RBP 2017 screws

Hi all,

My RBP 2017 is now out of warranty and I have plans to recondition the laptop. The battery expanded and warped the shell a bit. Battery removed and now runs on AC power nicely. This machine has been running macOS 10.13.6 and serves the role of “Mac” very well.
Now at the nearly 3 year mark I have plans to retrofit the laptop to fit my needs for a few more years. It will still only run macOS. The laptop display came with a few dead pixels and from the battery expansion the keyboard body was affected.
The plan is to take the entire machine apart. A replacement keyboard body and bottom cover will be Cerakote treated the silk black color of the RBP. I could take the screws from the present machine when transferring the logic board, however would like to also replace the screws.
So, now my question. I need a list of type of screw (M2 or M3) and length of the screws used during assembly. Would like to know the screw type and length used to attach the display to the keyboard body,

I can do this with calipers and such but would like to hear from Razer first. This will be done and be a remanufacture of this iconic machine.