I suggest going back and reading older versions of these tales, so you know what you are working with.
Disney has trademarked some words and phrases that might not be obvious. I would avoid any characters or names that originated with Disney. With Tangled and many of the other newer Disney films, much of the plot belongs to Disney, so you may be running afoul of their copyright and trademarks. It's mostly the old classic Disney films that stuck to the fairy tale plots.
I thought Rapunzel was horror, lol. The prince gets her pregnant (note: the useless jerk doesn't help her escape). The witch tosses him in the thorns, which blinds him, so he's wandering around aimlessly. Then she turns Rapunzel into a bird. The two reunite eventually, but yay?
A literature note: The Grimm brothers didn't write fairy tales. They collected and edited folk tales from a number of sources (men and women). Jacob was a scholar, but Wilhelm began to understand the marketability of fairy tales and edited out many of the more horrifying parts, over the following editions. Jack Zipes did a translation of the early editions, which was published in 2014.
Perrault is another collector/editor, but he rewrote tales in flowery style for the French aristocracy. On the whole, his tales are lighter in tone, but he doesn't save Little Red Riding Hood because he sees the tale as an analogy for seduction: "Children, especially attractive, well bred young ladies, should never talk to strangers, for if they should do so, they may well provide dinner for a wolf. I say "wolf," but there are various kinds of wolves. There are also those who are charming, quiet, polite, unassuming, complacent, and sweet, who pursue young women at home and in the streets. And unfortunately, it is these gentle wolves who are the most dangerous ones of all."
Andersen, on the other hand, did write fairy tales. I think the man was depressed; so many tragic endings.