Split/ Merging Fighting Styles

Yo, How would I go about making skills for Rokushiki (non-DF) and my Frog fruit? I plan to merge the two eventually, so would I split the two between the non-DF and DF sections, or would I just make it under the DF and have the Basic Rokushiki and modified Rokushiki techniques split amidst things? Would I just make the modified DF Rokushiki techniques my named techniques and say that My character has learned the basic 6 rokushiki techniques? This new technique system is just a bit confusing from what I'm used to.

Your fighting style encompasses everything that you use in combat. If you were a rokushiki-only user, then your fighting style would just be rokushiki. If you were a devil fruit only user, then your fighting style would only involve your devil fruit. The logic behind the current system is that your fighting style should include any and all types of special techniques that you use in combat. If you combine rokushiki with your devil fruit powers, then that is what your fighting style is. Since it's not one or the other, there is no point in splitting the two into separate pages, only further muddling the creation process.

TL;DR You don't need two different skill pages for your techniques. Just combine all of them under one. Skim through some of the approved ones for guidance and reference.