diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index d6da4499..00000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "source/sys-clk/overlay/lib/libultrahand"]
-	path = source/sys-clk/overlay/lib/libultrahand
-	url = https://github.com/ppkantorski/libultrahand.git
diff --git a/Source/sys-clk/build.sh b/Source/sys-clk/build.sh
index e429231b..05cc45c0 100644
--- a/Source/sys-clk/build.sh
+++ b/Source/sys-clk/build.sh
@@ -20,16 +20,9 @@ make -j$CORES
 popd > /dev/null
 
 mkdir -p "$DIST_DIR/atmosphere/contents/$TITLE_ID/flags"
-cp -vf "$ROOT_DIR/sysmodule/out/sys-clk.nsp" "$DIST_DIR/atmosphere/contents/$TITLE_ID/exefs.nsp"
+cp -vf "$ROOT_DIR/sysmodule/out/horizon-oc.nsp" "$DIST_DIR/atmosphere/contents/$TITLE_ID/exefs.nsp"
 >"$DIST_DIR/atmosphere/contents/$TITLE_ID/flags/boot2.flag"
 cp -vf "$ROOT_DIR/sysmodule/toolbox.json" "$DIST_DIR/atmosphere/contents/$TITLE_ID/toolbox.json"
-echo "*** manager ***"
-pushd "$ROOT_DIR/manager"
-make -j$CORES
-popd > /dev/null
-
-mkdir -p "$DIST_DIR/switch"
-cp -vf "$ROOT_DIR/manager/horizon-oc-manager.nro" "$DIST_DIR/switch/horizon-oc-manager.nro"
 
 echo "*** overlay ***"
 pushd "$ROOT_DIR/overlay"
diff --git a/Source/sys-clk/manager/.gitignore b/Source/sys-clk/manager/.gitignore
deleted file mode 100644
index f6dffc8e..00000000
--- a/Source/sys-clk/manager/.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-.*/
-build/
-build.nx/
-*~
-*.bak
-*.nro
-*.nacp
-*.elf
-.vscode
diff --git a/Source/sys-clk/manager/LICENSE b/Source/sys-clk/manager/LICENSE
deleted file mode 100644
index f288702d..00000000
--- a/Source/sys-clk/manager/LICENSE
+++ /dev/null
@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<https://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<https://www.gnu.org/licenses/why-not-lgpl.html>.
diff --git a/Source/sys-clk/manager/Makefile b/Source/sys-clk/manager/Makefile
deleted file mode 100644
index bcf2b20d..00000000
--- a/Source/sys-clk/manager/Makefile
+++ /dev/null
@@ -1,245 +0,0 @@
-#---------------------------------------------------------------------------------
-.SUFFIXES:
-#---------------------------------------------------------------------------------
-
-ifeq ($(strip $(DEVKITPRO)),)
-$(error "Please set DEVKITPRO in your environment. export DEVKITPRO=<path to>/devkitpro")
-endif
-
-TOPDIR ?= $(CURDIR)
-include $(DEVKITPRO)/libnx/switch_rules
-
-#---------------------------------------------------------------------------------
-# TARGET is the name of the output
-# BUILD is the directory where object files & intermediate files will be placed
-# SOURCES is a list of directories containing source code
-# DATA is a list of directories containing data files
-# INCLUDES is a list of directories containing header files
-# ROMFS is the directory containing data to be added to RomFS, relative to the Makefile (Optional)
-#
-# NO_ICON: if set to anything, do not use icon.
-# NO_NACP: if set to anything, no .nacp file is generated.
-# APP_TITLE is the name of the app stored in the .nacp file (Optional)
-# APP_AUTHOR is the author of the app stored in the .nacp file (Optional)
-# APP_VERSION is the version of the app stored in the .nacp file (Optional)
-# APP_TITLEID is the titleID of the app stored in the .nacp file (Optional)
-# ICON is the filename of the icon (.jpg), relative to the project folder.
-#   If not set, it attempts to use one of the following (in this order):
-#     - <Project name>.jpg
-#     - icon.jpg
-#     - <libnx folder>/default_icon.jpg
-#
-# CONFIG_JSON is the filename of the NPDM config file (.json), relative to the project folder.
-#   If not set, it attempts to use one of the following (in this order):
-#     - <Project name>.json
-#     - config.json
-#   If a JSON file is provided or autodetected, an ExeFS PFS0 (.nsp) is built instead
-#   of a homebrew executable (.nro). This is intended to be used for sysmodules.
-#   NACP building is skipped as well.
-#---------------------------------------------------------------------------------
-TARGET		:=	horizon-oc-manager
-BUILD		:=	build.nx
-SOURCES		:=	src ../common/src ../common/src/client
-RESOURCES	:=	resources
-DATA		:=	data
-INCLUDES	:=	../common/include
-APP_TITLE	:=	Horizon OC Manager
-APP_AUTHOR	:=	Souldbminer and RetroNX Team
-
-ROMFS				:=	$(BUILD)/romfs
-BOREALIS_PATH		:=	lib/borealis
-BOREALIS_RESOURCES	:=	romfs:/borealis/
-APP_RESOURCES		:=	romfs:/
-
-#---------------------------------------------------------------------------------
-# version control constants
-#---------------------------------------------------------------------------------
-TARGET_VERSION	:= $(shell git describe --dirty --always --tags)
-APP_VERSION		:= $(TARGET_VERSION)
-
-#---------------------------------------------------------------------------------
-# options for code generation
-#---------------------------------------------------------------------------------
-ARCH	:=	-march=armv8-a+crc+crypto -mtune=cortex-a57 -mtp=soft -fPIE
-
-CFLAGS	:=	-g -Wall -O2 -ffunction-sections \
-			$(ARCH) $(DEFINES)
-
-CFLAGS	+=	$(INCLUDE) -D__SWITCH__ \
-			-DAPP_TITLE="\"$(APP_TITLE)\"" \
-			-DBOREALIS_RESOURCES="\"$(BOREALIS_RESOURCES)\"" \
-			-DAPP_RESOURCES="\"$(APP_RESOURCES)\""
-
-CXXFLAGS	:= $(CFLAGS) -std=c++1z
-
-ASFLAGS	:=	-g $(ARCH)
-LDFLAGS	=	-specs=$(DEVKITPRO)/libnx/switch.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
-
-LIBS	:= -lnx -lm
-
-#---------------------------------------------------------------------------------
-# list of directories containing libraries, this must be the top level containing
-# include and lib
-#---------------------------------------------------------------------------------
-LIBDIRS	:= $(PORTLIBS) $(LIBNX)
-
-include $(TOPDIR)/$(BOREALIS_PATH)/library/borealis.mk
-
-#---------------------------------------------------------------------------------
-# no real need to edit anything past this point unless you need to add additional
-# rules for different file extensions
-#---------------------------------------------------------------------------------
-ifneq ($(BUILD),$(notdir $(CURDIR)))
-#---------------------------------------------------------------------------------
-
-export OUTPUT	:=	$(CURDIR)/$(TARGET)
-export TOPDIR	:=	$(CURDIR)
-
-export VPATH	:=	$(foreach dir,$(SOURCES),$(CURDIR)/$(dir)) \
-			$(foreach dir,$(DATA),$(CURDIR)/$(dir))
-
-export DEPSDIR	:=	$(CURDIR)/$(BUILD)
-
-CFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.c)))
-CPPFILES	:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp)))
-SFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s)))
-BINFILES	:=	$(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.*)))
-
-#---------------------------------------------------------------------------------
-# use CXX for linking C++ projects, CC for standard C
-#---------------------------------------------------------------------------------
-ifeq ($(strip $(CPPFILES)),)
-#---------------------------------------------------------------------------------
-	export LD	:=	$(CC)
-#---------------------------------------------------------------------------------
-else
-#---------------------------------------------------------------------------------
-	export LD	:=	$(CXX)
-#---------------------------------------------------------------------------------
-endif
-#---------------------------------------------------------------------------------
-
-export OFILES_BIN	:=	$(addsuffix .o,$(BINFILES))
-export OFILES_SRC	:=	$(CPPFILES:.cpp=.o) $(CFILES:.c=.o) $(SFILES:.s=.o)
-export OFILES 	:=	$(OFILES_BIN) $(OFILES_SRC)
-export HFILES_BIN	:=	$(addsuffix .h,$(subst .,_,$(BINFILES)))
-
-export INCLUDE	:=	$(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \
-			$(foreach dir,$(LIBDIRS),-I$(dir)/include) \
-			-I$(CURDIR)/$(BUILD)
-
-export LIBPATHS	:=	$(foreach dir,$(LIBDIRS),-L$(dir)/lib)
-
-ifeq ($(strip $(CONFIG_JSON)),)
-	jsons := $(wildcard *.json)
-	ifneq (,$(findstring $(TARGET).json,$(jsons)))
-		export APP_JSON := $(TOPDIR)/$(TARGET).json
-	else
-		ifneq (,$(findstring config.json,$(jsons)))
-			export APP_JSON := $(TOPDIR)/config.json
-		endif
-	endif
-else
-	export APP_JSON := $(TOPDIR)/$(CONFIG_JSON)
-endif
-
-ifeq ($(strip $(ICON)),)
-	icons := $(wildcard *.jpg)
-	ifneq (,$(findstring $(TARGET).jpg,$(icons)))
-		export APP_ICON := $(TOPDIR)/$(TARGET).jpg
-	else
-		ifneq (,$(findstring icon.jpg,$(icons)))
-			export APP_ICON := $(TOPDIR)/icon.jpg
-		endif
-	endif
-else
-	export APP_ICON := $(TOPDIR)/$(ICON)
-endif
-
-ifeq ($(strip $(NO_ICON)),)
-	export NROFLAGS += --icon=$(APP_ICON)
-endif
-
-ifeq ($(strip $(NO_NACP)),)
-	export NROFLAGS += --nacp=$(CURDIR)/$(TARGET).nacp
-endif
-
-ifneq ($(APP_TITLEID),)
-	export NACPFLAGS += --titleid=$(APP_TITLEID)
-endif
-
-ifneq ($(ROMFS),)
-	export NROFLAGS += --romfsdir=$(CURDIR)/$(ROMFS)
-endif
-
-.PHONY: $(BUILD) $(ROMFS) clean all
-
-#---------------------------------------------------------------------------------
-all: $(BUILD)
-
-$(ROMFS):
-	@[ -d $@ ] || mkdir -p $@
-	@echo Merging ROMFS...
-	@cp -ruf $(CURDIR)/$(BOREALIS_PATH)/resources/. $(CURDIR)/$(ROMFS)/borealis/
-	@cp -ruf $(CURDIR)/$(RESOURCES)/. $(CURDIR)/$(ROMFS)/
-
-$(BUILD): $(ROMFS)
-	@[ -d $@ ] || mkdir -p $@
-	@MSYS2_ARG_CONV_EXCL="-D;$(MSYS2_ARG_CONV_EXCL)" $(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
-
-#---------------------------------------------------------------------------------
-clean:
-	@echo clean ...
-ifeq ($(strip $(APP_JSON)),)
-	@rm -fr $(BUILD) $(TARGET).nro $(TARGET).nacp $(TARGET).elf
-else
-	@rm -fr $(BUILD) $(TARGET).nsp $(TARGET).nso $(TARGET).npdm $(TARGET).elf
-endif
-
-
-#---------------------------------------------------------------------------------
-else
-.PHONY:	all
-
-DEPENDS	:=	$(OFILES:.o=.d)
-
-#---------------------------------------------------------------------------------
-# main targets
-#---------------------------------------------------------------------------------
-ifeq ($(strip $(APP_JSON)),)
-
-all	:	$(OUTPUT).nro
-
-ifeq ($(strip $(NO_NACP)),)
-$(OUTPUT).nro	:	$(OUTPUT).elf $(OUTPUT).nacp
-else
-$(OUTPUT).nro	:	$(OUTPUT).elf
-endif
-
-else
-
-all	:	$(OUTPUT).nsp
-
-$(OUTPUT).nsp	:	$(OUTPUT).nso $(OUTPUT).npdm
-
-$(OUTPUT).nso	:	$(OUTPUT).elf
-
-endif
-
-$(OUTPUT).elf	:	$(OFILES)
-
-$(OFILES_SRC)	: $(HFILES_BIN)
-
-#---------------------------------------------------------------------------------
-# you need a rule like this for each extension you use as binary data
-#---------------------------------------------------------------------------------
-%.bin.o	%_bin.h :	%.bin
-#---------------------------------------------------------------------------------
-	@echo $(notdir $<)
-	@$(bin2o)
-
--include $(DEPENDS)
-
-#---------------------------------------------------------------------------------------
-endif
-#---------------------------------------------------------------------------------------
diff --git a/Source/sys-clk/manager/README.md b/Source/sys-clk/manager/README.md
deleted file mode 100644
index 62d38c81..00000000
--- a/Source/sys-clk/manager/README.md
+++ /dev/null
@@ -1 +0,0 @@
-# sys-clk-manager
\ No newline at end of file
diff --git a/Source/sys-clk/manager/icon.jpg b/Source/sys-clk/manager/icon.jpg
deleted file mode 100644
index b771a68e..00000000
Binary files a/Source/sys-clk/manager/icon.jpg and /dev/null differ
diff --git a/Source/sys-clk/manager/lib/borealis/.clang-format b/Source/sys-clk/manager/lib/borealis/.clang-format
deleted file mode 100644
index 21b7753d..00000000
--- a/Source/sys-clk/manager/lib/borealis/.clang-format
+++ /dev/null
@@ -1,21 +0,0 @@
----
-AccessModifierOffset: -2
-AlignConsecutiveAssignments: 'true'
-BasedOnStyle: WebKit
-BreakBeforeBraces: Allman
-IncludeBlocks: Regroup
-IncludeCategories: 
-  - Regex: '^<borealis/.*\.hpp>'
-    Priority: 2
-  - Regex: '^<.*\.h>'
-    Priority: 1
-  - Regex: '^<.*'
-    Priority: 2
-  - Regex: '.*'
-    Priority: 3
-IndentCaseLabels: 'true'
-PointerAlignment: Left
-SortIncludes: 'true'
-Standard: Cpp11
-
-...
diff --git a/Source/sys-clk/manager/lib/borealis/.gitattributes b/Source/sys-clk/manager/lib/borealis/.gitattributes
deleted file mode 100644
index 27173d11..00000000
--- a/Source/sys-clk/manager/lib/borealis/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-*.glsl text eol=lf
diff --git a/Source/sys-clk/manager/lib/borealis/.gitignore b/Source/sys-clk/manager/lib/borealis/.gitignore
deleted file mode 100644
index ac025a5b..00000000
--- a/Source/sys-clk/manager/lib/borealis/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-.*/
-build/
-build.nx/
-*~
-*.bak
-*.nro
-*.nacp
-*.elf
-.vscode
-builddir
diff --git a/Source/sys-clk/manager/lib/borealis/.gitrepo b/Source/sys-clk/manager/lib/borealis/.gitrepo
deleted file mode 100644
index 5e248275..00000000
--- a/Source/sys-clk/manager/lib/borealis/.gitrepo
+++ /dev/null
@@ -1,12 +0,0 @@
-; DO NOT EDIT (unless you know what you are doing)
-;
-; This subdirectory is a git "subrepo", and this file is maintained by the
-; git-subrepo command. See https://github.com/git-commands/git-subrepo#readme
-;
-[subrepo]
-	remote = https://github.com/natinusala/borealis
-	branch = master
-	commit = 2ec4957301f702635feac64111dcd212d2a37ec6
-	parent = ec9981362c84ff6d44bb574f311f1d994dc80d9c
-	method = rebase
-	cmdver = 0.4.0
diff --git a/Source/sys-clk/manager/lib/borealis/COPYING b/Source/sys-clk/manager/lib/borealis/COPYING
deleted file mode 100644
index 69a91e84..00000000
--- a/Source/sys-clk/manager/lib/borealis/COPYING
+++ /dev/null
@@ -1,17 +0,0 @@
-Copyright (c) 2019 fincs
-
-This software is provided 'as-is', without any express or implied
-warranty. In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
diff --git a/Source/sys-clk/manager/lib/borealis/LICENSE b/Source/sys-clk/manager/lib/borealis/LICENSE
deleted file mode 100644
index f288702d..00000000
--- a/Source/sys-clk/manager/lib/borealis/LICENSE
+++ /dev/null
@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<https://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<https://www.gnu.org/licenses/why-not-lgpl.html>.
diff --git a/Source/sys-clk/manager/lib/borealis/README.md b/Source/sys-clk/manager/lib/borealis/README.md
deleted file mode 100644
index 8df849ad..00000000
--- a/Source/sys-clk/manager/lib/borealis/README.md
+++ /dev/null
@@ -1,65 +0,0 @@
-# borealis
-
-Hardware accelerated, Nintendo Switch inspired UI library for PC and Nintendo Switch. Powered by nanovg. Skeleton based on the [hybrid glfw app](https://github.com/fincs/hybrid_app) by fincs.
-
-The library is still in early development and WILL lack features and contain bugs. Feel free to report them in the issues, or make a pull request if you happen to fix some.
-
-You can see the planned features in the Projects tab.
-
-Documentation is available [right here](https://github.com/natinusala/borealis/wiki). Warning: may not be up to date.
-
-## Building the example for Switch
-
-To build for Switch, a standard development environment must first be set up. In order to do so, [refer to the Getting Started guide](https://devkitpro.org/wiki/Getting_Started).
-
-```bash
-(sudo) (dkp-)pacman -S switch-glfw switch-mesa switch-glm
-make -j
-nxlink -s borealis_example.nro
-```
-
-## Building the example for PC
-
-To build for PC, the following components are required:
-
-- meson/ninja build system
-- A C++ compiler supporting the C++17 standard
-- GLFW version 3.3 or higher (as a static library)
-- GLM version 0.9.8 or higher
-
-Please refer to the usual sources of information for your particular operating system. Usually the commands needed to build this project will look like this:
-
-```bash
-meson build
-ninja -C build
-./build/borealis_example
-```
-
-Also, please note that the `resources` folder must be available in the working directory, otherwise the program will fail to find the shaders.
-
-### Building the example for Windows using msys2
-
-msys2 provides all packages needed to build this project:
-
-```bash
-pacman -S mingw-w64-x86_64-gcc mingw-w64-x86_64-meson mingw-w64-x86_64-ninja mingw-w64-x86_64-pkg-config mingw-w64-x86_64-glfw mingw-w64-x86_64-glm
-meson build
-ninja -C build
-./build/borealis_example
-```
-
-### Including in your project (TL;DR: see the example makefile in this repo)
-0. Your project must be built as C++17 (`-std=c++1z`). You also need to remove `-fno-rtti` and `-fno-exceptions` if you have them
-1. Use a submodule (or even better, a [subrepo](https://github.com/ingydotnet/git-subrepo)) to clone this repository in your project
-2. Copy the `resources` folder to the root of your project
-3. For PC (meson):
-    1. take a standard meson file
-    2. use `subdir` to import the library folder
-    3. use the `borealis_files`, `borealis_dependencies` and `borealis_include` variables for respectively objects to build, dependencies (glfw...) and includes directory
-    4. add a `BOREALIS_RESOURCES` define pointing to the resources folder at runtime (so `resources`)
-4. For Switch:
-    1. take a standard homebrew makefile
-    2. add a `BOREALIS_PATH` variable containing the subfolder you put the library in
-    3. use `include` to load `borealis.mk` (after `LIBDIRS` and `BOREALIS_PATH`)
-    4. set `ROMFS` to the resources folder
-    5. add a `BOREALIS_RESOURCES` define pointing to the resources folder at runtime (so `romfs:/`)
diff --git a/Source/sys-clk/manager/lib/borealis/example/main.cpp b/Source/sys-clk/manager/lib/borealis/example/main.cpp
deleted file mode 100644
index bbc19239..00000000
--- a/Source/sys-clk/manager/lib/borealis/example/main.cpp
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
-    Borealis, a Nintendo Switch UI Library
-    Copyright (C) 2019-2020  natinusala
-    Copyright (C) 2019  p-sam
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <borealis.hpp>
-#include <string>
-
-#include "sample_installer_page.hpp"
-#include "sample_loading_page.hpp"
-
-std::vector<std::string> NOTIFICATIONS = {
-    "You have cool hair",
-    "I like your shoes",
-    "borealis is powered by nanovg",
-    "The Triforce is an inside job",
-    "Pozznx will trigger in one day and twelve hours",
-    "Aurora Borealis? At this time of day, at this time of year, in this part of the gaming market, located entirely within your Switch?!",
-    "May I see it?",
-    "Hmm, Steamed Hams!"
-};
-
-int main(int argc, char* argv[])
-{
-    // Init the app
-    brls::Logger::setLogLevel(brls::LogLevel::DEBUG);
-
-    if (!brls::Application::init("Borealis example"))
-    {
-        brls::Logger::error("Unable to init Borealis application");
-        return EXIT_FAILURE;
-    }
-
-    // Create a sample view
-    brls::TabFrame* rootFrame = new brls::TabFrame();
-    rootFrame->setTitle("Borealis Example App");
-    rootFrame->setIcon(BOREALIS_ASSET("icon/borealis.jpg"));
-
-    brls::List* testList = new brls::List();
-
-    brls::ListItem* dialogItem = new brls::ListItem("Open a dialog");
-    dialogItem->getClickEvent()->subscribe([](brls::View* view) {
-        brls::Dialog* dialog = new brls::Dialog("Warning: PozzNX will wipe all data on your Switch and render it inoperable, do you want to proceed?");
-
-        brls::GenericEvent::Callback closeCallback = [dialog](brls::View* view) {
-            dialog->close();
-            brls::Application::notify("Running PozzNX...");
-        };
-
-        dialog->addButton("Continue", closeCallback);
-        dialog->addButton("Continue", closeCallback);
-        dialog->addButton("Continue", closeCallback);
-
-        dialog->setCancelable(false);
-
-        dialog->open();
-    });
-
-    brls::ListItem* notificationItem = new brls::ListItem("Post a random notification");
-    notificationItem->getClickEvent()->subscribe([](brls::View* view) {
-        std::string notification = NOTIFICATIONS[std::rand() % NOTIFICATIONS.size()];
-        brls::Application::notify(notification);
-    });
-
-    brls::ListItem* themeItem = new brls::ListItem("TV Resolution");
-    themeItem->setValue("Automatic");
-
-    brls::SelectListItem* jankItem = new brls::SelectListItem(
-        "User Interface Jank",
-        { "Native", "Minimal", "Regular", "Maximum", "SX OS", "Windows Vista", "iOS 14" });
-
-    brls::ListItem* crashItem = new brls::ListItem("Divide by 0", "Can the Switch do it?");
-    crashItem->getClickEvent()->subscribe([](brls::View* view) { brls::Application::crash("The software was closed because an error occured:\nSIGABRT (signal 6)"); });
-
-    brls::ListItem* popupItem = new brls::ListItem("Open popup");
-    popupItem->getClickEvent()->subscribe([](brls::View* view) {
-        brls::TabFrame* popupTabFrame = new brls::TabFrame();
-        popupTabFrame->addTab("Red", new brls::Rectangle(nvgRGB(255, 0, 0)));
-        popupTabFrame->addTab("Green", new brls::Rectangle(nvgRGB(0, 255, 0)));
-        popupTabFrame->addTab("Blue", new brls::Rectangle(nvgRGB(0, 0, 255)));
-        brls::PopupFrame::open("Popup title", BOREALIS_ASSET("icon/borealis.jpg"), popupTabFrame, "Subtitle left", "Subtitle right");
-    });
-
-    brls::ListItem* installerItem = new brls::ListItem("Open example installer");
-    installerItem->getClickEvent()->subscribe([](brls::View* view) {
-        brls::StagedAppletFrame* stagedFrame = new brls::StagedAppletFrame();
-        stagedFrame->setTitle("My great installer");
-
-        stagedFrame->addStage(new SampleInstallerPage(stagedFrame, "Go to step 2"));
-        stagedFrame->addStage(new SampleLoadingPage(stagedFrame));
-        stagedFrame->addStage(new SampleInstallerPage(stagedFrame, "Finish"));
-
-        brls::Application::pushView(stagedFrame);
-    });
-
-    brls::SelectListItem* layerSelectItem = new brls::SelectListItem("Select Layer", { "Layer 1", "Layer 2" });
-
-    testList->addView(dialogItem);
-    testList->addView(notificationItem);
-    testList->addView(themeItem);
-    testList->addView(jankItem);
-    testList->addView(crashItem);
-    testList->addView(installerItem);
-    testList->addView(popupItem);
-
-    brls::Label* testLabel = new brls::Label(brls::LabelStyle::REGULAR, "For more information about how to use Nintendo Switch and its features, please refer to the Nintendo Support Website on your smart device or PC.", true);
-    testList->addView(testLabel);
-
-    brls::ListItem* actionTestItem = new brls::ListItem("Custom Actions");
-    actionTestItem->registerAction("Show notification", brls::Key::L, [] {
-        brls::Application::notify("Custom Action triggered");
-        return true;
-    });
-    testList->addView(actionTestItem);
-
-    brls::LayerView* testLayers = new brls::LayerView();
-    brls::List* layerList1      = new brls::List();
-    brls::List* layerList2      = new brls::List();
-
-    layerList1->addView(new brls::Header("Layer 1", false));
-    layerList1->addView(new brls::ListItem("Item 1"));
-    layerList1->addView(new brls::ListItem("Item 2"));
-    layerList1->addView(new brls::ListItem("Item 3"));
-
-    layerList2->addView(new brls::Header("Layer 2", false));
-    layerList2->addView(new brls::ListItem("Item 1"));
-    layerList2->addView(new brls::ListItem("Item 2"));
-    layerList2->addView(new brls::ListItem("Item 3"));
-
-    testLayers->addLayer(layerList1);
-    testLayers->addLayer(layerList2);
-
-    layerSelectItem->getValueSelectedEvent()->subscribe([=](size_t selection) {
-        testLayers->changeLayer(selection);
-    });
-
-    testList->addView(layerSelectItem);
-
-    rootFrame->addTab("First tab", testList);
-    rootFrame->addTab("Second tab", testLayers);
-    rootFrame->addSeparator();
-    rootFrame->addTab("Third tab", new brls::Rectangle(nvgRGB(255, 0, 0)));
-    rootFrame->addTab("Fourth tab", new brls::Rectangle(nvgRGB(0, 255, 0)));
-
-    // Add the root view to the stack
-    brls::Application::pushView(rootFrame);
-
-    // Run the app
-    while (brls::Application::mainLoop())
-        ;
-
-    // Exit
-    return EXIT_SUCCESS;
-}
diff --git a/Source/sys-clk/manager/lib/borealis/example/sample_installer_page.cpp b/Source/sys-clk/manager/lib/borealis/example/sample_installer_page.cpp
deleted file mode 100644
index 2eecf359..00000000
--- a/Source/sys-clk/manager/lib/borealis/example/sample_installer_page.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
-    Borealis, a Nintendo Switch UI Library
-    Copyright (C) 2019  natinusala
-    Copyright (C) 2019  Billy Laws
-    Copyright (C) 2019  p-sam
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include "sample_installer_page.hpp"
-
-#include <math.h>
-
-SampleInstallerPage::SampleInstallerPage(brls::StagedAppletFrame* frame, std::string label)
-{
-    // Label
-    this->button = (new brls::Button(brls::ButtonStyle::BORDERLESS))->setLabel(label)->setImage(BOREALIS_ASSET("icon/borealis.jpg"));
-    this->button->setParent(this);
-    this->button->getClickEvent()->subscribe([frame](View* view) {
-        if (frame->isLastStage())
-            brls::Application::popView();
-        else
-            frame->nextStage();
-    });
-    this->label = new brls::Label(brls::LabelStyle::DIALOG, "Here, you would normally do useful things", true);
-    this->label->setHorizontalAlign(NVG_ALIGN_CENTER);
-    this->label->setParent(this);
-}
-
-void SampleInstallerPage::draw(NVGcontext* vg, int x, int y, unsigned width, unsigned height, brls::Style* style, brls::FrameContext* ctx)
-{
-    this->label->frame(ctx);
-    this->button->frame(ctx);
-}
-
-brls::View* SampleInstallerPage::getDefaultFocus()
-{
-    return this->button;
-}
-
-void SampleInstallerPage::layout(NVGcontext* vg, brls::Style* style, brls::FontStash* stash)
-{
-    this->label->setWidth(roundf((float)this->width * style->CrashFrame.labelWidth));
-    this->label->invalidate(true);
-
-    this->label->setBoundaries(
-        this->x + this->width / 2 - this->label->getWidth() / 2,
-        this->y + (this->height - style->AppletFrame.footerHeight) / 2,
-        this->label->getWidth(),
-        this->label->getHeight());
-
-    this->button->setBoundaries(
-        this->x + this->width / 2 - style->CrashFrame.buttonWidth / 2,
-        this->y + this->height / 2 + style->CrashFrame.buttonHeight,
-        style->CrashFrame.buttonWidth,
-        style->CrashFrame.buttonHeight);
-    this->button->invalidate();
-}
-
-SampleInstallerPage::~SampleInstallerPage()
-{
-    delete this->label;
-    delete this->button;
-}
diff --git a/Source/sys-clk/manager/lib/borealis/example/sample_installer_page.hpp b/Source/sys-clk/manager/lib/borealis/example/sample_installer_page.hpp
deleted file mode 100644
index 753f402a..00000000
--- a/Source/sys-clk/manager/lib/borealis/example/sample_installer_page.hpp
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-    Borealis, a Nintendo Switch UI Library
-    Copyright (C) 2019  natinusala
-    Copyright (C) 2019  Billy Laws
-    Copyright (C) 2019  p-sam
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include <borealis.hpp>
-
-class SampleInstallerPage : public brls::View
-{
-  private:
-    brls::Button* button;
-    brls::Label* label;
-
-  public:
-    SampleInstallerPage(brls::StagedAppletFrame* frame, std::string label);
-    ~SampleInstallerPage();
-
-    void draw(NVGcontext* vg, int x, int y, unsigned width, unsigned height, brls::Style* style, brls::FrameContext* ctx) override;
-    void layout(NVGcontext* vg, brls::Style* style, brls::FontStash* stash) override;
-    brls::View* getDefaultFocus() override;
-};
diff --git a/Source/sys-clk/manager/lib/borealis/example/sample_loading_page.cpp b/Source/sys-clk/manager/lib/borealis/example/sample_loading_page.cpp
deleted file mode 100644
index 26ace358..00000000
--- a/Source/sys-clk/manager/lib/borealis/example/sample_loading_page.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
-    Borealis, a Nintendo Switch UI Library
-    Copyright (C) 2019  natinusala
-    Copyright (C) 2019  Billy Laws
-    Copyright (C) 2019  p-sam
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include "sample_loading_page.hpp"
-
-#include <math.h>
-
-SampleLoadingPage::SampleLoadingPage(brls::StagedAppletFrame* frame)
-    : frame(frame)
-{
-    // Label
-    this->progressDisp = new brls::ProgressDisplay();
-    this->progressDisp->setProgress(this->progressValue, 1000);
-    this->progressDisp->setParent(this);
-    this->label = new brls::Label(brls::LabelStyle::DIALOG, "Example loading display", true);
-    this->label->setHorizontalAlign(NVG_ALIGN_CENTER);
-    this->label->setParent(this);
-}
-
-void SampleLoadingPage::draw(NVGcontext* vg, int x, int y, unsigned width, unsigned height, brls::Style* style, brls::FrameContext* ctx)
-{
-    if (progressValue == 500)
-        this->frame->nextStage();
-
-    this->progressValue++;
-    this->progressDisp->setProgress(this->progressValue, 500);
-    this->progressDisp->frame(ctx);
-    this->label->frame(ctx);
-}
-
-void SampleLoadingPage::layout(NVGcontext* vg, brls::Style* style, brls::FontStash* stash)
-{
-    this->label->setWidth(roundf((float)this->width * style->CrashFrame.labelWidth));
-    this->label->invalidate(true);
-
-    this->label->setBoundaries(
-        this->x + this->width / 2 - this->label->getWidth() / 2,
-        this->y + (this->height - style->AppletFrame.footerHeight) / 2,
-        this->label->getWidth(),
-        this->label->getHeight());
-
-    this->progressDisp->setBoundaries(
-        this->x + this->width / 2 - style->CrashFrame.buttonWidth,
-        this->y + this->height / 2,
-        style->CrashFrame.buttonWidth * 2,
-        style->CrashFrame.buttonHeight);
-}
-
-void SampleLoadingPage::willAppear(bool resetState)
-{
-    this->progressDisp->willAppear(resetState);
-}
-
-void SampleLoadingPage::willDisappear(bool resetState)
-{
-    this->progressDisp->willDisappear(resetState);
-}
-
-SampleLoadingPage::~SampleLoadingPage()
-{
-    delete this->progressDisp;
-    delete this->label;
-}
diff --git a/Source/sys-clk/manager/lib/borealis/example/sample_loading_page.hpp b/Source/sys-clk/manager/lib/borealis/example/sample_loading_page.hpp
deleted file mode 100644
index 035e0498..00000000
--- a/Source/sys-clk/manager/lib/borealis/example/sample_loading_page.hpp
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-    Borealis, a Nintendo Switch UI Library
-    Copyright (C) 2019  natinusala
-    Copyright (C) 2019  Billy Laws
-    Copyright (C) 2019  p-sam
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include <borealis.hpp>
-
-class SampleLoadingPage : public brls::View
-{
-  private:
-    brls::StagedAppletFrame* frame;
-    brls::ProgressDisplay* progressDisp;
-    brls::Label* label;
-    int progressValue = 0;
-
-  public:
-    SampleLoadingPage(brls::StagedAppletFrame* frame);
-    ~SampleLoadingPage();
-
-    void draw(NVGcontext* vg, int x, int y, unsigned width, unsigned height, brls::Style* style, brls::FrameContext* ctx) override;
-    void layout(NVGcontext* vg, brls::Style* style, brls::FontStash* stash) override;
-
-    void willAppear(bool resetState = false) override;
-    void willDisappear(bool resetState = false) override;
-};
diff --git a/Source/sys-clk/manager/lib/borealis/library/borealis.mk b/Source/sys-clk/manager/lib/borealis/library/borealis.mk
deleted file mode 100644
index c99a9da2..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/borealis.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-mkfile_path	:=	$(abspath $(lastword $(MAKEFILE_LIST)))
-current_dir	:=	$(BOREALIS_PATH)/$(notdir $(patsubst %/,%,$(dir $(mkfile_path))))
-
-LIBS		:=	-lglfw3 -lEGL -lglapi -ldrm_nouveau -lm $(LIBS)
-
-SOURCES		:=	$(SOURCES) \
-				$(current_dir)/lib \
-				$(current_dir)/lib/extern/glad \
-				$(current_dir)/lib/extern/nanovg \
-				$(current_dir)/lib/extern/libretro-common/compat \
-				$(current_dir)/lib/extern/libretro-common/encodings \
-				$(current_dir)/lib/extern/libretro-common/features
-
-INCLUDES	:=	$(INCLUDES) \
-				$(current_dir)/include \
-				$(current_dir)/include/borealis/extern/glad \
-				$(current_dir)/include/borealis/extern/nanovg \
-				$(current_dir)/include/borealis/extern/libretro-common
diff --git a/Source/sys-clk/manager/lib/borealis/library/include/GLFW/glfw3.h b/Source/sys-clk/manager/lib/borealis/library/include/GLFW/glfw3.h
deleted file mode 100644
index 3ce1c019..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/include/GLFW/glfw3.h
+++ /dev/null
@@ -1,6566 +0,0 @@
-/*************************************************************************
- * GLFW 3.5 - www.glfw.org
- * A library for OpenGL, window and input
- *------------------------------------------------------------------------
- * Copyright (c) 2002-2006 Marcus Geelnard
- * Copyright (c) 2006-2019 Camilla Löwy <elmindreda@glfw.org>
- *
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- *
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- *
- * 1. The origin of this software must not be misrepresented; you must not
- *    claim that you wrote the original software. If you use this software
- *    in a product, an acknowledgment in the product documentation would
- *    be appreciated but is not required.
- *
- * 2. Altered source versions must be plainly marked as such, and must not
- *    be misrepresented as being the original software.
- *
- * 3. This notice may not be removed or altered from any source
- *    distribution.
- *
- *************************************************************************/
-
-#ifndef _glfw3_h_
-#define _glfw3_h_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/*************************************************************************
- * Doxygen documentation
- *************************************************************************/
-
-/*! @file glfw3.h
- *  @brief The header of the GLFW 3 API.
- *
- *  This is the header file of the GLFW 3 API.  It defines all its types and
- *  declares all its functions.
- *
- *  For more information about how to use this file, see @ref build_include.
- */
-/*! @defgroup context Context reference
- *  @brief Functions and types related to OpenGL and OpenGL ES contexts.
- *
- *  This is the reference documentation for OpenGL and OpenGL ES context related
- *  functions.  For more task-oriented information, see the @ref context_guide.
- */
-/*! @defgroup vulkan Vulkan support reference
- *  @brief Functions and types related to Vulkan.
- *
- *  This is the reference documentation for Vulkan related functions and types.
- *  For more task-oriented information, see the @ref vulkan_guide.
- */
-/*! @defgroup init Initialization, version and error reference
- *  @brief Functions and types related to initialization and error handling.
- *
- *  This is the reference documentation for initialization and termination of
- *  the library, version management and error handling.  For more task-oriented
- *  information, see the @ref intro_guide.
- */
-/*! @defgroup input Input reference
- *  @brief Functions and types related to input handling.
- *
- *  This is the reference documentation for input related functions and types.
- *  For more task-oriented information, see the @ref input_guide.
- */
-/*! @defgroup monitor Monitor reference
- *  @brief Functions and types related to monitors.
- *
- *  This is the reference documentation for monitor related functions and types.
- *  For more task-oriented information, see the @ref monitor_guide.
- */
-/*! @defgroup window Window reference
- *  @brief Functions and types related to windows.
- *
- *  This is the reference documentation for window related functions and types,
- *  including creation, deletion and event polling.  For more task-oriented
- *  information, see the @ref window_guide.
- */
-
-
-/*************************************************************************
- * Compiler- and platform-specific preprocessor work
- *************************************************************************/
-
-/* If we are we on Windows, we want a single define for it.
- */
-#if !defined(_WIN32) && (defined(__WIN32__) || defined(WIN32) || defined(__MINGW32__))
- #define _WIN32
-#endif /* _WIN32 */
-
-/* Include because most Windows GLU headers need wchar_t and
- * the macOS OpenGL header blocks the definition of ptrdiff_t by glext.h.
- * Include it unconditionally to avoid surprising side-effects.
- */
-#include <stddef.h>
-
-/* Include because it is needed by Vulkan and related functions.
- * Include it unconditionally to avoid surprising side-effects.
- */
-#include <stdint.h>
-
-#if defined(GLFW_INCLUDE_VULKAN)
-  #include <vulkan/vulkan.h>
-#endif /* Vulkan header */
-
-/* The Vulkan header may have indirectly included windows.h (because of
- * VK_USE_PLATFORM_WIN32_KHR) so we offer our replacement symbols after it.
- */
-
-/* It is customary to use APIENTRY for OpenGL function pointer declarations on
- * all platforms.  Additionally, the Windows OpenGL header needs APIENTRY.
- */
-#if !defined(APIENTRY)
- #if defined(_WIN32)
-  #define APIENTRY __stdcall
- #else
-  #define APIENTRY
- #endif
- #define GLFW_APIENTRY_DEFINED
-#endif /* APIENTRY */
-
-/* Some Windows OpenGL headers need this.
- */
-#if !defined(WINGDIAPI) && defined(_WIN32)
- #define WINGDIAPI __declspec(dllimport)
- #define GLFW_WINGDIAPI_DEFINED
-#endif /* WINGDIAPI */
-
-/* Some Windows GLU headers need this.
- */
-#if !defined(CALLBACK) && defined(_WIN32)
- #define CALLBACK __stdcall
- #define GLFW_CALLBACK_DEFINED
-#endif /* CALLBACK */
-
-/* Include the chosen OpenGL or OpenGL ES headers.
- */
-#if defined(GLFW_INCLUDE_ES1)
-
- #include <GLES/gl.h>
- #if defined(GLFW_INCLUDE_GLEXT)
-  #include <GLES/glext.h>
- #endif
-
-#elif defined(GLFW_INCLUDE_ES2)
-
- #include <GLES2/gl2.h>
- #if defined(GLFW_INCLUDE_GLEXT)
-  #include <GLES2/gl2ext.h>
- #endif
-
-#elif defined(GLFW_INCLUDE_ES3)
-
- #include <GLES3/gl3.h>
- #if defined(GLFW_INCLUDE_GLEXT)
-  #include <GLES2/gl2ext.h>
- #endif
-
-#elif defined(GLFW_INCLUDE_ES31)
-
- #include <GLES3/gl31.h>
- #if defined(GLFW_INCLUDE_GLEXT)
-  #include <GLES2/gl2ext.h>
- #endif
-
-#elif defined(GLFW_INCLUDE_ES32)
-
- #include <GLES3/gl32.h>
- #if defined(GLFW_INCLUDE_GLEXT)
-  #include <GLES2/gl2ext.h>
- #endif
-
-#elif defined(GLFW_INCLUDE_GLCOREARB)
-
- #if defined(__APPLE__)
-
-  #include <OpenGL/gl3.h>
-  #if defined(GLFW_INCLUDE_GLEXT)
-   #include <OpenGL/gl3ext.h>
-  #endif /*GLFW_INCLUDE_GLEXT*/
-
- #else /*__APPLE__*/
-
-  #include <GL/glcorearb.h>
-  #if defined(GLFW_INCLUDE_GLEXT)
-   #include <GL/glext.h>
-  #endif
-
- #endif /*__APPLE__*/
-
-#elif defined(GLFW_INCLUDE_GLU)
-
- #if defined(__APPLE__)
-
-  #if defined(GLFW_INCLUDE_GLU)
-   #include <OpenGL/glu.h>
-  #endif
-
- #else /*__APPLE__*/
-
-  #if defined(GLFW_INCLUDE_GLU)
-   #include <GL/glu.h>
-  #endif
-
- #endif /*__APPLE__*/
-
-#elif !defined(GLFW_INCLUDE_NONE) && \
-      !defined(__gl_h_) && \
-      !defined(__gles1_gl_h_) && \
-      !defined(__gles2_gl2_h_) && \
-      !defined(__gles2_gl3_h_) && \
-      !defined(__gles2_gl31_h_) && \
-      !defined(__gles2_gl32_h_) && \
-      !defined(__gl_glcorearb_h_) && \
-      !defined(__gl2_h_) /*legacy*/ && \
-      !defined(__gl3_h_) /*legacy*/ && \
-      !defined(__gl31_h_) /*legacy*/ && \
-      !defined(__gl32_h_) /*legacy*/ && \
-      !defined(__glcorearb_h_) /*legacy*/ && \
-      !defined(__GL_H__) /*non-standard*/ && \
-      !defined(__gltypes_h_) /*non-standard*/ && \
-      !defined(__glee_h_) /*non-standard*/
-
- #if defined(__APPLE__)
-
-  #if !defined(GLFW_INCLUDE_GLEXT)
-   #define GL_GLEXT_LEGACY
-  #endif
-  #include <OpenGL/gl.h>
-
- #else /*__APPLE__*/
-
-  #include <GL/gl.h>
-  #if defined(GLFW_INCLUDE_GLEXT)
-   #include <GL/glext.h>
-  #endif
-
- #endif /*__APPLE__*/
-
-#endif /* OpenGL and OpenGL ES headers */
-
-#if defined(GLFW_DLL) && defined(_GLFW_BUILD_DLL)
- /* GLFW_DLL must be defined by applications that are linking against the DLL
-  * version of the GLFW library.  _GLFW_BUILD_DLL is defined by the GLFW
-  * configuration header when compiling the DLL version of the library.
-  */
- #error "You must not have both GLFW_DLL and _GLFW_BUILD_DLL defined"
-#endif
-
-/* GLFWAPI is used to declare public API functions for export
- * from the DLL / shared library / dynamic library.
- */
-#if defined(_WIN32) && defined(_GLFW_BUILD_DLL)
- /* We are building GLFW as a Win32 DLL */
- #define GLFWAPI __declspec(dllexport)
-#elif defined(_WIN32) && defined(GLFW_DLL)
- /* We are calling a GLFW Win32 DLL */
- #define GLFWAPI __declspec(dllimport)
-#elif defined(__GNUC__) && defined(_GLFW_BUILD_DLL)
- /* We are building GLFW as a Unix shared library */
- #define GLFWAPI __attribute__((visibility("default")))
-#else
- #define GLFWAPI
-#endif
-
-
-/*************************************************************************
- * GLFW API tokens
- *************************************************************************/
-
-/*! @name GLFW version macros
- *  @{ */
-/*! @brief The major version number of the GLFW header.
- *
- *  The major version number of the GLFW header.  This is incremented when the
- *  API is changed in non-compatible ways.
- *  @ingroup init
- */
-#define GLFW_VERSION_MAJOR          3
-/*! @brief The minor version number of the GLFW header.
- *
- *  The minor version number of the GLFW header.  This is incremented when
- *  features are added to the API but it remains backward-compatible.
- *  @ingroup init
- */
-#define GLFW_VERSION_MINOR          5
-/*! @brief The revision number of the GLFW header.
- *
- *  The revision number of the GLFW header.  This is incremented when a bug fix
- *  release is made that does not contain any API changes.
- *  @ingroup init
- */
-#define GLFW_VERSION_REVISION       0
-/*! @} */
-
-/*! @brief One.
- *
- *  This is only semantic sugar for the number 1.  You can instead use `1` or
- *  `true` or `_True` or `GL_TRUE` or `VK_TRUE` or anything else that is equal
- *  to one.
- *
- *  @ingroup init
- */
-#define GLFW_TRUE                   1
-/*! @brief Zero.
- *
- *  This is only semantic sugar for the number 0.  You can instead use `0` or
- *  `false` or `_False` or `GL_FALSE` or `VK_FALSE` or anything else that is
- *  equal to zero.
- *
- *  @ingroup init
- */
-#define GLFW_FALSE                  0
-
-/*! @name Key and button actions
- *  @{ */
-/*! @brief The key or mouse button was released.
- *
- *  The key or mouse button was released.
- *
- *  @ingroup input
- */
-#define GLFW_RELEASE                0
-/*! @brief The key or mouse button was pressed.
- *
- *  The key or mouse button was pressed.
- *
- *  @ingroup input
- */
-#define GLFW_PRESS                  1
-/*! @brief The key was held down until it repeated.
- *
- *  The key was held down until it repeated.
- *
- *  @ingroup input
- */
-#define GLFW_REPEAT                 2
-/*! @} */
-
-/*! @defgroup hat_state Joystick hat states
- *  @brief Joystick hat states.
- *
- *  See [joystick hat input](@ref joystick_hat) for how these are used.
- *
- *  @ingroup input
- *  @{ */
-#define GLFW_HAT_CENTERED           0
-#define GLFW_HAT_UP                 1
-#define GLFW_HAT_RIGHT              2
-#define GLFW_HAT_DOWN               4
-#define GLFW_HAT_LEFT               8
-#define GLFW_HAT_RIGHT_UP           (GLFW_HAT_RIGHT | GLFW_HAT_UP)
-#define GLFW_HAT_RIGHT_DOWN         (GLFW_HAT_RIGHT | GLFW_HAT_DOWN)
-#define GLFW_HAT_LEFT_UP            (GLFW_HAT_LEFT  | GLFW_HAT_UP)
-#define GLFW_HAT_LEFT_DOWN          (GLFW_HAT_LEFT  | GLFW_HAT_DOWN)
-
-/*! @ingroup input
- */
-#define GLFW_KEY_UNKNOWN            -1
-
-/*! @} */
-
-/*! @defgroup keys Keyboard key tokens
- *  @brief Keyboard key tokens.
- *
- *  See [key input](@ref input_key) for how these are used.
- *
- *  These key codes are inspired by the _USB HID Usage Tables v1.12_ (p. 53-60),
- *  but re-arranged to map to 7-bit ASCII for printable keys (function keys are
- *  put in the 256+ range).
- *
- *  The naming of the key codes follow these rules:
- *   - The US keyboard layout is used
- *   - Names of printable alphanumeric characters are used (e.g. "A", "R",
- *     "3", etc.)
- *   - For non-alphanumeric characters, Unicode:ish names are used (e.g.
- *     "COMMA", "LEFT_SQUARE_BRACKET", etc.). Note that some names do not
- *     correspond to the Unicode standard (usually for brevity)
- *   - Keys that lack a clear US mapping are named "WORLD_x"
- *   - For non-printable keys, custom names are used (e.g. "F4",
- *     "BACKSPACE", etc.)
- *
- *  @ingroup input
- *  @{
- */
-
-/* Printable keys */
-#define GLFW_KEY_SPACE              32
-#define GLFW_KEY_APOSTROPHE         39  /* ' */
-#define GLFW_KEY_COMMA              44  /* , */
-#define GLFW_KEY_MINUS              45  /* - */
-#define GLFW_KEY_PERIOD             46  /* . */
-#define GLFW_KEY_SLASH              47  /* / */
-#define GLFW_KEY_0                  48
-#define GLFW_KEY_1                  49
-#define GLFW_KEY_2                  50
-#define GLFW_KEY_3                  51
-#define GLFW_KEY_4                  52
-#define GLFW_KEY_5                  53
-#define GLFW_KEY_6                  54
-#define GLFW_KEY_7                  55
-#define GLFW_KEY_8                  56
-#define GLFW_KEY_9                  57
-#define GLFW_KEY_SEMICOLON          59  /* ; */
-#define GLFW_KEY_EQUAL              61  /* = */
-#define GLFW_KEY_A                  65
-#define GLFW_KEY_B                  66
-#define GLFW_KEY_C                  67
-#define GLFW_KEY_D                  68
-#define GLFW_KEY_E                  69
-#define GLFW_KEY_F                  70
-#define GLFW_KEY_G                  71
-#define GLFW_KEY_H                  72
-#define GLFW_KEY_I                  73
-#define GLFW_KEY_J                  74
-#define GLFW_KEY_K                  75
-#define GLFW_KEY_L                  76
-#define GLFW_KEY_M                  77
-#define GLFW_KEY_N                  78
-#define GLFW_KEY_O                  79
-#define GLFW_KEY_P                  80
-#define GLFW_KEY_Q                  81
-#define GLFW_KEY_R                  82
-#define GLFW_KEY_S                  83
-#define GLFW_KEY_T                  84
-#define GLFW_KEY_U                  85
-#define GLFW_KEY_V                  86
-#define GLFW_KEY_W                  87
-#define GLFW_KEY_X                  88
-#define GLFW_KEY_Y                  89
-#define GLFW_KEY_Z                  90
-#define GLFW_KEY_LEFT_BRACKET       91  /* [ */
-#define GLFW_KEY_BACKSLASH          92  /* \ */
-#define GLFW_KEY_RIGHT_BRACKET      93  /* ] */
-#define GLFW_KEY_GRAVE_ACCENT       96  /* ` */
-#define GLFW_KEY_WORLD_1            161 /* non-US #1 */
-#define GLFW_KEY_WORLD_2            162 /* non-US #2 */
-
-/* Function keys */
-#define GLFW_KEY_ESCAPE             256
-#define GLFW_KEY_ENTER              257
-#define GLFW_KEY_TAB                258
-#define GLFW_KEY_BACKSPACE          259
-#define GLFW_KEY_INSERT             260
-#define GLFW_KEY_DELETE             261
-#define GLFW_KEY_RIGHT              262
-#define GLFW_KEY_LEFT               263
-#define GLFW_KEY_DOWN               264
-#define GLFW_KEY_UP                 265
-#define GLFW_KEY_PAGE_UP            266
-#define GLFW_KEY_PAGE_DOWN          267
-#define GLFW_KEY_HOME               268
-#define GLFW_KEY_END                269
-#define GLFW_KEY_CAPS_LOCK          280
-#define GLFW_KEY_SCROLL_LOCK        281
-#define GLFW_KEY_NUM_LOCK           282
-#define GLFW_KEY_PRINT_SCREEN       283
-#define GLFW_KEY_PAUSE              284
-#define GLFW_KEY_F1                 290
-#define GLFW_KEY_F2                 291
-#define GLFW_KEY_F3                 292
-#define GLFW_KEY_F4                 293
-#define GLFW_KEY_F5                 294
-#define GLFW_KEY_F6                 295
-#define GLFW_KEY_F7                 296
-#define GLFW_KEY_F8                 297
-#define GLFW_KEY_F9                 298
-#define GLFW_KEY_F10                299
-#define GLFW_KEY_F11                300
-#define GLFW_KEY_F12                301
-#define GLFW_KEY_F13                302
-#define GLFW_KEY_F14                303
-#define GLFW_KEY_F15                304
-#define GLFW_KEY_F16                305
-#define GLFW_KEY_F17                306
-#define GLFW_KEY_F18                307
-#define GLFW_KEY_F19                308
-#define GLFW_KEY_F20                309
-#define GLFW_KEY_F21                310
-#define GLFW_KEY_F22                311
-#define GLFW_KEY_F23                312
-#define GLFW_KEY_F24                313
-#define GLFW_KEY_F25                314
-#define GLFW_KEY_KP_0               320
-#define GLFW_KEY_KP_1               321
-#define GLFW_KEY_KP_2               322
-#define GLFW_KEY_KP_3               323
-#define GLFW_KEY_KP_4               324
-#define GLFW_KEY_KP_5               325
-#define GLFW_KEY_KP_6               326
-#define GLFW_KEY_KP_7               327
-#define GLFW_KEY_KP_8               328
-#define GLFW_KEY_KP_9               329
-#define GLFW_KEY_KP_DECIMAL         330
-#define GLFW_KEY_KP_DIVIDE          331
-#define GLFW_KEY_KP_MULTIPLY        332
-#define GLFW_KEY_KP_SUBTRACT        333
-#define GLFW_KEY_KP_ADD             334
-#define GLFW_KEY_KP_ENTER           335
-#define GLFW_KEY_KP_EQUAL           336
-#define GLFW_KEY_LEFT_SHIFT         340
-#define GLFW_KEY_LEFT_CONTROL       341
-#define GLFW_KEY_LEFT_ALT           342
-#define GLFW_KEY_LEFT_SUPER         343
-#define GLFW_KEY_RIGHT_SHIFT        344
-#define GLFW_KEY_RIGHT_CONTROL      345
-#define GLFW_KEY_RIGHT_ALT          346
-#define GLFW_KEY_RIGHT_SUPER        347
-#define GLFW_KEY_MENU               348
-
-#define GLFW_KEY_LAST               GLFW_KEY_MENU
-
-/*! @} */
-
-/*! @defgroup mods Modifier key flags
- *  @brief Modifier key flags.
- *
- *  See [key input](@ref input_key) for how these are used.
- *
- *  @ingroup input
- *  @{ */
-
-/*! @brief If this bit is set one or more Shift keys were held down.
- *
- *  If this bit is set one or more Shift keys were held down.
- */
-#define GLFW_MOD_SHIFT           0x0001
-/*! @brief If this bit is set one or more Control keys were held down.
- *
- *  If this bit is set one or more Control keys were held down.
- */
-#define GLFW_MOD_CONTROL         0x0002
-/*! @brief If this bit is set one or more Alt keys were held down.
- *
- *  If this bit is set one or more Alt keys were held down.
- */
-#define GLFW_MOD_ALT             0x0004
-/*! @brief If this bit is set one or more Super keys were held down.
- *
- *  If this bit is set one or more Super keys were held down.
- */
-#define GLFW_MOD_SUPER           0x0008
-/*! @brief If this bit is set the Caps Lock key is enabled.
- *
- *  If this bit is set the Caps Lock key is enabled and the @ref
- *  GLFW_LOCK_KEY_MODS input mode is set.
- */
-#define GLFW_MOD_CAPS_LOCK       0x0010
-/*! @brief If this bit is set the Num Lock key is enabled.
- *
- *  If this bit is set the Num Lock key is enabled and the @ref
- *  GLFW_LOCK_KEY_MODS input mode is set.
- */
-#define GLFW_MOD_NUM_LOCK        0x0020
-
-/*! @} */
-
-/*! @defgroup buttons Mouse buttons
- *  @brief Mouse button IDs.
- *
- *  See [mouse button input](@ref input_mouse_button) for how these are used.
- *
- *  @ingroup input
- *  @{ */
-#define GLFW_MOUSE_BUTTON_1         0
-#define GLFW_MOUSE_BUTTON_2         1
-#define GLFW_MOUSE_BUTTON_3         2
-#define GLFW_MOUSE_BUTTON_4         3
-#define GLFW_MOUSE_BUTTON_5         4
-#define GLFW_MOUSE_BUTTON_6         5
-#define GLFW_MOUSE_BUTTON_7         6
-#define GLFW_MOUSE_BUTTON_8         7
-#define GLFW_MOUSE_BUTTON_LAST      GLFW_MOUSE_BUTTON_8
-#define GLFW_MOUSE_BUTTON_LEFT      GLFW_MOUSE_BUTTON_1
-#define GLFW_MOUSE_BUTTON_RIGHT     GLFW_MOUSE_BUTTON_2
-#define GLFW_MOUSE_BUTTON_MIDDLE    GLFW_MOUSE_BUTTON_3
-/*! @} */
-
-/*! @defgroup joysticks Joysticks
- *  @brief Joystick IDs.
- *
- *  See [joystick input](@ref joystick) for how these are used.
- *
- *  @ingroup input
- *  @{ */
-#define GLFW_JOYSTICK_1             0
-#define GLFW_JOYSTICK_2             1
-#define GLFW_JOYSTICK_3             2
-#define GLFW_JOYSTICK_4             3
-#define GLFW_JOYSTICK_5             4
-#define GLFW_JOYSTICK_6             5
-#define GLFW_JOYSTICK_7             6
-#define GLFW_JOYSTICK_8             7
-#define GLFW_JOYSTICK_9             8
-#define GLFW_JOYSTICK_10            9
-#define GLFW_JOYSTICK_11            10
-#define GLFW_JOYSTICK_12            11
-#define GLFW_JOYSTICK_13            12
-#define GLFW_JOYSTICK_14            13
-#define GLFW_JOYSTICK_15            14
-#define GLFW_JOYSTICK_16            15
-#define GLFW_JOYSTICK_LAST          GLFW_JOYSTICK_16
-/*! @} */
-
-/*! @defgroup gamepad_buttons Gamepad buttons
- *  @brief Gamepad buttons.
- *
- *  See @ref gamepad for how these are used.
- *
- *  @ingroup input
- *  @{ */
-#define GLFW_GAMEPAD_BUTTON_A               0
-#define GLFW_GAMEPAD_BUTTON_B               1
-#define GLFW_GAMEPAD_BUTTON_X               2
-#define GLFW_GAMEPAD_BUTTON_Y               3
-#define GLFW_GAMEPAD_BUTTON_LEFT_BUMPER     4
-#define GLFW_GAMEPAD_BUTTON_RIGHT_BUMPER    5
-#define GLFW_GAMEPAD_BUTTON_BACK            6
-#define GLFW_GAMEPAD_BUTTON_START           7
-#define GLFW_GAMEPAD_BUTTON_GUIDE           8
-#define GLFW_GAMEPAD_BUTTON_LEFT_THUMB      9
-#define GLFW_GAMEPAD_BUTTON_RIGHT_THUMB     10
-#define GLFW_GAMEPAD_BUTTON_DPAD_UP         11
-#define GLFW_GAMEPAD_BUTTON_DPAD_RIGHT      12
-#define GLFW_GAMEPAD_BUTTON_DPAD_DOWN       13
-#define GLFW_GAMEPAD_BUTTON_DPAD_LEFT       14
-#define GLFW_GAMEPAD_BUTTON_LAST            GLFW_GAMEPAD_BUTTON_DPAD_LEFT
-
-#define GLFW_GAMEPAD_BUTTON_CROSS       GLFW_GAMEPAD_BUTTON_A
-#define GLFW_GAMEPAD_BUTTON_CIRCLE      GLFW_GAMEPAD_BUTTON_B
-#define GLFW_GAMEPAD_BUTTON_SQUARE      GLFW_GAMEPAD_BUTTON_X
-#define GLFW_GAMEPAD_BUTTON_TRIANGLE    GLFW_GAMEPAD_BUTTON_Y
-/*! @} */
-
-/*! @defgroup gamepad_axes Gamepad axes
- *  @brief Gamepad axes.
- *
- *  See @ref gamepad for how these are used.
- *
- *  @ingroup input
- *  @{ */
-#define GLFW_GAMEPAD_AXIS_LEFT_X        0
-#define GLFW_GAMEPAD_AXIS_LEFT_Y        1
-#define GLFW_GAMEPAD_AXIS_RIGHT_X       2
-#define GLFW_GAMEPAD_AXIS_RIGHT_Y       3
-#define GLFW_GAMEPAD_AXIS_LEFT_TRIGGER  4
-#define GLFW_GAMEPAD_AXIS_RIGHT_TRIGGER 5
-#define GLFW_GAMEPAD_AXIS_LAST          GLFW_GAMEPAD_AXIS_RIGHT_TRIGGER
-/*! @} */
-
-/*! @defgroup errors Error codes
- *  @brief Error codes.
- *
- *  See [error handling](@ref error_handling) for how these are used.
- *
- *  @ingroup init
- *  @{ */
-/*! @brief No error has occurred.
- *
- *  No error has occurred.
- *
- *  @analysis Yay.
- */
-#define GLFW_NO_ERROR               0
-/*! @brief GLFW has not been initialized.
- *
- *  This occurs if a GLFW function was called that must not be called unless the
- *  library is [initialized](@ref intro_init).
- *
- *  @analysis Application programmer error.  Initialize GLFW before calling any
- *  function that requires initialization.
- */
-#define GLFW_NOT_INITIALIZED        0x00010001
-/*! @brief No context is current for this thread.
- *
- *  This occurs if a GLFW function was called that needs and operates on the
- *  current OpenGL or OpenGL ES context but no context is current on the calling
- *  thread.  One such function is @ref glfwSwapInterval.
- *
- *  @analysis Application programmer error.  Ensure a context is current before
- *  calling functions that require a current context.
- */
-#define GLFW_NO_CURRENT_CONTEXT     0x00010002
-/*! @brief One of the arguments to the function was an invalid enum value.
- *
- *  One of the arguments to the function was an invalid enum value, for example
- *  requesting @ref GLFW_RED_BITS with @ref glfwGetWindowAttrib.
- *
- *  @analysis Application programmer error.  Fix the offending call.
- */
-#define GLFW_INVALID_ENUM           0x00010003
-/*! @brief One of the arguments to the function was an invalid value.
- *
- *  One of the arguments to the function was an invalid value, for example
- *  requesting a non-existent OpenGL or OpenGL ES version like 2.7.
- *
- *  Requesting a valid but unavailable OpenGL or OpenGL ES version will instead
- *  result in a @ref GLFW_VERSION_UNAVAILABLE error.
- *
- *  @analysis Application programmer error.  Fix the offending call.
- */
-#define GLFW_INVALID_VALUE          0x00010004
-/*! @brief A memory allocation failed.
- *
- *  A memory allocation failed.
- *
- *  @analysis A bug in GLFW or the underlying operating system.  Report the bug
- *  to our [issue tracker](https://github.com/glfw/glfw/issues).
- */
-#define GLFW_OUT_OF_MEMORY          0x00010005
-/*! @brief GLFW could not find support for the requested API on the system.
- *
- *  GLFW could not find support for the requested API on the system.
- *
- *  @analysis The installed graphics driver does not support the requested
- *  API, or does not support it via the chosen context creation API.
- *  Below are a few examples.
- *
- *  @par
- *  Some pre-installed Windows graphics drivers do not support OpenGL.  AMD only
- *  supports OpenGL ES via EGL, while Nvidia and Intel only support it via
- *  a WGL or GLX extension.  macOS does not provide OpenGL ES at all.  The Mesa
- *  EGL, OpenGL and OpenGL ES libraries do not interface with the Nvidia binary
- *  driver.  Older graphics drivers do not support Vulkan.
- */
-#define GLFW_API_UNAVAILABLE        0x00010006
-/*! @brief The requested OpenGL or OpenGL ES version is not available.
- *
- *  The requested OpenGL or OpenGL ES version (including any requested context
- *  or framebuffer hints) is not available on this machine.
- *
- *  @analysis The machine does not support your requirements.  If your
- *  application is sufficiently flexible, downgrade your requirements and try
- *  again.  Otherwise, inform the user that their machine does not match your
- *  requirements.
- *
- *  @par
- *  Future invalid OpenGL and OpenGL ES versions, for example OpenGL 4.8 if 5.0
- *  comes out before the 4.x series gets that far, also fail with this error and
- *  not @ref GLFW_INVALID_VALUE, because GLFW cannot know what future versions
- *  will exist.
- */
-#define GLFW_VERSION_UNAVAILABLE    0x00010007
-/*! @brief A platform-specific error occurred that does not match any of the
- *  more specific categories.
- *
- *  A platform-specific error occurred that does not match any of the more
- *  specific categories.
- *
- *  @analysis A bug or configuration error in GLFW, the underlying operating
- *  system or its drivers, or a lack of required resources.  Report the issue to
- *  our [issue tracker](https://github.com/glfw/glfw/issues).
- */
-#define GLFW_PLATFORM_ERROR         0x00010008
-/*! @brief The requested format is not supported or available.
- *
- *  If emitted during window creation, the requested pixel format is not
- *  supported.
- *
- *  If emitted when querying the clipboard, the contents of the clipboard could
- *  not be converted to the requested format.
- *
- *  @analysis If emitted during window creation, one or more
- *  [hard constraints](@ref window_hints_hard) did not match any of the
- *  available pixel formats.  If your application is sufficiently flexible,
- *  downgrade your requirements and try again.  Otherwise, inform the user that
- *  their machine does not match your requirements.
- *
- *  @par
- *  If emitted when querying the clipboard, ignore the error or report it to
- *  the user, as appropriate.
- */
-#define GLFW_FORMAT_UNAVAILABLE     0x00010009
-/*! @brief The specified window does not have an OpenGL or OpenGL ES context.
- *
- *  A window that does not have an OpenGL or OpenGL ES context was passed to
- *  a function that requires it to have one.
- *
- *  @analysis Application programmer error.  Fix the offending call.
- */
-#define GLFW_NO_WINDOW_CONTEXT      0x0001000A
-/*! @brief The specified cursor shape is not available.
- *
- *  The specified standard cursor shape is not available, either because the
- *  current platform cursor theme does not provide it or because it is not
- *  available on the platform.
- *
- *  @analysis Platform or system settings limitation.  Pick another
- *  [standard cursor shape](@ref shapes) or create a
- *  [custom cursor](@ref cursor_custom).
- */
-#define GLFW_CURSOR_UNAVAILABLE     0x0001000B
-/*! @brief The requested feature is not provided by the platform.
- *
- *  The requested feature is not provided by the platform, so GLFW is unable to
- *  implement it.  The documentation for each function notes if it could emit
- *  this error.
- *
- *  @analysis Platform or platform version limitation.  The error can be ignored
- *  unless the feature is critical to the application.
- *
- *  @par
- *  A function call that emits this error has no effect other than the error and
- *  updating any existing out parameters.
- */
-#define GLFW_FEATURE_UNAVAILABLE    0x0001000C
-/*! @brief The requested feature is not implemented for the platform.
- *
- *  The requested feature has not yet been implemented in GLFW for this platform.
- *
- *  @analysis An incomplete implementation of GLFW for this platform, hopefully
- *  fixed in a future release.  The error can be ignored unless the feature is
- *  critical to the application.
- *
- *  @par
- *  A function call that emits this error has no effect other than the error and
- *  updating any existing out parameters.
- */
-#define GLFW_FEATURE_UNIMPLEMENTED  0x0001000D
-/*! @brief Platform unavailable or no matching platform was found.
- *
- *  If emitted during initialization, no matching platform was found.  If the @ref
- *  GLFW_PLATFORM init hint was set to `GLFW_ANY_PLATFORM`, GLFW could not detect any of
- *  the platforms supported by this library binary, except for the Null platform.  If the
- *  init hint was set to a specific platform, it is either not supported by this library
- *  binary or GLFW was not able to detect it.
- *
- *  If emitted by a native access function, GLFW was initialized for a different platform
- *  than the function is for.
- *
- *  @analysis Failure to detect any platform usually only happens on non-macOS Unix
- *  systems, either when no window system is running or the program was run from
- *  a terminal that does not have the necessary environment variables.  Fall back to
- *  a different platform if possible or notify the user that no usable platform was
- *  detected.
- *
- *  Failure to detect a specific platform may have the same cause as above or be because
- *  support for that platform was not compiled in.  Call @ref glfwPlatformSupported to
- *  check whether a specific platform is supported by a library binary.
- */
-#define GLFW_PLATFORM_UNAVAILABLE   0x0001000E
-/*! @} */
-
-/*! @addtogroup window
- *  @{ */
-/*! @brief Input focus window hint and attribute
- *
- *  Input focus [window hint](@ref GLFW_FOCUSED_hint) or
- *  [window attribute](@ref GLFW_FOCUSED_attrib).
- */
-#define GLFW_FOCUSED                0x00020001
-/*! @brief Window iconification window attribute
- *
- *  Window iconification [window attribute](@ref GLFW_ICONIFIED_attrib).
- */
-#define GLFW_ICONIFIED              0x00020002
-/*! @brief Window resize-ability window hint and attribute
- *
- *  Window resize-ability [window hint](@ref GLFW_RESIZABLE_hint) and
- *  [window attribute](@ref GLFW_RESIZABLE_attrib).
- */
-#define GLFW_RESIZABLE              0x00020003
-/*! @brief Window visibility window hint and attribute
- *
- *  Window visibility [window hint](@ref GLFW_VISIBLE_hint) and
- *  [window attribute](@ref GLFW_VISIBLE_attrib).
- */
-#define GLFW_VISIBLE                0x00020004
-/*! @brief Window decoration window hint and attribute
- *
- *  Window decoration [window hint](@ref GLFW_DECORATED_hint) and
- *  [window attribute](@ref GLFW_DECORATED_attrib).
- */
-#define GLFW_DECORATED              0x00020005
-/*! @brief Window auto-iconification window hint and attribute
- *
- *  Window auto-iconification [window hint](@ref GLFW_AUTO_ICONIFY_hint) and
- *  [window attribute](@ref GLFW_AUTO_ICONIFY_attrib).
- */
-#define GLFW_AUTO_ICONIFY           0x00020006
-/*! @brief Window decoration window hint and attribute
- *
- *  Window decoration [window hint](@ref GLFW_FLOATING_hint) and
- *  [window attribute](@ref GLFW_FLOATING_attrib).
- */
-#define GLFW_FLOATING               0x00020007
-/*! @brief Window maximization window hint and attribute
- *
- *  Window maximization [window hint](@ref GLFW_MAXIMIZED_hint) and
- *  [window attribute](@ref GLFW_MAXIMIZED_attrib).
- */
-#define GLFW_MAXIMIZED              0x00020008
-/*! @brief Cursor centering window hint
- *
- *  Cursor centering [window hint](@ref GLFW_CENTER_CURSOR_hint).
- */
-#define GLFW_CENTER_CURSOR          0x00020009
-/*! @brief Window framebuffer transparency hint and attribute
- *
- *  Window framebuffer transparency
- *  [window hint](@ref GLFW_TRANSPARENT_FRAMEBUFFER_hint) and
- *  [window attribute](@ref GLFW_TRANSPARENT_FRAMEBUFFER_attrib).
- */
-#define GLFW_TRANSPARENT_FRAMEBUFFER 0x0002000A
-/*! @brief Mouse cursor hover window attribute.
- *
- *  Mouse cursor hover [window attribute](@ref GLFW_HOVERED_attrib).
- */
-#define GLFW_HOVERED                0x0002000B
-/*! @brief Input focus on calling show window hint and attribute
- *
- *  Input focus [window hint](@ref GLFW_FOCUS_ON_SHOW_hint) or
- *  [window attribute](@ref GLFW_FOCUS_ON_SHOW_attrib).
- */
-#define GLFW_FOCUS_ON_SHOW          0x0002000C
-
-/*! @brief Mouse input transparency window hint and attribute
- *
- *  Mouse input transparency [window hint](@ref GLFW_MOUSE_PASSTHROUGH_hint) or
- *  [window attribute](@ref GLFW_MOUSE_PASSTHROUGH_attrib).
- */
-#define GLFW_MOUSE_PASSTHROUGH      0x0002000D
-
-/*! @brief Initial position x-coordinate window hint.
- *
- *  Initial position x-coordinate [window hint](@ref GLFW_POSITION_X).
- */
-#define GLFW_POSITION_X             0x0002000E
-
-/*! @brief Initial position y-coordinate window hint.
- *
- *  Initial position y-coordinate [window hint](@ref GLFW_POSITION_Y).
- */
-#define GLFW_POSITION_Y             0x0002000F
-
-/*! @brief Framebuffer bit depth hint.
- *
- *  Framebuffer bit depth [hint](@ref GLFW_RED_BITS).
- */
-#define GLFW_RED_BITS               0x00021001
-/*! @brief Framebuffer bit depth hint.
- *
- *  Framebuffer bit depth [hint](@ref GLFW_GREEN_BITS).
- */
-#define GLFW_GREEN_BITS             0x00021002
-/*! @brief Framebuffer bit depth hint.
- *
- *  Framebuffer bit depth [hint](@ref GLFW_BLUE_BITS).
- */
-#define GLFW_BLUE_BITS              0x00021003
-/*! @brief Framebuffer bit depth hint.
- *
- *  Framebuffer bit depth [hint](@ref GLFW_ALPHA_BITS).
- */
-#define GLFW_ALPHA_BITS             0x00021004
-/*! @brief Framebuffer bit depth hint.
- *
- *  Framebuffer bit depth [hint](@ref GLFW_DEPTH_BITS).
- */
-#define GLFW_DEPTH_BITS             0x00021005
-/*! @brief Framebuffer bit depth hint.
- *
- *  Framebuffer bit depth [hint](@ref GLFW_STENCIL_BITS).
- */
-#define GLFW_STENCIL_BITS           0x00021006
-/*! @brief Framebuffer bit depth hint.
- *
- *  Framebuffer bit depth [hint](@ref GLFW_ACCUM_RED_BITS).
- */
-#define GLFW_ACCUM_RED_BITS         0x00021007
-/*! @brief Framebuffer bit depth hint.
- *
- *  Framebuffer bit depth [hint](@ref GLFW_ACCUM_GREEN_BITS).
- */
-#define GLFW_ACCUM_GREEN_BITS       0x00021008
-/*! @brief Framebuffer bit depth hint.
- *
- *  Framebuffer bit depth [hint](@ref GLFW_ACCUM_BLUE_BITS).
- */
-#define GLFW_ACCUM_BLUE_BITS        0x00021009
-/*! @brief Framebuffer bit depth hint.
- *
- *  Framebuffer bit depth [hint](@ref GLFW_ACCUM_ALPHA_BITS).
- */
-#define GLFW_ACCUM_ALPHA_BITS       0x0002100A
-/*! @brief Framebuffer auxiliary buffer hint.
- *
- *  Framebuffer auxiliary buffer [hint](@ref GLFW_AUX_BUFFERS).
- */
-#define GLFW_AUX_BUFFERS            0x0002100B
-/*! @brief OpenGL stereoscopic rendering hint.
- *
- *  OpenGL stereoscopic rendering [hint](@ref GLFW_STEREO).
- */
-#define GLFW_STEREO                 0x0002100C
-/*! @brief Framebuffer MSAA samples hint.
- *
- *  Framebuffer MSAA samples [hint](@ref GLFW_SAMPLES).
- */
-#define GLFW_SAMPLES                0x0002100D
-/*! @brief Framebuffer sRGB hint.
- *
- *  Framebuffer sRGB [hint](@ref GLFW_SRGB_CAPABLE).
- */
-#define GLFW_SRGB_CAPABLE           0x0002100E
-/*! @brief Monitor refresh rate hint.
- *
- *  Monitor refresh rate [hint](@ref GLFW_REFRESH_RATE).
- */
-#define GLFW_REFRESH_RATE           0x0002100F
-/*! @brief Framebuffer double buffering hint and attribute.
- *
- *  Framebuffer double buffering [hint](@ref GLFW_DOUBLEBUFFER_hint) and
- *  [attribute](@ref GLFW_DOUBLEBUFFER_attrib).
- */
-#define GLFW_DOUBLEBUFFER           0x00021010
-
-/*! @brief Context client API hint and attribute.
- *
- *  Context client API [hint](@ref GLFW_CLIENT_API_hint) and
- *  [attribute](@ref GLFW_CLIENT_API_attrib).
- */
-#define GLFW_CLIENT_API             0x00022001
-/*! @brief Context client API major version hint and attribute.
- *
- *  Context client API major version [hint](@ref GLFW_CONTEXT_VERSION_MAJOR_hint)
- *  and [attribute](@ref GLFW_CONTEXT_VERSION_MAJOR_attrib).
- */
-#define GLFW_CONTEXT_VERSION_MAJOR  0x00022002
-/*! @brief Context client API minor version hint and attribute.
- *
- *  Context client API minor version [hint](@ref GLFW_CONTEXT_VERSION_MINOR_hint)
- *  and [attribute](@ref GLFW_CONTEXT_VERSION_MINOR_attrib).
- */
-#define GLFW_CONTEXT_VERSION_MINOR  0x00022003
-/*! @brief Context client API revision number attribute.
- *
- *  Context client API revision number
- *  [attribute](@ref GLFW_CONTEXT_REVISION_attrib).
- */
-#define GLFW_CONTEXT_REVISION       0x00022004
-/*! @brief Context robustness hint and attribute.
- *
- *  Context client API revision number [hint](@ref GLFW_CONTEXT_ROBUSTNESS_hint)
- *  and [attribute](@ref GLFW_CONTEXT_ROBUSTNESS_attrib).
- */
-#define GLFW_CONTEXT_ROBUSTNESS     0x00022005
-/*! @brief OpenGL forward-compatibility hint and attribute.
- *
- *  OpenGL forward-compatibility [hint](@ref GLFW_OPENGL_FORWARD_COMPAT_hint)
- *  and [attribute](@ref GLFW_OPENGL_FORWARD_COMPAT_attrib).
- */
-#define GLFW_OPENGL_FORWARD_COMPAT  0x00022006
-/*! @brief Debug mode context hint and attribute.
- *
- *  Debug mode context [hint](@ref GLFW_CONTEXT_DEBUG_hint) and
- *  [attribute](@ref GLFW_CONTEXT_DEBUG_attrib).
- */
-#define GLFW_CONTEXT_DEBUG          0x00022007
-/*! @brief Legacy name for compatibility.
- *
- *  This is an alias for compatibility with earlier versions.
- */
-#define GLFW_OPENGL_DEBUG_CONTEXT   GLFW_CONTEXT_DEBUG
-/*! @brief OpenGL profile hint and attribute.
- *
- *  OpenGL profile [hint](@ref GLFW_OPENGL_PROFILE_hint) and
- *  [attribute](@ref GLFW_OPENGL_PROFILE_attrib).
- */
-#define GLFW_OPENGL_PROFILE         0x00022008
-/*! @brief Context flush-on-release hint and attribute.
- *
- *  Context flush-on-release [hint](@ref GLFW_CONTEXT_RELEASE_BEHAVIOR_hint) and
- *  [attribute](@ref GLFW_CONTEXT_RELEASE_BEHAVIOR_attrib).
- */
-#define GLFW_CONTEXT_RELEASE_BEHAVIOR 0x00022009
-/*! @brief Context error suppression hint and attribute.
- *
- *  Context error suppression [hint](@ref GLFW_CONTEXT_NO_ERROR_hint) and
- *  [attribute](@ref GLFW_CONTEXT_NO_ERROR_attrib).
- */
-#define GLFW_CONTEXT_NO_ERROR       0x0002200A
-/*! @brief Context creation API hint and attribute.
- *
- *  Context creation API [hint](@ref GLFW_CONTEXT_CREATION_API_hint) and
- *  [attribute](@ref GLFW_CONTEXT_CREATION_API_attrib).
- */
-#define GLFW_CONTEXT_CREATION_API   0x0002200B
-/*! @brief Window content area scaling window
- *  [window hint](@ref GLFW_SCALE_TO_MONITOR).
- */
-#define GLFW_SCALE_TO_MONITOR       0x0002200C
-/*! @brief Window framebuffer scaling
- *  [window hint](@ref GLFW_SCALE_FRAMEBUFFER_hint).
- */
-#define GLFW_SCALE_FRAMEBUFFER      0x0002200D
-/*! @brief Legacy name for compatibility.
- *
- *  This is an alias for the
- *  [GLFW_SCALE_FRAMEBUFFER](@ref GLFW_SCALE_FRAMEBUFFER_hint) window hint for
- *  compatibility with earlier versions.
- */
-#define GLFW_COCOA_RETINA_FRAMEBUFFER 0x00023001
-/*! @brief macOS specific
- *  [window hint](@ref GLFW_COCOA_FRAME_NAME_hint).
- */
-#define GLFW_COCOA_FRAME_NAME         0x00023002
-/*! @brief macOS specific
- *  [window hint](@ref GLFW_COCOA_GRAPHICS_SWITCHING_hint).
- */
-#define GLFW_COCOA_GRAPHICS_SWITCHING 0x00023003
-/*! @brief X11 specific
- *  [window hint](@ref GLFW_X11_CLASS_NAME_hint).
- */
-#define GLFW_X11_CLASS_NAME         0x00024001
-/*! @brief X11 specific
- *  [window hint](@ref GLFW_X11_CLASS_NAME_hint).
- */
-#define GLFW_X11_INSTANCE_NAME      0x00024002
-#define GLFW_WIN32_KEYBOARD_MENU    0x00025001
-/*! @brief Win32 specific [window hint](@ref GLFW_WIN32_SHOWDEFAULT_hint).
- */
-#define GLFW_WIN32_SHOWDEFAULT      0x00025002
-/*! @brief Wayland specific
- *  [window hint](@ref GLFW_WAYLAND_APP_ID_hint).
- *  
- *  Allows specification of the Wayland app_id.
- */
-#define GLFW_WAYLAND_APP_ID         0x00026001
-/*! @} */
-
-#define GLFW_NO_API                          0
-#define GLFW_OPENGL_API             0x00030001
-#define GLFW_OPENGL_ES_API          0x00030002
-
-#define GLFW_NO_ROBUSTNESS                   0
-#define GLFW_NO_RESET_NOTIFICATION  0x00031001
-#define GLFW_LOSE_CONTEXT_ON_RESET  0x00031002
-
-#define GLFW_OPENGL_ANY_PROFILE              0
-#define GLFW_OPENGL_CORE_PROFILE    0x00032001
-#define GLFW_OPENGL_COMPAT_PROFILE  0x00032002
-
-#define GLFW_CURSOR                  0x00033001
-#define GLFW_STICKY_KEYS             0x00033002
-#define GLFW_STICKY_MOUSE_BUTTONS    0x00033003
-#define GLFW_LOCK_KEY_MODS           0x00033004
-#define GLFW_RAW_MOUSE_MOTION        0x00033005
-#define GLFW_UNLIMITED_MOUSE_BUTTONS 0x00033006
-
-#define GLFW_CURSOR_NORMAL          0x00034001
-#define GLFW_CURSOR_HIDDEN          0x00034002
-#define GLFW_CURSOR_DISABLED        0x00034003
-#define GLFW_CURSOR_CAPTURED        0x00034004
-
-#define GLFW_ANY_RELEASE_BEHAVIOR            0
-#define GLFW_RELEASE_BEHAVIOR_FLUSH 0x00035001
-#define GLFW_RELEASE_BEHAVIOR_NONE  0x00035002
-
-#define GLFW_NATIVE_CONTEXT_API     0x00036001
-#define GLFW_EGL_CONTEXT_API        0x00036002
-#define GLFW_OSMESA_CONTEXT_API     0x00036003
-
-#define GLFW_ANGLE_PLATFORM_TYPE_NONE    0x00037001
-#define GLFW_ANGLE_PLATFORM_TYPE_OPENGL  0x00037002
-#define GLFW_ANGLE_PLATFORM_TYPE_OPENGLES 0x00037003
-#define GLFW_ANGLE_PLATFORM_TYPE_D3D9    0x00037004
-#define GLFW_ANGLE_PLATFORM_TYPE_D3D11   0x00037005
-#define GLFW_ANGLE_PLATFORM_TYPE_VULKAN  0x00037007
-#define GLFW_ANGLE_PLATFORM_TYPE_METAL   0x00037008
-
-#define GLFW_WAYLAND_PREFER_LIBDECOR    0x00038001
-#define GLFW_WAYLAND_DISABLE_LIBDECOR   0x00038002
-
-#define GLFW_ANY_POSITION           0x80000000
-
-/*! @defgroup shapes Standard cursor shapes
- *  @brief Standard system cursor shapes.
- *
- *  These are the [standard cursor shapes](@ref cursor_standard) that can be
- *  requested from the platform (window system).
- *
- *  @ingroup input
- *  @{ */
-
-/*! @brief The regular arrow cursor shape.
- *
- *  The regular arrow cursor shape.
- */
-#define GLFW_ARROW_CURSOR           0x00036001
-/*! @brief The text input I-beam cursor shape.
- *
- *  The text input I-beam cursor shape.
- */
-#define GLFW_IBEAM_CURSOR           0x00036002
-/*! @brief The crosshair cursor shape.
- *
- *  The crosshair cursor shape.
- */
-#define GLFW_CROSSHAIR_CURSOR       0x00036003
-/*! @brief The pointing hand cursor shape.
- *
- *  The pointing hand cursor shape.
- */
-#define GLFW_POINTING_HAND_CURSOR   0x00036004
-/*! @brief The horizontal resize/move arrow shape.
- *
- *  The horizontal resize/move arrow shape.  This is usually a horizontal
- *  double-headed arrow.
- */
-#define GLFW_RESIZE_EW_CURSOR       0x00036005
-/*! @brief The vertical resize/move arrow shape.
- *
- *  The vertical resize/move shape.  This is usually a vertical double-headed
- *  arrow.
- */
-#define GLFW_RESIZE_NS_CURSOR       0x00036006
-/*! @brief The top-left to bottom-right diagonal resize/move arrow shape.
- *
- *  The top-left to bottom-right diagonal resize/move shape.  This is usually
- *  a diagonal double-headed arrow.
- *
- *  @note __macOS:__ This shape is provided by a private system API and may fail
- *  with @ref GLFW_CURSOR_UNAVAILABLE in the future.
- *
- *  @note __Wayland:__ This shape is provided by a newer standard not supported by
- *  all cursor themes.
- *
- *  @note __X11:__ This shape is provided by a newer standard not supported by all
- *  cursor themes.
- */
-#define GLFW_RESIZE_NWSE_CURSOR     0x00036007
-/*! @brief The top-right to bottom-left diagonal resize/move arrow shape.
- *
- *  The top-right to bottom-left diagonal resize/move shape.  This is usually
- *  a diagonal double-headed arrow.
- *
- *  @note __macOS:__ This shape is provided by a private system API and may fail
- *  with @ref GLFW_CURSOR_UNAVAILABLE in the future.
- *
- *  @note __Wayland:__ This shape is provided by a newer standard not supported by
- *  all cursor themes.
- *
- *  @note __X11:__ This shape is provided by a newer standard not supported by all
- *  cursor themes.
- */
-#define GLFW_RESIZE_NESW_CURSOR     0x00036008
-/*! @brief The omni-directional resize/move cursor shape.
- *
- *  The omni-directional resize cursor/move shape.  This is usually either
- *  a combined horizontal and vertical double-headed arrow or a grabbing hand.
- */
-#define GLFW_RESIZE_ALL_CURSOR      0x00036009
-/*! @brief The operation-not-allowed shape.
- *
- *  The operation-not-allowed shape.  This is usually a circle with a diagonal
- *  line through it.
- *
- *  @note __Wayland:__ This shape is provided by a newer standard not supported by
- *  all cursor themes.
- *
- *  @note __X11:__ This shape is provided by a newer standard not supported by all
- *  cursor themes.
- */
-#define GLFW_NOT_ALLOWED_CURSOR     0x0003600A
-/*! @brief Legacy name for compatibility.
- *
- *  This is an alias for compatibility with earlier versions.
- */
-#define GLFW_HRESIZE_CURSOR         GLFW_RESIZE_EW_CURSOR
-/*! @brief Legacy name for compatibility.
- *
- *  This is an alias for compatibility with earlier versions.
- */
-#define GLFW_VRESIZE_CURSOR         GLFW_RESIZE_NS_CURSOR
-/*! @brief Legacy name for compatibility.
- *
- *  This is an alias for compatibility with earlier versions.
- */
-#define GLFW_HAND_CURSOR            GLFW_POINTING_HAND_CURSOR
-/*! @} */
-
-#define GLFW_CONNECTED              0x00040001
-#define GLFW_DISCONNECTED           0x00040002
-
-/*! @addtogroup init
- *  @{ */
-/*! @brief Joystick hat buttons init hint.
- *
- *  Joystick hat buttons [init hint](@ref GLFW_JOYSTICK_HAT_BUTTONS).
- */
-#define GLFW_JOYSTICK_HAT_BUTTONS   0x00050001
-/*! @brief ANGLE rendering backend init hint.
- *
- *  ANGLE rendering backend [init hint](@ref GLFW_ANGLE_PLATFORM_TYPE_hint).
- */
-#define GLFW_ANGLE_PLATFORM_TYPE    0x00050002
-/*! @brief Platform selection init hint.
- *
- *  Platform selection [init hint](@ref GLFW_PLATFORM).
- */
-#define GLFW_PLATFORM               0x00050003
-/*! @brief macOS specific init hint.
- *
- *  macOS specific [init hint](@ref GLFW_COCOA_CHDIR_RESOURCES_hint).
- */
-#define GLFW_COCOA_CHDIR_RESOURCES  0x00051001
-/*! @brief macOS specific init hint.
- *
- *  macOS specific [init hint](@ref GLFW_COCOA_MENUBAR_hint).
- */
-#define GLFW_COCOA_MENUBAR          0x00051002
-/*! @brief X11 specific init hint.
- *
- *  X11 specific [init hint](@ref GLFW_X11_XCB_VULKAN_SURFACE_hint).
- */
-#define GLFW_X11_XCB_VULKAN_SURFACE 0x00052001
-/*! @brief Wayland specific init hint.
- *
- *  Wayland specific [init hint](@ref GLFW_WAYLAND_LIBDECOR_hint).
- */
-#define GLFW_WAYLAND_LIBDECOR       0x00053001
-/*! @} */
-
-/*! @addtogroup init
- *  @{ */
-/*! @brief Hint value that enables automatic platform selection.
- *
- *  Hint value for @ref GLFW_PLATFORM that enables automatic platform selection.
- */
-#define GLFW_ANY_PLATFORM           0x00060000
-#define GLFW_PLATFORM_WIN32         0x00060001
-#define GLFW_PLATFORM_COCOA         0x00060002
-#define GLFW_PLATFORM_WAYLAND       0x00060003
-#define GLFW_PLATFORM_X11           0x00060004
-#define GLFW_PLATFORM_NULL          0x00060005
-/*! @} */
-
-#define GLFW_DONT_CARE              -1
-
-
-/*************************************************************************
- * GLFW API types
- *************************************************************************/
-
-/*! @brief Client API function pointer type.
- *
- *  Generic function pointer used for returning client API function pointers
- *  without forcing a cast from a regular pointer.
- *
- *  @sa @ref context_glext
- *  @sa @ref glfwGetProcAddress
- *
- *  @since Added in version 3.0.
- *
- *  @ingroup context
- */
-typedef void (*GLFWglproc)(void);
-
-/*! @brief Vulkan API function pointer type.
- *
- *  Generic function pointer used for returning Vulkan API function pointers
- *  without forcing a cast from a regular pointer.
- *
- *  @sa @ref vulkan_proc
- *  @sa @ref glfwGetInstanceProcAddress
- *
- *  @since Added in version 3.2.
- *
- *  @ingroup vulkan
- */
-typedef void (*GLFWvkproc)(void);
-
-/*! @brief Opaque monitor object.
- *
- *  Opaque monitor object.
- *
- *  @see @ref monitor_object
- *
- *  @since Added in version 3.0.
- *
- *  @ingroup monitor
- */
-typedef struct GLFWmonitor GLFWmonitor;
-
-/*! @brief Opaque window object.
- *
- *  Opaque window object.
- *
- *  @see @ref window_object
- *
- *  @since Added in version 3.0.
- *
- *  @ingroup window
- */
-typedef struct GLFWwindow GLFWwindow;
-
-/*! @brief Opaque cursor object.
- *
- *  Opaque cursor object.
- *
- *  @see @ref cursor_object
- *
- *  @since Added in version 3.1.
- *
- *  @ingroup input
- */
-typedef struct GLFWcursor GLFWcursor;
-
-/*! @brief The function pointer type for memory allocation callbacks.
- *
- *  This is the function pointer type for memory allocation callbacks.  A memory
- *  allocation callback function has the following signature:
- *  @code
- *  void* function_name(size_t size, void* user)
- *  @endcode
- *
- *  This function must return either a memory block at least `size` bytes long,
- *  or `NULL` if allocation failed.  Note that not all parts of GLFW handle allocation
- *  failures gracefully yet.
- *
- *  This function must support being called during @ref glfwInit but before the library is
- *  flagged as initialized, as well as during @ref glfwTerminate after the library is no
- *  longer flagged as initialized.
- *
- *  Any memory allocated via this function will be deallocated via the same allocator
- *  during library termination or earlier.
- *
- *  Any memory allocated via this function must be suitably aligned for any object type.
- *  If you are using C99 or earlier, this alignment is platform-dependent but will be the
- *  same as what `malloc` provides.  If you are using C11 or later, this is the value of
- *  `alignof(max_align_t)`.
- *
- *  The size will always be greater than zero.  Allocations of size zero are filtered out
- *  before reaching the custom allocator.
- *
- *  If this function returns `NULL`, GLFW will emit @ref GLFW_OUT_OF_MEMORY.
- *
- *  This function must not call any GLFW function.
- *
- *  @param[in] size The minimum size, in bytes, of the memory block.
- *  @param[in] user The user-defined pointer from the allocator.
- *  @return The address of the newly allocated memory block, or `NULL` if an
- *  error occurred.
- *
- *  @pointer_lifetime The returned memory block must be valid at least until it
- *  is deallocated.
- *
- *  @reentrancy This function should not call any GLFW function.
- *
- *  @thread_safety This function must support being called from any thread that calls GLFW
- *  functions.
- *
- *  @sa @ref init_allocator
- *  @sa @ref GLFWallocator
- *
- *  @since Added in version 3.4.
- *
- *  @ingroup init
- */
-typedef void* (* GLFWallocatefun)(size_t size, void* user);
-
-/*! @brief The function pointer type for memory reallocation callbacks.
- *
- *  This is the function pointer type for memory reallocation callbacks.
- *  A memory reallocation callback function has the following signature:
- *  @code
- *  void* function_name(void* block, size_t size, void* user)
- *  @endcode
- *
- *  This function must return a memory block at least `size` bytes long, or
- *  `NULL` if allocation failed.  Note that not all parts of GLFW handle allocation
- *  failures gracefully yet.
- *
- *  This function must support being called during @ref glfwInit but before the library is
- *  flagged as initialized, as well as during @ref glfwTerminate after the library is no
- *  longer flagged as initialized.
- *
- *  Any memory allocated via this function will be deallocated via the same allocator
- *  during library termination or earlier.
- *
- *  Any memory allocated via this function must be suitably aligned for any object type.
- *  If you are using C99 or earlier, this alignment is platform-dependent but will be the
- *  same as what `realloc` provides.  If you are using C11 or later, this is the value of
- *  `alignof(max_align_t)`.
- *
- *  The block address will never be `NULL` and the size will always be greater than zero.
- *  Reallocations of a block to size zero are converted into deallocations before reaching
- *  the custom allocator.  Reallocations of `NULL` to a non-zero size are converted into
- *  regular allocations before reaching the custom allocator.
- *
- *  If this function returns `NULL`, GLFW will emit @ref GLFW_OUT_OF_MEMORY.
- *
- *  This function must not call any GLFW function.
- *
- *  @param[in] block The address of the memory block to reallocate.
- *  @param[in] size The new minimum size, in bytes, of the memory block.
- *  @param[in] user The user-defined pointer from the allocator.
- *  @return The address of the newly allocated or resized memory block, or
- *  `NULL` if an error occurred.
- *
- *  @pointer_lifetime The returned memory block must be valid at least until it
- *  is deallocated.
- *
- *  @reentrancy This function should not call any GLFW function.
- *
- *  @thread_safety This function must support being called from any thread that calls GLFW
- *  functions.
- *
- *  @sa @ref init_allocator
- *  @sa @ref GLFWallocator
- *
- *  @since Added in version 3.4.
- *
- *  @ingroup init
- */
-typedef void* (* GLFWreallocatefun)(void* block, size_t size, void* user);
-
-/*! @brief The function pointer type for memory deallocation callbacks.
- *
- *  This is the function pointer type for memory deallocation callbacks.
- *  A memory deallocation callback function has the following signature:
- *  @code
- *  void function_name(void* block, void* user)
- *  @endcode
- *
- *  This function may deallocate the specified memory block.  This memory block
- *  will have been allocated with the same allocator.
- *
- *  This function must support being called during @ref glfwInit but before the library is
- *  flagged as initialized, as well as during @ref glfwTerminate after the library is no
- *  longer flagged as initialized.
- *
- *  The block address will never be `NULL`.  Deallocations of `NULL` are filtered out
- *  before reaching the custom allocator.
- *
- *  If this function returns `NULL`, GLFW will emit @ref GLFW_OUT_OF_MEMORY.
- *
- *  This function must not call any GLFW function.
- *
- *  @param[in] block The address of the memory block to deallocate.
- *  @param[in] user The user-defined pointer from the allocator.
- *
- *  @pointer_lifetime The specified memory block will not be accessed by GLFW
- *  after this function is called.
- *
- *  @reentrancy This function should not call any GLFW function.
- *
- *  @thread_safety This function must support being called from any thread that calls GLFW
- *  functions.
- *
- *  @sa @ref init_allocator
- *  @sa @ref GLFWallocator
- *
- *  @since Added in version 3.4.
- *
- *  @ingroup init
- */
-typedef void (* GLFWdeallocatefun)(void* block, void* user);
-
-/*! @brief The function pointer type for error callbacks.
- *
- *  This is the function pointer type for error callbacks.  An error callback
- *  function has the following signature:
- *  @code
- *  void callback_name(int error_code, const char* description)
- *  @endcode
- *
- *  @param[in] error_code An [error code](@ref errors).  Future releases may add
- *  more error codes.
- *  @param[in] description A UTF-8 encoded string describing the error.
- *
- *  @pointer_lifetime The error description string is valid until the callback
- *  function returns.
- *
- *  @sa @ref error_handling
- *  @sa @ref glfwSetErrorCallback
- *
- *  @since Added in version 3.0.
- *
- *  @ingroup init
- */
-typedef void (* GLFWerrorfun)(int error_code, const char* description);
-
-/*! @brief The function pointer type for window position callbacks.
- *
- *  This is the function pointer type for window position callbacks.  A window
- *  position callback function has the following signature:
- *  @code
- *  void callback_name(GLFWwindow* window, int xpos, int ypos)
- *  @endcode
- *
- *  @param[in] window The window that was moved.
- *  @param[in] xpos The new x-coordinate, in screen coordinates, of the
- *  upper-left corner of the content area of the window.
- *  @param[in] ypos The new y-coordinate, in screen coordinates, of the
- *  upper-left corner of the content area of the window.
- *
- *  @sa @ref window_pos
- *  @sa @ref glfwSetWindowPosCallback
- *
- *  @since Added in version 3.0.
- *
- *  @ingroup window
- */
-typedef void (* GLFWwindowposfun)(GLFWwindow* window, int xpos, int ypos);
-
-/*! @brief The function pointer type for window size callbacks.
- *
- *  This is the function pointer type for window size callbacks.  A window size
- *  callback function has the following signature:
- *  @code
- *  void callback_name(GLFWwindow* window, int width, int height)
- *  @endcode
- *
- *  @param[in] window The window that was resized.
- *  @param[in] width The new width, in screen coordinates, of the window.
- *  @param[in] height The new height, in screen coordinates, of the window.
- *
- *  @sa @ref window_size
- *  @sa @ref glfwSetWindowSizeCallback
- *
- *  @since Added in version 1.0.
- *  __GLFW 3:__ Added window handle parameter.
- *
- *  @ingroup window
- */
-typedef void (* GLFWwindowsizefun)(GLFWwindow* window, int width, int height);
-
-/*! @brief The function pointer type for window close callbacks.
- *
- *  This is the function pointer type for window close callbacks.  A window
- *  close callback function has the following signature:
- *  @code
- *  void function_name(GLFWwindow* window)
- *  @endcode
- *
- *  @param[in] window The window that the user attempted to close.
- *
- *  @sa @ref window_close
- *  @sa @ref glfwSetWindowCloseCallback
- *
- *  @since Added in version 2.5.
- *  __GLFW 3:__ Added window handle parameter.
- *
- *  @ingroup window
- */
-typedef void (* GLFWwindowclosefun)(GLFWwindow* window);
-
-/*! @brief The function pointer type for window content refresh callbacks.
- *
- *  This is the function pointer type for window content refresh callbacks.
- *  A window content refresh callback function has the following signature:
- *  @code
- *  void function_name(GLFWwindow* window);
- *  @endcode
- *
- *  @param[in] window The window whose content needs to be refreshed.
- *
- *  @sa @ref window_refresh
- *  @sa @ref glfwSetWindowRefreshCallback
- *
- *  @since Added in version 2.5.
- *  __GLFW 3:__ Added window handle parameter.
- *
- *  @ingroup window
- */
-typedef void (* GLFWwindowrefreshfun)(GLFWwindow* window);
-
-/*! @brief The function pointer type for window focus callbacks.
- *
- *  This is the function pointer type for window focus callbacks.  A window
- *  focus callback function has the following signature:
- *  @code
- *  void function_name(GLFWwindow* window, int focused)
- *  @endcode
- *
- *  @param[in] window The window that gained or lost input focus.
- *  @param[in] focused `GLFW_TRUE` if the window was given input focus, or
- *  `GLFW_FALSE` if it lost it.
- *
- *  @sa @ref window_focus
- *  @sa @ref glfwSetWindowFocusCallback
- *
- *  @since Added in version 3.0.
- *
- *  @ingroup window
- */
-typedef void (* GLFWwindowfocusfun)(GLFWwindow* window, int focused);
-
-/*! @brief The function pointer type for window iconify callbacks.
- *
- *  This is the function pointer type for window iconify callbacks.  A window
- *  iconify callback function has the following signature:
- *  @code
- *  void function_name(GLFWwindow* window, int iconified)
- *  @endcode
- *
- *  @param[in] window The window that was iconified or restored.
- *  @param[in] iconified `GLFW_TRUE` if the window was iconified, or
- *  `GLFW_FALSE` if it was restored.
- *
- *  @sa @ref window_iconify
- *  @sa @ref glfwSetWindowIconifyCallback
- *
- *  @since Added in version 3.0.
- *
- *  @ingroup window
- */
-typedef void (* GLFWwindowiconifyfun)(GLFWwindow* window, int iconified);
-
-/*! @brief The function pointer type for window maximize callbacks.
- *
- *  This is the function pointer type for window maximize callbacks.  A window
- *  maximize callback function has the following signature:
- *  @code
- *  void function_name(GLFWwindow* window, int maximized)
- *  @endcode
- *
- *  @param[in] window The window that was maximized or restored.
- *  @param[in] maximized `GLFW_TRUE` if the window was maximized, or
- *  `GLFW_FALSE` if it was restored.
- *
- *  @sa @ref window_maximize
- *  @sa glfwSetWindowMaximizeCallback
- *
- *  @since Added in version 3.3.
- *
- *  @ingroup window
- */
-typedef void (* GLFWwindowmaximizefun)(GLFWwindow* window, int maximized);
-
-/*! @brief The function pointer type for framebuffer size callbacks.
- *
- *  This is the function pointer type for framebuffer size callbacks.
- *  A framebuffer size callback function has the following signature:
- *  @code
- *  void function_name(GLFWwindow* window, int width, int height)
- *  @endcode
- *
- *  @param[in] window The window whose framebuffer was resized.
- *  @param[in] width The new width, in pixels, of the framebuffer.
- *  @param[in] height The new height, in pixels, of the framebuffer.
- *
- *  @sa @ref window_fbsize
- *  @sa @ref glfwSetFramebufferSizeCallback
- *
- *  @since Added in version 3.0.
- *
- *  @ingroup window
- */
-typedef void (* GLFWframebuffersizefun)(GLFWwindow* window, int width, int height);
-
-/*! @brief The function pointer type for window content scale callbacks.
- *
- *  This is the function pointer type for window content scale callbacks.
- *  A window content scale callback function has the following signature:
- *  @code
- *  void function_name(GLFWwindow* window, float xscale, float yscale)
- *  @endcode
- *
- *  @param[in] window The window whose content scale changed.
- *  @param[in] xscale The new x-axis content scale of the window.
- *  @param[in] yscale The new y-axis content scale of the window.
- *
- *  @sa @ref window_scale
- *  @sa @ref glfwSetWindowContentScaleCallback
- *
- *  @since Added in version 3.3.
- *
- *  @ingroup window
- */
-typedef void (* GLFWwindowcontentscalefun)(GLFWwindow* window, float xscale, float yscale);
-
-/*! @brief The function pointer type for mouse button callbacks.
- *
- *  This is the function pointer type for mouse button callback functions.
- *  A mouse button callback function has the following signature:
- *  @code
- *  void function_name(GLFWwindow* window, int button, int action, int mods)
- *  @endcode
- *
- *  @param[in] window The window that received the event.
- *  @param[in] button The [mouse button](@ref buttons) that was pressed or
- *  released.
- *  @param[in] action One of `GLFW_PRESS` or `GLFW_RELEASE`.  Future releases
- *  may add more actions.
- *  @param[in] mods Bit field describing which [modifier keys](@ref mods) were
- *  held down.
- *
- *  @sa @ref input_mouse_button
- *  @sa @ref glfwSetMouseButtonCallback
- *
- *  @since Added in version 1.0.
- *  __GLFW 3:__ Added window handle and modifier mask parameters.
- *
- *  @ingroup input
- */
-typedef void (* GLFWmousebuttonfun)(GLFWwindow* window, int button, int action, int mods);
-
-/*! @brief The function pointer type for cursor position callbacks.
- *
- *  This is the function pointer type for cursor position callbacks.  A cursor
- *  position callback function has the following signature:
- *  @code
- *  void function_name(GLFWwindow* window, double xpos, double ypos);
- *  @endcode
- *
- *  @param[in] window The window that received the event.
- *  @param[in] xpos The new cursor x-coordinate, relative to the left edge of
- *  the content area.
- *  @param[in] ypos The new cursor y-coordinate, relative to the top edge of the
- *  content area.
- *
- *  @sa @ref cursor_pos
- *  @sa @ref glfwSetCursorPosCallback
- *
- *  @since Added in version 3.0.  Replaces `GLFWmouseposfun`.
- *
- *  @ingroup input
- */
-typedef void (* GLFWcursorposfun)(GLFWwindow* window, double xpos, double ypos);
-
-/*! @brief The function pointer type for cursor enter/leave callbacks.
- *
- *  This is the function pointer type for cursor enter/leave callbacks.
- *  A cursor enter/leave callback function has the following signature:
- *  @code
- *  void function_name(GLFWwindow* window, int entered)
- *  @endcode
- *
- *  @param[in] window The window that received the event.
- *  @param[in] entered `GLFW_TRUE` if the cursor entered the window's content
- *  area, or `GLFW_FALSE` if it left it.
- *
- *  @sa @ref cursor_enter
- *  @sa @ref glfwSetCursorEnterCallback
- *
- *  @since Added in version 3.0.
- *
- *  @ingroup input
- */
-typedef void (* GLFWcursorenterfun)(GLFWwindow* window, int entered);
-
-/*! @brief The function pointer type for scroll callbacks.
- *
- *  This is the function pointer type for scroll callbacks.  A scroll callback
- *  function has the following signature:
- *  @code
- *  void function_name(GLFWwindow* window, double xoffset, double yoffset)
- *  @endcode
- *
- *  @param[in] window The window that received the event.
- *  @param[in] xoffset The scroll offset along the x-axis.
- *  @param[in] yoffset The scroll offset along the y-axis.
- *
- *  @sa @ref scrolling
- *  @sa @ref glfwSetScrollCallback
- *
- *  @since Added in version 3.0.  Replaces `GLFWmousewheelfun`.
- *
- *  @ingroup input
- */
-typedef void (* GLFWscrollfun)(GLFWwindow* window, double xoffset, double yoffset);
-
-/*! @brief The function pointer type for keyboard key callbacks.
- *
- *  This is the function pointer type for keyboard key callbacks.  A keyboard
- *  key callback function has the following signature:
- *  @code
- *  void function_name(GLFWwindow* window, int key, int scancode, int action, int mods)
- *  @endcode
- *
- *  @param[in] window The window that received the event.
- *  @param[in] key The [keyboard key](@ref keys) that was pressed or released.
- *  @param[in] scancode The platform-specific scancode of the key.
- *  @param[in] action `GLFW_PRESS`, `GLFW_RELEASE` or `GLFW_REPEAT`.  Future
- *  releases may add more actions.
- *  @param[in] mods Bit field describing which [modifier keys](@ref mods) were
- *  held down.
- *
- *  @sa @ref input_key
- *  @sa @ref glfwSetKeyCallback
- *
- *  @since Added in version 1.0.
- *  __GLFW 3:__ Added window handle, scancode and modifier mask parameters.
- *
- *  @ingroup input
- */
-typedef void (* GLFWkeyfun)(GLFWwindow* window, int key, int scancode, int action, int mods);
-
-/*! @brief The function pointer type for Unicode character callbacks.
- *
- *  This is the function pointer type for Unicode character callbacks.
- *  A Unicode character callback function has the following signature:
- *  @code
- *  void function_name(GLFWwindow* window, unsigned int codepoint)
- *  @endcode
- *
- *  @param[in] window The window that received the event.
- *  @param[in] codepoint The Unicode code point of the character.
- *
- *  @sa @ref input_char
- *  @sa @ref glfwSetCharCallback
- *
- *  @since Added in version 2.4.
- *  __GLFW 3:__ Added window handle parameter.
- *
- *  @ingroup input
- */
-typedef void (* GLFWcharfun)(GLFWwindow* window, unsigned int codepoint);
-
-/*! @brief The function pointer type for Unicode character with modifiers
- *  callbacks.
- *
- *  This is the function pointer type for Unicode character with modifiers
- *  callbacks.  It is called for each input character, regardless of what
- *  modifier keys are held down.  A Unicode character with modifiers callback
- *  function has the following signature:
- *  @code
- *  void function_name(GLFWwindow* window, unsigned int codepoint, int mods)
- *  @endcode
- *
- *  @param[in] window The window that received the event.
- *  @param[in] codepoint The Unicode code point of the character.
- *  @param[in] mods Bit field describing which [modifier keys](@ref mods) were
- *  held down.
- *
- *  @sa @ref input_char
- *  @sa @ref glfwSetCharModsCallback
- *
- *  @deprecated Scheduled for removal in version 4.0.
- *
- *  @since Added in version 3.1.
- *
- *  @ingroup input
- */
-typedef void (* GLFWcharmodsfun)(GLFWwindow* window, unsigned int codepoint, int mods);
-
-/*! @brief The function pointer type for path drop callbacks.
- *
- *  This is the function pointer type for path drop callbacks.  A path drop
- *  callback function has the following signature:
- *  @code
- *  void function_name(GLFWwindow* window, int path_count, const char* paths[])
- *  @endcode
- *
- *  @param[in] window The window that received the event.
- *  @param[in] path_count The number of dropped paths.
- *  @param[in] paths The UTF-8 encoded file and/or directory path names.
- *
- *  @pointer_lifetime The path array and its strings are valid until the
- *  callback function returns.
- *
- *  @sa @ref path_drop
- *  @sa @ref glfwSetDropCallback
- *
- *  @since Added in version 3.1.
- *
- *  @ingroup input
- */
-typedef void (* GLFWdropfun)(GLFWwindow* window, int path_count, const char* paths[]);
-
-/*! @brief The function pointer type for monitor configuration callbacks.
- *
- *  This is the function pointer type for monitor configuration callbacks.
- *  A monitor callback function has the following signature:
- *  @code
- *  void function_name(GLFWmonitor* monitor, int event)
- *  @endcode
- *
- *  @param[in] monitor The monitor that was connected or disconnected.
- *  @param[in] event One of `GLFW_CONNECTED` or `GLFW_DISCONNECTED`.  Future
- *  releases may add more events.
- *
- *  @sa @ref monitor_event
- *  @sa @ref glfwSetMonitorCallback
- *
- *  @since Added in version 3.0.
- *
- *  @ingroup monitor
- */
-typedef void (* GLFWmonitorfun)(GLFWmonitor* monitor, int event);
-
-/*! @brief The function pointer type for joystick configuration callbacks.
- *
- *  This is the function pointer type for joystick configuration callbacks.
- *  A joystick configuration callback function has the following signature:
- *  @code
- *  void function_name(int jid, int event)
- *  @endcode
- *
- *  @param[in] jid The joystick that was connected or disconnected.
- *  @param[in] event One of `GLFW_CONNECTED` or `GLFW_DISCONNECTED`.  Future
- *  releases may add more events.
- *
- *  @sa @ref joystick_event
- *  @sa @ref glfwSetJoystickCallback
- *
- *  @since Added in version 3.2.
- *
- *  @ingroup input
- */
-typedef void (* GLFWjoystickfun)(int jid, int event);
-
-/*! @brief Video mode type.
- *
- *  This describes a single video mode.
- *
- *  @sa @ref monitor_modes
- *  @sa @ref glfwGetVideoMode
- *  @sa @ref glfwGetVideoModes
- *
- *  @since Added in version 1.0.
- *  __GLFW 3:__ Added refresh rate member.
- *
- *  @ingroup monitor
- */
-typedef struct GLFWvidmode
-{
-    /*! The width, in screen coordinates, of the video mode.
-     */
-    int width;
-    /*! The height, in screen coordinates, of the video mode.
-     */
-    int height;
-    /*! The bit depth of the red channel of the video mode.
-     */
-    int redBits;
-    /*! The bit depth of the green channel of the video mode.
-     */
-    int greenBits;
-    /*! The bit depth of the blue channel of the video mode.
-     */
-    int blueBits;
-    /*! The refresh rate, in Hz, of the video mode.
-     */
-    int refreshRate;
-} GLFWvidmode;
-
-/*! @brief Gamma ramp.
- *
- *  This describes the gamma ramp for a monitor.
- *
- *  @sa @ref monitor_gamma
- *  @sa @ref glfwGetGammaRamp
- *  @sa @ref glfwSetGammaRamp
- *
- *  @since Added in version 3.0.
- *
- *  @ingroup monitor
- */
-typedef struct GLFWgammaramp
-{
-    /*! An array of value describing the response of the red channel.
-     */
-    unsigned short* red;
-    /*! An array of value describing the response of the green channel.
-     */
-    unsigned short* green;
-    /*! An array of value describing the response of the blue channel.
-     */
-    unsigned short* blue;
-    /*! The number of elements in each array.
-     */
-    unsigned int size;
-} GLFWgammaramp;
-
-/*! @brief Image data.
- *
- *  This describes a single 2D image.  See the documentation for each related
- *  function what the expected pixel format is.
- *
- *  @sa @ref cursor_custom
- *  @sa @ref window_icon
- *
- *  @since Added in version 2.1.
- *  __GLFW 3:__ Removed format and bytes-per-pixel members.
- *
- *  @ingroup window
- */
-typedef struct GLFWimage
-{
-    /*! The width, in pixels, of this image.
-     */
-    int width;
-    /*! The height, in pixels, of this image.
-     */
-    int height;
-    /*! The pixel data of this image, arranged left-to-right, top-to-bottom.
-     */
-    unsigned char* pixels;
-} GLFWimage;
-
-/*! @brief Gamepad input state
- *
- *  This describes the input state of a gamepad.
- *
- *  @sa @ref gamepad
- *  @sa @ref glfwGetGamepadState
- *
- *  @since Added in version 3.3.
- *
- *  @ingroup input
- */
-typedef struct GLFWgamepadstate
-{
-    /*! The states of each [gamepad button](@ref gamepad_buttons), `GLFW_PRESS`
-     *  or `GLFW_RELEASE`.
-     */
-    unsigned char buttons[15];
-    /*! The states of each [gamepad axis](@ref gamepad_axes), in the range -1.0
-     *  to 1.0 inclusive.
-     */
-    float axes[6];
-} GLFWgamepadstate;
-
-/*! @brief Custom heap memory allocator.
- *
- *  This describes a custom heap memory allocator for GLFW.  To set an allocator, pass it
- *  to @ref glfwInitAllocator before initializing the library.
- *
- *  @sa @ref init_allocator
- *  @sa @ref glfwInitAllocator
- *
- *  @since Added in version 3.4.
- *
- *  @ingroup init
- */
-typedef struct GLFWallocator
-{
-    /*! The memory allocation function.  See @ref GLFWallocatefun for details about
-     *  allocation function.
-     */
-    GLFWallocatefun allocate;
-    /*! The memory reallocation function.  See @ref GLFWreallocatefun for details about
-     *  reallocation function.
-     */
-    GLFWreallocatefun reallocate;
-    /*! The memory deallocation function.  See @ref GLFWdeallocatefun for details about
-     *  deallocation function.
-     */
-    GLFWdeallocatefun deallocate;
-    /*! The user pointer for this custom allocator.  This value will be passed to the
-     *  allocator functions.
-     */
-    void* user;
-} GLFWallocator;
-
-
-/*************************************************************************
- * GLFW API functions
- *************************************************************************/
-
-/*! @brief Initializes the GLFW library.
- *
- *  This function initializes the GLFW library.  Before most GLFW functions can
- *  be used, GLFW must be initialized, and before an application terminates GLFW
- *  should be terminated in order to free any resources allocated during or
- *  after initialization.
- *
- *  If this function fails, it calls @ref glfwTerminate before returning.  If it
- *  succeeds, you should call @ref glfwTerminate before the application exits.
- *
- *  Additional calls to this function after successful initialization but before
- *  termination will return `GLFW_TRUE` immediately.
- *
- *  The @ref GLFW_PLATFORM init hint controls which platforms are considered during
- *  initialization.  This also depends on which platforms the library was compiled to
- *  support.
- *
- *  @return `GLFW_TRUE` if successful, or `GLFW_FALSE` if an
- *  [error](@ref error_handling) occurred.
- *
- *  @errors Possible errors include @ref GLFW_PLATFORM_UNAVAILABLE and @ref
- *  GLFW_PLATFORM_ERROR.
- *
- *  @remark __macOS:__ This function will change the current directory of the
- *  application to the `Contents/Resources` subdirectory of the application's
- *  bundle, if present.  This can be disabled with the @ref
- *  GLFW_COCOA_CHDIR_RESOURCES init hint.
- *
- *  @remark __macOS:__ This function will create the main menu and dock icon for the
- *  application.  If GLFW finds a `MainMenu.nib` it is loaded and assumed to
- *  contain a menu bar.  Otherwise a minimal menu bar is created manually with
- *  common commands like Hide, Quit and About.  The About entry opens a minimal
- *  about dialog with information from the application's bundle.  The menu bar
- *  and dock icon can be disabled entirely with the @ref GLFW_COCOA_MENUBAR init
- *  hint.
- *
- *  @remark __Wayland, X11:__ If the library was compiled with support for both
- *  Wayland and X11, and the @ref GLFW_PLATFORM init hint is set to
- *  `GLFW_ANY_PLATFORM`, the `XDG_SESSION_TYPE` environment variable affects
- *  which platform is picked.  If the environment variable is not set, or is set
- *  to something other than `wayland` or `x11`, the regular detection mechanism
- *  will be used instead.
- *
- *  @remark __X11:__ This function will set the `LC_CTYPE` category of the
- *  application locale according to the current environment if that category is
- *  still "C".  This is because the "C" locale breaks Unicode text input.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref intro_init
- *  @sa @ref glfwInitHint
- *  @sa @ref glfwInitAllocator
- *  @sa @ref glfwTerminate
- *
- *  @since Added in version 1.0.
- *
- *  @ingroup init
- */
-GLFWAPI int glfwInit(void);
-
-/*! @brief Terminates the GLFW library.
- *
- *  This function destroys all remaining windows and cursors, restores any
- *  modified gamma ramps and frees any other allocated resources.  Once this
- *  function is called, you must again call @ref glfwInit successfully before
- *  you will be able to use most GLFW functions.
- *
- *  If GLFW has been successfully initialized, this function should be called
- *  before the application exits.  If initialization fails, there is no need to
- *  call this function, as it is called by @ref glfwInit before it returns
- *  failure.
- *
- *  This function has no effect if GLFW is not initialized.
- *
- *  @errors Possible errors include @ref GLFW_PLATFORM_ERROR.
- *
- *  @remark This function may be called before @ref glfwInit.
- *
- *  @warning The contexts of any remaining windows must not be current on any
- *  other thread when this function is called.
- *
- *  @reentrancy This function must not be called from a callback.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref intro_init
- *  @sa @ref glfwInit
- *
- *  @since Added in version 1.0.
- *
- *  @ingroup init
- */
-GLFWAPI void glfwTerminate(void);
-
-/*! @brief Sets the specified init hint to the desired value.
- *
- *  This function sets hints for the next initialization of GLFW.
- *
- *  The values you set hints to are never reset by GLFW, but they only take
- *  effect during initialization.  Once GLFW has been initialized, any values
- *  you set will be ignored until the library is terminated and initialized
- *  again.
- *
- *  Some hints are platform specific.  These may be set on any platform but they
- *  will only affect their specific platform.  Other platforms will ignore them.
- *  Setting these hints requires no platform specific headers or functions.
- *
- *  @param[in] hint The [init hint](@ref init_hints) to set.
- *  @param[in] value The new value of the init hint.
- *
- *  @errors Possible errors include @ref GLFW_INVALID_ENUM and @ref
- *  GLFW_INVALID_VALUE.
- *
- *  @remarks This function may be called before @ref glfwInit.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa init_hints
- *  @sa glfwInit
- *
- *  @since Added in version 3.3.
- *
- *  @ingroup init
- */
-GLFWAPI void glfwInitHint(int hint, int value);
-
-/*! @brief Sets the init allocator to the desired value.
- *
- *  To use the default allocator, call this function with a `NULL` argument.
- *
- *  If you specify an allocator struct, every member must be a valid function
- *  pointer.  If any member is `NULL`, this function will emit @ref
- *  GLFW_INVALID_VALUE and the init allocator will be unchanged.
- *
- *  The functions in the allocator must fulfil a number of requirements.  See the
- *  documentation for @ref GLFWallocatefun, @ref GLFWreallocatefun and @ref
- *  GLFWdeallocatefun for details.
- *
- *  @param[in] allocator The allocator to use at the next initialization, or
- *  `NULL` to use the default one.
- *
- *  @errors Possible errors include @ref GLFW_INVALID_VALUE.
- *
- *  @pointer_lifetime The specified allocator is copied before this function
- *  returns.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref init_allocator
- *  @sa @ref glfwInit
- *
- *  @since Added in version 3.4.
- *
- *  @ingroup init
- */
-GLFWAPI void glfwInitAllocator(const GLFWallocator* allocator);
-
-#if defined(VK_VERSION_1_0)
-
-/*! @brief Sets the desired Vulkan `vkGetInstanceProcAddr` function.
- *
- *  This function sets the `vkGetInstanceProcAddr` function that GLFW will use for all
- *  Vulkan related entry point queries.
- *
- *  This feature is mostly useful on macOS, if your copy of the Vulkan loader is in
- *  a location where GLFW cannot find it through dynamic loading, or if you are still
- *  using the static library version of the loader.
- *
- *  If set to `NULL`, GLFW will try to load the Vulkan loader dynamically by its standard
- *  name and get this function from there.  This is the default behavior.
- *
- *  The standard name of the loader is `vulkan-1.dll` on Windows, `libvulkan.so.1` on
- *  Linux and other Unix-like systems and `libvulkan.1.dylib` on macOS.  If your code is
- *  also loading it via these names then you probably don't need to use this function.
- *
- *  The function address you set is never reset by GLFW, but it only takes effect during
- *  initialization.  Once GLFW has been initialized, any updates will be ignored until the
- *  library is terminated and initialized again.
- *
- *  @param[in] loader The address of the function to use, or `NULL`.
- *
- *  @par Loader function signature
- *  @code
- *  PFN_vkVoidFunction vkGetInstanceProcAddr(VkInstance instance, const char* name)
- *  @endcode
- *  For more information about this function, see the
- *  [Vulkan Registry](https://www.khronos.org/registry/vulkan/).
- *
- *  @errors None.
- *
- *  @remark This function may be called before @ref glfwInit.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref vulkan_loader
- *  @sa @ref glfwInit
- *
- *  @since Added in version 3.4.
- *
- *  @ingroup init
- */
-GLFWAPI void glfwInitVulkanLoader(PFN_vkGetInstanceProcAddr loader);
-
-#endif /*VK_VERSION_1_0*/
-
-/*! @brief Retrieves the version of the GLFW library.
- *
- *  This function retrieves the major, minor and revision numbers of the GLFW
- *  library.  It is intended for when you are using GLFW as a shared library and
- *  want to ensure that you are using the minimum required version.
- *
- *  Any or all of the version arguments may be `NULL`.
- *
- *  @param[out] major Where to store the major version number, or `NULL`.
- *  @param[out] minor Where to store the minor version number, or `NULL`.
- *  @param[out] rev Where to store the revision number, or `NULL`.
- *
- *  @errors None.
- *
- *  @remark This function may be called before @ref glfwInit.
- *
- *  @thread_safety This function may be called from any thread.
- *
- *  @sa @ref intro_version
- *  @sa @ref glfwGetVersionString
- *
- *  @since Added in version 1.0.
- *
- *  @ingroup init
- */
-GLFWAPI void glfwGetVersion(int* major, int* minor, int* rev);
-
-/*! @brief Returns a string describing the compile-time configuration.
- *
- *  This function returns the compile-time generated
- *  [version string](@ref intro_version_string) of the GLFW library binary.  It describes
- *  the version, platforms, compiler and any platform or operating system specific
- *  compile-time options.  It should not be confused with the OpenGL or OpenGL ES version
- *  string, queried with `glGetString`.
- *
- *  __Do not use the version string__ to parse the GLFW library version.  The
- *  @ref glfwGetVersion function provides the version of the running library
- *  binary in numerical format.
- *
- *  __Do not use the version string__ to parse what platforms are supported.  The @ref
- *  glfwPlatformSupported function lets you query platform support.
- *
- *  @return The ASCII encoded GLFW version string.
- *
- *  @errors None.
- *
- *  @remark This function may be called before @ref glfwInit.
- *
- *  @pointer_lifetime The returned string is static and compile-time generated.
- *
- *  @thread_safety This function may be called from any thread.
- *
- *  @sa @ref intro_version
- *  @sa @ref glfwGetVersion
- *
- *  @since Added in version 3.0.
- *
- *  @ingroup init
- */
-GLFWAPI const char* glfwGetVersionString(void);
-
-/*! @brief Returns and clears the last error for the calling thread.
- *
- *  This function returns and clears the [error code](@ref errors) of the last
- *  error that occurred on the calling thread, and optionally a UTF-8 encoded
- *  human-readable description of it.  If no error has occurred since the last
- *  call, it returns @ref GLFW_NO_ERROR (zero) and the description pointer is
- *  set to `NULL`.
- *
- *  @param[in] description Where to store the error description pointer, or `NULL`.
- *  @return The last error code for the calling thread, or @ref GLFW_NO_ERROR
- *  (zero).
- *
- *  @errors None.
- *
- *  @pointer_lifetime The returned string is allocated and freed by GLFW.  You
- *  should not free it yourself.  It is guaranteed to be valid only until the
- *  next error occurs or the library is terminated.
- *
- *  @remark This function may be called before @ref glfwInit.
- *
- *  @thread_safety This function may be called from any thread.
- *
- *  @sa @ref error_handling
- *  @sa @ref glfwSetErrorCallback
- *
- *  @since Added in version 3.3.
- *
- *  @ingroup init
- */
-GLFWAPI int glfwGetError(const char** description);
-
-/*! @brief Sets the error callback.
- *
- *  This function sets the error callback, which is called with an error code
- *  and a human-readable description each time a GLFW error occurs.
- *
- *  The error code is set before the callback is called.  Calling @ref
- *  glfwGetError from the error callback will return the same value as the error
- *  code argument.
- *
- *  The error callback is called on the thread where the error occurred.  If you
- *  are using GLFW from multiple threads, your error callback needs to be
- *  written accordingly.
- *
- *  Because the description string may have been generated specifically for that
- *  error, it is not guaranteed to be valid after the callback has returned.  If
- *  you wish to use it after the callback returns, you need to make a copy.
- *
- *  Once set, the error callback remains set even after the library has been
- *  terminated.
- *
- *  @param[in] callback The new callback, or `NULL` to remove the currently set
- *  callback.
- *  @return The previously set callback, or `NULL` if no callback was set.
- *
- *  @callback_signature
- *  @code
- *  void callback_name(int error_code, const char* description)
- *  @endcode
- *  For more information about the callback parameters, see the
- *  [callback pointer type](@ref GLFWerrorfun).
- *
- *  @errors None.
- *
- *  @remark This function may be called before @ref glfwInit.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref error_handling
- *  @sa @ref glfwGetError
- *
- *  @since Added in version 3.0.
- *
- *  @ingroup init
- */
-GLFWAPI GLFWerrorfun glfwSetErrorCallback(GLFWerrorfun callback);
-
-/*! @brief Returns the currently selected platform.
- *
- *  This function returns the platform that was selected during initialization.  The
- *  returned value will be one of `GLFW_PLATFORM_WIN32`, `GLFW_PLATFORM_COCOA`,
- *  `GLFW_PLATFORM_WAYLAND`, `GLFW_PLATFORM_X11` or `GLFW_PLATFORM_NULL`.
- *
- *  @return The currently selected platform, or zero if an error occurred.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED.
- *
- *  @thread_safety This function may be called from any thread.
- *
- *  @sa @ref platform
- *  @sa @ref glfwPlatformSupported
- *
- *  @since Added in version 3.4.
- *
- *  @ingroup init
- */
-GLFWAPI int glfwGetPlatform(void);
-
-/*! @brief Returns whether the library includes support for the specified platform.
- *
- *  This function returns whether the library was compiled with support for the specified
- *  platform.  The platform must be one of `GLFW_PLATFORM_WIN32`, `GLFW_PLATFORM_COCOA`,
- *  `GLFW_PLATFORM_WAYLAND`, `GLFW_PLATFORM_X11` or `GLFW_PLATFORM_NULL`.
- *
- *  @param[in] platform The platform to query.
- *  @return `GLFW_TRUE` if the platform is supported, or `GLFW_FALSE` otherwise.
- *
- *  @errors Possible errors include @ref GLFW_INVALID_ENUM.
- *
- *  @remark This function may be called before @ref glfwInit.
- *
- *  @thread_safety This function may be called from any thread.
- *
- *  @sa @ref platform
- *  @sa @ref glfwGetPlatform
- *
- *  @since Added in version 3.4.
- *
- *  @ingroup init
- */
-GLFWAPI int glfwPlatformSupported(int platform);
-
-/*! @brief Returns the currently connected monitors.
- *
- *  This function returns an array of handles for all currently connected
- *  monitors.  The primary monitor is always first in the returned array.  If no
- *  monitors were found, this function returns `NULL`.
- *
- *  @param[out] count Where to store the number of monitors in the returned
- *  array.  This is set to zero if an error occurred.
- *  @return An array of monitor handles, or `NULL` if no monitors were found or
- *  if an [error](@ref error_handling) occurred.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED.
- *
- *  @pointer_lifetime The returned array is allocated and freed by GLFW.  You
- *  should not free it yourself.  It is guaranteed to be valid only until the
- *  monitor configuration changes or the library is terminated.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref monitor_monitors
- *  @sa @ref monitor_event
- *  @sa @ref glfwGetPrimaryMonitor
- *
- *  @since Added in version 3.0.
- *
- *  @ingroup monitor
- */
-GLFWAPI GLFWmonitor** glfwGetMonitors(int* count);
-
-/*! @brief Returns the primary monitor.
- *
- *  This function returns the primary monitor.  This is usually the monitor
- *  where elements like the task bar or global menu bar are located.
- *
- *  @return The primary monitor, or `NULL` if no monitors were found or if an
- *  [error](@ref error_handling) occurred.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @remark The primary monitor is always first in the array returned by @ref
- *  glfwGetMonitors.
- *
- *  @sa @ref monitor_monitors
- *  @sa @ref glfwGetMonitors
- *
- *  @since Added in version 3.0.
- *
- *  @ingroup monitor
- */
-GLFWAPI GLFWmonitor* glfwGetPrimaryMonitor(void);
-
-/*! @brief Returns the position of the monitor's viewport on the virtual screen.
- *
- *  This function returns the position, in screen coordinates, of the upper-left
- *  corner of the specified monitor.
- *
- *  Any or all of the position arguments may be `NULL`.  If an error occurs, all
- *  non-`NULL` position arguments will be set to zero.
- *
- *  @param[in] monitor The monitor to query.
- *  @param[out] xpos Where to store the monitor x-coordinate, or `NULL`.
- *  @param[out] ypos Where to store the monitor y-coordinate, or `NULL`.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
- *  GLFW_PLATFORM_ERROR.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref monitor_properties
- *
- *  @since Added in version 3.0.
- *
- *  @ingroup monitor
- */
-GLFWAPI void glfwGetMonitorPos(GLFWmonitor* monitor, int* xpos, int* ypos);
-
-/*! @brief Retrieves the work area of the monitor.
- *
- *  This function returns the position, in screen coordinates, of the upper-left
- *  corner of the work area of the specified monitor along with the work area
- *  size in screen coordinates. The work area is defined as the area of the
- *  monitor not occluded by the window system task bar where present. If no
- *  task bar exists then the work area is the monitor resolution in screen
- *  coordinates.
- *
- *  Any or all of the position and size arguments may be `NULL`.  If an error
- *  occurs, all non-`NULL` position and size arguments will be set to zero.
- *
- *  @param[in] monitor The monitor to query.
- *  @param[out] xpos Where to store the monitor x-coordinate, or `NULL`.
- *  @param[out] ypos Where to store the monitor y-coordinate, or `NULL`.
- *  @param[out] width Where to store the monitor width, or `NULL`.
- *  @param[out] height Where to store the monitor height, or `NULL`.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
- *  GLFW_PLATFORM_ERROR.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref monitor_workarea
- *
- *  @since Added in version 3.3.
- *
- *  @ingroup monitor
- */
-GLFWAPI void glfwGetMonitorWorkarea(GLFWmonitor* monitor, int* xpos, int* ypos, int* width, int* height);
-
-/*! @brief Returns the physical size of the monitor.
- *
- *  This function returns the size, in millimetres, of the display area of the
- *  specified monitor.
- *
- *  Some platforms do not provide accurate monitor size information, either
- *  because the monitor [EDID][] data is incorrect or because the driver does
- *  not report it accurately.
- *
- *  [EDID]: https://en.wikipedia.org/wiki/Extended_display_identification_data
- *
- *  Any or all of the size arguments may be `NULL`.  If an error occurs, all
- *  non-`NULL` size arguments will be set to zero.
- *
- *  @param[in] monitor The monitor to query.
- *  @param[out] widthMM Where to store the width, in millimetres, of the
- *  monitor's display area, or `NULL`.
- *  @param[out] heightMM Where to store the height, in millimetres, of the
- *  monitor's display area, or `NULL`.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED.
- *
- *  @remark __Win32:__ On Windows 8 and earlier the physical size is calculated from
- *  the current resolution and system DPI instead of querying the monitor EDID data.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref monitor_properties
- *
- *  @since Added in version 3.0.
- *
- *  @ingroup monitor
- */
-GLFWAPI void glfwGetMonitorPhysicalSize(GLFWmonitor* monitor, int* widthMM, int* heightMM);
-
-/*! @brief Retrieves the content scale for the specified monitor.
- *
- *  This function retrieves the content scale for the specified monitor.  The
- *  content scale is the ratio between the current DPI and the platform's
- *  default DPI.  This is especially important for text and any UI elements.  If
- *  the pixel dimensions of your UI scaled by this look appropriate on your
- *  machine then it should appear at a reasonable size on other machines
- *  regardless of their DPI and scaling settings.  This relies on the system DPI
- *  and scaling settings being somewhat correct.
- *
- *  The content scale may depend on both the monitor resolution and pixel
- *  density and on user settings.  It may be very different from the raw DPI
- *  calculated from the physical size and current resolution.
- *
- *  @param[in] monitor The monitor to query.
- *  @param[out] xscale Where to store the x-axis content scale, or `NULL`.
- *  @param[out] yscale Where to store the y-axis content scale, or `NULL`.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
- *  GLFW_PLATFORM_ERROR.
- *
- *  @remark __Wayland:__ Fractional scaling information is not yet available for
- *  monitors, so this function only returns integer content scales.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref monitor_scale
- *  @sa @ref glfwGetWindowContentScale
- *
- *  @since Added in version 3.3.
- *
- *  @ingroup monitor
- */
-GLFWAPI void glfwGetMonitorContentScale(GLFWmonitor* monitor, float* xscale, float* yscale);
-
-/*! @brief Returns the name of the specified monitor.
- *
- *  This function returns a human-readable name, encoded as UTF-8, of the
- *  specified monitor.  The name typically reflects the make and model of the
- *  monitor and is not guaranteed to be unique among the connected monitors.
- *
- *  @param[in] monitor The monitor to query.
- *  @return The UTF-8 encoded name of the monitor, or `NULL` if an
- *  [error](@ref error_handling) occurred.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED.
- *
- *  @pointer_lifetime The returned string is allocated and freed by GLFW.  You
- *  should not free it yourself.  It is valid until the specified monitor is
- *  disconnected or the library is terminated.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref monitor_properties
- *
- *  @since Added in version 3.0.
- *
- *  @ingroup monitor
- */
-GLFWAPI const char* glfwGetMonitorName(GLFWmonitor* monitor);
-
-/*! @brief Sets the user pointer of the specified monitor.
- *
- *  This function sets the user-defined pointer of the specified monitor.  The
- *  current value is retained until the monitor is disconnected.  The initial
- *  value is `NULL`.
- *
- *  This function may be called from the monitor callback, even for a monitor
- *  that is being disconnected.
- *
- *  @param[in] monitor The monitor whose pointer to set.
- *  @param[in] pointer The new value.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED.
- *
- *  @thread_safety This function may be called from any thread.  Access is not
- *  synchronized.
- *
- *  @sa @ref monitor_userptr
- *  @sa @ref glfwGetMonitorUserPointer
- *
- *  @since Added in version 3.3.
- *
- *  @ingroup monitor
- */
-GLFWAPI void glfwSetMonitorUserPointer(GLFWmonitor* monitor, void* pointer);
-
-/*! @brief Returns the user pointer of the specified monitor.
- *
- *  This function returns the current value of the user-defined pointer of the
- *  specified monitor.  The initial value is `NULL`.
- *
- *  This function may be called from the monitor callback, even for a monitor
- *  that is being disconnected.
- *
- *  @param[in] monitor The monitor whose pointer to return.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED.
- *
- *  @thread_safety This function may be called from any thread.  Access is not
- *  synchronized.
- *
- *  @sa @ref monitor_userptr
- *  @sa @ref glfwSetMonitorUserPointer
- *
- *  @since Added in version 3.3.
- *
- *  @ingroup monitor
- */
-GLFWAPI void* glfwGetMonitorUserPointer(GLFWmonitor* monitor);
-
-/*! @brief Sets the monitor configuration callback.
- *
- *  This function sets the monitor configuration callback, or removes the
- *  currently set callback.  This is called when a monitor is connected to or
- *  disconnected from the system.
- *
- *  @param[in] callback The new callback, or `NULL` to remove the currently set
- *  callback.
- *  @return The previously set callback, or `NULL` if no callback was set or the
- *  library had not been [initialized](@ref intro_init).
- *
- *  @callback_signature
- *  @code
- *  void function_name(GLFWmonitor* monitor, int event)
- *  @endcode
- *  For more information about the callback parameters, see the
- *  [function pointer type](@ref GLFWmonitorfun).
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref monitor_event
- *
- *  @since Added in version 3.0.
- *
- *  @ingroup monitor
- */
-GLFWAPI GLFWmonitorfun glfwSetMonitorCallback(GLFWmonitorfun callback);
-
-/*! @brief Returns the available video modes for the specified monitor.
- *
- *  This function returns an array of all video modes supported by the specified
- *  monitor.  The returned array is sorted in ascending order, first by color
- *  bit depth (the sum of all channel depths), then by resolution area (the
- *  product of width and height), then resolution width and finally by refresh
- *  rate.
- *
- *  @param[in] monitor The monitor to query.
- *  @param[out] count Where to store the number of video modes in the returned
- *  array.  This is set to zero if an error occurred.
- *  @return An array of video modes, or `NULL` if an
- *  [error](@ref error_handling) occurred.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
- *  GLFW_PLATFORM_ERROR.
- *
- *  @pointer_lifetime The returned array is allocated and freed by GLFW.  You
- *  should not free it yourself.  It is valid until the specified monitor is
- *  disconnected, this function is called again for that monitor or the library
- *  is terminated.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref monitor_modes
- *  @sa @ref glfwGetVideoMode
- *
- *  @since Added in version 1.0.
- *  __GLFW 3:__ Changed to return an array of modes for a specific monitor.
- *
- *  @ingroup monitor
- */
-GLFWAPI const GLFWvidmode* glfwGetVideoModes(GLFWmonitor* monitor, int* count);
-
-/*! @brief Returns the current mode of the specified monitor.
- *
- *  This function returns the current video mode of the specified monitor.  If
- *  you have created a full screen window for that monitor, the return value
- *  will depend on whether that window is iconified.
- *
- *  @param[in] monitor The monitor to query.
- *  @return The current mode of the monitor, or `NULL` if an
- *  [error](@ref error_handling) occurred.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
- *  GLFW_PLATFORM_ERROR.
- *
- *  @pointer_lifetime The returned array is allocated and freed by GLFW.  You
- *  should not free it yourself.  It is valid until the specified monitor is
- *  disconnected or the library is terminated.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref monitor_modes
- *  @sa @ref glfwGetVideoModes
- *
- *  @since Added in version 3.0.  Replaces `glfwGetDesktopMode`.
- *
- *  @ingroup monitor
- */
-GLFWAPI const GLFWvidmode* glfwGetVideoMode(GLFWmonitor* monitor);
-
-/*! @brief Generates a gamma ramp and sets it for the specified monitor.
- *
- *  This function generates an appropriately sized gamma ramp from the specified
- *  exponent and then calls @ref glfwSetGammaRamp with it.  The value must be
- *  a finite number greater than zero.
- *
- *  The software controlled gamma ramp is applied _in addition_ to the hardware
- *  gamma correction, which today is usually an approximation of sRGB gamma.
- *  This means that setting a perfectly linear ramp, or gamma 1.0, will produce
- *  the default (usually sRGB-like) behavior.
- *
- *  For gamma correct rendering with OpenGL or OpenGL ES, see the @ref
- *  GLFW_SRGB_CAPABLE hint.
- *
- *  @param[in] monitor The monitor whose gamma ramp to set.
- *  @param[in] gamma The desired exponent.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED, @ref GLFW_INVALID_VALUE,
- *  @ref GLFW_PLATFORM_ERROR and @ref GLFW_FEATURE_UNAVAILABLE (see remarks).
- *
- *  @remark __Wayland:__ Monitor gamma is a privileged protocol, so this function
- *  cannot be implemented and emits @ref GLFW_FEATURE_UNAVAILABLE.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref monitor_gamma
- *
- *  @since Added in version 3.0.
- *
- *  @ingroup monitor
- */
-GLFWAPI void glfwSetGamma(GLFWmonitor* monitor, float gamma);
-
-/*! @brief Returns the current gamma ramp for the specified monitor.
- *
- *  This function returns the current gamma ramp of the specified monitor.
- *
- *  @param[in] monitor The monitor to query.
- *  @return The current gamma ramp, or `NULL` if an
- *  [error](@ref error_handling) occurred.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED, @ref GLFW_PLATFORM_ERROR
- *  and @ref GLFW_FEATURE_UNAVAILABLE (see remarks).
- *
- *  @remark __Wayland:__ Monitor gamma is a privileged protocol, so this function
- *  cannot be implemented and emits @ref GLFW_FEATURE_UNAVAILABLE while
- *  returning `NULL`.
- *
- *  @pointer_lifetime The returned structure and its arrays are allocated and
- *  freed by GLFW.  You should not free them yourself.  They are valid until the
- *  specified monitor is disconnected, this function is called again for that
- *  monitor or the library is terminated.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref monitor_gamma
- *
- *  @since Added in version 3.0.
- *
- *  @ingroup monitor
- */
-GLFWAPI const GLFWgammaramp* glfwGetGammaRamp(GLFWmonitor* monitor);
-
-/*! @brief Sets the current gamma ramp for the specified monitor.
- *
- *  This function sets the current gamma ramp for the specified monitor.  The
- *  original gamma ramp for that monitor is saved by GLFW the first time this
- *  function is called and is restored by @ref glfwTerminate.
- *
- *  The software controlled gamma ramp is applied _in addition_ to the hardware
- *  gamma correction, which today is usually an approximation of sRGB gamma.
- *  This means that setting a perfectly linear ramp, or gamma 1.0, will produce
- *  the default (usually sRGB-like) behavior.
- *
- *  For gamma correct rendering with OpenGL or OpenGL ES, see the @ref
- *  GLFW_SRGB_CAPABLE hint.
- *
- *  @param[in] monitor The monitor whose gamma ramp to set.
- *  @param[in] ramp The gamma ramp to use.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED, @ref GLFW_PLATFORM_ERROR
- *  and @ref GLFW_FEATURE_UNAVAILABLE (see remarks).
- *
- *  @remark The size of the specified gamma ramp should match the size of the
- *  current ramp for that monitor.
- *
- *  @remark __Win32:__ The gamma ramp size must be 256.
- *
- *  @remark __Wayland:__ Monitor gamma is a privileged protocol, so this function
- *  cannot be implemented and emits @ref GLFW_FEATURE_UNAVAILABLE.
- *
- *  @pointer_lifetime The specified gamma ramp is copied before this function
- *  returns.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref monitor_gamma
- *
- *  @since Added in version 3.0.
- *
- *  @ingroup monitor
- */
-GLFWAPI void glfwSetGammaRamp(GLFWmonitor* monitor, const GLFWgammaramp* ramp);
-
-/*! @brief Resets all window hints to their default values.
- *
- *  This function resets all window hints to their
- *  [default values](@ref window_hints_values).
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref window_hints
- *  @sa @ref glfwWindowHint
- *  @sa @ref glfwWindowHintString
- *
- *  @since Added in version 3.0.
- *
- *  @ingroup window
- */
-GLFWAPI void glfwDefaultWindowHints(void);
-
-/*! @brief Sets the specified window hint to the desired value.
- *
- *  This function sets hints for the next call to @ref glfwCreateWindow.  The
- *  hints, once set, retain their values until changed by a call to this
- *  function or @ref glfwDefaultWindowHints, or until the library is terminated.
- *
- *  Only integer value hints can be set with this function.  String value hints
- *  are set with @ref glfwWindowHintString.
- *
- *  This function does not check whether the specified hint values are valid.
- *  If you set hints to invalid values this will instead be reported by the next
- *  call to @ref glfwCreateWindow.
- *
- *  Some hints are platform specific.  These may be set on any platform but they
- *  will only affect their specific platform.  Other platforms will ignore them.
- *  Setting these hints requires no platform specific headers or functions.
- *
- *  @param[in] hint The [window hint](@ref window_hints) to set.
- *  @param[in] value The new value of the window hint.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
- *  GLFW_INVALID_ENUM.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref window_hints
- *  @sa @ref glfwWindowHintString
- *  @sa @ref glfwDefaultWindowHints
- *
- *  @since Added in version 3.0.  Replaces `glfwOpenWindowHint`.
- *
- *  @ingroup window
- */
-GLFWAPI void glfwWindowHint(int hint, int value);
-
-/*! @brief Sets the specified window hint to the desired value.
- *
- *  This function sets hints for the next call to @ref glfwCreateWindow.  The
- *  hints, once set, retain their values until changed by a call to this
- *  function or @ref glfwDefaultWindowHints, or until the library is terminated.
- *
- *  Only string type hints can be set with this function.  Integer value hints
- *  are set with @ref glfwWindowHint.
- *
- *  This function does not check whether the specified hint values are valid.
- *  If you set hints to invalid values this will instead be reported by the next
- *  call to @ref glfwCreateWindow.
- *
- *  Some hints are platform specific.  These may be set on any platform but they
- *  will only affect their specific platform.  Other platforms will ignore them.
- *  Setting these hints requires no platform specific headers or functions.
- *
- *  @param[in] hint The [window hint](@ref window_hints) to set.
- *  @param[in] value The new value of the window hint.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
- *  GLFW_INVALID_ENUM.
- *
- *  @pointer_lifetime The specified string is copied before this function
- *  returns.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref window_hints
- *  @sa @ref glfwWindowHint
- *  @sa @ref glfwDefaultWindowHints
- *
- *  @since Added in version 3.3.
- *
- *  @ingroup window
- */
-GLFWAPI void glfwWindowHintString(int hint, const char* value);
-
-/*! @brief Creates a window and its associated context.
- *
- *  This function creates a window and its associated OpenGL or OpenGL ES
- *  context.  Most of the options controlling how the window and its context
- *  should be created are specified with [window hints](@ref window_hints).
- *
- *  Successful creation does not change which context is current.  Before you
- *  can use the newly created context, you need to
- *  [make it current](@ref context_current).  For information about the `share`
- *  parameter, see @ref context_sharing.
- *
- *  The created window, framebuffer and context may differ from what you
- *  requested, as not all parameters and hints are
- *  [hard constraints](@ref window_hints_hard).  This includes the size of the
- *  window, especially for full screen windows.  To query the actual attributes
- *  of the created window, framebuffer and context, see @ref
- *  glfwGetWindowAttrib, @ref glfwGetWindowSize and @ref glfwGetFramebufferSize.
- *
- *  To create a full screen window, you need to specify the monitor the window
- *  will cover.  If no monitor is specified, the window will be windowed mode.
- *  Unless you have a way for the user to choose a specific monitor, it is
- *  recommended that you pick the primary monitor.  For more information on how
- *  to query connected monitors, see @ref monitor_monitors.
- *
- *  For full screen windows, the specified size becomes the resolution of the
- *  window's _desired video mode_.  As long as a full screen window is not
- *  iconified, the supported video mode most closely matching the desired video
- *  mode is set for the specified monitor.  For more information about full
- *  screen windows, including the creation of so called _windowed full screen_
- *  or _borderless full screen_ windows, see @ref window_windowed_full_screen.
- *
- *  Once you have created the window, you can switch it between windowed and
- *  full screen mode with @ref glfwSetWindowMonitor.  This will not affect its
- *  OpenGL or OpenGL ES context.
- *
- *  By default, newly created windows use the placement recommended by the
- *  window system.  To create the window at a specific position, set the @ref
- *  GLFW_POSITION_X and @ref GLFW_POSITION_Y window hints before creation.  To
- *  restore the default behavior, set either or both hints back to
- *  `GLFW_ANY_POSITION`.
- *
- *  As long as at least one full screen window is not iconified, the screensaver
- *  is prohibited from starting.
- *
- *  Window systems put limits on window sizes.  Very large or very small window
- *  dimensions may be overridden by the window system on creation.  Check the
- *  actual [size](@ref window_size) after creation.
- *
- *  The [swap interval](@ref buffer_swap) is not set during window creation and
- *  the initial value may vary depending on driver settings and defaults.
- *
- *  @param[in] width The desired width, in screen coordinates, of the window.
- *  This must be greater than zero.
- *  @param[in] height The desired height, in screen coordinates, of the window.
- *  This must be greater than zero.
- *  @param[in] title The initial, UTF-8 encoded window title.
- *  @param[in] monitor The monitor to use for full screen mode, or `NULL` for
- *  windowed mode.
- *  @param[in] share The window whose context to share resources with, or `NULL`
- *  to not share resources.
- *  @return The handle of the created window, or `NULL` if an
- *  [error](@ref error_handling) occurred.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED, @ref
- *  GLFW_INVALID_ENUM, @ref GLFW_INVALID_VALUE, @ref GLFW_API_UNAVAILABLE, @ref
- *  GLFW_VERSION_UNAVAILABLE, @ref GLFW_FORMAT_UNAVAILABLE, @ref
- *  GLFW_NO_WINDOW_CONTEXT and @ref GLFW_PLATFORM_ERROR.
- *
- *  @remark __Win32:__ Window creation will fail if the Microsoft GDI software
- *  OpenGL implementation is the only one available.
- *
- *  @remark __Win32:__ If the executable has an icon resource named `GLFW_ICON,` it
- *  will be set as the initial icon for the window.  If no such icon is present,
- *  the `IDI_APPLICATION` icon will be used instead.  To set a different icon,
- *  see @ref glfwSetWindowIcon.
- *
- *  @remark __Win32:__ The context to share resources with must not be current on
- *  any other thread.
- *
- *  @remark __macOS:__ The OS only supports core profile contexts for OpenGL
- *  versions 3.2 and later.  Before creating an OpenGL context of version 3.2 or
- *  later you must set the [GLFW_OPENGL_PROFILE](@ref GLFW_OPENGL_PROFILE_hint)
- *  hint accordingly.  OpenGL 3.0 and 3.1 contexts are not supported at all
- *  on macOS.
- *
- *  @remark __macOS:__ The GLFW window has no icon, as it is not a document
- *  window, but the dock icon will be the same as the application bundle's icon.
- *  For more information on bundles, see the
- *  [Bundle Programming Guide][bundle-guide] in the Mac Developer Library.
- *
- *  [bundle-guide]: https://developer.apple.com/library/mac/documentation/CoreFoundation/Conceptual/CFBundles/
- *
- *  @remark __macOS:__  The window frame will not be rendered at full resolution
- *  on Retina displays unless the
- *  [GLFW_SCALE_FRAMEBUFFER](@ref GLFW_SCALE_FRAMEBUFFER_hint)
- *  hint is `GLFW_TRUE` and the `NSHighResolutionCapable` key is enabled in the
- *  application bundle's `Info.plist`.  For more information, see
- *  [High Resolution Guidelines for OS X][hidpi-guide] in the Mac Developer
- *  Library.  The GLFW test and example programs use a custom `Info.plist`
- *  template for this, which can be found as `CMake/Info.plist.in` in the source
- *  tree.
- *
- *  [hidpi-guide]: https://developer.apple.com/library/mac/documentation/GraphicsAnimation/Conceptual/HighResolutionOSX/Explained/Explained.html
- *
- *  @remark __macOS:__ When activating frame autosaving with
- *  [GLFW_COCOA_FRAME_NAME](@ref GLFW_COCOA_FRAME_NAME_hint), the specified
- *  window size and position may be overridden by previously saved values.
- *
- *  @remark __Wayland:__ GLFW uses [libdecor][] where available to create its window
- *  decorations.  This in turn uses server-side XDG decorations where available
- *  and provides high quality client-side decorations on compositors like GNOME.
- *  If both XDG decorations and libdecor are unavailable, GLFW falls back to
- *  a very simple set of window decorations that only support moving, resizing
- *  and the window manager's right-click menu.
- *
- *  [libdecor]: https://gitlab.freedesktop.org/libdecor/libdecor
- *
- *  @remark __X11:__ Some window managers will not respect the placement of
- *  initially hidden windows.
- *
- *  @remark __X11:__ Due to the asynchronous nature of X11, it may take a moment for
- *  a window to reach its requested state.  This means you may not be able to
- *  query the final size, position or other attributes directly after window
- *  creation.
- *
- *  @remark __X11:__ The class part of the `WM_CLASS` window property will by
- *  default be set to the window title passed to this function.  The instance
- *  part will use the contents of the `RESOURCE_NAME` environment variable, if
- *  present and not empty, or fall back to the window title.  Set the
- *  [GLFW_X11_CLASS_NAME](@ref GLFW_X11_CLASS_NAME_hint) and
- *  [GLFW_X11_INSTANCE_NAME](@ref GLFW_X11_INSTANCE_NAME_hint) window hints to
- *  override this.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref window_creation
- *  @sa @ref glfwDestroyWindow
- *
- *  @since Added in version 3.0.  Replaces `glfwOpenWindow`.
- *
- *  @ingroup window
- */
-GLFWAPI GLFWwindow* glfwCreateWindow(int width, int height, const char* title, GLFWmonitor* monitor, GLFWwindow* share);
-
-/*! @brief Destroys the specified window and its context.
- *
- *  This function destroys the specified window and its context.  On calling
- *  this function, no further callbacks will be called for that window.
- *
- *  If the context of the specified window is current on the main thread, it is
- *  detached before being destroyed.
- *
- *  @param[in] window The window to destroy.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
- *  GLFW_PLATFORM_ERROR.
- *
- *  @note The context of the specified window must not be current on any other
- *  thread when this function is called.
- *
- *  @reentrancy This function must not be called from a callback.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref window_creation
- *  @sa @ref glfwCreateWindow
- *
- *  @since Added in version 3.0.  Replaces `glfwCloseWindow`.
- *
- *  @ingroup window
- */
-GLFWAPI void glfwDestroyWindow(GLFWwindow* window);
-
-/*! @brief Checks the close flag of the specified window.
- *
- *  This function returns the value of the close flag of the specified window.
- *
- *  @param[in] window The window to query.
- *  @return The value of the close flag.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED.
- *
- *  @thread_safety This function may be called from any thread.  Access is not
- *  synchronized.
- *
- *  @sa @ref window_close
- *
- *  @since Added in version 3.0.
- *
- *  @ingroup window
- */
-GLFWAPI int glfwWindowShouldClose(GLFWwindow* window);
-
-/*! @brief Sets the close flag of the specified window.
- *
- *  This function sets the value of the close flag of the specified window.
- *  This can be used to override the user's attempt to close the window, or
- *  to signal that it should be closed.
- *
- *  @param[in] window The window whose flag to change.
- *  @param[in] value The new value.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED.
- *
- *  @thread_safety This function may be called from any thread.  Access is not
- *  synchronized.
- *
- *  @sa @ref window_close
- *
- *  @since Added in version 3.0.
- *
- *  @ingroup window
- */
-GLFWAPI void glfwSetWindowShouldClose(GLFWwindow* window, int value);
-
-/*! @brief Returns the title of the specified window.
- *
- *  This function returns the window title, encoded as UTF-8, of the specified
- *  window.  This is the title set previously by @ref glfwCreateWindow
- *  or @ref glfwSetWindowTitle.
- *
- *  @param[in] window The window to query.
- *  @return The UTF-8 encoded window title, or `NULL` if an
- *  [error](@ref error_handling) occurred.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED.
- *
- *  @remark The returned title is currently a copy of the title last set by @ref
- *  glfwCreateWindow or @ref glfwSetWindowTitle.  It does not include any
- *  additional text which may be appended by the platform or another program.
- *
- *  @pointer_lifetime The returned string is allocated and freed by GLFW.  You
- *  should not free it yourself.  It is valid until the next call to @ref
- *  glfwGetWindowTitle or @ref glfwSetWindowTitle, or until the library is
- *  terminated.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref window_title
- *  @sa @ref glfwSetWindowTitle
- *
- *  @since Added in version 3.4.
- *
- *  @ingroup window
- */
-GLFWAPI const char* glfwGetWindowTitle(GLFWwindow* window);
-
-/*! @brief Sets the title of the specified window.
- *
- *  This function sets the window title, encoded as UTF-8, of the specified
- *  window.
- *
- *  @param[in] window The window whose title to change.
- *  @param[in] title The UTF-8 encoded window title.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
- *  GLFW_PLATFORM_ERROR.
- *
- *  @remark __macOS:__ The window title will not be updated until the next time you
- *  process events.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref window_title
- *  @sa @ref glfwGetWindowTitle
- *
- *  @since Added in version 1.0.
- *  __GLFW 3:__ Added window handle parameter.
- *
- *  @ingroup window
- */
-GLFWAPI void glfwSetWindowTitle(GLFWwindow* window, const char* title);
-
-/*! @brief Sets the icon for the specified window.
- *
- *  This function sets the icon of the specified window.  If passed an array of
- *  candidate images, those of or closest to the sizes desired by the system are
- *  selected.  If no images are specified, the window reverts to its default
- *  icon.
- *
- *  The pixels are 32-bit, little-endian, non-premultiplied RGBA, i.e. eight
- *  bits per channel with the red channel first.  They are arranged canonically
- *  as packed sequential rows, starting from the top-left corner.
- *
- *  The desired image sizes varies depending on platform and system settings.
- *  The selected images will be rescaled as needed.  Good sizes include 16x16,
- *  32x32 and 48x48.
- *
- *  @param[in] window The window whose icon to set.
- *  @param[in] count The number of images in the specified array, or zero to
- *  revert to the default window icon.
- *  @param[in] images The images to create the icon from.  This is ignored if
- *  count is zero.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED, @ref
- *  GLFW_INVALID_VALUE, @ref GLFW_PLATFORM_ERROR and @ref
- *  GLFW_FEATURE_UNAVAILABLE (see remarks).
- *
- *  @pointer_lifetime The specified image data is copied before this function
- *  returns.
- *
- *  @remark __macOS:__ Regular windows do not have icons on macOS.  This function
- *  will emit @ref GLFW_FEATURE_UNAVAILABLE.  The dock icon will be the same as
- *  the application bundle's icon.  For more information on bundles, see the
- *  [Bundle Programming Guide][bundle-guide] in the Mac Developer Library.
- *
- *  [bundle-guide]: https://developer.apple.com/library/mac/documentation/CoreFoundation/Conceptual/CFBundles/
- *
- *  @remark __Wayland:__ There is no existing protocol to change an icon, the
- *  window will thus inherit the one defined in the application's desktop file.
- *  This function will emit @ref GLFW_FEATURE_UNAVAILABLE.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref window_icon
- *
- *  @since Added in version 3.2.
- *
- *  @ingroup window
- */
-GLFWAPI void glfwSetWindowIcon(GLFWwindow* window, int count, const GLFWimage* images);
-
-/*! @brief Retrieves the position of the content area of the specified window.
- *
- *  This function retrieves the position, in screen coordinates, of the
- *  upper-left corner of the content area of the specified window.
- *
- *  Any or all of the position arguments may be `NULL`.  If an error occurs, all
- *  non-`NULL` position arguments will be set to zero.
- *
- *  @param[in] window The window to query.
- *  @param[out] xpos Where to store the x-coordinate of the upper-left corner of
- *  the content area, or `NULL`.
- *  @param[out] ypos Where to store the y-coordinate of the upper-left corner of
- *  the content area, or `NULL`.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED, @ref
- *  GLFW_PLATFORM_ERROR and @ref GLFW_FEATURE_UNAVAILABLE (see remarks).
- *
- *  @remark __Wayland:__ Window positions are not currently part of any common
- *  Wayland protocol, so this function cannot be implemented and will emit @ref
- *  GLFW_FEATURE_UNAVAILABLE.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref window_pos
- *  @sa @ref glfwSetWindowPos
- *
- *  @since Added in version 3.0.
- *
- *  @ingroup window
- */
-GLFWAPI void glfwGetWindowPos(GLFWwindow* window, int* xpos, int* ypos);
-
-/*! @brief Sets the position of the content area of the specified window.
- *
- *  This function sets the position, in screen coordinates, of the upper-left
- *  corner of the content area of the specified windowed mode window.  If the
- *  window is a full screen window, this function does nothing.
- *
- *  __Do not use this function__ to move an already visible window unless you
- *  have very good reasons for doing so, as it will confuse and annoy the user.
- *
- *  The window manager may put limits on what positions are allowed.  GLFW
- *  cannot and should not override these limits.
- *
- *  @param[in] window The window to query.
- *  @param[in] xpos The x-coordinate of the upper-left corner of the content area.
- *  @param[in] ypos The y-coordinate of the upper-left corner of the content area.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED, @ref
- *  GLFW_PLATFORM_ERROR and @ref GLFW_FEATURE_UNAVAILABLE (see remarks).
- *
- *  @remark __Wayland:__ Window positions are not currently part of any common
- *  Wayland protocol, so this function cannot be implemented and will emit @ref
- *  GLFW_FEATURE_UNAVAILABLE.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref window_pos
- *  @sa @ref glfwGetWindowPos
- *
- *  @since Added in version 1.0.
- *  __GLFW 3:__ Added window handle parameter.
- *
- *  @ingroup window
- */
-GLFWAPI void glfwSetWindowPos(GLFWwindow* window, int xpos, int ypos);
-
-/*! @brief Retrieves the size of the content area of the specified window.
- *
- *  This function retrieves the size, in screen coordinates, of the content area
- *  of the specified window.  If you wish to retrieve the size of the
- *  framebuffer of the window in pixels, see @ref glfwGetFramebufferSize.
- *
- *  Any or all of the size arguments may be `NULL`.  If an error occurs, all
- *  non-`NULL` size arguments will be set to zero.
- *
- *  @param[in] window The window whose size to retrieve.
- *  @param[out] width Where to store the width, in screen coordinates, of the
- *  content area, or `NULL`.
- *  @param[out] height Where to store the height, in screen coordinates, of the
- *  content area, or `NULL`.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
- *  GLFW_PLATFORM_ERROR.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref window_size
- *  @sa @ref glfwSetWindowSize
- *
- *  @since Added in version 1.0.
- *  __GLFW 3:__ Added window handle parameter.
- *
- *  @ingroup window
- */
-GLFWAPI void glfwGetWindowSize(GLFWwindow* window, int* width, int* height);
-
-/*! @brief Sets the size limits of the specified window.
- *
- *  This function sets the size limits of the content area of the specified
- *  window.  If the window is full screen, the size limits only take effect
- *  once it is made windowed.  If the window is not resizable, this function
- *  does nothing.
- *
- *  The size limits are applied immediately to a windowed mode window and may
- *  cause it to be resized.
- *
- *  The maximum dimensions must be greater than or equal to the minimum
- *  dimensions and all must be greater than or equal to zero.
- *
- *  @param[in] window The window to set limits for.
- *  @param[in] minwidth The minimum width, in screen coordinates, of the content
- *  area, or `GLFW_DONT_CARE`.
- *  @param[in] minheight The minimum height, in screen coordinates, of the
- *  content area, or `GLFW_DONT_CARE`.
- *  @param[in] maxwidth The maximum width, in screen coordinates, of the content
- *  area, or `GLFW_DONT_CARE`.
- *  @param[in] maxheight The maximum height, in screen coordinates, of the
- *  content area, or `GLFW_DONT_CARE`.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED, @ref
- *  GLFW_INVALID_VALUE and @ref GLFW_PLATFORM_ERROR.
- *
- *  @remark If you set size limits and an aspect ratio that conflict, the
- *  results are undefined.
- *
- *  @remark __Wayland:__ The size limits will not be applied until the window is
- *  actually resized, either by the user or by the compositor.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref window_sizelimits
- *  @sa @ref glfwSetWindowAspectRatio
- *
- *  @since Added in version 3.2.
- *
- *  @ingroup window
- */
-GLFWAPI void glfwSetWindowSizeLimits(GLFWwindow* window, int minwidth, int minheight, int maxwidth, int maxheight);
-
-/*! @brief Sets the aspect ratio of the specified window.
- *
- *  This function sets the required aspect ratio of the content area of the
- *  specified window.  If the window is full screen, the aspect ratio only takes
- *  effect once it is made windowed.  If the window is not resizable, this
- *  function does nothing.
- *
- *  The aspect ratio is specified as a numerator and a denominator and both
- *  values must be greater than zero.  For example, the common 16:9 aspect ratio
- *  is specified as 16 and 9, respectively.
- *
- *  If the numerator and denominator is set to `GLFW_DONT_CARE` then the aspect
- *  ratio limit is disabled.
- *
- *  The aspect ratio is applied immediately to a windowed mode window and may
- *  cause it to be resized.
- *
- *  @param[in] window The window to set limits for.
- *  @param[in] numer The numerator of the desired aspect ratio, or
- *  `GLFW_DONT_CARE`.
- *  @param[in] denom The denominator of the desired aspect ratio, or
- *  `GLFW_DONT_CARE`.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED, @ref
- *  GLFW_INVALID_VALUE and @ref GLFW_PLATFORM_ERROR.
- *
- *  @remark If you set size limits and an aspect ratio that conflict, the
- *  results are undefined.
- *
- *  @remark __Wayland:__ The aspect ratio will not be applied until the window is
- *  actually resized, either by the user or by the compositor.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref window_sizelimits
- *  @sa @ref glfwSetWindowSizeLimits
- *
- *  @since Added in version 3.2.
- *
- *  @ingroup window
- */
-GLFWAPI void glfwSetWindowAspectRatio(GLFWwindow* window, int numer, int denom);
-
-/*! @brief Sets the size of the content area of the specified window.
- *
- *  This function sets the size, in screen coordinates, of the content area of
- *  the specified window.
- *
- *  For full screen windows, this function updates the resolution of its desired
- *  video mode and switches to the video mode closest to it, without affecting
- *  the window's context.  As the context is unaffected, the bit depths of the
- *  framebuffer remain unchanged.
- *
- *  If you wish to update the refresh rate of the desired video mode in addition
- *  to its resolution, see @ref glfwSetWindowMonitor.
- *
- *  The window manager may put limits on what sizes are allowed.  GLFW cannot
- *  and should not override these limits.
- *
- *  @param[in] window The window to resize.
- *  @param[in] width The desired width, in screen coordinates, of the window
- *  content area.
- *  @param[in] height The desired height, in screen coordinates, of the window
- *  content area.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
- *  GLFW_PLATFORM_ERROR.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref window_size
- *  @sa @ref glfwGetWindowSize
- *  @sa @ref glfwSetWindowMonitor
- *
- *  @since Added in version 1.0.
- *  __GLFW 3:__ Added window handle parameter.
- *
- *  @ingroup window
- */
-GLFWAPI void glfwSetWindowSize(GLFWwindow* window, int width, int height);
-
-/*! @brief Retrieves the size of the framebuffer of the specified window.
- *
- *  This function retrieves the size, in pixels, of the framebuffer of the
- *  specified window.  If you wish to retrieve the size of the window in screen
- *  coordinates, see @ref glfwGetWindowSize.
- *
- *  Any or all of the size arguments may be `NULL`.  If an error occurs, all
- *  non-`NULL` size arguments will be set to zero.
- *
- *  @param[in] window The window whose framebuffer to query.
- *  @param[out] width Where to store the width, in pixels, of the framebuffer,
- *  or `NULL`.
- *  @param[out] height Where to store the height, in pixels, of the framebuffer,
- *  or `NULL`.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
- *  GLFW_PLATFORM_ERROR.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref window_fbsize
- *  @sa @ref glfwSetFramebufferSizeCallback
- *
- *  @since Added in version 3.0.
- *
- *  @ingroup window
- */
-GLFWAPI void glfwGetFramebufferSize(GLFWwindow* window, int* width, int* height);
-
-/*! @brief Retrieves the size of the frame of the window.
- *
- *  This function retrieves the size, in screen coordinates, of each edge of the
- *  frame of the specified window.  This size includes the title bar, if the
- *  window has one.  The size of the frame may vary depending on the
- *  [window-related hints](@ref window_hints_wnd) used to create it.
- *
- *  Because this function retrieves the size of each window frame edge and not
- *  the offset along a particular coordinate axis, the retrieved values will
- *  always be zero or positive.
- *
- *  Any or all of the size arguments may be `NULL`.  If an error occurs, all
- *  non-`NULL` size arguments will be set to zero.
- *
- *  @param[in] window The window whose frame size to query.
- *  @param[out] left Where to store the size, in screen coordinates, of the left
- *  edge of the window frame, or `NULL`.
- *  @param[out] top Where to store the size, in screen coordinates, of the top
- *  edge of the window frame, or `NULL`.
- *  @param[out] right Where to store the size, in screen coordinates, of the
- *  right edge of the window frame, or `NULL`.
- *  @param[out] bottom Where to store the size, in screen coordinates, of the
- *  bottom edge of the window frame, or `NULL`.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
- *  GLFW_PLATFORM_ERROR.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref window_size
- *
- *  @since Added in version 3.1.
- *
- *  @ingroup window
- */
-GLFWAPI void glfwGetWindowFrameSize(GLFWwindow* window, int* left, int* top, int* right, int* bottom);
-
-/*! @brief Retrieves the content scale for the specified window.
- *
- *  This function retrieves the content scale for the specified window.  The
- *  content scale is the ratio between the current DPI and the platform's
- *  default DPI.  This is especially important for text and any UI elements.  If
- *  the pixel dimensions of your UI scaled by this look appropriate on your
- *  machine then it should appear at a reasonable size on other machines
- *  regardless of their DPI and scaling settings.  This relies on the system DPI
- *  and scaling settings being somewhat correct.
- *
- *  On platforms where each monitors can have its own content scale, the window
- *  content scale will depend on which monitor the system considers the window
- *  to be on.
- *
- *  @param[in] window The window to query.
- *  @param[out] xscale Where to store the x-axis content scale, or `NULL`.
- *  @param[out] yscale Where to store the y-axis content scale, or `NULL`.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
- *  GLFW_PLATFORM_ERROR.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref window_scale
- *  @sa @ref glfwSetWindowContentScaleCallback
- *  @sa @ref glfwGetMonitorContentScale
- *
- *  @since Added in version 3.3.
- *
- *  @ingroup window
- */
-GLFWAPI void glfwGetWindowContentScale(GLFWwindow* window, float* xscale, float* yscale);
-
-/*! @brief Returns the opacity of the whole window.
- *
- *  This function returns the opacity of the window, including any decorations.
- *
- *  The opacity (or alpha) value is a positive finite number between zero and
- *  one, where zero is fully transparent and one is fully opaque.  If the system
- *  does not support whole window transparency, this function always returns one.
- *
- *  The initial opacity value for newly created windows is one.
- *
- *  @param[in] window The window to query.
- *  @return The opacity value of the specified window.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
- *  GLFW_PLATFORM_ERROR.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref window_transparency
- *  @sa @ref glfwSetWindowOpacity
- *
- *  @since Added in version 3.3.
- *
- *  @ingroup window
- */
-GLFWAPI float glfwGetWindowOpacity(GLFWwindow* window);
-
-/*! @brief Sets the opacity of the whole window.
- *
- *  This function sets the opacity of the window, including any decorations.
- *
- *  The opacity (or alpha) value is a positive finite number between zero and
- *  one, where zero is fully transparent and one is fully opaque.
- *
- *  The initial opacity value for newly created windows is one.
- *
- *  A window created with framebuffer transparency may not use whole window
- *  transparency.  The results of doing this are undefined.
- *
- *  @param[in] window The window to set the opacity for.
- *  @param[in] opacity The desired opacity of the specified window.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED, @ref
- *  GLFW_PLATFORM_ERROR and @ref GLFW_FEATURE_UNAVAILABLE (see remarks).
- *
- *  @remark __Wayland:__ There is no way to set an opacity factor for a window.
- *  This function will emit @ref GLFW_FEATURE_UNAVAILABLE.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref window_transparency
- *  @sa @ref glfwGetWindowOpacity
- *
- *  @since Added in version 3.3.
- *
- *  @ingroup window
- */
-GLFWAPI void glfwSetWindowOpacity(GLFWwindow* window, float opacity);
-
-/*! @brief Iconifies the specified window.
- *
- *  This function iconifies (minimizes) the specified window if it was
- *  previously restored.  If the window is already iconified, this function does
- *  nothing.
- *
- *  If the specified window is a full screen window, GLFW restores the original
- *  video mode of the monitor.  The window's desired video mode is set again
- *  when the window is restored.
- *
- *  @param[in] window The window to iconify.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
- *  GLFW_PLATFORM_ERROR.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref window_iconify
- *  @sa @ref glfwRestoreWindow
- *  @sa @ref glfwMaximizeWindow
- *
- *  @since Added in version 2.1.
- *  __GLFW 3:__ Added window handle parameter.
- *
- *  @ingroup window
- */
-GLFWAPI void glfwIconifyWindow(GLFWwindow* window);
-
-/*! @brief Restores the specified window.
- *
- *  This function restores the specified window if it was previously iconified
- *  (minimized) or maximized.  If the window is already restored, this function
- *  does nothing.
- *
- *  If the specified window is an iconified full screen window, its desired
- *  video mode is set again for its monitor when the window is restored.
- *
- *  @param[in] window The window to restore.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
- *  GLFW_PLATFORM_ERROR.
- *
- *  @remark __Wayland:__ Restoring a window from maximization is not currently
- *  part of any common Wayland protocol, so this function can only restore
- *  windows from maximization.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref window_iconify
- *  @sa @ref glfwIconifyWindow
- *  @sa @ref glfwMaximizeWindow
- *
- *  @since Added in version 2.1.
- *  __GLFW 3:__ Added window handle parameter.
- *
- *  @ingroup window
- */
-GLFWAPI void glfwRestoreWindow(GLFWwindow* window);
-
-/*! @brief Maximizes the specified window.
- *
- *  This function maximizes the specified window if it was previously not
- *  maximized.  If the window is already maximized, this function does nothing.
- *
- *  If the specified window is a full screen window, this function does nothing.
- *
- *  @param[in] window The window to maximize.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
- *  GLFW_PLATFORM_ERROR.
- *
- *  @par Thread Safety
- *  This function may only be called from the main thread.
- *
- *  @sa @ref window_iconify
- *  @sa @ref glfwIconifyWindow
- *  @sa @ref glfwRestoreWindow
- *
- *  @since Added in GLFW 3.2.
- *
- *  @ingroup window
- */
-GLFWAPI void glfwMaximizeWindow(GLFWwindow* window);
-
-/*! @brief Makes the specified window visible.
- *
- *  This function makes the specified window visible if it was previously
- *  hidden.  If the window is already visible or is in full screen mode, this
- *  function does nothing.
- *
- *  By default, windowed mode windows are focused when shown
- *  Set the [GLFW_FOCUS_ON_SHOW](@ref GLFW_FOCUS_ON_SHOW_hint) window hint
- *  to change this behavior for all newly created windows, or change the
- *  behavior for an existing window with @ref glfwSetWindowAttrib.
- *
- *  @param[in] window The window to make visible.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
- *  GLFW_PLATFORM_ERROR.
- *
- *  @remark __Wayland:__ Because Wayland wants every frame of the desktop to be
- *  complete, this function does not immediately make the window visible.
- *  Instead it will become visible the next time the window framebuffer is
- *  updated after this call.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref window_hide
- *  @sa @ref glfwHideWindow
- *
- *  @since Added in version 3.0.
- *
- *  @ingroup window
- */
-GLFWAPI void glfwShowWindow(GLFWwindow* window);
-
-/*! @brief Hides the specified window.
- *
- *  This function hides the specified window if it was previously visible.  If
- *  the window is already hidden or is in full screen mode, this function does
- *  nothing.
- *
- *  @param[in] window The window to hide.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
- *  GLFW_PLATFORM_ERROR.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref window_hide
- *  @sa @ref glfwShowWindow
- *
- *  @since Added in version 3.0.
- *
- *  @ingroup window
- */
-GLFWAPI void glfwHideWindow(GLFWwindow* window);
-
-/*! @brief Brings the specified window to front and sets input focus.
- *
- *  This function brings the specified window to front and sets input focus.
- *  The window should already be visible and not iconified.
- *
- *  By default, both windowed and full screen mode windows are focused when
- *  initially created.  Set the [GLFW_FOCUSED](@ref GLFW_FOCUSED_hint) to
- *  disable this behavior.
- *
- *  Also by default, windowed mode windows are focused when shown
- *  with @ref glfwShowWindow. Set the
- *  [GLFW_FOCUS_ON_SHOW](@ref GLFW_FOCUS_ON_SHOW_hint) to disable this behavior.
- *
- *  __Do not use this function__ to steal focus from other applications unless
- *  you are certain that is what the user wants.  Focus stealing can be
- *  extremely disruptive.
- *
- *  For a less disruptive way of getting the user's attention, see
- *  [attention requests](@ref window_attention).
- *
- *  @param[in] window The window to give input focus.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
- *  GLFW_PLATFORM_ERROR.
- *
- *  @remark __Wayland:__ The compositor will likely ignore focus requests unless
- *  another window created by the same application already has input focus.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref window_focus
- *  @sa @ref window_attention
- *
- *  @since Added in version 3.2.
- *
- *  @ingroup window
- */
-GLFWAPI void glfwFocusWindow(GLFWwindow* window);
-
-/*! @brief Requests user attention to the specified window.
- *
- *  This function requests user attention to the specified window.  On
- *  platforms where this is not supported, attention is requested to the
- *  application as a whole.
- *
- *  Once the user has given attention, usually by focusing the window or
- *  application, the system will end the request automatically.
- *
- *  @param[in] window The window to request attention to.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
- *  GLFW_PLATFORM_ERROR.
- *
- *  @remark __macOS:__ Attention is requested to the application as a whole, not the
- *  specific window.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref window_attention
- *
- *  @since Added in version 3.3.
- *
- *  @ingroup window
- */
-GLFWAPI void glfwRequestWindowAttention(GLFWwindow* window);
-
-/*! @brief Returns the monitor that the window uses for full screen mode.
- *
- *  This function returns the handle of the monitor that the specified window is
- *  in full screen on.
- *
- *  @param[in] window The window to query.
- *  @return The monitor, or `NULL` if the window is in windowed mode or an
- *  [error](@ref error_handling) occurred.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref window_monitor
- *  @sa @ref glfwSetWindowMonitor
- *
- *  @since Added in version 3.0.
- *
- *  @ingroup window
- */
-GLFWAPI GLFWmonitor* glfwGetWindowMonitor(GLFWwindow* window);
-
-/*! @brief Sets the mode, monitor, video mode and placement of a window.
- *
- *  This function sets the monitor that the window uses for full screen mode or,
- *  if the monitor is `NULL`, makes it windowed mode.
- *
- *  When setting a monitor, this function updates the width, height and refresh
- *  rate of the desired video mode and switches to the video mode closest to it.
- *  The window position is ignored when setting a monitor.
- *
- *  When the monitor is `NULL`, the position, width and height are used to
- *  place the window content area.  The refresh rate is ignored when no monitor
- *  is specified.
- *
- *  If you only wish to update the resolution of a full screen window or the
- *  size of a windowed mode window, see @ref glfwSetWindowSize.
- *
- *  When a window transitions from full screen to windowed mode, this function
- *  restores any previous window settings such as whether it is decorated,
- *  floating, resizable, has size or aspect ratio limits, etc.
- *
- *  @param[in] window The window whose monitor, size or video mode to set.
- *  @param[in] monitor The desired monitor, or `NULL` to set windowed mode.
- *  @param[in] xpos The desired x-coordinate of the upper-left corner of the
- *  content area.
- *  @param[in] ypos The desired y-coordinate of the upper-left corner of the
- *  content area.
- *  @param[in] width The desired with, in screen coordinates, of the content
- *  area or video mode.
- *  @param[in] height The desired height, in screen coordinates, of the content
- *  area or video mode.
- *  @param[in] refreshRate The desired refresh rate, in Hz, of the video mode,
- *  or `GLFW_DONT_CARE`.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
- *  GLFW_PLATFORM_ERROR.
- *
- *  @remark The OpenGL or OpenGL ES context will not be destroyed or otherwise
- *  affected by any resizing or mode switching, although you may need to update
- *  your viewport if the framebuffer size has changed.
- *
- *  @remark __Wayland:__ Window positions are not currently part of any common
- *  Wayland protocol.  The window position arguments are ignored.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref window_monitor
- *  @sa @ref window_full_screen
- *  @sa @ref glfwGetWindowMonitor
- *  @sa @ref glfwSetWindowSize
- *
- *  @since Added in version 3.2.
- *
- *  @ingroup window
- */
-GLFWAPI void glfwSetWindowMonitor(GLFWwindow* window, GLFWmonitor* monitor, int xpos, int ypos, int width, int height, int refreshRate);
-
-/*! @brief Returns an attribute of the specified window.
- *
- *  This function returns the value of an attribute of the specified window or
- *  its OpenGL or OpenGL ES context.
- *
- *  @param[in] window The window to query.
- *  @param[in] attrib The [window attribute](@ref window_attribs) whose value to
- *  return.
- *  @return The value of the attribute, or zero if an
- *  [error](@ref error_handling) occurred.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED, @ref
- *  GLFW_INVALID_ENUM and @ref GLFW_PLATFORM_ERROR.
- *
- *  @remark Framebuffer related hints are not window attributes.  See @ref
- *  window_attribs_fb for more information.
- *
- *  @remark Zero is a valid value for many window and context related
- *  attributes so you cannot use a return value of zero as an indication of
- *  errors.  However, this function should not fail as long as it is passed
- *  valid arguments and the library has been [initialized](@ref intro_init).
- *
- *  @remark __Wayland:__ Checking whether a window is iconified is not currently
- *  part of any common Wayland protocol, so the @ref GLFW_ICONIFIED attribute
- *  cannot be implemented and is always `GLFW_FALSE`.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref window_attribs
- *  @sa @ref glfwSetWindowAttrib
- *
- *  @since Added in version 3.0.  Replaces `glfwGetWindowParam` and
- *  `glfwGetGLVersion`.
- *
- *  @ingroup window
- */
-GLFWAPI int glfwGetWindowAttrib(GLFWwindow* window, int attrib);
-
-/*! @brief Sets an attribute of the specified window.
- *
- *  This function sets the value of an attribute of the specified window.
- *
- *  The supported attributes are [GLFW_DECORATED](@ref GLFW_DECORATED_attrib),
- *  [GLFW_RESIZABLE](@ref GLFW_RESIZABLE_attrib),
- *  [GLFW_FLOATING](@ref GLFW_FLOATING_attrib),
- *  [GLFW_AUTO_ICONIFY](@ref GLFW_AUTO_ICONIFY_attrib) and
- *  [GLFW_FOCUS_ON_SHOW](@ref GLFW_FOCUS_ON_SHOW_attrib).
- *  [GLFW_MOUSE_PASSTHROUGH](@ref GLFW_MOUSE_PASSTHROUGH_attrib)
- *
- *  Some of these attributes are ignored for full screen windows.  The new
- *  value will take effect if the window is later made windowed.
- *
- *  Some of these attributes are ignored for windowed mode windows.  The new
- *  value will take effect if the window is later made full screen.
- *
- *  @param[in] window The window to set the attribute for.
- *  @param[in] attrib A supported window attribute.
- *  @param[in] value `GLFW_TRUE` or `GLFW_FALSE`.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED, @ref
- *  GLFW_INVALID_ENUM, @ref GLFW_INVALID_VALUE, @ref GLFW_PLATFORM_ERROR and @ref
- *  GLFW_FEATURE_UNAVAILABLE (see remarks).
- *
- *  @remark Calling @ref glfwGetWindowAttrib will always return the latest
- *  value, even if that value is ignored by the current mode of the window.
- *
- *  @remark __Wayland:__ The [GLFW_FLOATING](@ref GLFW_FLOATING_attrib) window attribute is
- *  not supported.  Setting this will emit @ref GLFW_FEATURE_UNAVAILABLE.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref window_attribs
- *  @sa @ref glfwGetWindowAttrib
- *
- *  @since Added in version 3.3.
- *
- *  @ingroup window
- */
-GLFWAPI void glfwSetWindowAttrib(GLFWwindow* window, int attrib, int value);
-
-/*! @brief Sets the user pointer of the specified window.
- *
- *  This function sets the user-defined pointer of the specified window.  The
- *  current value is retained until the window is destroyed.  The initial value
- *  is `NULL`.
- *
- *  @param[in] window The window whose pointer to set.
- *  @param[in] pointer The new value.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED.
- *
- *  @thread_safety This function may be called from any thread.  Access is not
- *  synchronized.
- *
- *  @sa @ref window_userptr
- *  @sa @ref glfwGetWindowUserPointer
- *
- *  @since Added in version 3.0.
- *
- *  @ingroup window
- */
-GLFWAPI void glfwSetWindowUserPointer(GLFWwindow* window, void* pointer);
-
-/*! @brief Returns the user pointer of the specified window.
- *
- *  This function returns the current value of the user-defined pointer of the
- *  specified window.  The initial value is `NULL`.
- *
- *  @param[in] window The window whose pointer to return.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED.
- *
- *  @thread_safety This function may be called from any thread.  Access is not
- *  synchronized.
- *
- *  @sa @ref window_userptr
- *  @sa @ref glfwSetWindowUserPointer
- *
- *  @since Added in version 3.0.
- *
- *  @ingroup window
- */
-GLFWAPI void* glfwGetWindowUserPointer(GLFWwindow* window);
-
-/*! @brief Sets the position callback for the specified window.
- *
- *  This function sets the position callback of the specified window, which is
- *  called when the window is moved.  The callback is provided with the
- *  position, in screen coordinates, of the upper-left corner of the content
- *  area of the window.
- *
- *  @param[in] window The window whose callback to set.
- *  @param[in] callback The new callback, or `NULL` to remove the currently set
- *  callback.
- *  @return The previously set callback, or `NULL` if no callback was set or the
- *  library had not been [initialized](@ref intro_init).
- *
- *  @callback_signature
- *  @code
- *  void function_name(GLFWwindow* window, int xpos, int ypos)
- *  @endcode
- *  For more information about the callback parameters, see the
- *  [function pointer type](@ref GLFWwindowposfun).
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED.
- *
- *  @remark __Wayland:__ This callback will not be called.  The Wayland protocol
- *  provides no way to be notified of when a window is moved.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref window_pos
- *
- *  @since Added in version 3.0.
- *
- *  @ingroup window
- */
-GLFWAPI GLFWwindowposfun glfwSetWindowPosCallback(GLFWwindow* window, GLFWwindowposfun callback);
-
-/*! @brief Sets the size callback for the specified window.
- *
- *  This function sets the size callback of the specified window, which is
- *  called when the window is resized.  The callback is provided with the size,
- *  in screen coordinates, of the content area of the window.
- *
- *  @param[in] window The window whose callback to set.
- *  @param[in] callback The new callback, or `NULL` to remove the currently set
- *  callback.
- *  @return The previously set callback, or `NULL` if no callback was set or the
- *  library had not been [initialized](@ref intro_init).
- *
- *  @callback_signature
- *  @code
- *  void function_name(GLFWwindow* window, int width, int height)
- *  @endcode
- *  For more information about the callback parameters, see the
- *  [function pointer type](@ref GLFWwindowsizefun).
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref window_size
- *
- *  @since Added in version 1.0.
- *  __GLFW 3:__ Added window handle parameter and return value.
- *
- *  @ingroup window
- */
-GLFWAPI GLFWwindowsizefun glfwSetWindowSizeCallback(GLFWwindow* window, GLFWwindowsizefun callback);
-
-/*! @brief Sets the close callback for the specified window.
- *
- *  This function sets the close callback of the specified window, which is
- *  called when the user attempts to close the window, for example by clicking
- *  the close widget in the title bar.
- *
- *  The close flag is set before this callback is called, but you can modify it
- *  at any time with @ref glfwSetWindowShouldClose.
- *
- *  The close callback is not triggered by @ref glfwDestroyWindow.
- *
- *  @param[in] window The window whose callback to set.
- *  @param[in] callback The new callback, or `NULL` to remove the currently set
- *  callback.
- *  @return The previously set callback, or `NULL` if no callback was set or the
- *  library had not been [initialized](@ref intro_init).
- *
- *  @callback_signature
- *  @code
- *  void function_name(GLFWwindow* window)
- *  @endcode
- *  For more information about the callback parameters, see the
- *  [function pointer type](@ref GLFWwindowclosefun).
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED.
- *
- *  @remark __macOS:__ Selecting Quit from the application menu will trigger the
- *  close callback for all windows.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref window_close
- *
- *  @since Added in version 2.5.
- *  __GLFW 3:__ Added window handle parameter and return value.
- *
- *  @ingroup window
- */
-GLFWAPI GLFWwindowclosefun glfwSetWindowCloseCallback(GLFWwindow* window, GLFWwindowclosefun callback);
-
-/*! @brief Sets the refresh callback for the specified window.
- *
- *  This function sets the refresh callback of the specified window, which is
- *  called when the content area of the window needs to be redrawn, for example
- *  if the window has been exposed after having been covered by another window.
- *
- *  On compositing window systems such as Aero, Compiz, Aqua or Wayland, where
- *  the window contents are saved off-screen, this callback may be called only
- *  very infrequently or never at all.
- *
- *  @param[in] window The window whose callback to set.
- *  @param[in] callback The new callback, or `NULL` to remove the currently set
- *  callback.
- *  @return The previously set callback, or `NULL` if no callback was set or the
- *  library had not been [initialized](@ref intro_init).
- *
- *  @callback_signature
- *  @code
- *  void function_name(GLFWwindow* window);
- *  @endcode
- *  For more information about the callback parameters, see the
- *  [function pointer type](@ref GLFWwindowrefreshfun).
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref window_refresh
- *
- *  @since Added in version 2.5.
- *  __GLFW 3:__ Added window handle parameter and return value.
- *
- *  @ingroup window
- */
-GLFWAPI GLFWwindowrefreshfun glfwSetWindowRefreshCallback(GLFWwindow* window, GLFWwindowrefreshfun callback);
-
-/*! @brief Sets the focus callback for the specified window.
- *
- *  This function sets the focus callback of the specified window, which is
- *  called when the window gains or loses input focus.
- *
- *  After the focus callback is called for a window that lost input focus,
- *  synthetic key and mouse button release events will be generated for all such
- *  that had been pressed.  For more information, see @ref glfwSetKeyCallback
- *  and @ref glfwSetMouseButtonCallback.
- *
- *  @param[in] window The window whose callback to set.
- *  @param[in] callback The new callback, or `NULL` to remove the currently set
- *  callback.
- *  @return The previously set callback, or `NULL` if no callback was set or the
- *  library had not been [initialized](@ref intro_init).
- *
- *  @callback_signature
- *  @code
- *  void function_name(GLFWwindow* window, int focused)
- *  @endcode
- *  For more information about the callback parameters, see the
- *  [function pointer type](@ref GLFWwindowfocusfun).
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref window_focus
- *
- *  @since Added in version 3.0.
- *
- *  @ingroup window
- */
-GLFWAPI GLFWwindowfocusfun glfwSetWindowFocusCallback(GLFWwindow* window, GLFWwindowfocusfun callback);
-
-/*! @brief Sets the iconify callback for the specified window.
- *
- *  This function sets the iconification callback of the specified window, which
- *  is called when the window is iconified or restored.
- *
- *  @param[in] window The window whose callback to set.
- *  @param[in] callback The new callback, or `NULL` to remove the currently set
- *  callback.
- *  @return The previously set callback, or `NULL` if no callback was set or the
- *  library had not been [initialized](@ref intro_init).
- *
- *  @callback_signature
- *  @code
- *  void function_name(GLFWwindow* window, int iconified)
- *  @endcode
- *  For more information about the callback parameters, see the
- *  [function pointer type](@ref GLFWwindowiconifyfun).
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED.
- *
- *  @remark __Wayland:__ This callback will not be called.  The Wayland protocol
- *  provides no way to be notified of when a window is iconified, and no way to
- *  check whether a window is currently iconified.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref window_iconify
- *
- *  @since Added in version 3.0.
- *
- *  @ingroup window
- */
-GLFWAPI GLFWwindowiconifyfun glfwSetWindowIconifyCallback(GLFWwindow* window, GLFWwindowiconifyfun callback);
-
-/*! @brief Sets the maximize callback for the specified window.
- *
- *  This function sets the maximization callback of the specified window, which
- *  is called when the window is maximized or restored.
- *
- *  @param[in] window The window whose callback to set.
- *  @param[in] callback The new callback, or `NULL` to remove the currently set
- *  callback.
- *  @return The previously set callback, or `NULL` if no callback was set or the
- *  library had not been [initialized](@ref intro_init).
- *
- *  @callback_signature
- *  @code
- *  void function_name(GLFWwindow* window, int maximized)
- *  @endcode
- *  For more information about the callback parameters, see the
- *  [function pointer type](@ref GLFWwindowmaximizefun).
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref window_maximize
- *
- *  @since Added in version 3.3.
- *
- *  @ingroup window
- */
-GLFWAPI GLFWwindowmaximizefun glfwSetWindowMaximizeCallback(GLFWwindow* window, GLFWwindowmaximizefun callback);
-
-/*! @brief Sets the framebuffer resize callback for the specified window.
- *
- *  This function sets the framebuffer resize callback of the specified window,
- *  which is called when the framebuffer of the specified window is resized.
- *
- *  @param[in] window The window whose callback to set.
- *  @param[in] callback The new callback, or `NULL` to remove the currently set
- *  callback.
- *  @return The previously set callback, or `NULL` if no callback was set or the
- *  library had not been [initialized](@ref intro_init).
- *
- *  @callback_signature
- *  @code
- *  void function_name(GLFWwindow* window, int width, int height)
- *  @endcode
- *  For more information about the callback parameters, see the
- *  [function pointer type](@ref GLFWframebuffersizefun).
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref window_fbsize
- *
- *  @since Added in version 3.0.
- *
- *  @ingroup window
- */
-GLFWAPI GLFWframebuffersizefun glfwSetFramebufferSizeCallback(GLFWwindow* window, GLFWframebuffersizefun callback);
-
-/*! @brief Sets the window content scale callback for the specified window.
- *
- *  This function sets the window content scale callback of the specified window,
- *  which is called when the content scale of the specified window changes.
- *
- *  @param[in] window The window whose callback to set.
- *  @param[in] callback The new callback, or `NULL` to remove the currently set
- *  callback.
- *  @return The previously set callback, or `NULL` if no callback was set or the
- *  library had not been [initialized](@ref intro_init).
- *
- *  @callback_signature
- *  @code
- *  void function_name(GLFWwindow* window, float xscale, float yscale)
- *  @endcode
- *  For more information about the callback parameters, see the
- *  [function pointer type](@ref GLFWwindowcontentscalefun).
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref window_scale
- *  @sa @ref glfwGetWindowContentScale
- *
- *  @since Added in version 3.3.
- *
- *  @ingroup window
- */
-GLFWAPI GLFWwindowcontentscalefun glfwSetWindowContentScaleCallback(GLFWwindow* window, GLFWwindowcontentscalefun callback);
-
-/*! @brief Processes all pending events.
- *
- *  This function processes only those events that are already in the event
- *  queue and then returns immediately.  Processing events will cause the window
- *  and input callbacks associated with those events to be called.
- *
- *  On some platforms, a window move, resize or menu operation will cause event
- *  processing to block.  This is due to how event processing is designed on
- *  those platforms.  You can use the
- *  [window refresh callback](@ref window_refresh) to redraw the contents of
- *  your window when necessary during such operations.
- *
- *  Do not assume that callbacks you set will _only_ be called in response to
- *  event processing functions like this one.  While it is necessary to poll for
- *  events, window systems that require GLFW to register callbacks of its own
- *  can pass events to GLFW in response to many window system function calls.
- *  GLFW will pass those events on to the application callbacks before
- *  returning.
- *
- *  Event processing is not required for joystick input to work.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
- *  GLFW_PLATFORM_ERROR.
- *
- *  @reentrancy This function must not be called from a callback.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref events
- *  @sa @ref glfwWaitEvents
- *  @sa @ref glfwWaitEventsTimeout
- *
- *  @since Added in version 1.0.
- *
- *  @ingroup window
- */
-GLFWAPI void glfwPollEvents(void);
-
-/*! @brief Waits until events are queued and processes them.
- *
- *  This function puts the calling thread to sleep until at least one event is
- *  available in the event queue.  Once one or more events are available,
- *  it behaves exactly like @ref glfwPollEvents, i.e. the events in the queue
- *  are processed and the function then returns immediately.  Processing events
- *  will cause the window and input callbacks associated with those events to be
- *  called.
- *
- *  Since not all events are associated with callbacks, this function may return
- *  without a callback having been called even if you are monitoring all
- *  callbacks.
- *
- *  On some platforms, a window move, resize or menu operation will cause event
- *  processing to block.  This is due to how event processing is designed on
- *  those platforms.  You can use the
- *  [window refresh callback](@ref window_refresh) to redraw the contents of
- *  your window when necessary during such operations.
- *
- *  Do not assume that callbacks you set will _only_ be called in response to
- *  event processing functions like this one.  While it is necessary to poll for
- *  events, window systems that require GLFW to register callbacks of its own
- *  can pass events to GLFW in response to many window system function calls.
- *  GLFW will pass those events on to the application callbacks before
- *  returning.
- *
- *  Event processing is not required for joystick input to work.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
- *  GLFW_PLATFORM_ERROR.
- *
- *  @reentrancy This function must not be called from a callback.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref events
- *  @sa @ref glfwPollEvents
- *  @sa @ref glfwWaitEventsTimeout
- *
- *  @since Added in version 2.5.
- *
- *  @ingroup window
- */
-GLFWAPI void glfwWaitEvents(void);
-
-/*! @brief Waits with timeout until events are queued and processes them.
- *
- *  This function puts the calling thread to sleep until at least one event is
- *  available in the event queue, or until the specified timeout is reached.  If
- *  one or more events are available, it behaves exactly like @ref
- *  glfwPollEvents, i.e. the events in the queue are processed and the function
- *  then returns immediately.  Processing events will cause the window and input
- *  callbacks associated with those events to be called.
- *
- *  The timeout value must be a positive finite number.
- *
- *  Since not all events are associated with callbacks, this function may return
- *  without a callback having been called even if you are monitoring all
- *  callbacks.
- *
- *  On some platforms, a window move, resize or menu operation will cause event
- *  processing to block.  This is due to how event processing is designed on
- *  those platforms.  You can use the
- *  [window refresh callback](@ref window_refresh) to redraw the contents of
- *  your window when necessary during such operations.
- *
- *  Do not assume that callbacks you set will _only_ be called in response to
- *  event processing functions like this one.  While it is necessary to poll for
- *  events, window systems that require GLFW to register callbacks of its own
- *  can pass events to GLFW in response to many window system function calls.
- *  GLFW will pass those events on to the application callbacks before
- *  returning.
- *
- *  Event processing is not required for joystick input to work.
- *
- *  @param[in] timeout The maximum amount of time, in seconds, to wait.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED, @ref
- *  GLFW_INVALID_VALUE and @ref GLFW_PLATFORM_ERROR.
- *
- *  @reentrancy This function must not be called from a callback.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref events
- *  @sa @ref glfwPollEvents
- *  @sa @ref glfwWaitEvents
- *
- *  @since Added in version 3.2.
- *
- *  @ingroup window
- */
-GLFWAPI void glfwWaitEventsTimeout(double timeout);
-
-/*! @brief Posts an empty event to the event queue.
- *
- *  This function posts an empty event from the current thread to the event
- *  queue, causing @ref glfwWaitEvents or @ref glfwWaitEventsTimeout to return.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
- *  GLFW_PLATFORM_ERROR.
- *
- *  @thread_safety This function may be called from any thread.
- *
- *  @sa @ref events
- *  @sa @ref glfwWaitEvents
- *  @sa @ref glfwWaitEventsTimeout
- *
- *  @since Added in version 3.1.
- *
- *  @ingroup window
- */
-GLFWAPI void glfwPostEmptyEvent(void);
-
-/*! @brief Returns the value of an input option for the specified window.
- *
- *  This function returns the value of an input option for the specified window.
- *  The mode must be one of @ref GLFW_CURSOR, @ref GLFW_STICKY_KEYS,
- *  @ref GLFW_STICKY_MOUSE_BUTTONS, @ref GLFW_LOCK_KEY_MODS or
- *  @ref GLFW_RAW_MOUSE_MOTION.
- *
- *  @param[in] window The window to query.
- *  @param[in] mode One of `GLFW_CURSOR`, `GLFW_STICKY_KEYS`,
- *  `GLFW_STICKY_MOUSE_BUTTONS`, `GLFW_LOCK_KEY_MODS` or
- *  `GLFW_RAW_MOUSE_MOTION`.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
- *  GLFW_INVALID_ENUM.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref glfwSetInputMode
- *
- *  @since Added in version 3.0.
- *
- *  @ingroup input
- */
-GLFWAPI int glfwGetInputMode(GLFWwindow* window, int mode);
-
-/*! @brief Sets an input option for the specified window.
- *
- *  This function sets an input mode option for the specified window.  The mode
- *  must be one of @ref GLFW_CURSOR, @ref GLFW_STICKY_KEYS,
- *  @ref GLFW_STICKY_MOUSE_BUTTONS, @ref GLFW_LOCK_KEY_MODS
- *  @ref GLFW_RAW_MOUSE_MOTION, or @ref GLFW_UNLIMITED_MOUSE_BUTTONS.
- *
- *  If the mode is `GLFW_CURSOR`, the value must be one of the following cursor
- *  modes:
- *  - `GLFW_CURSOR_NORMAL` makes the cursor visible and behaving normally.
- *  - `GLFW_CURSOR_HIDDEN` makes the cursor invisible when it is over the
- *    content area of the window but does not restrict the cursor from leaving.
- *  - `GLFW_CURSOR_DISABLED` hides and grabs the cursor, providing virtual
- *    and unlimited cursor movement.  This is useful for implementing for
- *    example 3D camera controls.
- *  - `GLFW_CURSOR_CAPTURED` makes the cursor visible and confines it to the
- *    content area of the window.
- *
- *  If the mode is `GLFW_STICKY_KEYS`, the value must be either `GLFW_TRUE` to
- *  enable sticky keys, or `GLFW_FALSE` to disable it.  If sticky keys are
- *  enabled, a key press will ensure that @ref glfwGetKey returns `GLFW_PRESS`
- *  the next time it is called even if the key had been released before the
- *  call.  This is useful when you are only interested in whether keys have been
- *  pressed but not when or in which order.
- *
- *  If the mode is `GLFW_STICKY_MOUSE_BUTTONS`, the value must be either
- *  `GLFW_TRUE` to enable sticky mouse buttons, or `GLFW_FALSE` to disable it.
- *  If sticky mouse buttons are enabled, a mouse button press will ensure that
- *  @ref glfwGetMouseButton returns `GLFW_PRESS` the next time it is called even
- *  if the mouse button had been released before the call.  This is useful when
- *  you are only interested in whether mouse buttons have been pressed but not
- *  when or in which order.
- *
- *  If the mode is `GLFW_LOCK_KEY_MODS`, the value must be either `GLFW_TRUE` to
- *  enable lock key modifier bits, or `GLFW_FALSE` to disable them.  If enabled,
- *  callbacks that receive modifier bits will also have the @ref
- *  GLFW_MOD_CAPS_LOCK bit set when the event was generated with Caps Lock on,
- *  and the @ref GLFW_MOD_NUM_LOCK bit when Num Lock was on.
- *
- *  If the mode is `GLFW_RAW_MOUSE_MOTION`, the value must be either `GLFW_TRUE`
- *  to enable raw (unscaled and unaccelerated) mouse motion when the cursor is
- *  disabled, or `GLFW_FALSE` to disable it.  If raw motion is not supported,
- *  attempting to set this will emit @ref GLFW_FEATURE_UNAVAILABLE.  Call @ref
- *  glfwRawMouseMotionSupported to check for support.
- *
- *  If the mode is `GLFW_UNLIMITED_MOUSE_BUTTONS`, the value must be either
- *  `GLFW_TRUE` to disable the mouse button limit when calling the mouse button
- *  callback, or `GLFW_FALSE` to limit the mouse buttons sent to the callback
- *  to the mouse button token values up to `GLFW_MOUSE_BUTTON_LAST`.
- *
- *  @param[in] window The window whose input mode to set.
- *  @param[in] mode One of `GLFW_CURSOR`, `GLFW_STICKY_KEYS`,
- *  `GLFW_STICKY_MOUSE_BUTTONS`, `GLFW_LOCK_KEY_MODS` or
- *  `GLFW_RAW_MOUSE_MOTION`.
- *  @param[in] value The new value of the specified input mode.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED, @ref
- *  GLFW_INVALID_ENUM, @ref GLFW_PLATFORM_ERROR and @ref
- *  GLFW_FEATURE_UNAVAILABLE (see above).
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref glfwGetInputMode
- *
- *  @since Added in version 3.0.  Replaces `glfwEnable` and `glfwDisable`.
- *
- *  @ingroup input
- */
-GLFWAPI void glfwSetInputMode(GLFWwindow* window, int mode, int value);
-
-/*! @brief Returns whether raw mouse motion is supported.
- *
- *  This function returns whether raw mouse motion is supported on the current
- *  system.  This status does not change after GLFW has been initialized so you
- *  only need to check this once.  If you attempt to enable raw motion on
- *  a system that does not support it, @ref GLFW_PLATFORM_ERROR will be emitted.
- *
- *  Raw mouse motion is closer to the actual motion of the mouse across
- *  a surface.  It is not affected by the scaling and acceleration applied to
- *  the motion of the desktop cursor.  That processing is suitable for a cursor
- *  while raw motion is better for controlling for example a 3D camera.  Because
- *  of this, raw mouse motion is only provided when the cursor is disabled.
- *
- *  @return `GLFW_TRUE` if raw mouse motion is supported on the current machine,
- *  or `GLFW_FALSE` otherwise.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref raw_mouse_motion
- *  @sa @ref glfwSetInputMode
- *
- *  @since Added in version 3.3.
- *
- *  @ingroup input
- */
-GLFWAPI int glfwRawMouseMotionSupported(void);
-
-/*! @brief Returns the layout-specific name of the specified printable key.
- *
- *  This function returns the name of the specified printable key, encoded as
- *  UTF-8.  This is typically the character that key would produce without any
- *  modifier keys, intended for displaying key bindings to the user.  For dead
- *  keys, it is typically the diacritic it would add to a character.
- *
- *  __Do not use this function__ for [text input](@ref input_char).  You will
- *  break text input for many languages even if it happens to work for yours.
- *
- *  If the key is `GLFW_KEY_UNKNOWN`, the scancode is used to identify the key,
- *  otherwise the scancode is ignored.  If you specify a non-printable key, or
- *  `GLFW_KEY_UNKNOWN` and a scancode that maps to a non-printable key, this
- *  function returns `NULL` but does not emit an error.
- *
- *  This behavior allows you to always pass in the arguments in the
- *  [key callback](@ref input_key) without modification.
- *
- *  The printable keys are:
- *  - `GLFW_KEY_APOSTROPHE`
- *  - `GLFW_KEY_COMMA`
- *  - `GLFW_KEY_MINUS`
- *  - `GLFW_KEY_PERIOD`
- *  - `GLFW_KEY_SLASH`
- *  - `GLFW_KEY_SEMICOLON`
- *  - `GLFW_KEY_EQUAL`
- *  - `GLFW_KEY_LEFT_BRACKET`
- *  - `GLFW_KEY_RIGHT_BRACKET`
- *  - `GLFW_KEY_BACKSLASH`
- *  - `GLFW_KEY_WORLD_1`
- *  - `GLFW_KEY_WORLD_2`
- *  - `GLFW_KEY_0` to `GLFW_KEY_9`
- *  - `GLFW_KEY_A` to `GLFW_KEY_Z`
- *  - `GLFW_KEY_KP_0` to `GLFW_KEY_KP_9`
- *  - `GLFW_KEY_KP_DECIMAL`
- *  - `GLFW_KEY_KP_DIVIDE`
- *  - `GLFW_KEY_KP_MULTIPLY`
- *  - `GLFW_KEY_KP_SUBTRACT`
- *  - `GLFW_KEY_KP_ADD`
- *  - `GLFW_KEY_KP_EQUAL`
- *
- *  Names for printable keys depend on keyboard layout, while names for
- *  non-printable keys are the same across layouts but depend on the application
- *  language and should be localized along with other user interface text.
- *
- *  @param[in] key The key to query, or `GLFW_KEY_UNKNOWN`.
- *  @param[in] scancode The scancode of the key to query.
- *  @return The UTF-8 encoded, layout-specific name of the key, or `NULL`.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED, @ref
- *  GLFW_INVALID_VALUE, @ref GLFW_INVALID_ENUM and @ref GLFW_PLATFORM_ERROR.
- *
- *  @remark The contents of the returned string may change when a keyboard
- *  layout change event is received.
- *
- *  @pointer_lifetime The returned string is allocated and freed by GLFW.  You
- *  should not free it yourself.  It is valid until the library is terminated.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref input_key_name
- *
- *  @since Added in version 3.2.
- *
- *  @ingroup input
- */
-GLFWAPI const char* glfwGetKeyName(int key, int scancode);
-
-/*! @brief Returns the platform-specific scancode of the specified key.
- *
- *  This function returns the platform-specific scancode of the specified key.
- *
- *  If the specified [key token](@ref keys) corresponds to a physical key not
- *  supported on the current platform then this method will return `-1`.
- *  Calling this function with anything other than a key token will return `-1`
- *  and generate a @ref GLFW_INVALID_ENUM error.
- *
- *  @param[in] key Any [key token](@ref keys).
- *  @return The platform-specific scancode for the key, or `-1` if the key is
- *  not supported on the current platform or an [error](@ref error_handling)
- *  occurred.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
- *  GLFW_INVALID_ENUM.
- *
- *  @thread_safety This function may be called from any thread.
- *
- *  @sa @ref input_key
- *
- *  @since Added in version 3.3.
- *
- *  @ingroup input
- */
-GLFWAPI int glfwGetKeyScancode(int key);
-
-/*! @brief Returns the last reported state of a keyboard key for the specified
- *  window.
- *
- *  This function returns the last state reported for the specified key to the
- *  specified window.  The returned state is one of `GLFW_PRESS` or
- *  `GLFW_RELEASE`.  The action `GLFW_REPEAT` is only reported to the key callback.
- *
- *  If the @ref GLFW_STICKY_KEYS input mode is enabled, this function returns
- *  `GLFW_PRESS` the first time you call it for a key that was pressed, even if
- *  that key has already been released.
- *
- *  The key functions deal with physical keys, with [key tokens](@ref keys)
- *  named after their use on the standard US keyboard layout.  If you want to
- *  input text, use the Unicode character callback instead.
- *
- *  The [modifier key bit masks](@ref mods) are not key tokens and cannot be
- *  used with this function.
- *
- *  __Do not use this function__ to implement [text input](@ref input_char).
- *
- *  @param[in] window The desired window.
- *  @param[in] key The desired [keyboard key](@ref keys).  `GLFW_KEY_UNKNOWN` is
- *  not a valid key for this function.
- *  @return One of `GLFW_PRESS` or `GLFW_RELEASE`.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
- *  GLFW_INVALID_ENUM.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref input_key
- *
- *  @since Added in version 1.0.
- *  __GLFW 3:__ Added window handle parameter.
- *
- *  @ingroup input
- */
-GLFWAPI int glfwGetKey(GLFWwindow* window, int key);
-
-/*! @brief Returns the last reported state of a mouse button for the specified
- *  window.
- *
- *  This function returns the last state reported for the specified mouse button
- *  to the specified window.  The returned state is one of `GLFW_PRESS` or
- *  `GLFW_RELEASE`.
- *
- *  If the @ref GLFW_STICKY_MOUSE_BUTTONS input mode is enabled, this function
- *  returns `GLFW_PRESS` the first time you call it for a mouse button that was
- *  pressed, even if that mouse button has already been released.
- *
- *  The @ref GLFW_UNLIMITED_MOUSE_BUTTONS input mode does not effect the
- *  limit on buttons which can be polled with this function.
- *
- *  @param[in] window The desired window.
- *  @param[in] button The desired [mouse button token](@ref buttons).
- *  @return One of `GLFW_PRESS` or `GLFW_RELEASE`.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
- *  GLFW_INVALID_ENUM.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref input_mouse_button
- *
- *  @since Added in version 1.0.
- *  __GLFW 3:__ Added window handle parameter.
- *
- *  @ingroup input
- */
-GLFWAPI int glfwGetMouseButton(GLFWwindow* window, int button);
-
-/*! @brief Retrieves the position of the cursor relative to the content area of
- *  the window.
- *
- *  This function returns the position of the cursor, in screen coordinates,
- *  relative to the upper-left corner of the content area of the specified
- *  window.
- *
- *  If the cursor is disabled (with `GLFW_CURSOR_DISABLED`) then the cursor
- *  position is unbounded and limited only by the minimum and maximum values of
- *  a `double`.
- *
- *  The coordinate can be converted to their integer equivalents with the
- *  `floor` function.  Casting directly to an integer type works for positive
- *  coordinates, but fails for negative ones.
- *
- *  Any or all of the position arguments may be `NULL`.  If an error occurs, all
- *  non-`NULL` position arguments will be set to zero.
- *
- *  @param[in] window The desired window.
- *  @param[out] xpos Where to store the cursor x-coordinate, relative to the
- *  left edge of the content area, or `NULL`.
- *  @param[out] ypos Where to store the cursor y-coordinate, relative to the to
- *  top edge of the content area, or `NULL`.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
- *  GLFW_PLATFORM_ERROR.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref cursor_pos
- *  @sa @ref glfwSetCursorPos
- *
- *  @since Added in version 3.0.  Replaces `glfwGetMousePos`.
- *
- *  @ingroup input
- */
-GLFWAPI void glfwGetCursorPos(GLFWwindow* window, double* xpos, double* ypos);
-
-/*! @brief Sets the position of the cursor, relative to the content area of the
- *  window.
- *
- *  This function sets the position, in screen coordinates, of the cursor
- *  relative to the upper-left corner of the content area of the specified
- *  window.  The window must have input focus.  If the window does not have
- *  input focus when this function is called, it fails silently.
- *
- *  __Do not use this function__ to implement things like camera controls.  GLFW
- *  already provides the `GLFW_CURSOR_DISABLED` cursor mode that hides the
- *  cursor, transparently re-centers it and provides unconstrained cursor
- *  motion.  See @ref glfwSetInputMode for more information.
- *
- *  If the cursor mode is `GLFW_CURSOR_DISABLED` then the cursor position is
- *  unconstrained and limited only by the minimum and maximum values of
- *  a `double`.
- *
- *  @param[in] window The desired window.
- *  @param[in] xpos The desired x-coordinate, relative to the left edge of the
- *  content area.
- *  @param[in] ypos The desired y-coordinate, relative to the top edge of the
- *  content area.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED, @ref
- *  GLFW_PLATFORM_ERROR and @ref GLFW_FEATURE_UNAVAILABLE (see remarks).
- *
- *  @remark __Wayland:__ This function will only work when the cursor mode is
- *  `GLFW_CURSOR_DISABLED`, otherwise it will emit @ref GLFW_FEATURE_UNAVAILABLE.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref cursor_pos
- *  @sa @ref glfwGetCursorPos
- *
- *  @since Added in version 3.0.  Replaces `glfwSetMousePos`.
- *
- *  @ingroup input
- */
-GLFWAPI void glfwSetCursorPos(GLFWwindow* window, double xpos, double ypos);
-
-/*! @brief Creates a custom cursor.
- *
- *  Creates a new custom cursor image that can be set for a window with @ref
- *  glfwSetCursor.  The cursor can be destroyed with @ref glfwDestroyCursor.
- *  Any remaining cursors are destroyed by @ref glfwTerminate.
- *
- *  The pixels are 32-bit, little-endian, non-premultiplied RGBA, i.e. eight
- *  bits per channel with the red channel first.  They are arranged canonically
- *  as packed sequential rows, starting from the top-left corner.
- *
- *  The cursor hotspot is specified in pixels, relative to the upper-left corner
- *  of the cursor image.  Like all other coordinate systems in GLFW, the X-axis
- *  points to the right and the Y-axis points down.
- *
- *  @param[in] image The desired cursor image.
- *  @param[in] xhot The desired x-coordinate, in pixels, of the cursor hotspot.
- *  @param[in] yhot The desired y-coordinate, in pixels, of the cursor hotspot.
- *  @return The handle of the created cursor, or `NULL` if an
- *  [error](@ref error_handling) occurred.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED, @ref
- *  GLFW_INVALID_VALUE and @ref GLFW_PLATFORM_ERROR.
- *
- *  @pointer_lifetime The specified image data is copied before this function
- *  returns.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref cursor_object
- *  @sa @ref glfwDestroyCursor
- *  @sa @ref glfwCreateStandardCursor
- *
- *  @since Added in version 3.1.
- *
- *  @ingroup input
- */
-GLFWAPI GLFWcursor* glfwCreateCursor(const GLFWimage* image, int xhot, int yhot);
-
-/*! @brief Creates a cursor with a standard shape.
- *
- *  Returns a cursor with a standard shape, that can be set for a window with
- *  @ref glfwSetCursor.  The images for these cursors come from the system
- *  cursor theme and their exact appearance will vary between platforms.
- *
- *  Most of these shapes are guaranteed to exist on every supported platform but
- *  a few may not be present.  See the table below for details.
- *
- *  Cursor shape                   | Windows | macOS | X11    | Wayland
- *  ------------------------------ | ------- | ----- | ------ | -------
- *  @ref GLFW_ARROW_CURSOR         | Yes     | Yes   | Yes    | Yes
- *  @ref GLFW_IBEAM_CURSOR         | Yes     | Yes   | Yes    | Yes
- *  @ref GLFW_CROSSHAIR_CURSOR     | Yes     | Yes   | Yes    | Yes
- *  @ref GLFW_POINTING_HAND_CURSOR | Yes     | Yes   | Yes    | Yes
- *  @ref GLFW_RESIZE_EW_CURSOR     | Yes     | Yes   | Yes    | Yes
- *  @ref GLFW_RESIZE_NS_CURSOR     | Yes     | Yes   | Yes    | Yes
- *  @ref GLFW_RESIZE_NWSE_CURSOR   | Yes     | Yes<sup>1</sup> | Maybe<sup>2</sup> | Maybe<sup>2</sup>
- *  @ref GLFW_RESIZE_NESW_CURSOR   | Yes     | Yes<sup>1</sup> | Maybe<sup>2</sup> | Maybe<sup>2</sup>
- *  @ref GLFW_RESIZE_ALL_CURSOR    | Yes     | Yes   | Yes    | Yes
- *  @ref GLFW_NOT_ALLOWED_CURSOR   | Yes     | Yes   | Maybe<sup>2</sup> | Maybe<sup>2</sup>
- *
- *  1) This uses a private system API and may fail in the future.
- *
- *  2) This uses a newer standard that not all cursor themes support.
- *
- *  If the requested shape is not available, this function emits a @ref
- *  GLFW_CURSOR_UNAVAILABLE error and returns `NULL`.
- *
- *  @param[in] shape One of the [standard shapes](@ref shapes).
- *  @return A new cursor ready to use or `NULL` if an
- *  [error](@ref error_handling) occurred.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED, @ref
- *  GLFW_INVALID_ENUM, @ref GLFW_CURSOR_UNAVAILABLE and @ref
- *  GLFW_PLATFORM_ERROR.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref cursor_standard
- *  @sa @ref glfwCreateCursor
- *
- *  @since Added in version 3.1.
- *
- *  @ingroup input
- */
-GLFWAPI GLFWcursor* glfwCreateStandardCursor(int shape);
-
-/*! @brief Destroys a cursor.
- *
- *  This function destroys a cursor previously created with @ref
- *  glfwCreateCursor.  Any remaining cursors will be destroyed by @ref
- *  glfwTerminate.
- *
- *  If the specified cursor is current for any window, that window will be
- *  reverted to the default cursor.  This does not affect the cursor mode.
- *
- *  @param[in] cursor The cursor object to destroy.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
- *  GLFW_PLATFORM_ERROR.
- *
- *  @reentrancy This function must not be called from a callback.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref cursor_object
- *  @sa @ref glfwCreateCursor
- *
- *  @since Added in version 3.1.
- *
- *  @ingroup input
- */
-GLFWAPI void glfwDestroyCursor(GLFWcursor* cursor);
-
-/*! @brief Sets the cursor for the window.
- *
- *  This function sets the cursor image to be used when the cursor is over the
- *  content area of the specified window.  The set cursor will only be visible
- *  when the [cursor mode](@ref cursor_mode) of the window is
- *  `GLFW_CURSOR_NORMAL`.
- *
- *  On some platforms, the set cursor may not be visible unless the window also
- *  has input focus.
- *
- *  @param[in] window The window to set the cursor for.
- *  @param[in] cursor The cursor to set, or `NULL` to switch back to the default
- *  arrow cursor.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
- *  GLFW_PLATFORM_ERROR.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref cursor_object
- *
- *  @since Added in version 3.1.
- *
- *  @ingroup input
- */
-GLFWAPI void glfwSetCursor(GLFWwindow* window, GLFWcursor* cursor);
-
-/*! @brief Sets the key callback.
- *
- *  This function sets the key callback of the specified window, which is called
- *  when a key is pressed, repeated or released.
- *
- *  The key functions deal with physical keys, with layout independent
- *  [key tokens](@ref keys) named after their values in the standard US keyboard
- *  layout.  If you want to input text, use the
- *  [character callback](@ref glfwSetCharCallback) instead.
- *
- *  When a window loses input focus, it will generate synthetic key release
- *  events for all pressed keys with associated key tokens.  You can tell these
- *  events from user-generated events by the fact that the synthetic ones are
- *  generated after the focus loss event has been processed, i.e. after the
- *  [window focus callback](@ref glfwSetWindowFocusCallback) has been called.
- *
- *  The scancode of a key is specific to that platform or sometimes even to that
- *  machine.  Scancodes are intended to allow users to bind keys that don't have
- *  a GLFW key token.  Such keys have `key` set to `GLFW_KEY_UNKNOWN`, their
- *  state is not saved and so it cannot be queried with @ref glfwGetKey.
- *
- *  Sometimes GLFW needs to generate synthetic key events, in which case the
- *  scancode may be zero.
- *
- *  @param[in] window The window whose callback to set.
- *  @param[in] callback The new key callback, or `NULL` to remove the currently
- *  set callback.
- *  @return The previously set callback, or `NULL` if no callback was set or the
- *  library had not been [initialized](@ref intro_init).
- *
- *  @callback_signature
- *  @code
- *  void function_name(GLFWwindow* window, int key, int scancode, int action, int mods)
- *  @endcode
- *  For more information about the callback parameters, see the
- *  [function pointer type](@ref GLFWkeyfun).
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref input_key
- *
- *  @since Added in version 1.0.
- *  __GLFW 3:__ Added window handle parameter and return value.
- *
- *  @ingroup input
- */
-GLFWAPI GLFWkeyfun glfwSetKeyCallback(GLFWwindow* window, GLFWkeyfun callback);
-
-/*! @brief Sets the Unicode character callback.
- *
- *  This function sets the character callback of the specified window, which is
- *  called when a Unicode character is input.
- *
- *  The character callback is intended for Unicode text input.  As it deals with
- *  characters, it is keyboard layout dependent, whereas the
- *  [key callback](@ref glfwSetKeyCallback) is not.  Characters do not map 1:1
- *  to physical keys, as a key may produce zero, one or more characters.  If you
- *  want to know whether a specific physical key was pressed or released, see
- *  the key callback instead.
- *
- *  The character callback behaves as system text input normally does and will
- *  not be called if modifier keys are held down that would prevent normal text
- *  input on that platform, for example a Super (Command) key on macOS or Alt key
- *  on Windows.
- *
- *  @param[in] window The window whose callback to set.
- *  @param[in] callback The new callback, or `NULL` to remove the currently set
- *  callback.
- *  @return The previously set callback, or `NULL` if no callback was set or the
- *  library had not been [initialized](@ref intro_init).
- *
- *  @callback_signature
- *  @code
- *  void function_name(GLFWwindow* window, unsigned int codepoint)
- *  @endcode
- *  For more information about the callback parameters, see the
- *  [function pointer type](@ref GLFWcharfun).
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref input_char
- *
- *  @since Added in version 2.4.
- *  __GLFW 3:__ Added window handle parameter and return value.
- *
- *  @ingroup input
- */
-GLFWAPI GLFWcharfun glfwSetCharCallback(GLFWwindow* window, GLFWcharfun callback);
-
-/*! @brief Sets the Unicode character with modifiers callback.
- *
- *  This function sets the character with modifiers callback of the specified
- *  window, which is called when a Unicode character is input regardless of what
- *  modifier keys are used.
- *
- *  The character with modifiers callback is intended for implementing custom
- *  Unicode character input.  For regular Unicode text input, see the
- *  [character callback](@ref glfwSetCharCallback).  Like the character
- *  callback, the character with modifiers callback deals with characters and is
- *  keyboard layout dependent.  Characters do not map 1:1 to physical keys, as
- *  a key may produce zero, one or more characters.  If you want to know whether
- *  a specific physical key was pressed or released, see the
- *  [key callback](@ref glfwSetKeyCallback) instead.
- *
- *  @param[in] window The window whose callback to set.
- *  @param[in] callback The new callback, or `NULL` to remove the currently set
- *  callback.
- *  @return The previously set callback, or `NULL` if no callback was set or an
- *  [error](@ref error_handling) occurred.
- *
- *  @callback_signature
- *  @code
- *  void function_name(GLFWwindow* window, unsigned int codepoint, int mods)
- *  @endcode
- *  For more information about the callback parameters, see the
- *  [function pointer type](@ref GLFWcharmodsfun).
- *
- *  @deprecated Scheduled for removal in version 4.0.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref input_char
- *
- *  @since Added in version 3.1.
- *
- *  @ingroup input
- */
-GLFWAPI GLFWcharmodsfun glfwSetCharModsCallback(GLFWwindow* window, GLFWcharmodsfun callback);
-
-/*! @brief Sets the mouse button callback.
- *
- *  This function sets the mouse button callback of the specified window, which
- *  is called when a mouse button is pressed or released.
- *
- *  When a window loses input focus, it will generate synthetic mouse button
- *  release events for all pressed mouse buttons with associated button tokens.
- *  You can tell these events from user-generated events by the fact that the
- *  synthetic ones are generated after the focus loss event has been processed,
- *  i.e. after the [window focus callback](@ref glfwSetWindowFocusCallback) has
- *  been called.
- *
- *  The reported `button` value can be higher than `GLFW_MOUSE_BUTTON_LAST` if
- *  the button does not have an associated [button token](@ref buttons) and the
- *  @ref GLFW_UNLIMITED_MOUSE_BUTTONS input mode is set.
- *
- *  @param[in] window The window whose callback to set.
- *  @param[in] callback The new callback, or `NULL` to remove the currently set
- *  callback.
- *  @return The previously set callback, or `NULL` if no callback was set or the
- *  library had not been [initialized](@ref intro_init).
- *
- *  @callback_signature
- *  @code
- *  void function_name(GLFWwindow* window, int button, int action, int mods)
- *  @endcode
- *  For more information about the callback parameters, see the
- *  [function pointer type](@ref GLFWmousebuttonfun).
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref input_mouse_button
- *
- *  @since Added in version 1.0.
- *  __GLFW 3:__ Added window handle parameter and return value.
- *
- *  @ingroup input
- */
-GLFWAPI GLFWmousebuttonfun glfwSetMouseButtonCallback(GLFWwindow* window, GLFWmousebuttonfun callback);
-
-/*! @brief Sets the cursor position callback.
- *
- *  This function sets the cursor position callback of the specified window,
- *  which is called when the cursor is moved.  The callback is provided with the
- *  position, in screen coordinates, relative to the upper-left corner of the
- *  content area of the window.
- *
- *  @param[in] window The window whose callback to set.
- *  @param[in] callback The new callback, or `NULL` to remove the currently set
- *  callback.
- *  @return The previously set callback, or `NULL` if no callback was set or the
- *  library had not been [initialized](@ref intro_init).
- *
- *  @callback_signature
- *  @code
- *  void function_name(GLFWwindow* window, double xpos, double ypos);
- *  @endcode
- *  For more information about the callback parameters, see the
- *  [function pointer type](@ref GLFWcursorposfun).
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref cursor_pos
- *
- *  @since Added in version 3.0.  Replaces `glfwSetMousePosCallback`.
- *
- *  @ingroup input
- */
-GLFWAPI GLFWcursorposfun glfwSetCursorPosCallback(GLFWwindow* window, GLFWcursorposfun callback);
-
-/*! @brief Sets the cursor enter/leave callback.
- *
- *  This function sets the cursor boundary crossing callback of the specified
- *  window, which is called when the cursor enters or leaves the content area of
- *  the window.
- *
- *  @param[in] window The window whose callback to set.
- *  @param[in] callback The new callback, or `NULL` to remove the currently set
- *  callback.
- *  @return The previously set callback, or `NULL` if no callback was set or the
- *  library had not been [initialized](@ref intro_init).
- *
- *  @callback_signature
- *  @code
- *  void function_name(GLFWwindow* window, int entered)
- *  @endcode
- *  For more information about the callback parameters, see the
- *  [function pointer type](@ref GLFWcursorenterfun).
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref cursor_enter
- *
- *  @since Added in version 3.0.
- *
- *  @ingroup input
- */
-GLFWAPI GLFWcursorenterfun glfwSetCursorEnterCallback(GLFWwindow* window, GLFWcursorenterfun callback);
-
-/*! @brief Sets the scroll callback.
- *
- *  This function sets the scroll callback of the specified window, which is
- *  called when a scrolling device is used, such as a mouse wheel or scrolling
- *  area of a touchpad.
- *
- *  The scroll callback receives all scrolling input, like that from a mouse
- *  wheel or a touchpad scrolling area.
- *
- *  @param[in] window The window whose callback to set.
- *  @param[in] callback The new scroll callback, or `NULL` to remove the
- *  currently set callback.
- *  @return The previously set callback, or `NULL` if no callback was set or the
- *  library had not been [initialized](@ref intro_init).
- *
- *  @callback_signature
- *  @code
- *  void function_name(GLFWwindow* window, double xoffset, double yoffset)
- *  @endcode
- *  For more information about the callback parameters, see the
- *  [function pointer type](@ref GLFWscrollfun).
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref scrolling
- *
- *  @since Added in version 3.0.  Replaces `glfwSetMouseWheelCallback`.
- *
- *  @ingroup input
- */
-GLFWAPI GLFWscrollfun glfwSetScrollCallback(GLFWwindow* window, GLFWscrollfun callback);
-
-/*! @brief Sets the path drop callback.
- *
- *  This function sets the path drop callback of the specified window, which is
- *  called when one or more dragged paths are dropped on the window.
- *
- *  Because the path array and its strings may have been generated specifically
- *  for that event, they are not guaranteed to be valid after the callback has
- *  returned.  If you wish to use them after the callback returns, you need to
- *  make a deep copy.
- *
- *  @param[in] window The window whose callback to set.
- *  @param[in] callback The new file drop callback, or `NULL` to remove the
- *  currently set callback.
- *  @return The previously set callback, or `NULL` if no callback was set or the
- *  library had not been [initialized](@ref intro_init).
- *
- *  @callback_signature
- *  @code
- *  void function_name(GLFWwindow* window, int path_count, const char* paths[])
- *  @endcode
- *  For more information about the callback parameters, see the
- *  [function pointer type](@ref GLFWdropfun).
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref path_drop
- *
- *  @since Added in version 3.1.
- *
- *  @ingroup input
- */
-GLFWAPI GLFWdropfun glfwSetDropCallback(GLFWwindow* window, GLFWdropfun callback);
-
-/*! @brief Returns whether the specified joystick is present.
- *
- *  This function returns whether the specified joystick is present.
- *
- *  There is no need to call this function before other functions that accept
- *  a joystick ID, as they all check for presence before performing any other
- *  work.
- *
- *  @param[in] jid The [joystick](@ref joysticks) to query.
- *  @return `GLFW_TRUE` if the joystick is present, or `GLFW_FALSE` otherwise.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED, @ref
- *  GLFW_INVALID_ENUM and @ref GLFW_PLATFORM_ERROR.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref joystick
- *
- *  @since Added in version 3.0.  Replaces `glfwGetJoystickParam`.
- *
- *  @ingroup input
- */
-GLFWAPI int glfwJoystickPresent(int jid);
-
-/*! @brief Returns the values of all axes of the specified joystick.
- *
- *  This function returns the values of all axes of the specified joystick.
- *  Each element in the array is a value between -1.0 and 1.0.
- *
- *  If the specified joystick is not present this function will return `NULL`
- *  but will not generate an error.  This can be used instead of first calling
- *  @ref glfwJoystickPresent.
- *
- *  @param[in] jid The [joystick](@ref joysticks) to query.
- *  @param[out] count Where to store the number of axis values in the returned
- *  array.  This is set to zero if the joystick is not present or an error
- *  occurred.
- *  @return An array of axis values, or `NULL` if the joystick is not present or
- *  an [error](@ref error_handling) occurred.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED, @ref
- *  GLFW_INVALID_ENUM and @ref GLFW_PLATFORM_ERROR.
- *
- *  @pointer_lifetime The returned array is allocated and freed by GLFW.  You
- *  should not free it yourself.  It is valid until the specified joystick is
- *  disconnected or the library is terminated.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref joystick_axis
- *
- *  @since Added in version 3.0.  Replaces `glfwGetJoystickPos`.
- *
- *  @ingroup input
- */
-GLFWAPI const float* glfwGetJoystickAxes(int jid, int* count);
-
-/*! @brief Returns the state of all buttons of the specified joystick.
- *
- *  This function returns the state of all buttons of the specified joystick.
- *  Each element in the array is either `GLFW_PRESS` or `GLFW_RELEASE`.
- *
- *  For backward compatibility with earlier versions that did not have @ref
- *  glfwGetJoystickHats, the button array also includes all hats, each
- *  represented as four buttons.  The hats are in the same order as returned by
- *  __glfwGetJoystickHats__ and are in the order _up_, _right_, _down_ and
- *  _left_.  To disable these extra buttons, set the @ref
- *  GLFW_JOYSTICK_HAT_BUTTONS init hint before initialization.
- *
- *  If the specified joystick is not present this function will return `NULL`
- *  but will not generate an error.  This can be used instead of first calling
- *  @ref glfwJoystickPresent.
- *
- *  @param[in] jid The [joystick](@ref joysticks) to query.
- *  @param[out] count Where to store the number of button states in the returned
- *  array.  This is set to zero if the joystick is not present or an error
- *  occurred.
- *  @return An array of button states, or `NULL` if the joystick is not present
- *  or an [error](@ref error_handling) occurred.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED, @ref
- *  GLFW_INVALID_ENUM and @ref GLFW_PLATFORM_ERROR.
- *
- *  @pointer_lifetime The returned array is allocated and freed by GLFW.  You
- *  should not free it yourself.  It is valid until the specified joystick is
- *  disconnected or the library is terminated.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref joystick_button
- *
- *  @since Added in version 2.2.
- *  __GLFW 3:__ Changed to return a dynamic array.
- *
- *  @ingroup input
- */
-GLFWAPI const unsigned char* glfwGetJoystickButtons(int jid, int* count);
-
-/*! @brief Returns the state of all hats of the specified joystick.
- *
- *  This function returns the state of all hats of the specified joystick.
- *  Each element in the array is one of the following values:
- *
- *  Name                  | Value
- *  ----                  | -----
- *  `GLFW_HAT_CENTERED`   | 0
- *  `GLFW_HAT_UP`         | 1
- *  `GLFW_HAT_RIGHT`      | 2
- *  `GLFW_HAT_DOWN`       | 4
- *  `GLFW_HAT_LEFT`       | 8
- *  `GLFW_HAT_RIGHT_UP`   | `GLFW_HAT_RIGHT` \| `GLFW_HAT_UP`
- *  `GLFW_HAT_RIGHT_DOWN` | `GLFW_HAT_RIGHT` \| `GLFW_HAT_DOWN`
- *  `GLFW_HAT_LEFT_UP`    | `GLFW_HAT_LEFT` \| `GLFW_HAT_UP`
- *  `GLFW_HAT_LEFT_DOWN`  | `GLFW_HAT_LEFT` \| `GLFW_HAT_DOWN`
- *
- *  The diagonal directions are bitwise combinations of the primary (up, right,
- *  down and left) directions and you can test for these individually by ANDing
- *  it with the corresponding direction.
- *
- *  @code
- *  if (hats[2] & GLFW_HAT_RIGHT)
- *  {
- *      // State of hat 2 could be right-up, right or right-down
- *  }
- *  @endcode
- *
- *  If the specified joystick is not present this function will return `NULL`
- *  but will not generate an error.  This can be used instead of first calling
- *  @ref glfwJoystickPresent.
- *
- *  @param[in] jid The [joystick](@ref joysticks) to query.
- *  @param[out] count Where to store the number of hat states in the returned
- *  array.  This is set to zero if the joystick is not present or an error
- *  occurred.
- *  @return An array of hat states, or `NULL` if the joystick is not present
- *  or an [error](@ref error_handling) occurred.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED, @ref
- *  GLFW_INVALID_ENUM and @ref GLFW_PLATFORM_ERROR.
- *
- *  @pointer_lifetime The returned array is allocated and freed by GLFW.  You
- *  should not free it yourself.  It is valid until the specified joystick is
- *  disconnected, this function is called again for that joystick or the library
- *  is terminated.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref joystick_hat
- *
- *  @since Added in version 3.3.
- *
- *  @ingroup input
- */
-GLFWAPI const unsigned char* glfwGetJoystickHats(int jid, int* count);
-
-/*! @brief Returns the name of the specified joystick.
- *
- *  This function returns the name, encoded as UTF-8, of the specified joystick.
- *  The returned string is allocated and freed by GLFW.  You should not free it
- *  yourself.
- *
- *  If the specified joystick is not present this function will return `NULL`
- *  but will not generate an error.  This can be used instead of first calling
- *  @ref glfwJoystickPresent.
- *
- *  @param[in] jid The [joystick](@ref joysticks) to query.
- *  @return The UTF-8 encoded name of the joystick, or `NULL` if the joystick
- *  is not present or an [error](@ref error_handling) occurred.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED, @ref
- *  GLFW_INVALID_ENUM and @ref GLFW_PLATFORM_ERROR.
- *
- *  @pointer_lifetime The returned string is allocated and freed by GLFW.  You
- *  should not free it yourself.  It is valid until the specified joystick is
- *  disconnected or the library is terminated.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref joystick_name
- *
- *  @since Added in version 3.0.
- *
- *  @ingroup input
- */
-GLFWAPI const char* glfwGetJoystickName(int jid);
-
-/*! @brief Returns the SDL compatible GUID of the specified joystick.
- *
- *  This function returns the SDL compatible GUID, as a UTF-8 encoded
- *  hexadecimal string, of the specified joystick.  The returned string is
- *  allocated and freed by GLFW.  You should not free it yourself.
- *
- *  The GUID is what connects a joystick to a gamepad mapping.  A connected
- *  joystick will always have a GUID even if there is no gamepad mapping
- *  assigned to it.
- *
- *  If the specified joystick is not present this function will return `NULL`
- *  but will not generate an error.  This can be used instead of first calling
- *  @ref glfwJoystickPresent.
- *
- *  The GUID uses the format introduced in SDL 2.0.5.  This GUID tries to
- *  uniquely identify the make and model of a joystick but does not identify
- *  a specific unit, e.g. all wired Xbox 360 controllers will have the same
- *  GUID on that platform.  The GUID for a unit may vary between platforms
- *  depending on what hardware information the platform specific APIs provide.
- *
- *  @param[in] jid The [joystick](@ref joysticks) to query.
- *  @return The UTF-8 encoded GUID of the joystick, or `NULL` if the joystick
- *  is not present or an [error](@ref error_handling) occurred.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED, @ref
- *  GLFW_INVALID_ENUM and @ref GLFW_PLATFORM_ERROR.
- *
- *  @pointer_lifetime The returned string is allocated and freed by GLFW.  You
- *  should not free it yourself.  It is valid until the specified joystick is
- *  disconnected or the library is terminated.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref gamepad
- *
- *  @since Added in version 3.3.
- *
- *  @ingroup input
- */
-GLFWAPI const char* glfwGetJoystickGUID(int jid);
-
-/*! @brief Sets the user pointer of the specified joystick.
- *
- *  This function sets the user-defined pointer of the specified joystick.  The
- *  current value is retained until the joystick is disconnected.  The initial
- *  value is `NULL`.
- *
- *  This function may be called from the joystick callback, even for a joystick
- *  that is being disconnected.
- *
- *  @param[in] jid The joystick whose pointer to set.
- *  @param[in] pointer The new value.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED.
- *
- *  @thread_safety This function may be called from any thread.  Access is not
- *  synchronized.
- *
- *  @sa @ref joystick_userptr
- *  @sa @ref glfwGetJoystickUserPointer
- *
- *  @since Added in version 3.3.
- *
- *  @ingroup input
- */
-GLFWAPI void glfwSetJoystickUserPointer(int jid, void* pointer);
-
-/*! @brief Returns the user pointer of the specified joystick.
- *
- *  This function returns the current value of the user-defined pointer of the
- *  specified joystick.  The initial value is `NULL`.
- *
- *  This function may be called from the joystick callback, even for a joystick
- *  that is being disconnected.
- *
- *  @param[in] jid The joystick whose pointer to return.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED.
- *
- *  @thread_safety This function may be called from any thread.  Access is not
- *  synchronized.
- *
- *  @sa @ref joystick_userptr
- *  @sa @ref glfwSetJoystickUserPointer
- *
- *  @since Added in version 3.3.
- *
- *  @ingroup input
- */
-GLFWAPI void* glfwGetJoystickUserPointer(int jid);
-
-/*! @brief Returns whether the specified joystick has a gamepad mapping.
- *
- *  This function returns whether the specified joystick is both present and has
- *  a gamepad mapping.
- *
- *  If the specified joystick is present but does not have a gamepad mapping
- *  this function will return `GLFW_FALSE` but will not generate an error.  Call
- *  @ref glfwJoystickPresent to check if a joystick is present regardless of
- *  whether it has a mapping.
- *
- *  @param[in] jid The [joystick](@ref joysticks) to query.
- *  @return `GLFW_TRUE` if a joystick is both present and has a gamepad mapping,
- *  or `GLFW_FALSE` otherwise.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
- *  GLFW_INVALID_ENUM.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref gamepad
- *  @sa @ref glfwGetGamepadState
- *
- *  @since Added in version 3.3.
- *
- *  @ingroup input
- */
-GLFWAPI int glfwJoystickIsGamepad(int jid);
-
-/*! @brief Sets the joystick configuration callback.
- *
- *  This function sets the joystick configuration callback, or removes the
- *  currently set callback.  This is called when a joystick is connected to or
- *  disconnected from the system.
- *
- *  For joystick connection and disconnection events to be delivered on all
- *  platforms, you need to call one of the [event processing](@ref events)
- *  functions.  Joystick disconnection may also be detected and the callback
- *  called by joystick functions.  The function will then return whatever it
- *  returns if the joystick is not present.
- *
- *  @param[in] callback The new callback, or `NULL` to remove the currently set
- *  callback.
- *  @return The previously set callback, or `NULL` if no callback was set or the
- *  library had not been [initialized](@ref intro_init).
- *
- *  @callback_signature
- *  @code
- *  void function_name(int jid, int event)
- *  @endcode
- *  For more information about the callback parameters, see the
- *  [function pointer type](@ref GLFWjoystickfun).
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref joystick_event
- *
- *  @since Added in version 3.2.
- *
- *  @ingroup input
- */
-GLFWAPI GLFWjoystickfun glfwSetJoystickCallback(GLFWjoystickfun callback);
-
-/*! @brief Adds the specified SDL_GameControllerDB gamepad mappings.
- *
- *  This function parses the specified ASCII encoded string and updates the
- *  internal list with any gamepad mappings it finds.  This string may
- *  contain either a single gamepad mapping or many mappings separated by
- *  newlines.  The parser supports the full format of the `gamecontrollerdb.txt`
- *  source file including empty lines and comments.
- *
- *  See @ref gamepad_mapping for a description of the format.
- *
- *  If there is already a gamepad mapping for a given GUID in the internal list,
- *  it will be replaced by the one passed to this function.  If the library is
- *  terminated and re-initialized the internal list will revert to the built-in
- *  default.
- *
- *  @param[in] string The string containing the gamepad mappings.
- *  @return `GLFW_TRUE` if successful, or `GLFW_FALSE` if an
- *  [error](@ref error_handling) occurred.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
- *  GLFW_INVALID_VALUE.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref gamepad
- *  @sa @ref glfwJoystickIsGamepad
- *  @sa @ref glfwGetGamepadName
- *
- *  @since Added in version 3.3.
- *
- *  @ingroup input
- */
-GLFWAPI int glfwUpdateGamepadMappings(const char* string);
-
-/*! @brief Returns the human-readable gamepad name for the specified joystick.
- *
- *  This function returns the human-readable name of the gamepad from the
- *  gamepad mapping assigned to the specified joystick.
- *
- *  If the specified joystick is not present or does not have a gamepad mapping
- *  this function will return `NULL` but will not generate an error.  Call
- *  @ref glfwJoystickPresent to check whether it is present regardless of
- *  whether it has a mapping.
- *
- *  @param[in] jid The [joystick](@ref joysticks) to query.
- *  @return The UTF-8 encoded name of the gamepad, or `NULL` if the
- *  joystick is not present, does not have a mapping or an
- *  [error](@ref error_handling) occurred.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref GLFW_INVALID_ENUM.
- *
- *  @pointer_lifetime The returned string is allocated and freed by GLFW.  You
- *  should not free it yourself.  It is valid until the specified joystick is
- *  disconnected, the gamepad mappings are updated or the library is terminated.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref gamepad
- *  @sa @ref glfwJoystickIsGamepad
- *
- *  @since Added in version 3.3.
- *
- *  @ingroup input
- */
-GLFWAPI const char* glfwGetGamepadName(int jid);
-
-/*! @brief Retrieves the state of the specified joystick remapped as a gamepad.
- *
- *  This function retrieves the state of the specified joystick remapped to
- *  an Xbox-like gamepad.
- *
- *  If the specified joystick is not present or does not have a gamepad mapping
- *  this function will return `GLFW_FALSE` but will not generate an error.  Call
- *  @ref glfwJoystickPresent to check whether it is present regardless of
- *  whether it has a mapping.
- *
- *  The Guide button may not be available for input as it is often hooked by the
- *  system or the Steam client.
- *
- *  Not all devices have all the buttons or axes provided by @ref
- *  GLFWgamepadstate.  Unavailable buttons and axes will always report
- *  `GLFW_RELEASE` and 0.0 respectively.
- *
- *  @param[in] jid The [joystick](@ref joysticks) to query.
- *  @param[out] state The gamepad input state of the joystick.
- *  @return `GLFW_TRUE` if successful, or `GLFW_FALSE` if no joystick is
- *  connected, it has no gamepad mapping or an [error](@ref error_handling)
- *  occurred.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
- *  GLFW_INVALID_ENUM.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref gamepad
- *  @sa @ref glfwUpdateGamepadMappings
- *  @sa @ref glfwJoystickIsGamepad
- *
- *  @since Added in version 3.3.
- *
- *  @ingroup input
- */
-GLFWAPI int glfwGetGamepadState(int jid, GLFWgamepadstate* state);
-
-/*! @brief Sets the clipboard to the specified string.
- *
- *  This function sets the system clipboard to the specified, UTF-8 encoded
- *  string.
- *
- *  @param[in] window Deprecated.  Any valid window or `NULL`.
- *  @param[in] string A UTF-8 encoded string.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
- *  GLFW_PLATFORM_ERROR.
- *
- *  @remark __Win32:__ The clipboard on Windows has a single global lock for reading and
- *  writing.  GLFW tries to acquire it a few times, which is almost always enough.  If it
- *  cannot acquire the lock then this function emits @ref GLFW_PLATFORM_ERROR and returns.
- *  It is safe to try this multiple times.
- *
- *  @pointer_lifetime The specified string is copied before this function
- *  returns.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref clipboard
- *  @sa @ref glfwGetClipboardString
- *
- *  @since Added in version 3.0.
- *
- *  @ingroup input
- */
-GLFWAPI void glfwSetClipboardString(GLFWwindow* window, const char* string);
-
-/*! @brief Returns the contents of the clipboard as a string.
- *
- *  This function returns the contents of the system clipboard, if it contains
- *  or is convertible to a UTF-8 encoded string.  If the clipboard is empty or
- *  if its contents cannot be converted, `NULL` is returned and a @ref
- *  GLFW_FORMAT_UNAVAILABLE error is generated.
- *
- *  @param[in] window Deprecated.  Any valid window or `NULL`.
- *  @return The contents of the clipboard as a UTF-8 encoded string, or `NULL`
- *  if an [error](@ref error_handling) occurred.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED, @ref
- *  GLFW_FORMAT_UNAVAILABLE and @ref GLFW_PLATFORM_ERROR.
- *
- *  @remark __Win32:__ The clipboard on Windows has a single global lock for reading and
- *  writing.  GLFW tries to acquire it a few times, which is almost always enough.  If it
- *  cannot acquire the lock then this function emits @ref GLFW_PLATFORM_ERROR and returns.
- *  It is safe to try this multiple times.
- *
- *  @pointer_lifetime The returned string is allocated and freed by GLFW.  You
- *  should not free it yourself.  It is valid until the next call to @ref
- *  glfwGetClipboardString or @ref glfwSetClipboardString, or until the library
- *  is terminated.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref clipboard
- *  @sa @ref glfwSetClipboardString
- *
- *  @since Added in version 3.0.
- *
- *  @ingroup input
- */
-GLFWAPI const char* glfwGetClipboardString(GLFWwindow* window);
-
-/*! @brief Returns the GLFW time.
- *
- *  This function returns the current GLFW time, in seconds.  Unless the time
- *  has been set using @ref glfwSetTime it measures time elapsed since GLFW was
- *  initialized.
- *
- *  This function and @ref glfwSetTime are helper functions on top of @ref
- *  glfwGetTimerFrequency and @ref glfwGetTimerValue.
- *
- *  The resolution of the timer is system dependent, but is usually on the order
- *  of a few micro- or nanoseconds.  It uses the highest-resolution monotonic
- *  time source on each operating system.
- *
- *  @return The current time, in seconds, or zero if an
- *  [error](@ref error_handling) occurred.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED.
- *
- *  @thread_safety This function may be called from any thread.  Reading and
- *  writing of the internal base time is not atomic, so it needs to be
- *  externally synchronized with calls to @ref glfwSetTime.
- *
- *  @sa @ref time
- *
- *  @since Added in version 1.0.
- *
- *  @ingroup input
- */
-GLFWAPI double glfwGetTime(void);
-
-/*! @brief Sets the GLFW time.
- *
- *  This function sets the current GLFW time, in seconds.  The value must be
- *  a positive finite number less than or equal to 18446744073.0, which is
- *  approximately 584.5 years.
- *
- *  This function and @ref glfwGetTime are helper functions on top of @ref
- *  glfwGetTimerFrequency and @ref glfwGetTimerValue.
- *
- *  @param[in] time The new value, in seconds.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
- *  GLFW_INVALID_VALUE.
- *
- *  @remark The upper limit of GLFW time is calculated as
- *  floor((2<sup>64</sup> - 1) / 10<sup>9</sup>) and is due to implementations
- *  storing nanoseconds in 64 bits.  The limit may be increased in the future.
- *
- *  @thread_safety This function may be called from any thread.  Reading and
- *  writing of the internal base time is not atomic, so it needs to be
- *  externally synchronized with calls to @ref glfwGetTime.
- *
- *  @sa @ref time
- *
- *  @since Added in version 2.2.
- *
- *  @ingroup input
- */
-GLFWAPI void glfwSetTime(double time);
-
-/*! @brief Returns the current value of the raw timer.
- *
- *  This function returns the current value of the raw timer, measured in
- *  1&nbsp;/&nbsp;frequency seconds.  To get the frequency, call @ref
- *  glfwGetTimerFrequency.
- *
- *  @return The value of the timer, or zero if an
- *  [error](@ref error_handling) occurred.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED.
- *
- *  @thread_safety This function may be called from any thread.
- *
- *  @sa @ref time
- *  @sa @ref glfwGetTimerFrequency
- *
- *  @since Added in version 3.2.
- *
- *  @ingroup input
- */
-GLFWAPI uint64_t glfwGetTimerValue(void);
-
-/*! @brief Returns the frequency, in Hz, of the raw timer.
- *
- *  This function returns the frequency, in Hz, of the raw timer.
- *
- *  @return The frequency of the timer, in Hz, or zero if an
- *  [error](@ref error_handling) occurred.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED.
- *
- *  @thread_safety This function may be called from any thread.
- *
- *  @sa @ref time
- *  @sa @ref glfwGetTimerValue
- *
- *  @since Added in version 3.2.
- *
- *  @ingroup input
- */
-GLFWAPI uint64_t glfwGetTimerFrequency(void);
-
-/*! @brief Makes the context of the specified window current for the calling
- *  thread.
- *
- *  This function makes the OpenGL or OpenGL ES context of the specified window
- *  current on the calling thread.  It can also detach the current context from
- *  the calling thread without making a new one current by passing in `NULL`.
- *
- *  A context must only be made current on a single thread at a time and each
- *  thread can have only a single current context at a time.  Making a context
- *  current detaches any previously current context on the calling thread.
- *
- *  When moving a context between threads, you must detach it (make it
- *  non-current) on the old thread before making it current on the new one.
- *
- *  By default, making a context non-current implicitly forces a pipeline flush.
- *  On machines that support `GL_KHR_context_flush_control`, you can control
- *  whether a context performs this flush by setting the
- *  [GLFW_CONTEXT_RELEASE_BEHAVIOR](@ref GLFW_CONTEXT_RELEASE_BEHAVIOR_hint)
- *  hint.
- *
- *  The specified window must have an OpenGL or OpenGL ES context.  Specifying
- *  a window without a context will generate a @ref GLFW_NO_WINDOW_CONTEXT
- *  error.
- *
- *  @param[in] window The window whose context to make current, or `NULL` to
- *  detach the current context.
- *
- *  @remarks If the previously current context was created via a different
- *  context creation API than the one passed to this function, GLFW will still
- *  detach the previous one from its API before making the new one current.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED, @ref
- *  GLFW_NO_WINDOW_CONTEXT and @ref GLFW_PLATFORM_ERROR.
- *
- *  @thread_safety This function may be called from any thread.
- *
- *  @sa @ref context_current
- *  @sa @ref glfwGetCurrentContext
- *
- *  @since Added in version 3.0.
- *
- *  @ingroup context
- */
-GLFWAPI void glfwMakeContextCurrent(GLFWwindow* window);
-
-/*! @brief Returns the window whose context is current on the calling thread.
- *
- *  This function returns the window whose OpenGL or OpenGL ES context is
- *  current on the calling thread.
- *
- *  @return The window whose context is current, or `NULL` if no window's
- *  context is current.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED.
- *
- *  @thread_safety This function may be called from any thread.
- *
- *  @sa @ref context_current
- *  @sa @ref glfwMakeContextCurrent
- *
- *  @since Added in version 3.0.
- *
- *  @ingroup context
- */
-GLFWAPI GLFWwindow* glfwGetCurrentContext(void);
-
-/*! @brief Swaps the front and back buffers of the specified window.
- *
- *  This function swaps the front and back buffers of the specified window when
- *  rendering with OpenGL or OpenGL ES.  If the swap interval is greater than
- *  zero, the GPU driver waits the specified number of screen updates before
- *  swapping the buffers.
- *
- *  The specified window must have an OpenGL or OpenGL ES context.  Specifying
- *  a window without a context will generate a @ref GLFW_NO_WINDOW_CONTEXT
- *  error.
- *
- *  This function does not apply to Vulkan.  If you are rendering with Vulkan,
- *  see `vkQueuePresentKHR` instead.
- *
- *  @param[in] window The window whose buffers to swap.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED, @ref
- *  GLFW_NO_WINDOW_CONTEXT and @ref GLFW_PLATFORM_ERROR.
- *
- *  @remark __EGL:__ The context of the specified window must be current on the
- *  calling thread.
- *
- *  @thread_safety This function may be called from any thread.
- *
- *  @sa @ref buffer_swap
- *  @sa @ref glfwSwapInterval
- *
- *  @since Added in version 1.0.
- *  __GLFW 3:__ Added window handle parameter.
- *
- *  @ingroup window
- */
-GLFWAPI void glfwSwapBuffers(GLFWwindow* window);
-
-/*! @brief Sets the swap interval for the current context.
- *
- *  This function sets the swap interval for the current OpenGL or OpenGL ES
- *  context, i.e. the number of screen updates to wait from the time @ref
- *  glfwSwapBuffers was called before swapping the buffers and returning.  This
- *  is sometimes called _vertical synchronization_, _vertical retrace
- *  synchronization_ or just _vsync_.
- *
- *  A context that supports either of the `WGL_EXT_swap_control_tear` and
- *  `GLX_EXT_swap_control_tear` extensions also accepts _negative_ swap
- *  intervals, which allows the driver to swap immediately even if a frame
- *  arrives a little bit late.  You can check for these extensions with @ref
- *  glfwExtensionSupported.
- *
- *  A context must be current on the calling thread.  Calling this function
- *  without a current context will cause a @ref GLFW_NO_CURRENT_CONTEXT error.
- *
- *  This function does not apply to Vulkan.  If you are rendering with Vulkan,
- *  see the present mode of your swapchain instead.
- *
- *  @param[in] interval The minimum number of screen updates to wait for
- *  until the buffers are swapped by @ref glfwSwapBuffers.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED, @ref
- *  GLFW_NO_CURRENT_CONTEXT and @ref GLFW_PLATFORM_ERROR.
- *
- *  @remark This function is not called during context creation, leaving the
- *  swap interval set to whatever is the default for that API.  This is done
- *  because some swap interval extensions used by GLFW do not allow the swap
- *  interval to be reset to zero once it has been set to a non-zero value.
- *
- *  @remark Some GPU drivers do not honor the requested swap interval, either
- *  because of a user setting that overrides the application's request or due to
- *  bugs in the driver.
- *
- *  @thread_safety This function may be called from any thread.
- *
- *  @sa @ref buffer_swap
- *  @sa @ref glfwSwapBuffers
- *
- *  @since Added in version 1.0.
- *
- *  @ingroup context
- */
-GLFWAPI void glfwSwapInterval(int interval);
-
-/*! @brief Returns whether the specified extension is available.
- *
- *  This function returns whether the specified
- *  [API extension](@ref context_glext) is supported by the current OpenGL or
- *  OpenGL ES context.  It searches both for client API extension and context
- *  creation API extensions.
- *
- *  A context must be current on the calling thread.  Calling this function
- *  without a current context will cause a @ref GLFW_NO_CURRENT_CONTEXT error.
- *
- *  As this functions retrieves and searches one or more extension strings each
- *  call, it is recommended that you cache its results if it is going to be used
- *  frequently.  The extension strings will not change during the lifetime of
- *  a context, so there is no danger in doing this.
- *
- *  This function does not apply to Vulkan.  If you are using Vulkan, see @ref
- *  glfwGetRequiredInstanceExtensions, `vkEnumerateInstanceExtensionProperties`
- *  and `vkEnumerateDeviceExtensionProperties` instead.
- *
- *  @param[in] extension The ASCII encoded name of the extension.
- *  @return `GLFW_TRUE` if the extension is available, or `GLFW_FALSE`
- *  otherwise.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED, @ref
- *  GLFW_NO_CURRENT_CONTEXT, @ref GLFW_INVALID_VALUE and @ref
- *  GLFW_PLATFORM_ERROR.
- *
- *  @thread_safety This function may be called from any thread.
- *
- *  @sa @ref context_glext
- *  @sa @ref glfwGetProcAddress
- *
- *  @since Added in version 1.0.
- *
- *  @ingroup context
- */
-GLFWAPI int glfwExtensionSupported(const char* extension);
-
-/*! @brief Returns the address of the specified function for the current
- *  context.
- *
- *  This function returns the address of the specified OpenGL or OpenGL ES
- *  [core or extension function](@ref context_glext), if it is supported
- *  by the current context.
- *
- *  A context must be current on the calling thread.  Calling this function
- *  without a current context will cause a @ref GLFW_NO_CURRENT_CONTEXT error.
- *
- *  This function does not apply to Vulkan.  If you are rendering with Vulkan,
- *  see @ref glfwGetInstanceProcAddress, `vkGetInstanceProcAddr` and
- *  `vkGetDeviceProcAddr` instead.
- *
- *  @param[in] procname The ASCII encoded name of the function.
- *  @return The address of the function, or `NULL` if an
- *  [error](@ref error_handling) occurred.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED, @ref
- *  GLFW_NO_CURRENT_CONTEXT and @ref GLFW_PLATFORM_ERROR.
- *
- *  @remark The address of a given function is not guaranteed to be the same
- *  between contexts.
- *
- *  @remark This function may return a non-`NULL` address despite the
- *  associated version or extension not being available.  Always check the
- *  context version or extension string first.
- *
- *  @pointer_lifetime The returned function pointer is valid until the context
- *  is destroyed or the library is terminated.
- *
- *  @thread_safety This function may be called from any thread.
- *
- *  @sa @ref context_glext
- *  @sa @ref glfwExtensionSupported
- *
- *  @since Added in version 1.0.
- *
- *  @ingroup context
- */
-GLFWAPI GLFWglproc glfwGetProcAddress(const char* procname);
-
-/*! @brief Returns whether the Vulkan loader and an ICD have been found.
- *
- *  This function returns whether the Vulkan loader and any minimally functional
- *  ICD have been found.
- *
- *  The availability of a Vulkan loader and even an ICD does not by itself guarantee that
- *  surface creation or even instance creation is possible.  Call @ref
- *  glfwGetRequiredInstanceExtensions to check whether the extensions necessary for Vulkan
- *  surface creation are available and @ref glfwGetPhysicalDevicePresentationSupport to
- *  check whether a queue family of a physical device supports image presentation.
- *
- *  @return `GLFW_TRUE` if Vulkan is minimally available, or `GLFW_FALSE`
- *  otherwise.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED.
- *
- *  @thread_safety This function may be called from any thread.
- *
- *  @sa @ref vulkan_support
- *
- *  @since Added in version 3.2.
- *
- *  @ingroup vulkan
- */
-GLFWAPI int glfwVulkanSupported(void);
-
-/*! @brief Returns the Vulkan instance extensions required by GLFW.
- *
- *  This function returns an array of names of Vulkan instance extensions required
- *  by GLFW for creating Vulkan surfaces for GLFW windows.  If successful, the
- *  list will always contain `VK_KHR_surface`, so if you don't require any
- *  additional extensions you can pass this list directly to the
- *  `VkInstanceCreateInfo` struct.
- *
- *  If Vulkan is not available on the machine, this function returns `NULL` and
- *  generates a @ref GLFW_API_UNAVAILABLE error.  Call @ref glfwVulkanSupported
- *  to check whether Vulkan is at least minimally available.
- *
- *  If Vulkan is available but no set of extensions allowing window surface
- *  creation was found, this function returns `NULL`.  You may still use Vulkan
- *  for off-screen rendering and compute work.
- *
- *  @param[out] count Where to store the number of extensions in the returned
- *  array.  This is set to zero if an error occurred.
- *  @return An array of ASCII encoded extension names, or `NULL` if an
- *  [error](@ref error_handling) occurred.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
- *  GLFW_API_UNAVAILABLE.
- *
- *  @remark Additional extensions may be required by future versions of GLFW.
- *  You should check if any extensions you wish to enable are already in the
- *  returned array, as it is an error to specify an extension more than once in
- *  the `VkInstanceCreateInfo` struct.
- *
- *  @pointer_lifetime The returned array is allocated and freed by GLFW.  You
- *  should not free it yourself.  It is guaranteed to be valid only until the
- *  library is terminated.
- *
- *  @thread_safety This function may be called from any thread.
- *
- *  @sa @ref vulkan_ext
- *  @sa @ref glfwCreateWindowSurface
- *
- *  @since Added in version 3.2.
- *
- *  @ingroup vulkan
- */
-GLFWAPI const char** glfwGetRequiredInstanceExtensions(uint32_t* count);
-
-#if defined(VK_VERSION_1_0)
-
-/*! @brief Returns the address of the specified Vulkan instance function.
- *
- *  This function returns the address of the specified Vulkan core or extension
- *  function for the specified instance.  If instance is set to `NULL` it can
- *  return any function exported from the Vulkan loader, including at least the
- *  following functions:
- *
- *  - `vkEnumerateInstanceExtensionProperties`
- *  - `vkEnumerateInstanceLayerProperties`
- *  - `vkCreateInstance`
- *  - `vkGetInstanceProcAddr`
- *
- *  If Vulkan is not available on the machine, this function returns `NULL` and
- *  generates a @ref GLFW_API_UNAVAILABLE error.  Call @ref glfwVulkanSupported
- *  to check whether Vulkan is at least minimally available.
- *
- *  This function is equivalent to calling `vkGetInstanceProcAddr` with
- *  a platform-specific query of the Vulkan loader as a fallback.
- *
- *  @param[in] instance The Vulkan instance to query, or `NULL` to retrieve
- *  functions related to instance creation.
- *  @param[in] procname The ASCII encoded name of the function.
- *  @return The address of the function, or `NULL` if an
- *  [error](@ref error_handling) occurred.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
- *  GLFW_API_UNAVAILABLE.
- *
- *  @pointer_lifetime The returned function pointer is valid until the library
- *  is terminated.
- *
- *  @thread_safety This function may be called from any thread.
- *
- *  @sa @ref vulkan_proc
- *
- *  @since Added in version 3.2.
- *
- *  @ingroup vulkan
- */
-GLFWAPI GLFWvkproc glfwGetInstanceProcAddress(VkInstance instance, const char* procname);
-
-/*! @brief Returns whether the specified queue family can present images.
- *
- *  This function returns whether the specified queue family of the specified
- *  physical device supports presentation to the platform GLFW was built for.
- *
- *  If Vulkan or the required window surface creation instance extensions are
- *  not available on the machine, or if the specified instance was not created
- *  with the required extensions, this function returns `GLFW_FALSE` and
- *  generates a @ref GLFW_API_UNAVAILABLE error.  Call @ref glfwVulkanSupported
- *  to check whether Vulkan is at least minimally available and @ref
- *  glfwGetRequiredInstanceExtensions to check what instance extensions are
- *  required.
- *
- *  @param[in] instance The instance that the physical device belongs to.
- *  @param[in] device The physical device that the queue family belongs to.
- *  @param[in] queuefamily The index of the queue family to query.
- *  @return `GLFW_TRUE` if the queue family supports presentation, or
- *  `GLFW_FALSE` otherwise.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED, @ref
- *  GLFW_API_UNAVAILABLE and @ref GLFW_PLATFORM_ERROR.
- *
- *  @remark __macOS:__ This function currently always returns `GLFW_TRUE`, as the
- *  `VK_MVK_macos_surface` and `VK_EXT_metal_surface` extensions do not provide
- *  a `vkGetPhysicalDevice*PresentationSupport` type function.
- *
- *  @thread_safety This function may be called from any thread.  For
- *  synchronization details of Vulkan objects, see the Vulkan specification.
- *
- *  @sa @ref vulkan_present
- *
- *  @since Added in version 3.2.
- *
- *  @ingroup vulkan
- */
-GLFWAPI int glfwGetPhysicalDevicePresentationSupport(VkInstance instance, VkPhysicalDevice device, uint32_t queuefamily);
-
-/*! @brief Creates a Vulkan surface for the specified window.
- *
- *  This function creates a Vulkan surface for the specified window.
- *
- *  If the Vulkan loader or at least one minimally functional ICD were not found,
- *  this function returns `VK_ERROR_INITIALIZATION_FAILED` and generates a @ref
- *  GLFW_API_UNAVAILABLE error.  Call @ref glfwVulkanSupported to check whether
- *  Vulkan is at least minimally available.
- *
- *  If the required window surface creation instance extensions are not
- *  available or if the specified instance was not created with these extensions
- *  enabled, this function returns `VK_ERROR_EXTENSION_NOT_PRESENT` and
- *  generates a @ref GLFW_API_UNAVAILABLE error.  Call @ref
- *  glfwGetRequiredInstanceExtensions to check what instance extensions are
- *  required.
- *
- *  The window surface cannot be shared with another API so the window must
- *  have been created with the [client api hint](@ref GLFW_CLIENT_API_attrib)
- *  set to `GLFW_NO_API` otherwise it generates a @ref GLFW_INVALID_VALUE error
- *  and returns `VK_ERROR_NATIVE_WINDOW_IN_USE_KHR`.
- *
- *  The window surface must be destroyed before the specified Vulkan instance.
- *  It is the responsibility of the caller to destroy the window surface.  GLFW
- *  does not destroy it for you.  Call `vkDestroySurfaceKHR` to destroy the
- *  surface.
- *
- *  @param[in] instance The Vulkan instance to create the surface in.
- *  @param[in] window The window to create the surface for.
- *  @param[in] allocator The allocator to use, or `NULL` to use the default
- *  allocator.
- *  @param[out] surface Where to store the handle of the surface.  This is set
- *  to `VK_NULL_HANDLE` if an error occurred.
- *  @return `VK_SUCCESS` if successful, or a Vulkan error code if an
- *  [error](@ref error_handling) occurred.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED, @ref
- *  GLFW_API_UNAVAILABLE, @ref GLFW_PLATFORM_ERROR and @ref GLFW_INVALID_VALUE
- *
- *  @remark If an error occurs before the creation call is made, GLFW returns
- *  the Vulkan error code most appropriate for the error.  Appropriate use of
- *  @ref glfwVulkanSupported and @ref glfwGetRequiredInstanceExtensions should
- *  eliminate almost all occurrences of these errors.
- *
- *  @remark __macOS:__ GLFW prefers the `VK_EXT_metal_surface` extension, with the
- *  `VK_MVK_macos_surface` extension as a fallback.  The name of the selected
- *  extension, if any, is included in the array returned by @ref
- *  glfwGetRequiredInstanceExtensions.
- *
- *  @remark __macOS:__ This function creates and sets a `CAMetalLayer` instance for
- *  the window content view, which is required for MoltenVK to function.
- *
- *  @remark __X11:__ By default GLFW prefers the `VK_KHR_xcb_surface` extension,
- *  with the `VK_KHR_xlib_surface` extension as a fallback.  You can make
- *  `VK_KHR_xlib_surface` the preferred extension by setting the
- *  [GLFW_X11_XCB_VULKAN_SURFACE](@ref GLFW_X11_XCB_VULKAN_SURFACE_hint) init
- *  hint.  The name of the selected extension, if any, is included in the array
- *  returned by @ref glfwGetRequiredInstanceExtensions.
- *
- *  @thread_safety This function may be called from any thread.  For
- *  synchronization details of Vulkan objects, see the Vulkan specification.
- *
- *  @sa @ref vulkan_surface
- *  @sa @ref glfwGetRequiredInstanceExtensions
- *
- *  @since Added in version 3.2.
- *
- *  @ingroup vulkan
- */
-GLFWAPI VkResult glfwCreateWindowSurface(VkInstance instance, GLFWwindow* window, const VkAllocationCallbacks* allocator, VkSurfaceKHR* surface);
-
-#endif /*VK_VERSION_1_0*/
-
-
-/*************************************************************************
- * Global definition cleanup
- *************************************************************************/
-
-/* ------------------- BEGIN SYSTEM/COMPILER SPECIFIC -------------------- */
-
-#ifdef GLFW_WINGDIAPI_DEFINED
- #undef WINGDIAPI
- #undef GLFW_WINGDIAPI_DEFINED
-#endif
-
-#ifdef GLFW_CALLBACK_DEFINED
- #undef CALLBACK
- #undef GLFW_CALLBACK_DEFINED
-#endif
-
-/* Some OpenGL related headers need GLAPIENTRY, but it is unconditionally
- * defined by some gl.h variants (OpenBSD) so define it after if needed.
- */
-#ifndef GLAPIENTRY
- #define GLAPIENTRY APIENTRY
- #define GLFW_GLAPIENTRY_DEFINED
-#endif
-
-/* -------------------- END SYSTEM/COMPILER SPECIFIC --------------------- */
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _glfw3_h_ */
-
diff --git a/Source/sys-clk/manager/lib/borealis/library/include/GLFW/glfw3native.h b/Source/sys-clk/manager/lib/borealis/library/include/GLFW/glfw3native.h
deleted file mode 100644
index 8db2cfa3..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/include/GLFW/glfw3native.h
+++ /dev/null
@@ -1,709 +0,0 @@
-/*************************************************************************
- * GLFW 3.5 - www.glfw.org
- * A library for OpenGL, window and input
- *------------------------------------------------------------------------
- * Copyright (c) 2002-2006 Marcus Geelnard
- * Copyright (c) 2006-2018 Camilla Löwy <elmindreda@glfw.org>
- *
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- *
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- *
- * 1. The origin of this software must not be misrepresented; you must not
- *    claim that you wrote the original software. If you use this software
- *    in a product, an acknowledgment in the product documentation would
- *    be appreciated but is not required.
- *
- * 2. Altered source versions must be plainly marked as such, and must not
- *    be misrepresented as being the original software.
- *
- * 3. This notice may not be removed or altered from any source
- *    distribution.
- *
- *************************************************************************/
-
-#ifndef _glfw3_native_h_
-#define _glfw3_native_h_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/*************************************************************************
- * Doxygen documentation
- *************************************************************************/
-
-/*! @file glfw3native.h
- *  @brief The header of the native access functions.
- *
- *  This is the header file of the native access functions.  See @ref native for
- *  more information.
- */
-/*! @defgroup native Native access
- *  @brief Functions related to accessing native handles.
- *
- *  **By using the native access functions you assert that you know what you're
- *  doing and how to fix problems caused by using them.  If you don't, you
- *  shouldn't be using them.**
- *
- *  Before the inclusion of @ref glfw3native.h, you may define zero or more
- *  window system API macro and zero or more context creation API macros.
- *
- *  The chosen backends must match those the library was compiled for.  Failure
- *  to do this will cause a link-time error.
- *
- *  The available window API macros are:
- *  * `GLFW_EXPOSE_NATIVE_WIN32`
- *  * `GLFW_EXPOSE_NATIVE_COCOA`
- *  * `GLFW_EXPOSE_NATIVE_X11`
- *  * `GLFW_EXPOSE_NATIVE_WAYLAND`
- *
- *  The available context API macros are:
- *  * `GLFW_EXPOSE_NATIVE_WGL`
- *  * `GLFW_EXPOSE_NATIVE_NSGL`
- *  * `GLFW_EXPOSE_NATIVE_GLX`
- *  * `GLFW_EXPOSE_NATIVE_EGL`
- *  * `GLFW_EXPOSE_NATIVE_OSMESA`
- *
- *  These macros select which of the native access functions that are declared
- *  and which platform-specific headers to include.  It is then up your (by
- *  definition platform-specific) code to handle which of these should be
- *  defined.
- *
- *  If you do not want the platform-specific headers to be included, define
- *  `GLFW_NATIVE_INCLUDE_NONE` before including the @ref glfw3native.h header.
- *
- *  @code
- *  #define GLFW_EXPOSE_NATIVE_WIN32
- *  #define GLFW_EXPOSE_NATIVE_WGL
- *  #define GLFW_NATIVE_INCLUDE_NONE
- *  #include <GLFW/glfw3native.h>
- *  @endcode
- */
-
-
-/*************************************************************************
- * System headers and types
- *************************************************************************/
-
-#if !defined(GLFW_NATIVE_INCLUDE_NONE)
-
- #if defined(GLFW_EXPOSE_NATIVE_WIN32) || defined(GLFW_EXPOSE_NATIVE_WGL)
-  /* This is a workaround for the fact that glfw3.h needs to export APIENTRY (for
-   * example to allow applications to correctly declare a GL_KHR_debug callback)
-   * but windows.h assumes no one will define APIENTRY before it does
-   */
-  #if defined(GLFW_APIENTRY_DEFINED)
-   #undef APIENTRY
-   #undef GLFW_APIENTRY_DEFINED
-  #endif
-  #include <windows.h>
- #endif
-
- #if defined(GLFW_EXPOSE_NATIVE_COCOA) || defined(GLFW_EXPOSE_NATIVE_NSGL)
-  #if defined(__OBJC__)
-   #import <Cocoa/Cocoa.h>
-  #else
-   #include <ApplicationServices/ApplicationServices.h>
-   #include <objc/objc.h>
-  #endif
- #endif
-
- #if defined(GLFW_EXPOSE_NATIVE_X11) || defined(GLFW_EXPOSE_NATIVE_GLX)
-  #include <X11/Xlib.h>
-  #include <X11/extensions/Xrandr.h>
- #endif
-
- #if defined(GLFW_EXPOSE_NATIVE_WAYLAND)
-  #include <wayland-client.h>
- #endif
-
- #if defined(GLFW_EXPOSE_NATIVE_WGL)
-  /* WGL is declared by windows.h */
- #endif
- #if defined(GLFW_EXPOSE_NATIVE_NSGL)
-  /* NSGL is declared by Cocoa.h */
- #endif
- #if defined(GLFW_EXPOSE_NATIVE_GLX)
-  /* This is a workaround for the fact that glfw3.h defines GLAPIENTRY because by
-   * default it also acts as an OpenGL header
-   * However, glx.h will include gl.h, which will define it unconditionally
-   */
-  #if defined(GLFW_GLAPIENTRY_DEFINED)
-   #undef GLAPIENTRY
-   #undef GLFW_GLAPIENTRY_DEFINED
-  #endif
-  #include <GL/glx.h>
- #endif
- #if defined(GLFW_EXPOSE_NATIVE_EGL)
-  #include <EGL/egl.h>
- #endif
- #if defined(GLFW_EXPOSE_NATIVE_OSMESA)
-  /* This is a workaround for the fact that glfw3.h defines GLAPIENTRY because by
-   * default it also acts as an OpenGL header
-   * However, osmesa.h will include gl.h, which will define it unconditionally
-   */
-  #if defined(GLFW_GLAPIENTRY_DEFINED)
-   #undef GLAPIENTRY
-   #undef GLFW_GLAPIENTRY_DEFINED
-  #endif
-  #include <GL/osmesa.h>
- #endif
-
-#endif /*GLFW_NATIVE_INCLUDE_NONE*/
-
-
-/*************************************************************************
- * Functions
- *************************************************************************/
-
-#if defined(GLFW_EXPOSE_NATIVE_WIN32)
-/*! @brief Returns the adapter device name of the specified monitor.
- *
- *  @return The UTF-8 encoded adapter device name (for example `\\.\DISPLAY1`)
- *  of the specified monitor, or `NULL` if an [error](@ref error_handling)
- *  occurred.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
- *  GLFW_PLATFORM_UNAVAILABLE.
- *
- *  @thread_safety This function may be called from any thread.  Access is not
- *  synchronized.
- *
- *  @since Added in version 3.1.
- *
- *  @ingroup native
- */
-GLFWAPI const char* glfwGetWin32Adapter(GLFWmonitor* monitor);
-
-/*! @brief Returns the display device name of the specified monitor.
- *
- *  @return The UTF-8 encoded display device name (for example
- *  `\\.\DISPLAY1\Monitor0`) of the specified monitor, or `NULL` if an
- *  [error](@ref error_handling) occurred.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
- *  GLFW_PLATFORM_UNAVAILABLE.
- *
- *  @thread_safety This function may be called from any thread.  Access is not
- *  synchronized.
- *
- *  @since Added in version 3.1.
- *
- *  @ingroup native
- */
-GLFWAPI const char* glfwGetWin32Monitor(GLFWmonitor* monitor);
-
-/*! @brief Returns the `HWND` of the specified window.
- *
- *  @return The `HWND` of the specified window, or `NULL` if an
- *  [error](@ref error_handling) occurred.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
- *  GLFW_PLATFORM_UNAVAILABLE.
- *
- *  @remark The `HDC` associated with the window can be queried with the
- *  [GetDC](https://docs.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-getdc)
- *  function.
- *  @code
- *  HDC dc = GetDC(glfwGetWin32Window(window));
- *  @endcode
- *  This DC is private and does not need to be released.
- *
- *  @thread_safety This function may be called from any thread.  Access is not
- *  synchronized.
- *
- *  @since Added in version 3.0.
- *
- *  @ingroup native
- */
-GLFWAPI HWND glfwGetWin32Window(GLFWwindow* window);
-#endif
-
-#if defined(GLFW_EXPOSE_NATIVE_WGL)
-/*! @brief Returns the `HGLRC` of the specified window.
- *
- *  @return The `HGLRC` of the specified window, or `NULL` if an
- *  [error](@ref error_handling) occurred.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED, @ref
- *  GLFW_PLATFORM_UNAVAILABLE and @ref GLFW_NO_WINDOW_CONTEXT.
- *
- *  @remark The `HDC` associated with the window can be queried with the
- *  [GetDC](https://docs.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-getdc)
- *  function.
- *  @code
- *  HDC dc = GetDC(glfwGetWin32Window(window));
- *  @endcode
- *  This DC is private and does not need to be released.
- *
- *  @thread_safety This function may be called from any thread.  Access is not
- *  synchronized.
- *
- *  @since Added in version 3.0.
- *
- *  @ingroup native
- */
-GLFWAPI HGLRC glfwGetWGLContext(GLFWwindow* window);
-#endif
-
-#if defined(GLFW_EXPOSE_NATIVE_COCOA)
-/*! @brief Returns the `CGDirectDisplayID` of the specified monitor.
- *
- *  @return The `CGDirectDisplayID` of the specified monitor, or
- *  `kCGNullDirectDisplay` if an [error](@ref error_handling) occurred.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
- *  GLFW_PLATFORM_UNAVAILABLE.
- *
- *  @thread_safety This function may be called from any thread.  Access is not
- *  synchronized.
- *
- *  @since Added in version 3.1.
- *
- *  @ingroup native
- */
-GLFWAPI CGDirectDisplayID glfwGetCocoaMonitor(GLFWmonitor* monitor);
-
-/*! @brief Returns the `NSWindow` of the specified window.
- *
- *  @return The `NSWindow` of the specified window, or `nil` if an
- *  [error](@ref error_handling) occurred.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
- *  GLFW_PLATFORM_UNAVAILABLE.
- *
- *  @thread_safety This function may be called from any thread.  Access is not
- *  synchronized.
- *
- *  @since Added in version 3.0.
- *
- *  @ingroup native
- */
-GLFWAPI id glfwGetCocoaWindow(GLFWwindow* window);
-
-/*! @brief Returns the `NSView` of the specified window.
- *
- *  @return The `NSView` of the specified window, or `nil` if an
- *  [error](@ref error_handling) occurred.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
- *  GLFW_PLATFORM_UNAVAILABLE.
- *
- *  @thread_safety This function may be called from any thread.  Access is not
- *  synchronized.
- *
- *  @since Added in version 3.4.
- *
- *  @ingroup native
- */
-GLFWAPI id glfwGetCocoaView(GLFWwindow* window);
-#endif
-
-#if defined(GLFW_EXPOSE_NATIVE_NSGL)
-/*! @brief Returns the `NSOpenGLContext` of the specified window.
- *
- *  @return The `NSOpenGLContext` of the specified window, or `nil` if an
- *  [error](@ref error_handling) occurred.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED, @ref
- *  GLFW_PLATFORM_UNAVAILABLE and @ref GLFW_NO_WINDOW_CONTEXT.
- *
- *  @thread_safety This function may be called from any thread.  Access is not
- *  synchronized.
- *
- *  @since Added in version 3.0.
- *
- *  @ingroup native
- */
-GLFWAPI id glfwGetNSGLContext(GLFWwindow* window);
-#endif
-
-#if defined(GLFW_EXPOSE_NATIVE_X11)
-/*! @brief Returns the `Display` used by GLFW.
- *
- *  @return The `Display` used by GLFW, or `NULL` if an
- *  [error](@ref error_handling) occurred.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
- *  GLFW_PLATFORM_UNAVAILABLE.
- *
- *  @thread_safety This function may be called from any thread.  Access is not
- *  synchronized.
- *
- *  @since Added in version 3.0.
- *
- *  @ingroup native
- */
-GLFWAPI Display* glfwGetX11Display(void);
-
-/*! @brief Returns the `RRCrtc` of the specified monitor.
- *
- *  @return The `RRCrtc` of the specified monitor, or `None` if an
- *  [error](@ref error_handling) occurred.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
- *  GLFW_PLATFORM_UNAVAILABLE.
- *
- *  @thread_safety This function may be called from any thread.  Access is not
- *  synchronized.
- *
- *  @since Added in version 3.1.
- *
- *  @ingroup native
- */
-GLFWAPI RRCrtc glfwGetX11Adapter(GLFWmonitor* monitor);
-
-/*! @brief Returns the `RROutput` of the specified monitor.
- *
- *  @return The `RROutput` of the specified monitor, or `None` if an
- *  [error](@ref error_handling) occurred.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
- *  GLFW_PLATFORM_UNAVAILABLE.
- *
- *  @thread_safety This function may be called from any thread.  Access is not
- *  synchronized.
- *
- *  @since Added in version 3.1.
- *
- *  @ingroup native
- */
-GLFWAPI RROutput glfwGetX11Monitor(GLFWmonitor* monitor);
-
-/*! @brief Returns the `Window` of the specified window.
- *
- *  @return The `Window` of the specified window, or `None` if an
- *  [error](@ref error_handling) occurred.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
- *  GLFW_PLATFORM_UNAVAILABLE.
- *
- *  @thread_safety This function may be called from any thread.  Access is not
- *  synchronized.
- *
- *  @since Added in version 3.0.
- *
- *  @ingroup native
- */
-GLFWAPI Window glfwGetX11Window(GLFWwindow* window);
-
-/*! @brief Sets the current primary selection to the specified string.
- *
- *  @param[in] string A UTF-8 encoded string.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED, @ref
- *  GLFW_PLATFORM_UNAVAILABLE and @ref GLFW_PLATFORM_ERROR.
- *
- *  @pointer_lifetime The specified string is copied before this function
- *  returns.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref clipboard
- *  @sa glfwGetX11SelectionString
- *  @sa glfwSetClipboardString
- *
- *  @since Added in version 3.3.
- *
- *  @ingroup native
- */
-GLFWAPI void glfwSetX11SelectionString(const char* string);
-
-/*! @brief Returns the contents of the current primary selection as a string.
- *
- *  If the selection is empty or if its contents cannot be converted, `NULL`
- *  is returned and a @ref GLFW_FORMAT_UNAVAILABLE error is generated.
- *
- *  @return The contents of the selection as a UTF-8 encoded string, or `NULL`
- *  if an [error](@ref error_handling) occurred.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED, @ref
- *  GLFW_PLATFORM_UNAVAILABLE and @ref GLFW_PLATFORM_ERROR.
- *
- *  @pointer_lifetime The returned string is allocated and freed by GLFW. You
- *  should not free it yourself. It is valid until the next call to @ref
- *  glfwGetX11SelectionString or @ref glfwSetX11SelectionString, or until the
- *  library is terminated.
- *
- *  @thread_safety This function must only be called from the main thread.
- *
- *  @sa @ref clipboard
- *  @sa glfwSetX11SelectionString
- *  @sa glfwGetClipboardString
- *
- *  @since Added in version 3.3.
- *
- *  @ingroup native
- */
-GLFWAPI const char* glfwGetX11SelectionString(void);
-#endif
-
-#if defined(GLFW_EXPOSE_NATIVE_GLX)
-/*! @brief Returns the `GLXContext` of the specified window.
- *
- *  @return The `GLXContext` of the specified window, or `NULL` if an
- *  [error](@ref error_handling) occurred.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED, @ref
- *  GLFW_NO_WINDOW_CONTEXT and @ref GLFW_PLATFORM_UNAVAILABLE.
- *
- *  @thread_safety This function may be called from any thread.  Access is not
- *  synchronized.
- *
- *  @since Added in version 3.0.
- *
- *  @ingroup native
- */
-GLFWAPI GLXContext glfwGetGLXContext(GLFWwindow* window);
-
-/*! @brief Returns the `GLXWindow` of the specified window.
- *
- *  @return The `GLXWindow` of the specified window, or `None` if an
- *  [error](@ref error_handling) occurred.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED, @ref
- *  GLFW_NO_WINDOW_CONTEXT and @ref GLFW_PLATFORM_UNAVAILABLE.
- *
- *  @thread_safety This function may be called from any thread.  Access is not
- *  synchronized.
- *
- *  @since Added in version 3.2.
- *
- *  @ingroup native
- */
-GLFWAPI GLXWindow glfwGetGLXWindow(GLFWwindow* window);
-
-/*! @brief Retrieves the `GLXFBConfig` of the specified window's `GLXWindow`.
- *
- *  @param[in] window The window whose `GLXWindow` to query.
- *  @param[out] config The `GLXFBConfig` of the window `GLXWindow`, if available.
- *  @return `GLFW_TRUE` if successful, or `GLFW_FALSE` if an
- *  [error](@ref error_handling) occurred.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED, @ref
- *  GLFW_NO_WINDOW_CONTEXT and @ref GLFW_PLATFORM_UNAVAILABLE.
- *
- *  @remark `GLXFBConfig` is an opaque type.  Unlike other GLFW functions, the
- *  @p config out parameter is not cleared on error, as core GLX does not define
- *  any invalid value.
- *
- *  @thread_safety This function may be called from any thread.  Access is not
- *  synchronized.
- *
- *  @since Added in version 3.5
- *
- *  @ingroup native
- */
-GLFWAPI int glfwGetGLXFBConfig(GLFWwindow* window, GLXFBConfig* config);
-#endif
-
-#if defined(GLFW_EXPOSE_NATIVE_WAYLAND)
-/*! @brief Returns the `struct wl_display*` used by GLFW.
- *
- *  @return The `struct wl_display*` used by GLFW, or `NULL` if an
- *  [error](@ref error_handling) occurred.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
- *  GLFW_PLATFORM_UNAVAILABLE.
- *
- *  @thread_safety This function may be called from any thread.  Access is not
- *  synchronized.
- *
- *  @since Added in version 3.2.
- *
- *  @ingroup native
- */
-GLFWAPI struct wl_display* glfwGetWaylandDisplay(void);
-
-/*! @brief Returns the `struct wl_output*` of the specified monitor.
- *
- *  @return The `struct wl_output*` of the specified monitor, or `NULL` if an
- *  [error](@ref error_handling) occurred.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
- *  GLFW_PLATFORM_UNAVAILABLE.
- *
- *  @thread_safety This function may be called from any thread.  Access is not
- *  synchronized.
- *
- *  @since Added in version 3.2.
- *
- *  @ingroup native
- */
-GLFWAPI struct wl_output* glfwGetWaylandMonitor(GLFWmonitor* monitor);
-
-/*! @brief Returns the main `struct wl_surface*` of the specified window.
- *
- *  @return The main `struct wl_surface*` of the specified window, or `NULL` if
- *  an [error](@ref error_handling) occurred.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
- *  GLFW_PLATFORM_UNAVAILABLE.
- *
- *  @thread_safety This function may be called from any thread.  Access is not
- *  synchronized.
- *
- *  @since Added in version 3.2.
- *
- *  @ingroup native
- */
-GLFWAPI struct wl_surface* glfwGetWaylandWindow(GLFWwindow* window);
-#endif
-
-#if defined(GLFW_EXPOSE_NATIVE_EGL)
-/*! @brief Returns the `EGLDisplay` used by GLFW.
- *
- *  @return The `EGLDisplay` used by GLFW, or `EGL_NO_DISPLAY` if an
- *  [error](@ref error_handling) occurred.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED.
- *
- *  @remark Because EGL is initialized on demand, this function will return
- *  `EGL_NO_DISPLAY` until the first context has been created via EGL.
- *
- *  @thread_safety This function may be called from any thread.  Access is not
- *  synchronized.
- *
- *  @since Added in version 3.0.
- *
- *  @ingroup native
- */
-GLFWAPI EGLDisplay glfwGetEGLDisplay(void);
-
-/*! @brief Returns the `EGLContext` of the specified window.
- *
- *  @return The `EGLContext` of the specified window, or `EGL_NO_CONTEXT` if an
- *  [error](@ref error_handling) occurred.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
- *  GLFW_NO_WINDOW_CONTEXT.
- *
- *  @thread_safety This function may be called from any thread.  Access is not
- *  synchronized.
- *
- *  @since Added in version 3.0.
- *
- *  @ingroup native
- */
-GLFWAPI EGLContext glfwGetEGLContext(GLFWwindow* window);
-
-/*! @brief Returns the `EGLSurface` of the specified window.
- *
- *  @return The `EGLSurface` of the specified window, or `EGL_NO_SURFACE` if an
- *  [error](@ref error_handling) occurred.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
- *  GLFW_NO_WINDOW_CONTEXT.
- *
- *  @thread_safety This function may be called from any thread.  Access is not
- *  synchronized.
- *
- *  @since Added in version 3.0.
- *
- *  @ingroup native
- */
-GLFWAPI EGLSurface glfwGetEGLSurface(GLFWwindow* window);
-
-/*! @brief Retrieves the `EGLConfig` of the specified window's `EGLSurface`.
- *
- *  @param[in] window The window whose `EGLSurface` to query.
- *  @param[out] config The `EGLConfig` of the window `EGLSurface`, if available.
- *  @return `GLFW_TRUE` if successful, or `GLFW_FALSE` if an
- *  [error](@ref error_handling) occurred.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
- *  GLFW_NO_WINDOW_CONTEXT.
- *
- *  @remark `EGLConfig` is an opaque type.  Unlike other GLFW functions, the @p
- *  config out parameter is not cleared on error, as core EGL does not define
- *  any invalid value.
- *
- *  @thread_safety This function may be called from any thread.  Access is not
- *  synchronized.
- *
- *  @since Added in version 3.5.
- *
- *  @ingroup native
- */
-GLFWAPI int glfwGetEGLConfig(GLFWwindow* window, EGLConfig* config);
-#endif
-
-#if defined(GLFW_EXPOSE_NATIVE_OSMESA)
-/*! @brief Retrieves the color buffer associated with the specified window.
- *
- *  @param[in] window The window whose color buffer to retrieve.
- *  @param[out] width Where to store the width of the color buffer, or `NULL`.
- *  @param[out] height Where to store the height of the color buffer, or `NULL`.
- *  @param[out] format Where to store the OSMesa pixel format of the color
- *  buffer, or `NULL`.
- *  @param[out] buffer Where to store the address of the color buffer, or
- *  `NULL`.
- *  @return `GLFW_TRUE` if successful, or `GLFW_FALSE` if an
- *  [error](@ref error_handling) occurred.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
- *  GLFW_NO_WINDOW_CONTEXT.
- *
- *  @thread_safety This function may be called from any thread.  Access is not
- *  synchronized.
- *
- *  @since Added in version 3.3.
- *
- *  @ingroup native
- */
-GLFWAPI int glfwGetOSMesaColorBuffer(GLFWwindow* window, int* width, int* height, int* format, void** buffer);
-
-/*! @brief Retrieves the depth buffer associated with the specified window.
- *
- *  @param[in] window The window whose depth buffer to retrieve.
- *  @param[out] width Where to store the width of the depth buffer, or `NULL`.
- *  @param[out] height Where to store the height of the depth buffer, or `NULL`.
- *  @param[out] bytesPerValue Where to store the number of bytes per depth
- *  buffer element, or `NULL`.
- *  @param[out] buffer Where to store the address of the depth buffer, or
- *  `NULL`.
- *  @return `GLFW_TRUE` if successful, or `GLFW_FALSE` if an
- *  [error](@ref error_handling) occurred.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
- *  GLFW_NO_WINDOW_CONTEXT.
- *
- *  @thread_safety This function may be called from any thread.  Access is not
- *  synchronized.
- *
- *  @since Added in version 3.3.
- *
- *  @ingroup native
- */
-GLFWAPI int glfwGetOSMesaDepthBuffer(GLFWwindow* window, int* width, int* height, int* bytesPerValue, void** buffer);
-
-/*! @brief Returns the `OSMesaContext` of the specified window.
- *
- *  @return The `OSMesaContext` of the specified window, or `NULL` if an
- *  [error](@ref error_handling) occurred.
- *
- *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
- *  GLFW_NO_WINDOW_CONTEXT.
- *
- *  @thread_safety This function may be called from any thread.  Access is not
- *  synchronized.
- *
- *  @since Added in version 3.3.
- *
- *  @ingroup native
- */
-GLFWAPI OSMesaContext glfwGetOSMesaContext(GLFWwindow* window);
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _glfw3_native_h_ */
-
diff --git a/Source/sys-clk/manager/lib/borealis/library/include/borealis.hpp b/Source/sys-clk/manager/lib/borealis/library/include/borealis.hpp
deleted file mode 100644
index 4063cca4..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/include/borealis.hpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-    Borealis, a Nintendo Switch UI Library
-    Copyright (C) 2019  natinusala
-    Copyright (C) 2019  p-sam
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#ifndef BOREALIS_RESOURCES
-#error BOREALIS_RESOURCES define missing
-#endif
-#define BOREALIS_ASSET(_str) BOREALIS_RESOURCES _str
-
-// Library
-#include <borealis/applet_frame.hpp>
-#include <borealis/application.hpp>
-#include <borealis/box_layout.hpp>
-#include <borealis/button.hpp>
-#include <borealis/crash_frame.hpp>
-#include <borealis/dialog.hpp>
-#include <borealis/dropdown.hpp>
-#include <borealis/event.hpp>
-#include <borealis/header.hpp>
-#include <borealis/image.hpp>
-#include <borealis/label.hpp>
-#include <borealis/layer_view.hpp>
-#include <borealis/list.hpp>
-#include <borealis/logger.hpp>
-#include <borealis/material_icon.hpp>
-#include <borealis/notification_manager.hpp>
-#include <borealis/popup_frame.hpp>
-#include <borealis/progress_display.hpp>
-#include <borealis/progress_spinner.hpp>
-#include <borealis/rectangle.hpp>
-#include <borealis/repeating_task.hpp>
-#include <borealis/sidebar.hpp>
-#include <borealis/staged_applet_frame.hpp>
-#include <borealis/style.hpp>
-#include <borealis/tab_frame.hpp>
-#include <borealis/table.hpp>
-#include <borealis/theme.hpp>
-#include <borealis/thumbnail_frame.hpp>
-#include <borealis/view.hpp>
diff --git a/Source/sys-clk/manager/lib/borealis/library/include/borealis/actions.hpp b/Source/sys-clk/manager/lib/borealis/library/include/borealis/actions.hpp
deleted file mode 100644
index e8e67928..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/include/borealis/actions.hpp
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
-    Borealis, a Nintendo Switch UI Library
-    Copyright (C) 2020  WerWolv
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include <functional>
-#include <string>
-
-#define GLFW_INCLUDE_NONE
-#include <GLFW/glfw3.h>
-
-namespace brls
-{
-
-class View;
-
-typedef std::function<bool(void)> ActionListener;
-
-// ZL and ZR do not exist here because GLFW doesn't know them
-enum class Key
-{
-    A      = GLFW_GAMEPAD_BUTTON_A,
-    B      = GLFW_GAMEPAD_BUTTON_B,
-    X      = GLFW_GAMEPAD_BUTTON_X,
-    Y      = GLFW_GAMEPAD_BUTTON_Y,
-    LSTICK = GLFW_GAMEPAD_BUTTON_LEFT_THUMB,
-    RSTICK = GLFW_GAMEPAD_BUTTON_RIGHT_THUMB,
-    L      = GLFW_GAMEPAD_BUTTON_LEFT_BUMPER,
-    R      = GLFW_GAMEPAD_BUTTON_RIGHT_BUMPER,
-    PLUS   = GLFW_GAMEPAD_BUTTON_START,
-    MINUS  = GLFW_GAMEPAD_BUTTON_BACK,
-    DLEFT  = GLFW_GAMEPAD_BUTTON_DPAD_LEFT,
-    DUP    = GLFW_GAMEPAD_BUTTON_DPAD_UP,
-    DRIGHT = GLFW_GAMEPAD_BUTTON_DPAD_RIGHT,
-    DDOWN  = GLFW_GAMEPAD_BUTTON_DPAD_DOWN,
-};
-
-struct Action
-{
-    Key key;
-
-    std::string hintText;
-    bool available;
-    bool hidden;
-    ActionListener actionListener;
-
-    bool operator==(const Key other)
-    {
-        return this->key == other;
-    }
-};
-
-} // namespace brls
diff --git a/Source/sys-clk/manager/lib/borealis/library/include/borealis/animations.hpp b/Source/sys-clk/manager/lib/borealis/library/include/borealis/animations.hpp
deleted file mode 100644
index 68006096..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/include/borealis/animations.hpp
+++ /dev/null
@@ -1,178 +0,0 @@
-/*  RetroArch - A frontend for libretro.
- *  Borealis, a Nintendo Switch UI Library
- *  Copyright (C) 2014-2017 - Jean-André Santoni
- *  Copyright (C) 2011-2017 - Daniel De Matteis
- *  Copyright (C) 2019      - natinusala
-    Copyright (C) 2019      - p-sam
- *
- *  RetroArch is free software: you can redistribute it and/or modify it under the terms
- *  of the GNU General Public License as published by the Free Software Found-
- *  ation, either version 3 of the License, or (at your option) any later version.
- *
- *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- *  PURPOSE.  See the GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along with RetroArch.
- *  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include <stdint.h>
-#include <stdlib.h>
-
-#include <functional>
-
-namespace brls
-{
-
-typedef float (*easing_cb)(float, float, float, float);
-typedef std::function<void(void*)> tween_cb;
-
-enum menu_animation_ctl_state
-{
-    MENU_ANIMATION_CTL_NONE = 0,
-    MENU_ANIMATION_CTL_DEINIT,
-    MENU_ANIMATION_CTL_CLEAR_ACTIVE,
-    MENU_ANIMATION_CTL_SET_ACTIVE
-};
-
-enum menu_animation_easing_type
-{
-    /* Linear */
-    EASING_LINEAR = 0,
-    /* Quad */
-    EASING_IN_QUAD,
-    EASING_OUT_QUAD,
-    EASING_IN_OUT_QUAD,
-    EASING_OUT_IN_QUAD,
-    /* Cubic */
-    EASING_IN_CUBIC,
-    EASING_OUT_CUBIC,
-    EASING_IN_OUT_CUBIC,
-    EASING_OUT_IN_CUBIC,
-    /* Quart */
-    EASING_IN_QUART,
-    EASING_OUT_QUART,
-    EASING_IN_OUT_QUART,
-    EASING_OUT_IN_QUART,
-    /* Quint */
-    EASING_IN_QUINT,
-    EASING_OUT_QUINT,
-    EASING_IN_OUT_QUINT,
-    EASING_OUT_IN_QUINT,
-    /* Sine */
-    EASING_IN_SINE,
-    EASING_OUT_SINE,
-    EASING_IN_OUT_SINE,
-    EASING_OUT_IN_SINE,
-    /* Expo */
-    EASING_IN_EXPO,
-    EASING_OUT_EXPO,
-    EASING_IN_OUT_EXPO,
-    EASING_OUT_IN_EXPO,
-    /* Circ */
-    EASING_IN_CIRC,
-    EASING_OUT_CIRC,
-    EASING_IN_OUT_CIRC,
-    EASING_OUT_IN_CIRC,
-    /* Bounce */
-    EASING_IN_BOUNCE,
-    EASING_OUT_BOUNCE,
-    EASING_IN_OUT_BOUNCE,
-    EASING_OUT_IN_BOUNCE,
-
-    EASING_LAST
-};
-
-/* TODO:
- * Add a reverse loop ticker for languages
- * that read right to left */
-enum menu_animation_ticker_type
-{
-    TICKER_TYPE_BOUNCE = 0,
-    TICKER_TYPE_LOOP,
-    TICKER_TYPE_LAST
-};
-
-typedef uintptr_t menu_animation_ctx_tag;
-
-typedef struct menu_animation_ctx_subject
-{
-    size_t count;
-    const void* data;
-} menu_animation_ctx_subject_t;
-
-typedef struct menu_animation_ctx_entry
-{
-    enum menu_animation_easing_type easing_enum;
-    uintptr_t tag;
-    float duration;
-    float target_value;
-    float* subject;
-    tween_cb cb;
-    tween_cb tick;
-    void* userdata;
-} menu_animation_ctx_entry_t;
-
-typedef struct menu_animation_ctx_ticker
-{
-    bool selected;
-    size_t len;
-    uint64_t idx;
-    enum menu_animation_ticker_type type_enum;
-    char* s;
-    const char* str;
-    const char* spacer;
-} menu_animation_ctx_ticker_t;
-
-typedef float menu_timer_t;
-
-typedef struct menu_timer_ctx_entry
-{
-    float duration;
-    tween_cb cb;
-    tween_cb tick;
-    void* userdata;
-} menu_timer_ctx_entry_t;
-
-typedef struct menu_delayed_animation
-{
-    menu_timer_t timer;
-    menu_animation_ctx_entry_t entry;
-} menu_delayed_animation_t;
-
-void menu_timer_start(menu_timer_t* timer, menu_timer_ctx_entry_t* timer_entry);
-
-void menu_timer_kill(menu_timer_t* timer);
-
-void menu_animation_init(void);
-
-void menu_animation_free(void);
-
-bool menu_animation_update(void);
-
-bool menu_animation_ticker(menu_animation_ctx_ticker_t* ticker);
-
-float menu_animation_get_delta_time(void);
-
-bool menu_animation_is_active(void);
-
-bool menu_animation_kill_by_tag(menu_animation_ctx_tag* tag);
-
-void menu_animation_kill_by_subject(menu_animation_ctx_subject_t* subject);
-
-bool menu_animation_push(menu_animation_ctx_entry_t* entry);
-
-void menu_animation_push_delayed(unsigned delay, menu_animation_ctx_entry_t* entry);
-
-bool menu_animation_ctl(enum menu_animation_ctl_state state, void* data);
-
-uint64_t menu_animation_get_ticker_idx(void);
-
-uint64_t menu_animation_get_ticker_slow_idx(void);
-
-void menu_animation_get_highlight(float* gradient_x, float* gradient_y, float* color);
-
-} // namespace brls
diff --git a/Source/sys-clk/manager/lib/borealis/library/include/borealis/applet_frame.hpp b/Source/sys-clk/manager/lib/borealis/library/include/borealis/applet_frame.hpp
deleted file mode 100644
index a7803831..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/include/borealis/applet_frame.hpp
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
-    Borealis, a Nintendo Switch UI Library
-    Copyright (C) 2019  natinusala
-    Copyright (C) 2019  p-sam
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include <borealis/frame_context.hpp>
-#include <borealis/hint.hpp>
-#include <borealis/image.hpp>
-#include <borealis/view.hpp>
-#include <string>
-
-namespace brls
-{
-
-enum class HeaderStyle
-{
-    REGULAR,
-    POPUP // Only meant for PopupFrames. Using it in other contexts might cause weird behaviour
-};
-
-// A Horizon settings-like frame, with header and footer (no sidebar)
-class AppletFrame : public View
-{
-  private:
-    std::string title      = "";
-    std::string footerText = "";
-
-    std::string subTitleLeft = "", subTitleRight = "";
-
-    View* icon = nullptr;
-    Hint* hint = nullptr;
-
-    View* contentView = nullptr;
-
-    bool slideOut = false;
-    bool slideIn  = false;
-
-    ViewAnimation animation;
-
-  protected:
-    HeaderStyle headerStyle = HeaderStyle::REGULAR;
-
-    void layout(NVGcontext* vg, Style* style, FontStash* stash) override;
-
-    unsigned leftPadding  = 0;
-    unsigned rightPadding = 0;
-
-  public:
-    AppletFrame(bool padLeft, bool padRight);
-
-    void draw(NVGcontext* vg, int x, int y, unsigned width, unsigned height, Style* style, FrameContext* ctx) override;
-    View* getDefaultFocus() override;
-    virtual bool onCancel();
-    void willAppear(bool resetState = false) override;
-    void willDisappear(bool resetState = false) override;
-    void show(std::function<void(void)> cb, bool animate = true, ViewAnimation animation = ViewAnimation::FADE) override;
-    void hide(std::function<void(void)> cb, bool animated = true, ViewAnimation animation = ViewAnimation::FADE) override;
-    void onWindowSizeChanged() override;
-
-    void setTitle(std::string title);
-    void setFooterText(std::string footerText);
-    void setSubtitle(std::string left, std::string right);
-    void setIcon(unsigned char* buffer, size_t bufferSize);
-    void setIcon(std::string imagePath);
-    void setIcon(View* view);
-    virtual void setContentView(View* view);
-    bool hasContentView();
-    void setHeaderStyle(HeaderStyle headerStyle);
-
-    void setAnimateHint(bool animate)
-    {
-        this->hint->setAnimate(animate);
-    }
-
-    ~AppletFrame();
-};
-
-} // namespace brls
diff --git a/Source/sys-clk/manager/lib/borealis/library/include/borealis/application.hpp b/Source/sys-clk/manager/lib/borealis/library/include/borealis/application.hpp
deleted file mode 100644
index bf2a3ecf..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/include/borealis/application.hpp
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
-    Borealis, a Nintendo Switch UI Library
-    Copyright (C) 2019-2020  natinusala
-    Copyright (C) 2019  p-sam
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#define GLFW_INCLUDE_NONE
-#include <GLFW/glfw3.h>
-#include <nanovg.h>
-
-#include <borealis/animations.hpp>
-#include <borealis/frame_context.hpp>
-#include <borealis/hint.hpp>
-#include <borealis/label.hpp>
-#include <borealis/logger.hpp>
-#include <borealis/notification_manager.hpp>
-#include <borealis/style.hpp>
-#include <borealis/task_manager.hpp>
-#include <borealis/theme.hpp>
-#include <borealis/view.hpp>
-#include <map>
-#include <vector>
-
-namespace brls
-{
-
-// The top-right framerate counter
-class FramerateCounter : public Label
-{
-  private:
-    retro_time_t lastSecond = 0;
-    unsigned frames         = 0;
-
-  public:
-    FramerateCounter();
-
-    void frame(FrameContext* ctx) override;
-};
-
-class Application
-{
-  public:
-    //Init with default style and theme (as close to HOS as possible)
-    static bool init(std::string title);
-
-    // Init with given style and theme
-    static bool init(std::string title, Style style, Theme theme);
-
-    static bool mainLoop();
-
-    /**
-      * Pushes a view on this applications's view stack
-      *
-      * The view will automatically be resized to take
-      * the whole screen and layout() will be called
-      *
-      * The view will gain focus if applicable
-      */
-    static void pushView(View* view, ViewAnimation animation = ViewAnimation::FADE);
-
-    /**
-      * Pops the last pushed view from the stack
-      * and gives focus back where it was before
-      */
-    static void popView(
-        ViewAnimation animation = ViewAnimation::FADE, std::function<void(void)> cb = []() {});
-
-    /**
-     * Gives the focus to the given view
-     * or clears the focus if given nullptr
-     */
-    static void giveFocus(View* view);
-
-    static Style* getStyle();
-    static void setTheme(Theme theme);
-    static ThemeValues* getThemeValues();
-    static ThemeValues* getThemeValuesForVariant(ThemeVariant variant);
-    static ThemeVariant getThemeVariant();
-
-    static int loadFont(const char* fontName, const char* filePath);
-    static int loadFontFromMemory(const char* fontName, void* data, size_t size, bool freeData);
-    static int findFont(const char* fontName);
-
-    static FontStash* getFontStash();
-
-    static void notify(std::string text);
-
-    static void onGamepadButtonPressed(char button, bool repeating);
-
-    /**
-      * "Crashes" the app (displays a fullscreen CrashFrame)
-      */
-    static void crash(std::string text);
-
-    static void quit();
-
-    /**
-      * Blocks any and all user inputs
-      */
-    static void blockInputs();
-
-    /**
-      * Unblocks inputs after a call to
-      * blockInputs()
-      */
-    static void unblockInputs();
-
-    static NVGcontext* getNVGContext();
-    static TaskManager* getTaskManager();
-    static NotificationManager* getNotificationManager();
-
-    static void setCommonFooter(std::string footer);
-    static std::string* getCommonFooter();
-
-    static void setDisplayFramerate(bool enabled);
-    static void toggleFramerateDisplay();
-
-    static void setMaximumFPS(unsigned fps);
-
-    // public so that the glfw callback can access it
-    inline static unsigned contentWidth, contentHeight;
-    inline static float windowScale;
-
-    static void resizeFramerateCounter();
-    static void resizeNotificationManager();
-
-    static GenericEvent* getGlobalFocusChangeEvent();
-    static VoidEvent* getGlobalHintsUpdateEvent();
-
-    static View* getCurrentFocus();
-
-    static std::string getTitle();
-
-  private:
-    inline static GLFWwindow* window;
-    inline static NVGcontext* vg;
-
-    inline static std::string title;
-
-    inline static TaskManager* taskManager;
-    inline static NotificationManager* notificationManager;
-
-    inline static FontStash fontStash;
-
-    inline static std::vector<View*> viewStack;
-    inline static std::vector<View*> focusStack;
-
-    inline static unsigned windowWidth, windowHeight;
-
-    inline static View* currentFocus;
-
-    inline static Theme currentTheme;
-    inline static ThemeVariant currentThemeVariant;
-
-    inline static GLFWgamepadstate oldGamepad;
-    inline static GLFWgamepadstate gamepad;
-
-    inline static Style currentStyle;
-
-    inline static unsigned blockInputsTokens = 0; // any value > 0 means inputs are blocked
-
-    inline static std::string commonFooter = "";
-
-    inline static FramerateCounter* framerateCounter = nullptr;
-
-    inline static float frameTime = 0.0f;
-
-    inline static View* repetitionOldFocus = nullptr;
-
-    inline static GenericEvent globalFocusChangeEvent;
-    inline static VoidEvent globalHintsUpdateEvent;
-
-    static void navigate(FocusDirection direction);
-
-    static void onWindowSizeChanged();
-
-    static void frame();
-    static void clear();
-    static void exit();
-
-    /**
-     * Handles actions for the currently focused view and
-     * the given button
-     * Returns true if at least one action has been fired
-     */
-    static bool handleAction(char button);
-};
-
-} // namespace brls
diff --git a/Source/sys-clk/manager/lib/borealis/library/include/borealis/box_layout.hpp b/Source/sys-clk/manager/lib/borealis/library/include/borealis/box_layout.hpp
deleted file mode 100644
index 7dba96f5..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/include/borealis/box_layout.hpp
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
-    Borealis, a Nintendo Switch UI Library
-    Copyright (C) 2019  natinusala
-    Copyright (C) 2019  WerWolv
-    Copyright (C) 2019  p-sam
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include <borealis/view.hpp>
-#include <vector>
-
-namespace brls
-{
-
-enum class BoxLayoutOrientation
-{
-    VERTICAL,
-    HORIZONTAL
-};
-
-// TODO: Implement all gravity options for both orientations
-enum class BoxLayoutGravity
-{
-    DEFAULT, // left for horizontal, top for vertical
-    LEFT,
-    RIGHT,
-    TOP,
-    BOTTOM,
-    CENTER
-};
-
-class BoxLayoutChild
-{
-  public:
-    View* view;
-    bool fill; // should the child fill the remaining space?
-};
-
-// A basic horizontal or vertical box layout :
-// - Children can currently only be stretched to full width (vertical) or height (horizontal)
-// - Only works with children with fixed width (horizontal) or height (vertical)
-
-// TODO: More complex alignment and/or stretching parameters to children
-class BoxLayout : public View
-{
-  private:
-    BoxLayoutOrientation orientation;
-
-    unsigned spacing = 0;
-
-    bool resize = false; // should the view be resized according to children size after a layout?
-
-    BoxLayoutGravity gravity = BoxLayoutGravity::DEFAULT;
-
-  protected:
-    std::vector<BoxLayoutChild*> children;
-
-    size_t originalDefaultFocus = 0;
-    size_t defaultFocusedIndex  = 0;
-    bool childFocused           = false;
-
-    bool rememberFocus = false;
-
-    unsigned marginTop    = 0;
-    unsigned marginRight  = 0;
-    unsigned marginBottom = 0;
-    unsigned marginLeft   = 0;
-
-    /**
-      * Should the BoxLayout apply spacing after
-      * this view?
-      */
-    virtual void customSpacing(View* current, View* next, int* spacing) {}
-
-  public:
-    BoxLayout(BoxLayoutOrientation orientation, size_t defaultFocus = 0);
-    ~BoxLayout();
-
-    void layout(NVGcontext* vg, Style* style, FontStash* stash) override;
-    void draw(NVGcontext* vg, int x, int y, unsigned width, unsigned height, Style* style, FrameContext* ctx) override;
-    View* getNextFocus(FocusDirection direction, void* parentUserdata) override;
-    View* getDefaultFocus() override;
-    void onChildFocusGained(View* child) override;
-    void onChildFocusLost(View* child) override;
-    void willAppear(bool resetState = false) override;
-    void willDisappear(bool resetState = false) override;
-    void onWindowSizeChanged() override;
-
-    /**
-     * Sets gravity
-     */
-    void setGravity(BoxLayoutGravity gravity);
-
-    /**
-      * Sets spacing between views
-      */
-    void setSpacing(unsigned spacing);
-    unsigned getSpacing();
-
-    /**
-      * Sets margins around views
-      * Bottom (vertical) or right (horizontal) are
-      * only effective if the last child is set to fill
-      */
-    void setMargins(unsigned top, unsigned right, unsigned bottom, unsigned left);
-    void setMarginBottom(unsigned bottom);
-
-    /**
-      * Adds a view to this box layout
-      * If fill is set to true, the child will
-      * fill the remaining space
-      */
-    void addView(View* view, bool fill = false, bool resetState = false);
-
-    /**
-      * Removes the view at specified
-      * The view will be freed if free
-      * is set to true (defaults to true)
-      *
-      * Warning: this method isn't correctly
-      * implemented - currently removing a view will
-      * most likely result in memory corruption
-      */
-    void removeView(int index, bool free = true);
-
-    /**
-     * Removes all views
-     * from this layout
-     */
-    void clear(bool free = true);
-
-    /**
-      * Returns true if this layout
-      * doesn't contain any views
-      */
-    bool isEmpty();
-
-    bool isChildFocused();
-
-    void setFocusedIndex(unsigned index);
-    size_t getViewsCount();
-
-    View* getChild(size_t i);
-
-    /**
-     * If enabled, will force the layout to resize itself
-     * to match the children size
-     * Mandatory for using in a ScrollView
-     */
-    void setResize(bool resize);
-
-    /**
-     * Should the default focus be set to the originally focused
-     * view (until the layout disappears)?
-     */
-    void setRememberFocus(bool rememberFocus);
-};
-
-} // namespace brls
diff --git a/Source/sys-clk/manager/lib/borealis/library/include/borealis/button.hpp b/Source/sys-clk/manager/lib/borealis/library/include/borealis/button.hpp
deleted file mode 100644
index e15bcd55..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/include/borealis/button.hpp
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
-    Borealis, a Nintendo Switch UI Library
-    Copyright (C) 2019-2020  natinusala
-    Copyright (C) 2019  p-sam
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include <borealis/image.hpp>
-#include <borealis/label.hpp>
-#include <borealis/view.hpp>
-
-namespace brls
-{
-
-enum class ButtonStyle
-{
-    PLAIN = 0, // regular, plain button
-    BORDERED, // text and a border
-    BORDERLESS, // only text
-    CRASH, // same as borderless but with a different text color
-    DIALOG // same as borderless but with a different text color
-};
-
-enum class ButtonState
-{
-    ENABLED = 0,
-    DISABLED
-};
-
-// A button
-class Button : public View
-{
-  private:
-    ButtonStyle style;
-    Label* label = nullptr;
-    Image* image = nullptr;
-
-    GenericEvent clickEvent;
-
-    LabelStyle getLabelStyle();
-
-    ButtonState state = ButtonState::ENABLED;
-
-    float cornerRadiusOverride = 0;
-
-  public:
-    Button(ButtonStyle style);
-    ~Button();
-
-    void draw(NVGcontext* vg, int x, int y, unsigned width, unsigned height, Style* style, FrameContext* ctx) override;
-    virtual bool onClick();
-    void layout(NVGcontext* vg, Style* style, FontStash* stash);
-    void getHighlightInsets(unsigned* top, unsigned* right, unsigned* bottom, unsigned* left) override;
-
-    ButtonState getState();
-    void setState(ButtonState state);
-
-    Button* setLabel(std::string label);
-    Button* setImage(std::string path);
-    Button* setImage(unsigned char* buffer, size_t bufferSize);
-
-    GenericEvent* getClickEvent();
-
-    View* getDefaultFocus() override
-    {
-        return this;
-    }
-
-    void setCornerRadius(float cornerRadius);
-
-    void getHighlightMetrics(Style* style, float* cornerRadius) override
-    {
-        if (cornerRadiusOverride)
-            *cornerRadius = cornerRadiusOverride;
-        else
-            *cornerRadius = style->Button.cornerRadius;
-    }
-
-    bool isHighlightBackgroundEnabled() override
-    {
-        return false;
-    }
-};
-
-} // namespace brls
diff --git a/Source/sys-clk/manager/lib/borealis/library/include/borealis/crash_frame.hpp b/Source/sys-clk/manager/lib/borealis/library/include/borealis/crash_frame.hpp
deleted file mode 100644
index 545325ef..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/include/borealis/crash_frame.hpp
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-    Borealis, a Nintendo Switch UI Library
-    Copyright (C) 2019-2020  natinusala
-    Copyright (C) 2019  p-sam
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include <borealis/button.hpp>
-#include <borealis/hint.hpp>
-#include <borealis/label.hpp>
-#include <borealis/view.hpp>
-
-namespace brls
-{
-
-// A screen similar to the "The software has closed" dialog
-// pressing OK will exit the app
-class CrashFrame : public View
-{
-  private:
-    Label* label;
-    Button* button;
-    Hint* hint;
-
-  public:
-    CrashFrame(std::string text);
-
-    void draw(NVGcontext* vg, int x, int y, unsigned width, unsigned height, Style* style, FrameContext* ctx) override;
-    void layout(NVGcontext* vg, Style* style, FontStash* stash) override;
-    void onShowAnimationEnd() override;
-    View* getDefaultFocus() override;
-
-    bool isTranslucent() override
-    {
-        return true; // have it always translucent to disable fade out animation
-    }
-
-    ~CrashFrame();
-};
-
-} // namespace brls
diff --git a/Source/sys-clk/manager/lib/borealis/library/include/borealis/dialog.hpp b/Source/sys-clk/manager/lib/borealis/library/include/borealis/dialog.hpp
deleted file mode 100644
index 47191b84..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/include/borealis/dialog.hpp
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
-    Borealis, a Nintendo Switch UI Library
-    Copyright (C) 2019-2020  natinusala
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include <borealis/box_layout.hpp>
-#include <borealis/view.hpp>
-
-namespace brls
-{
-
-// TODO: Add a "can be cancelled with B" flag
-// TODO: Add buttons at creation time
-// TODO: Add the blurred dialog type once the blur is finished
-
-class DialogButton
-{
-  public:
-    std::string label;
-    GenericEvent::Callback cb;
-};
-
-// A modal dialog with zero to three buttons
-// and anything as content
-// Create the dialog then use open() and close()
-class Dialog : public View
-{
-  private:
-    View* contentView = nullptr;
-
-    unsigned frameX, frameY, frameWidth, frameHeight;
-
-    std::vector<DialogButton*> buttons;
-    BoxLayout* verticalButtonsLayout   = nullptr;
-    BoxLayout* horizontalButtonsLayout = nullptr;
-
-    void rebuildButtons();
-
-    unsigned getButtonsHeight();
-
-    bool cancelable = true;
-
-  public:
-    Dialog(std::string text);
-    Dialog(View* contentView);
-    ~Dialog();
-
-    void draw(NVGcontext* vg, int x, int y, unsigned width, unsigned height, Style* style, FrameContext* ctx) override;
-    void layout(NVGcontext* vg, Style* style, FontStash* stash) override;
-    View* getDefaultFocus() override;
-    virtual bool onCancel();
-
-    /**
-     * Adds a button to this dialog, with a maximum of three
-     * The position depends on the add order
-     *
-     * Adding a button after the dialog has been opened is
-     * NOT SUPPORTED
-     */
-    void addButton(std::string label, GenericEvent::Callback cb);
-
-    /**
-     * A cancelable dialog is closed when
-     * the user presses B (defaults to true)
-     *
-     * A dialog without any buttons cannot
-     * be cancelable
-     */
-    void setCancelable(bool cancelable);
-
-    void open();
-    void close(std::function<void(void)> cb = []() {});
-
-    bool isTranslucent() override
-    {
-        return true;
-    }
-};
-
-} // namespace brls
diff --git a/Source/sys-clk/manager/lib/borealis/library/include/borealis/dropdown.hpp b/Source/sys-clk/manager/lib/borealis/library/include/borealis/dropdown.hpp
deleted file mode 100644
index 88f12609..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/include/borealis/dropdown.hpp
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
-    Borealis, a Nintendo Switch UI Library
-    Copyright (C) 2019-2020  natinusala
-    Copyright (C) 2019-2020  p-sam
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include <borealis/event.hpp>
-#include <borealis/list.hpp>
-#include <borealis/view.hpp>
-#include <string>
-
-namespace brls
-{
-
-// Fired when the user has selected a value
-//
-// Parameter is either the selected value index
-// or -1 if the user cancelled
-//
-// Assume that the Dropdown is deleted
-// as soon as this function is called
-typedef Event<int> ValueSelectedEvent;
-
-// Allows the user to select between multiple
-// values
-// Use Dropdown::open()
-class Dropdown : public View
-{
-  private:
-    Dropdown(std::string title, std::vector<std::string> values, ValueSelectedEvent::Callback cb, size_t selected = 0);
-
-    std::string title;
-
-    int valuesCount;
-
-    ValueSelectedEvent valueEvent;
-
-    List* list;
-    Hint* hint;
-
-    float topOffset; // for slide in animation
-
-  protected:
-    unsigned getShowAnimationDuration(ViewAnimation animation) override;
-
-  public:
-    ~Dropdown();
-
-    void draw(NVGcontext* vg, int x, int y, unsigned width, unsigned height, Style* style, FrameContext* ctx) override;
-    void layout(NVGcontext* vg, Style* style, FontStash* stash) override;
-    View* getDefaultFocus() override;
-    virtual bool onCancel();
-    void show(std::function<void(void)> cb, bool animate = true, ViewAnimation animation = ViewAnimation::FADE) override;
-    void willAppear(bool resetState = false) override;
-    void willDisappear(bool resetState = false) override;
-
-    static void open(std::string title, std::vector<std::string> values, ValueSelectedEvent::Callback cb, int selected = -1);
-
-    bool isTranslucent() override
-    {
-        return true || View::isTranslucent();
-    }
-};
-
-} // namespace brls
diff --git a/Source/sys-clk/manager/lib/borealis/library/include/borealis/event.hpp b/Source/sys-clk/manager/lib/borealis/library/include/borealis/event.hpp
deleted file mode 100644
index 0c58a571..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/include/borealis/event.hpp
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
-    Borealis, a Nintendo Switch UI Library
-    Copyright (C) 2020  natinusala
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include <algorithm>
-#include <functional>
-#include <list>
-
-namespace brls
-{
-
-// Simple observer pattern implementation
-//
-// Usage:
-// 1. typedef your event type
-// 2. create as many events as you want using that type
-// 3. call subscribe on the events with your observers
-// 4. call fire when you want to fire the events
-//    it wil return true if at least one subscriber exists
-//    for that event
-template <typename... Ts>
-class Event
-{
-  public:
-    typedef std::function<void(Ts...)> Callback;
-    typedef std::list<Callback> CallbacksList;
-    typedef typename CallbacksList::iterator Subscription;
-
-    Subscription subscribe(Callback cb);
-    void unsubscribe(Subscription subscription);
-    bool fire(Ts... args);
-
-  private:
-    CallbacksList callbacks;
-};
-
-template <typename... Ts>
-typename Event<Ts...>::Subscription Event<Ts...>::subscribe(Event<Ts...>::Callback cb)
-{
-    this->callbacks.push_back(cb);
-    return --this->callbacks.end();
-}
-
-template <typename... Ts>
-void Event<Ts...>::unsubscribe(Event<Ts...>::Subscription subscription)
-{
-    this->callbacks.erase(subscription);
-}
-
-template <typename... Ts>
-bool Event<Ts...>::fire(Ts... args)
-{
-    for (Callback cb : this->callbacks)
-        cb(args...);
-
-    return !this->callbacks.empty();
-}
-
-}; // namespace brls
diff --git a/Source/sys-clk/manager/lib/borealis/library/include/borealis/extern/glad/glad.h b/Source/sys-clk/manager/lib/borealis/library/include/borealis/extern/glad/glad.h
deleted file mode 100644
index dddd6ccc..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/include/borealis/extern/glad/glad.h
+++ /dev/null
@@ -1,3274 +0,0 @@
-/*
-
-    OpenGL loader generated by glad 0.1.27 on Wed Sep 19 00:03:30 2018.
-
-    Language/Generator: C/C++
-    Specification: gl
-    APIs: gl=4.3
-    Profile: core
-    Extensions:
-        
-    Loader: False
-    Local files: True
-    Omit khrplatform: True
-    Reproducible: False
-
-    Commandline:
-        --profile="core" --api="gl=4.3" --generator="c" --spec="gl" --no-loader --local-files --omit-khrplatform --extensions=""
-    Online:
-        http://glad.dav1d.de/#profile=core&language=c&specification=gl&api=gl%3D4.3
-*/
-
-
-#ifndef __glad_h_
-#define __glad_h_
-
-#ifdef __gl_h_
-#error OpenGL header already included, remove this include, glad already provides it
-#endif
-#define __gl_h_
-
-#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__)
-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN 1
-#endif
-#ifndef NOMINMAX
-#define NOMINMAX 1
-#endif
-#include <windows.h>
-#endif
-
-#ifndef APIENTRY
-#define APIENTRY
-#endif
-#ifndef APIENTRYP
-#define APIENTRYP APIENTRY *
-#endif
-
-#ifndef GLAPIENTRY
-#define GLAPIENTRY APIENTRY
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct gladGLversionStruct {
-    int major;
-    int minor;
-};
-
-typedef void* (* GLADloadproc)(const char *name);
-
-#ifndef GLAPI
-# if defined(GLAD_GLAPI_EXPORT)
-#  if defined(_WIN32) || defined(__CYGWIN__)
-#   if defined(GLAD_GLAPI_EXPORT_BUILD)
-#    if defined(__GNUC__)
-#     define GLAPI __attribute__ ((dllexport)) extern
-#    else
-#     define GLAPI __declspec(dllexport) extern
-#    endif
-#   else
-#    if defined(__GNUC__)
-#     define GLAPI __attribute__ ((dllimport)) extern
-#    else
-#     define GLAPI __declspec(dllimport) extern
-#    endif
-#   endif
-#  elif defined(__GNUC__) && defined(GLAD_GLAPI_EXPORT_BUILD)
-#   define GLAPI __attribute__ ((visibility ("default"))) extern
-#  else
-#   define GLAPI extern
-#  endif
-# else
-#  define GLAPI extern
-# endif
-#endif
-
-GLAPI struct gladGLversionStruct GLVersion;
-GLAPI int gladLoadGLLoader(GLADloadproc);
-
-#include <stddef.h>
-#ifndef GLEXT_64_TYPES_DEFINED
-/* This code block is duplicated in glxext.h, so must be protected */
-#define GLEXT_64_TYPES_DEFINED
-/* Define int32_t, int64_t, and uint64_t types for UST/MSC */
-/* (as used in the GL_EXT_timer_query extension). */
-#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
-#include <inttypes.h>
-#elif defined(__sun__) || defined(__digital__)
-#include <inttypes.h>
-#if defined(__STDC__)
-#if defined(__arch64__) || defined(_LP64)
-typedef long int int64_t;
-typedef unsigned long int uint64_t;
-#else
-typedef long long int int64_t;
-typedef unsigned long long int uint64_t;
-#endif /* __arch64__ */
-#endif /* __STDC__ */
-#elif defined( __VMS ) || defined(__sgi)
-#include <inttypes.h>
-#elif defined(__SCO__) || defined(__USLC__)
-#include <stdint.h>
-#elif defined(__UNIXOS2__) || defined(__SOL64__)
-typedef long int int32_t;
-typedef long long int int64_t;
-typedef unsigned long long int uint64_t;
-#elif defined(_WIN32) && defined(__GNUC__)
-#include <stdint.h>
-#elif defined(_WIN32)
-typedef __int32 int32_t;
-typedef __int64 int64_t;
-typedef unsigned __int64 uint64_t;
-#else
-/* Fallback if nothing above works */
-#include <inttypes.h>
-#endif
-#endif
-typedef unsigned int GLenum;
-typedef unsigned char GLboolean;
-typedef unsigned int GLbitfield;
-typedef void GLvoid;
-typedef signed char GLbyte;
-typedef short GLshort;
-typedef int GLint;
-typedef int GLclampx;
-typedef unsigned char GLubyte;
-typedef unsigned short GLushort;
-typedef unsigned int GLuint;
-typedef int GLsizei;
-typedef float GLfloat;
-typedef float GLclampf;
-typedef double GLdouble;
-typedef double GLclampd;
-typedef void *GLeglClientBufferEXT;
-typedef void *GLeglImageOES;
-typedef char GLchar;
-typedef char GLcharARB;
-#ifdef __APPLE__
-typedef void *GLhandleARB;
-#else
-typedef unsigned int GLhandleARB;
-#endif
-typedef unsigned short GLhalfARB;
-typedef unsigned short GLhalf;
-typedef GLint GLfixed;
-#if defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) && (__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ > 1060)
-#if defined(__khrplatform_h_)
-typedef khronos_intptr_t GLintptr;
-#else
-typedef long GLintptr;
-#endif
-#else
-#if defined(__khrplatform_h_)
-typedef khronos_intptr_t GLintptr;
-#else
-typedef ptrdiff_t GLintptr;
-#endif
-#endif
-#if defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) && (__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ > 1060)
-#if defined(__khrplatform_h_)
-typedef khronos_ssize_t GLsizeiptr;
-#else
-typedef long GLsizeiptr;
-#endif
-#else
-#if defined(__khrplatform_h_)
-typedef khronos_ssize_t GLsizeiptr;
-#else
-typedef ptrdiff_t GLsizeiptr;
-#endif
-#endif
-typedef int64_t GLint64;
-typedef uint64_t GLuint64;
-#if defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) && (__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ > 1060)
-typedef long GLintptrARB;
-#else
-typedef ptrdiff_t GLintptrARB;
-#endif
-#if defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) && (__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ > 1060)
-typedef long GLsizeiptrARB;
-#else
-typedef ptrdiff_t GLsizeiptrARB;
-#endif
-typedef int64_t GLint64EXT;
-typedef uint64_t GLuint64EXT;
-typedef struct __GLsync *GLsync;
-struct _cl_context;
-struct _cl_event;
-typedef void (APIENTRY *GLDEBUGPROC)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,const void *userParam);
-typedef void (APIENTRY *GLDEBUGPROCARB)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,const void *userParam);
-typedef void (APIENTRY *GLDEBUGPROCKHR)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,const void *userParam);
-typedef void (APIENTRY *GLDEBUGPROCAMD)(GLuint id,GLenum category,GLenum severity,GLsizei length,const GLchar *message,void *userParam);
-typedef unsigned short GLhalfNV;
-typedef GLintptr GLvdpauSurfaceNV;
-typedef void (APIENTRY *GLVULKANPROCNV)(void);
-#define GL_DEPTH_BUFFER_BIT 0x00000100
-#define GL_STENCIL_BUFFER_BIT 0x00000400
-#define GL_COLOR_BUFFER_BIT 0x00004000
-#define GL_FALSE 0
-#define GL_TRUE 1
-#define GL_POINTS 0x0000
-#define GL_LINES 0x0001
-#define GL_LINE_LOOP 0x0002
-#define GL_LINE_STRIP 0x0003
-#define GL_TRIANGLES 0x0004
-#define GL_TRIANGLE_STRIP 0x0005
-#define GL_TRIANGLE_FAN 0x0006
-#define GL_NEVER 0x0200
-#define GL_LESS 0x0201
-#define GL_EQUAL 0x0202
-#define GL_LEQUAL 0x0203
-#define GL_GREATER 0x0204
-#define GL_NOTEQUAL 0x0205
-#define GL_GEQUAL 0x0206
-#define GL_ALWAYS 0x0207
-#define GL_ZERO 0
-#define GL_ONE 1
-#define GL_SRC_COLOR 0x0300
-#define GL_ONE_MINUS_SRC_COLOR 0x0301
-#define GL_SRC_ALPHA 0x0302
-#define GL_ONE_MINUS_SRC_ALPHA 0x0303
-#define GL_DST_ALPHA 0x0304
-#define GL_ONE_MINUS_DST_ALPHA 0x0305
-#define GL_DST_COLOR 0x0306
-#define GL_ONE_MINUS_DST_COLOR 0x0307
-#define GL_SRC_ALPHA_SATURATE 0x0308
-#define GL_NONE 0
-#define GL_FRONT_LEFT 0x0400
-#define GL_FRONT_RIGHT 0x0401
-#define GL_BACK_LEFT 0x0402
-#define GL_BACK_RIGHT 0x0403
-#define GL_FRONT 0x0404
-#define GL_BACK 0x0405
-#define GL_LEFT 0x0406
-#define GL_RIGHT 0x0407
-#define GL_FRONT_AND_BACK 0x0408
-#define GL_NO_ERROR 0
-#define GL_INVALID_ENUM 0x0500
-#define GL_INVALID_VALUE 0x0501
-#define GL_INVALID_OPERATION 0x0502
-#define GL_OUT_OF_MEMORY 0x0505
-#define GL_CW 0x0900
-#define GL_CCW 0x0901
-#define GL_POINT_SIZE 0x0B11
-#define GL_POINT_SIZE_RANGE 0x0B12
-#define GL_POINT_SIZE_GRANULARITY 0x0B13
-#define GL_LINE_SMOOTH 0x0B20
-#define GL_LINE_WIDTH 0x0B21
-#define GL_LINE_WIDTH_RANGE 0x0B22
-#define GL_LINE_WIDTH_GRANULARITY 0x0B23
-#define GL_POLYGON_MODE 0x0B40
-#define GL_POLYGON_SMOOTH 0x0B41
-#define GL_CULL_FACE 0x0B44
-#define GL_CULL_FACE_MODE 0x0B45
-#define GL_FRONT_FACE 0x0B46
-#define GL_DEPTH_RANGE 0x0B70
-#define GL_DEPTH_TEST 0x0B71
-#define GL_DEPTH_WRITEMASK 0x0B72
-#define GL_DEPTH_CLEAR_VALUE 0x0B73
-#define GL_DEPTH_FUNC 0x0B74
-#define GL_STENCIL_TEST 0x0B90
-#define GL_STENCIL_CLEAR_VALUE 0x0B91
-#define GL_STENCIL_FUNC 0x0B92
-#define GL_STENCIL_VALUE_MASK 0x0B93
-#define GL_STENCIL_FAIL 0x0B94
-#define GL_STENCIL_PASS_DEPTH_FAIL 0x0B95
-#define GL_STENCIL_PASS_DEPTH_PASS 0x0B96
-#define GL_STENCIL_REF 0x0B97
-#define GL_STENCIL_WRITEMASK 0x0B98
-#define GL_VIEWPORT 0x0BA2
-#define GL_DITHER 0x0BD0
-#define GL_BLEND_DST 0x0BE0
-#define GL_BLEND_SRC 0x0BE1
-#define GL_BLEND 0x0BE2
-#define GL_LOGIC_OP_MODE 0x0BF0
-#define GL_DRAW_BUFFER 0x0C01
-#define GL_READ_BUFFER 0x0C02
-#define GL_SCISSOR_BOX 0x0C10
-#define GL_SCISSOR_TEST 0x0C11
-#define GL_COLOR_CLEAR_VALUE 0x0C22
-#define GL_COLOR_WRITEMASK 0x0C23
-#define GL_DOUBLEBUFFER 0x0C32
-#define GL_STEREO 0x0C33
-#define GL_LINE_SMOOTH_HINT 0x0C52
-#define GL_POLYGON_SMOOTH_HINT 0x0C53
-#define GL_UNPACK_SWAP_BYTES 0x0CF0
-#define GL_UNPACK_LSB_FIRST 0x0CF1
-#define GL_UNPACK_ROW_LENGTH 0x0CF2
-#define GL_UNPACK_SKIP_ROWS 0x0CF3
-#define GL_UNPACK_SKIP_PIXELS 0x0CF4
-#define GL_UNPACK_ALIGNMENT 0x0CF5
-#define GL_PACK_SWAP_BYTES 0x0D00
-#define GL_PACK_LSB_FIRST 0x0D01
-#define GL_PACK_ROW_LENGTH 0x0D02
-#define GL_PACK_SKIP_ROWS 0x0D03
-#define GL_PACK_SKIP_PIXELS 0x0D04
-#define GL_PACK_ALIGNMENT 0x0D05
-#define GL_MAX_TEXTURE_SIZE 0x0D33
-#define GL_MAX_VIEWPORT_DIMS 0x0D3A
-#define GL_SUBPIXEL_BITS 0x0D50
-#define GL_TEXTURE_1D 0x0DE0
-#define GL_TEXTURE_2D 0x0DE1
-#define GL_TEXTURE_WIDTH 0x1000
-#define GL_TEXTURE_HEIGHT 0x1001
-#define GL_TEXTURE_BORDER_COLOR 0x1004
-#define GL_DONT_CARE 0x1100
-#define GL_FASTEST 0x1101
-#define GL_NICEST 0x1102
-#define GL_BYTE 0x1400
-#define GL_UNSIGNED_BYTE 0x1401
-#define GL_SHORT 0x1402
-#define GL_UNSIGNED_SHORT 0x1403
-#define GL_INT 0x1404
-#define GL_UNSIGNED_INT 0x1405
-#define GL_FLOAT 0x1406
-#define GL_CLEAR 0x1500
-#define GL_AND 0x1501
-#define GL_AND_REVERSE 0x1502
-#define GL_COPY 0x1503
-#define GL_AND_INVERTED 0x1504
-#define GL_NOOP 0x1505
-#define GL_XOR 0x1506
-#define GL_OR 0x1507
-#define GL_NOR 0x1508
-#define GL_EQUIV 0x1509
-#define GL_INVERT 0x150A
-#define GL_OR_REVERSE 0x150B
-#define GL_COPY_INVERTED 0x150C
-#define GL_OR_INVERTED 0x150D
-#define GL_NAND 0x150E
-#define GL_SET 0x150F
-#define GL_TEXTURE 0x1702
-#define GL_COLOR 0x1800
-#define GL_DEPTH 0x1801
-#define GL_STENCIL 0x1802
-#define GL_STENCIL_INDEX 0x1901
-#define GL_DEPTH_COMPONENT 0x1902
-#define GL_RED 0x1903
-#define GL_GREEN 0x1904
-#define GL_BLUE 0x1905
-#define GL_ALPHA 0x1906
-#define GL_RGB 0x1907
-#define GL_RGBA 0x1908
-#define GL_POINT 0x1B00
-#define GL_LINE 0x1B01
-#define GL_FILL 0x1B02
-#define GL_KEEP 0x1E00
-#define GL_REPLACE 0x1E01
-#define GL_INCR 0x1E02
-#define GL_DECR 0x1E03
-#define GL_VENDOR 0x1F00
-#define GL_RENDERER 0x1F01
-#define GL_VERSION 0x1F02
-#define GL_EXTENSIONS 0x1F03
-#define GL_NEAREST 0x2600
-#define GL_LINEAR 0x2601
-#define GL_NEAREST_MIPMAP_NEAREST 0x2700
-#define GL_LINEAR_MIPMAP_NEAREST 0x2701
-#define GL_NEAREST_MIPMAP_LINEAR 0x2702
-#define GL_LINEAR_MIPMAP_LINEAR 0x2703
-#define GL_TEXTURE_MAG_FILTER 0x2800
-#define GL_TEXTURE_MIN_FILTER 0x2801
-#define GL_TEXTURE_WRAP_S 0x2802
-#define GL_TEXTURE_WRAP_T 0x2803
-#define GL_REPEAT 0x2901
-#define GL_COLOR_LOGIC_OP 0x0BF2
-#define GL_POLYGON_OFFSET_UNITS 0x2A00
-#define GL_POLYGON_OFFSET_POINT 0x2A01
-#define GL_POLYGON_OFFSET_LINE 0x2A02
-#define GL_POLYGON_OFFSET_FILL 0x8037
-#define GL_POLYGON_OFFSET_FACTOR 0x8038
-#define GL_TEXTURE_BINDING_1D 0x8068
-#define GL_TEXTURE_BINDING_2D 0x8069
-#define GL_TEXTURE_INTERNAL_FORMAT 0x1003
-#define GL_TEXTURE_RED_SIZE 0x805C
-#define GL_TEXTURE_GREEN_SIZE 0x805D
-#define GL_TEXTURE_BLUE_SIZE 0x805E
-#define GL_TEXTURE_ALPHA_SIZE 0x805F
-#define GL_DOUBLE 0x140A
-#define GL_PROXY_TEXTURE_1D 0x8063
-#define GL_PROXY_TEXTURE_2D 0x8064
-#define GL_R3_G3_B2 0x2A10
-#define GL_RGB4 0x804F
-#define GL_RGB5 0x8050
-#define GL_RGB8 0x8051
-#define GL_RGB10 0x8052
-#define GL_RGB12 0x8053
-#define GL_RGB16 0x8054
-#define GL_RGBA2 0x8055
-#define GL_RGBA4 0x8056
-#define GL_RGB5_A1 0x8057
-#define GL_RGBA8 0x8058
-#define GL_RGB10_A2 0x8059
-#define GL_RGBA12 0x805A
-#define GL_RGBA16 0x805B
-#define GL_UNSIGNED_BYTE_3_3_2 0x8032
-#define GL_UNSIGNED_SHORT_4_4_4_4 0x8033
-#define GL_UNSIGNED_SHORT_5_5_5_1 0x8034
-#define GL_UNSIGNED_INT_8_8_8_8 0x8035
-#define GL_UNSIGNED_INT_10_10_10_2 0x8036
-#define GL_TEXTURE_BINDING_3D 0x806A
-#define GL_PACK_SKIP_IMAGES 0x806B
-#define GL_PACK_IMAGE_HEIGHT 0x806C
-#define GL_UNPACK_SKIP_IMAGES 0x806D
-#define GL_UNPACK_IMAGE_HEIGHT 0x806E
-#define GL_TEXTURE_3D 0x806F
-#define GL_PROXY_TEXTURE_3D 0x8070
-#define GL_TEXTURE_DEPTH 0x8071
-#define GL_TEXTURE_WRAP_R 0x8072
-#define GL_MAX_3D_TEXTURE_SIZE 0x8073
-#define GL_UNSIGNED_BYTE_2_3_3_REV 0x8362
-#define GL_UNSIGNED_SHORT_5_6_5 0x8363
-#define GL_UNSIGNED_SHORT_5_6_5_REV 0x8364
-#define GL_UNSIGNED_SHORT_4_4_4_4_REV 0x8365
-#define GL_UNSIGNED_SHORT_1_5_5_5_REV 0x8366
-#define GL_UNSIGNED_INT_8_8_8_8_REV 0x8367
-#define GL_UNSIGNED_INT_2_10_10_10_REV 0x8368
-#define GL_BGR 0x80E0
-#define GL_BGRA 0x80E1
-#define GL_MAX_ELEMENTS_VERTICES 0x80E8
-#define GL_MAX_ELEMENTS_INDICES 0x80E9
-#define GL_CLAMP_TO_EDGE 0x812F
-#define GL_TEXTURE_MIN_LOD 0x813A
-#define GL_TEXTURE_MAX_LOD 0x813B
-#define GL_TEXTURE_BASE_LEVEL 0x813C
-#define GL_TEXTURE_MAX_LEVEL 0x813D
-#define GL_SMOOTH_POINT_SIZE_RANGE 0x0B12
-#define GL_SMOOTH_POINT_SIZE_GRANULARITY 0x0B13
-#define GL_SMOOTH_LINE_WIDTH_RANGE 0x0B22
-#define GL_SMOOTH_LINE_WIDTH_GRANULARITY 0x0B23
-#define GL_ALIASED_LINE_WIDTH_RANGE 0x846E
-#define GL_TEXTURE0 0x84C0
-#define GL_TEXTURE1 0x84C1
-#define GL_TEXTURE2 0x84C2
-#define GL_TEXTURE3 0x84C3
-#define GL_TEXTURE4 0x84C4
-#define GL_TEXTURE5 0x84C5
-#define GL_TEXTURE6 0x84C6
-#define GL_TEXTURE7 0x84C7
-#define GL_TEXTURE8 0x84C8
-#define GL_TEXTURE9 0x84C9
-#define GL_TEXTURE10 0x84CA
-#define GL_TEXTURE11 0x84CB
-#define GL_TEXTURE12 0x84CC
-#define GL_TEXTURE13 0x84CD
-#define GL_TEXTURE14 0x84CE
-#define GL_TEXTURE15 0x84CF
-#define GL_TEXTURE16 0x84D0
-#define GL_TEXTURE17 0x84D1
-#define GL_TEXTURE18 0x84D2
-#define GL_TEXTURE19 0x84D3
-#define GL_TEXTURE20 0x84D4
-#define GL_TEXTURE21 0x84D5
-#define GL_TEXTURE22 0x84D6
-#define GL_TEXTURE23 0x84D7
-#define GL_TEXTURE24 0x84D8
-#define GL_TEXTURE25 0x84D9
-#define GL_TEXTURE26 0x84DA
-#define GL_TEXTURE27 0x84DB
-#define GL_TEXTURE28 0x84DC
-#define GL_TEXTURE29 0x84DD
-#define GL_TEXTURE30 0x84DE
-#define GL_TEXTURE31 0x84DF
-#define GL_ACTIVE_TEXTURE 0x84E0
-#define GL_MULTISAMPLE 0x809D
-#define GL_SAMPLE_ALPHA_TO_COVERAGE 0x809E
-#define GL_SAMPLE_ALPHA_TO_ONE 0x809F
-#define GL_SAMPLE_COVERAGE 0x80A0
-#define GL_SAMPLE_BUFFERS 0x80A8
-#define GL_SAMPLES 0x80A9
-#define GL_SAMPLE_COVERAGE_VALUE 0x80AA
-#define GL_SAMPLE_COVERAGE_INVERT 0x80AB
-#define GL_TEXTURE_CUBE_MAP 0x8513
-#define GL_TEXTURE_BINDING_CUBE_MAP 0x8514
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_X 0x8515
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X 0x8516
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y 0x8517
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y 0x8518
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z 0x8519
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z 0x851A
-#define GL_PROXY_TEXTURE_CUBE_MAP 0x851B
-#define GL_MAX_CUBE_MAP_TEXTURE_SIZE 0x851C
-#define GL_COMPRESSED_RGB 0x84ED
-#define GL_COMPRESSED_RGBA 0x84EE
-#define GL_TEXTURE_COMPRESSION_HINT 0x84EF
-#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE 0x86A0
-#define GL_TEXTURE_COMPRESSED 0x86A1
-#define GL_NUM_COMPRESSED_TEXTURE_FORMATS 0x86A2
-#define GL_COMPRESSED_TEXTURE_FORMATS 0x86A3
-#define GL_CLAMP_TO_BORDER 0x812D
-#define GL_BLEND_DST_RGB 0x80C8
-#define GL_BLEND_SRC_RGB 0x80C9
-#define GL_BLEND_DST_ALPHA 0x80CA
-#define GL_BLEND_SRC_ALPHA 0x80CB
-#define GL_POINT_FADE_THRESHOLD_SIZE 0x8128
-#define GL_DEPTH_COMPONENT16 0x81A5
-#define GL_DEPTH_COMPONENT24 0x81A6
-#define GL_DEPTH_COMPONENT32 0x81A7
-#define GL_MIRRORED_REPEAT 0x8370
-#define GL_MAX_TEXTURE_LOD_BIAS 0x84FD
-#define GL_TEXTURE_LOD_BIAS 0x8501
-#define GL_INCR_WRAP 0x8507
-#define GL_DECR_WRAP 0x8508
-#define GL_TEXTURE_DEPTH_SIZE 0x884A
-#define GL_TEXTURE_COMPARE_MODE 0x884C
-#define GL_TEXTURE_COMPARE_FUNC 0x884D
-#define GL_BLEND_COLOR 0x8005
-#define GL_BLEND_EQUATION 0x8009
-#define GL_CONSTANT_COLOR 0x8001
-#define GL_ONE_MINUS_CONSTANT_COLOR 0x8002
-#define GL_CONSTANT_ALPHA 0x8003
-#define GL_ONE_MINUS_CONSTANT_ALPHA 0x8004
-#define GL_FUNC_ADD 0x8006
-#define GL_FUNC_REVERSE_SUBTRACT 0x800B
-#define GL_FUNC_SUBTRACT 0x800A
-#define GL_MIN 0x8007
-#define GL_MAX 0x8008
-#define GL_BUFFER_SIZE 0x8764
-#define GL_BUFFER_USAGE 0x8765
-#define GL_QUERY_COUNTER_BITS 0x8864
-#define GL_CURRENT_QUERY 0x8865
-#define GL_QUERY_RESULT 0x8866
-#define GL_QUERY_RESULT_AVAILABLE 0x8867
-#define GL_ARRAY_BUFFER 0x8892
-#define GL_ELEMENT_ARRAY_BUFFER 0x8893
-#define GL_ARRAY_BUFFER_BINDING 0x8894
-#define GL_ELEMENT_ARRAY_BUFFER_BINDING 0x8895
-#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING 0x889F
-#define GL_READ_ONLY 0x88B8
-#define GL_WRITE_ONLY 0x88B9
-#define GL_READ_WRITE 0x88BA
-#define GL_BUFFER_ACCESS 0x88BB
-#define GL_BUFFER_MAPPED 0x88BC
-#define GL_BUFFER_MAP_POINTER 0x88BD
-#define GL_STREAM_DRAW 0x88E0
-#define GL_STREAM_READ 0x88E1
-#define GL_STREAM_COPY 0x88E2
-#define GL_STATIC_DRAW 0x88E4
-#define GL_STATIC_READ 0x88E5
-#define GL_STATIC_COPY 0x88E6
-#define GL_DYNAMIC_DRAW 0x88E8
-#define GL_DYNAMIC_READ 0x88E9
-#define GL_DYNAMIC_COPY 0x88EA
-#define GL_SAMPLES_PASSED 0x8914
-#define GL_SRC1_ALPHA 0x8589
-#define GL_BLEND_EQUATION_RGB 0x8009
-#define GL_VERTEX_ATTRIB_ARRAY_ENABLED 0x8622
-#define GL_VERTEX_ATTRIB_ARRAY_SIZE 0x8623
-#define GL_VERTEX_ATTRIB_ARRAY_STRIDE 0x8624
-#define GL_VERTEX_ATTRIB_ARRAY_TYPE 0x8625
-#define GL_CURRENT_VERTEX_ATTRIB 0x8626
-#define GL_VERTEX_PROGRAM_POINT_SIZE 0x8642
-#define GL_VERTEX_ATTRIB_ARRAY_POINTER 0x8645
-#define GL_STENCIL_BACK_FUNC 0x8800
-#define GL_STENCIL_BACK_FAIL 0x8801
-#define GL_STENCIL_BACK_PASS_DEPTH_FAIL 0x8802
-#define GL_STENCIL_BACK_PASS_DEPTH_PASS 0x8803
-#define GL_MAX_DRAW_BUFFERS 0x8824
-#define GL_DRAW_BUFFER0 0x8825
-#define GL_DRAW_BUFFER1 0x8826
-#define GL_DRAW_BUFFER2 0x8827
-#define GL_DRAW_BUFFER3 0x8828
-#define GL_DRAW_BUFFER4 0x8829
-#define GL_DRAW_BUFFER5 0x882A
-#define GL_DRAW_BUFFER6 0x882B
-#define GL_DRAW_BUFFER7 0x882C
-#define GL_DRAW_BUFFER8 0x882D
-#define GL_DRAW_BUFFER9 0x882E
-#define GL_DRAW_BUFFER10 0x882F
-#define GL_DRAW_BUFFER11 0x8830
-#define GL_DRAW_BUFFER12 0x8831
-#define GL_DRAW_BUFFER13 0x8832
-#define GL_DRAW_BUFFER14 0x8833
-#define GL_DRAW_BUFFER15 0x8834
-#define GL_BLEND_EQUATION_ALPHA 0x883D
-#define GL_MAX_VERTEX_ATTRIBS 0x8869
-#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED 0x886A
-#define GL_MAX_TEXTURE_IMAGE_UNITS 0x8872
-#define GL_FRAGMENT_SHADER 0x8B30
-#define GL_VERTEX_SHADER 0x8B31
-#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS 0x8B49
-#define GL_MAX_VERTEX_UNIFORM_COMPONENTS 0x8B4A
-#define GL_MAX_VARYING_FLOATS 0x8B4B
-#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS 0x8B4C
-#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS 0x8B4D
-#define GL_SHADER_TYPE 0x8B4F
-#define GL_FLOAT_VEC2 0x8B50
-#define GL_FLOAT_VEC3 0x8B51
-#define GL_FLOAT_VEC4 0x8B52
-#define GL_INT_VEC2 0x8B53
-#define GL_INT_VEC3 0x8B54
-#define GL_INT_VEC4 0x8B55
-#define GL_BOOL 0x8B56
-#define GL_BOOL_VEC2 0x8B57
-#define GL_BOOL_VEC3 0x8B58
-#define GL_BOOL_VEC4 0x8B59
-#define GL_FLOAT_MAT2 0x8B5A
-#define GL_FLOAT_MAT3 0x8B5B
-#define GL_FLOAT_MAT4 0x8B5C
-#define GL_SAMPLER_1D 0x8B5D
-#define GL_SAMPLER_2D 0x8B5E
-#define GL_SAMPLER_3D 0x8B5F
-#define GL_SAMPLER_CUBE 0x8B60
-#define GL_SAMPLER_1D_SHADOW 0x8B61
-#define GL_SAMPLER_2D_SHADOW 0x8B62
-#define GL_DELETE_STATUS 0x8B80
-#define GL_COMPILE_STATUS 0x8B81
-#define GL_LINK_STATUS 0x8B82
-#define GL_VALIDATE_STATUS 0x8B83
-#define GL_INFO_LOG_LENGTH 0x8B84
-#define GL_ATTACHED_SHADERS 0x8B85
-#define GL_ACTIVE_UNIFORMS 0x8B86
-#define GL_ACTIVE_UNIFORM_MAX_LENGTH 0x8B87
-#define GL_SHADER_SOURCE_LENGTH 0x8B88
-#define GL_ACTIVE_ATTRIBUTES 0x8B89
-#define GL_ACTIVE_ATTRIBUTE_MAX_LENGTH 0x8B8A
-#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT 0x8B8B
-#define GL_SHADING_LANGUAGE_VERSION 0x8B8C
-#define GL_CURRENT_PROGRAM 0x8B8D
-#define GL_POINT_SPRITE_COORD_ORIGIN 0x8CA0
-#define GL_LOWER_LEFT 0x8CA1
-#define GL_UPPER_LEFT 0x8CA2
-#define GL_STENCIL_BACK_REF 0x8CA3
-#define GL_STENCIL_BACK_VALUE_MASK 0x8CA4
-#define GL_STENCIL_BACK_WRITEMASK 0x8CA5
-#define GL_PIXEL_PACK_BUFFER 0x88EB
-#define GL_PIXEL_UNPACK_BUFFER 0x88EC
-#define GL_PIXEL_PACK_BUFFER_BINDING 0x88ED
-#define GL_PIXEL_UNPACK_BUFFER_BINDING 0x88EF
-#define GL_FLOAT_MAT2x3 0x8B65
-#define GL_FLOAT_MAT2x4 0x8B66
-#define GL_FLOAT_MAT3x2 0x8B67
-#define GL_FLOAT_MAT3x4 0x8B68
-#define GL_FLOAT_MAT4x2 0x8B69
-#define GL_FLOAT_MAT4x3 0x8B6A
-#define GL_SRGB 0x8C40
-#define GL_SRGB8 0x8C41
-#define GL_SRGB_ALPHA 0x8C42
-#define GL_SRGB8_ALPHA8 0x8C43
-#define GL_COMPRESSED_SRGB 0x8C48
-#define GL_COMPRESSED_SRGB_ALPHA 0x8C49
-#define GL_COMPARE_REF_TO_TEXTURE 0x884E
-#define GL_CLIP_DISTANCE0 0x3000
-#define GL_CLIP_DISTANCE1 0x3001
-#define GL_CLIP_DISTANCE2 0x3002
-#define GL_CLIP_DISTANCE3 0x3003
-#define GL_CLIP_DISTANCE4 0x3004
-#define GL_CLIP_DISTANCE5 0x3005
-#define GL_CLIP_DISTANCE6 0x3006
-#define GL_CLIP_DISTANCE7 0x3007
-#define GL_MAX_CLIP_DISTANCES 0x0D32
-#define GL_MAJOR_VERSION 0x821B
-#define GL_MINOR_VERSION 0x821C
-#define GL_NUM_EXTENSIONS 0x821D
-#define GL_CONTEXT_FLAGS 0x821E
-#define GL_COMPRESSED_RED 0x8225
-#define GL_COMPRESSED_RG 0x8226
-#define GL_CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT 0x00000001
-#define GL_RGBA32F 0x8814
-#define GL_RGB32F 0x8815
-#define GL_RGBA16F 0x881A
-#define GL_RGB16F 0x881B
-#define GL_VERTEX_ATTRIB_ARRAY_INTEGER 0x88FD
-#define GL_MAX_ARRAY_TEXTURE_LAYERS 0x88FF
-#define GL_MIN_PROGRAM_TEXEL_OFFSET 0x8904
-#define GL_MAX_PROGRAM_TEXEL_OFFSET 0x8905
-#define GL_CLAMP_READ_COLOR 0x891C
-#define GL_FIXED_ONLY 0x891D
-#define GL_MAX_VARYING_COMPONENTS 0x8B4B
-#define GL_TEXTURE_1D_ARRAY 0x8C18
-#define GL_PROXY_TEXTURE_1D_ARRAY 0x8C19
-#define GL_TEXTURE_2D_ARRAY 0x8C1A
-#define GL_PROXY_TEXTURE_2D_ARRAY 0x8C1B
-#define GL_TEXTURE_BINDING_1D_ARRAY 0x8C1C
-#define GL_TEXTURE_BINDING_2D_ARRAY 0x8C1D
-#define GL_R11F_G11F_B10F 0x8C3A
-#define GL_UNSIGNED_INT_10F_11F_11F_REV 0x8C3B
-#define GL_RGB9_E5 0x8C3D
-#define GL_UNSIGNED_INT_5_9_9_9_REV 0x8C3E
-#define GL_TEXTURE_SHARED_SIZE 0x8C3F
-#define GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH 0x8C76
-#define GL_TRANSFORM_FEEDBACK_BUFFER_MODE 0x8C7F
-#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS 0x8C80
-#define GL_TRANSFORM_FEEDBACK_VARYINGS 0x8C83
-#define GL_TRANSFORM_FEEDBACK_BUFFER_START 0x8C84
-#define GL_TRANSFORM_FEEDBACK_BUFFER_SIZE 0x8C85
-#define GL_PRIMITIVES_GENERATED 0x8C87
-#define GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN 0x8C88
-#define GL_RASTERIZER_DISCARD 0x8C89
-#define GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS 0x8C8A
-#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS 0x8C8B
-#define GL_INTERLEAVED_ATTRIBS 0x8C8C
-#define GL_SEPARATE_ATTRIBS 0x8C8D
-#define GL_TRANSFORM_FEEDBACK_BUFFER 0x8C8E
-#define GL_TRANSFORM_FEEDBACK_BUFFER_BINDING 0x8C8F
-#define GL_RGBA32UI 0x8D70
-#define GL_RGB32UI 0x8D71
-#define GL_RGBA16UI 0x8D76
-#define GL_RGB16UI 0x8D77
-#define GL_RGBA8UI 0x8D7C
-#define GL_RGB8UI 0x8D7D
-#define GL_RGBA32I 0x8D82
-#define GL_RGB32I 0x8D83
-#define GL_RGBA16I 0x8D88
-#define GL_RGB16I 0x8D89
-#define GL_RGBA8I 0x8D8E
-#define GL_RGB8I 0x8D8F
-#define GL_RED_INTEGER 0x8D94
-#define GL_GREEN_INTEGER 0x8D95
-#define GL_BLUE_INTEGER 0x8D96
-#define GL_RGB_INTEGER 0x8D98
-#define GL_RGBA_INTEGER 0x8D99
-#define GL_BGR_INTEGER 0x8D9A
-#define GL_BGRA_INTEGER 0x8D9B
-#define GL_SAMPLER_1D_ARRAY 0x8DC0
-#define GL_SAMPLER_2D_ARRAY 0x8DC1
-#define GL_SAMPLER_1D_ARRAY_SHADOW 0x8DC3
-#define GL_SAMPLER_2D_ARRAY_SHADOW 0x8DC4
-#define GL_SAMPLER_CUBE_SHADOW 0x8DC5
-#define GL_UNSIGNED_INT_VEC2 0x8DC6
-#define GL_UNSIGNED_INT_VEC3 0x8DC7
-#define GL_UNSIGNED_INT_VEC4 0x8DC8
-#define GL_INT_SAMPLER_1D 0x8DC9
-#define GL_INT_SAMPLER_2D 0x8DCA
-#define GL_INT_SAMPLER_3D 0x8DCB
-#define GL_INT_SAMPLER_CUBE 0x8DCC
-#define GL_INT_SAMPLER_1D_ARRAY 0x8DCE
-#define GL_INT_SAMPLER_2D_ARRAY 0x8DCF
-#define GL_UNSIGNED_INT_SAMPLER_1D 0x8DD1
-#define GL_UNSIGNED_INT_SAMPLER_2D 0x8DD2
-#define GL_UNSIGNED_INT_SAMPLER_3D 0x8DD3
-#define GL_UNSIGNED_INT_SAMPLER_CUBE 0x8DD4
-#define GL_UNSIGNED_INT_SAMPLER_1D_ARRAY 0x8DD6
-#define GL_UNSIGNED_INT_SAMPLER_2D_ARRAY 0x8DD7
-#define GL_QUERY_WAIT 0x8E13
-#define GL_QUERY_NO_WAIT 0x8E14
-#define GL_QUERY_BY_REGION_WAIT 0x8E15
-#define GL_QUERY_BY_REGION_NO_WAIT 0x8E16
-#define GL_BUFFER_ACCESS_FLAGS 0x911F
-#define GL_BUFFER_MAP_LENGTH 0x9120
-#define GL_BUFFER_MAP_OFFSET 0x9121
-#define GL_DEPTH_COMPONENT32F 0x8CAC
-#define GL_DEPTH32F_STENCIL8 0x8CAD
-#define GL_FLOAT_32_UNSIGNED_INT_24_8_REV 0x8DAD
-#define GL_INVALID_FRAMEBUFFER_OPERATION 0x0506
-#define GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING 0x8210
-#define GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE 0x8211
-#define GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE 0x8212
-#define GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE 0x8213
-#define GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE 0x8214
-#define GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE 0x8215
-#define GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE 0x8216
-#define GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE 0x8217
-#define GL_FRAMEBUFFER_DEFAULT 0x8218
-#define GL_FRAMEBUFFER_UNDEFINED 0x8219
-#define GL_DEPTH_STENCIL_ATTACHMENT 0x821A
-#define GL_MAX_RENDERBUFFER_SIZE 0x84E8
-#define GL_DEPTH_STENCIL 0x84F9
-#define GL_UNSIGNED_INT_24_8 0x84FA
-#define GL_DEPTH24_STENCIL8 0x88F0
-#define GL_TEXTURE_STENCIL_SIZE 0x88F1
-#define GL_TEXTURE_RED_TYPE 0x8C10
-#define GL_TEXTURE_GREEN_TYPE 0x8C11
-#define GL_TEXTURE_BLUE_TYPE 0x8C12
-#define GL_TEXTURE_ALPHA_TYPE 0x8C13
-#define GL_TEXTURE_DEPTH_TYPE 0x8C16
-#define GL_UNSIGNED_NORMALIZED 0x8C17
-#define GL_FRAMEBUFFER_BINDING 0x8CA6
-#define GL_DRAW_FRAMEBUFFER_BINDING 0x8CA6
-#define GL_RENDERBUFFER_BINDING 0x8CA7
-#define GL_READ_FRAMEBUFFER 0x8CA8
-#define GL_DRAW_FRAMEBUFFER 0x8CA9
-#define GL_READ_FRAMEBUFFER_BINDING 0x8CAA
-#define GL_RENDERBUFFER_SAMPLES 0x8CAB
-#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE 0x8CD0
-#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME 0x8CD1
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL 0x8CD2
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE 0x8CD3
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER 0x8CD4
-#define GL_FRAMEBUFFER_COMPLETE 0x8CD5
-#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT 0x8CD6
-#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT 0x8CD7
-#define GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER 0x8CDB
-#define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER 0x8CDC
-#define GL_FRAMEBUFFER_UNSUPPORTED 0x8CDD
-#define GL_MAX_COLOR_ATTACHMENTS 0x8CDF
-#define GL_COLOR_ATTACHMENT0 0x8CE0
-#define GL_COLOR_ATTACHMENT1 0x8CE1
-#define GL_COLOR_ATTACHMENT2 0x8CE2
-#define GL_COLOR_ATTACHMENT3 0x8CE3
-#define GL_COLOR_ATTACHMENT4 0x8CE4
-#define GL_COLOR_ATTACHMENT5 0x8CE5
-#define GL_COLOR_ATTACHMENT6 0x8CE6
-#define GL_COLOR_ATTACHMENT7 0x8CE7
-#define GL_COLOR_ATTACHMENT8 0x8CE8
-#define GL_COLOR_ATTACHMENT9 0x8CE9
-#define GL_COLOR_ATTACHMENT10 0x8CEA
-#define GL_COLOR_ATTACHMENT11 0x8CEB
-#define GL_COLOR_ATTACHMENT12 0x8CEC
-#define GL_COLOR_ATTACHMENT13 0x8CED
-#define GL_COLOR_ATTACHMENT14 0x8CEE
-#define GL_COLOR_ATTACHMENT15 0x8CEF
-#define GL_COLOR_ATTACHMENT16 0x8CF0
-#define GL_COLOR_ATTACHMENT17 0x8CF1
-#define GL_COLOR_ATTACHMENT18 0x8CF2
-#define GL_COLOR_ATTACHMENT19 0x8CF3
-#define GL_COLOR_ATTACHMENT20 0x8CF4
-#define GL_COLOR_ATTACHMENT21 0x8CF5
-#define GL_COLOR_ATTACHMENT22 0x8CF6
-#define GL_COLOR_ATTACHMENT23 0x8CF7
-#define GL_COLOR_ATTACHMENT24 0x8CF8
-#define GL_COLOR_ATTACHMENT25 0x8CF9
-#define GL_COLOR_ATTACHMENT26 0x8CFA
-#define GL_COLOR_ATTACHMENT27 0x8CFB
-#define GL_COLOR_ATTACHMENT28 0x8CFC
-#define GL_COLOR_ATTACHMENT29 0x8CFD
-#define GL_COLOR_ATTACHMENT30 0x8CFE
-#define GL_COLOR_ATTACHMENT31 0x8CFF
-#define GL_DEPTH_ATTACHMENT 0x8D00
-#define GL_STENCIL_ATTACHMENT 0x8D20
-#define GL_FRAMEBUFFER 0x8D40
-#define GL_RENDERBUFFER 0x8D41
-#define GL_RENDERBUFFER_WIDTH 0x8D42
-#define GL_RENDERBUFFER_HEIGHT 0x8D43
-#define GL_RENDERBUFFER_INTERNAL_FORMAT 0x8D44
-#define GL_STENCIL_INDEX1 0x8D46
-#define GL_STENCIL_INDEX4 0x8D47
-#define GL_STENCIL_INDEX8 0x8D48
-#define GL_STENCIL_INDEX16 0x8D49
-#define GL_RENDERBUFFER_RED_SIZE 0x8D50
-#define GL_RENDERBUFFER_GREEN_SIZE 0x8D51
-#define GL_RENDERBUFFER_BLUE_SIZE 0x8D52
-#define GL_RENDERBUFFER_ALPHA_SIZE 0x8D53
-#define GL_RENDERBUFFER_DEPTH_SIZE 0x8D54
-#define GL_RENDERBUFFER_STENCIL_SIZE 0x8D55
-#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE 0x8D56
-#define GL_MAX_SAMPLES 0x8D57
-#define GL_FRAMEBUFFER_SRGB 0x8DB9
-#define GL_HALF_FLOAT 0x140B
-#define GL_MAP_READ_BIT 0x0001
-#define GL_MAP_WRITE_BIT 0x0002
-#define GL_MAP_INVALIDATE_RANGE_BIT 0x0004
-#define GL_MAP_INVALIDATE_BUFFER_BIT 0x0008
-#define GL_MAP_FLUSH_EXPLICIT_BIT 0x0010
-#define GL_MAP_UNSYNCHRONIZED_BIT 0x0020
-#define GL_COMPRESSED_RED_RGTC1 0x8DBB
-#define GL_COMPRESSED_SIGNED_RED_RGTC1 0x8DBC
-#define GL_COMPRESSED_RG_RGTC2 0x8DBD
-#define GL_COMPRESSED_SIGNED_RG_RGTC2 0x8DBE
-#define GL_RG 0x8227
-#define GL_RG_INTEGER 0x8228
-#define GL_R8 0x8229
-#define GL_R16 0x822A
-#define GL_RG8 0x822B
-#define GL_RG16 0x822C
-#define GL_R16F 0x822D
-#define GL_R32F 0x822E
-#define GL_RG16F 0x822F
-#define GL_RG32F 0x8230
-#define GL_R8I 0x8231
-#define GL_R8UI 0x8232
-#define GL_R16I 0x8233
-#define GL_R16UI 0x8234
-#define GL_R32I 0x8235
-#define GL_R32UI 0x8236
-#define GL_RG8I 0x8237
-#define GL_RG8UI 0x8238
-#define GL_RG16I 0x8239
-#define GL_RG16UI 0x823A
-#define GL_RG32I 0x823B
-#define GL_RG32UI 0x823C
-#define GL_VERTEX_ARRAY_BINDING 0x85B5
-#define GL_SAMPLER_2D_RECT 0x8B63
-#define GL_SAMPLER_2D_RECT_SHADOW 0x8B64
-#define GL_SAMPLER_BUFFER 0x8DC2
-#define GL_INT_SAMPLER_2D_RECT 0x8DCD
-#define GL_INT_SAMPLER_BUFFER 0x8DD0
-#define GL_UNSIGNED_INT_SAMPLER_2D_RECT 0x8DD5
-#define GL_UNSIGNED_INT_SAMPLER_BUFFER 0x8DD8
-#define GL_TEXTURE_BUFFER 0x8C2A
-#define GL_MAX_TEXTURE_BUFFER_SIZE 0x8C2B
-#define GL_TEXTURE_BINDING_BUFFER 0x8C2C
-#define GL_TEXTURE_BUFFER_DATA_STORE_BINDING 0x8C2D
-#define GL_TEXTURE_RECTANGLE 0x84F5
-#define GL_TEXTURE_BINDING_RECTANGLE 0x84F6
-#define GL_PROXY_TEXTURE_RECTANGLE 0x84F7
-#define GL_MAX_RECTANGLE_TEXTURE_SIZE 0x84F8
-#define GL_R8_SNORM 0x8F94
-#define GL_RG8_SNORM 0x8F95
-#define GL_RGB8_SNORM 0x8F96
-#define GL_RGBA8_SNORM 0x8F97
-#define GL_R16_SNORM 0x8F98
-#define GL_RG16_SNORM 0x8F99
-#define GL_RGB16_SNORM 0x8F9A
-#define GL_RGBA16_SNORM 0x8F9B
-#define GL_SIGNED_NORMALIZED 0x8F9C
-#define GL_PRIMITIVE_RESTART 0x8F9D
-#define GL_PRIMITIVE_RESTART_INDEX 0x8F9E
-#define GL_COPY_READ_BUFFER 0x8F36
-#define GL_COPY_WRITE_BUFFER 0x8F37
-#define GL_UNIFORM_BUFFER 0x8A11
-#define GL_UNIFORM_BUFFER_BINDING 0x8A28
-#define GL_UNIFORM_BUFFER_START 0x8A29
-#define GL_UNIFORM_BUFFER_SIZE 0x8A2A
-#define GL_MAX_VERTEX_UNIFORM_BLOCKS 0x8A2B
-#define GL_MAX_GEOMETRY_UNIFORM_BLOCKS 0x8A2C
-#define GL_MAX_FRAGMENT_UNIFORM_BLOCKS 0x8A2D
-#define GL_MAX_COMBINED_UNIFORM_BLOCKS 0x8A2E
-#define GL_MAX_UNIFORM_BUFFER_BINDINGS 0x8A2F
-#define GL_MAX_UNIFORM_BLOCK_SIZE 0x8A30
-#define GL_MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS 0x8A31
-#define GL_MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS 0x8A32
-#define GL_MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS 0x8A33
-#define GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT 0x8A34
-#define GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH 0x8A35
-#define GL_ACTIVE_UNIFORM_BLOCKS 0x8A36
-#define GL_UNIFORM_TYPE 0x8A37
-#define GL_UNIFORM_SIZE 0x8A38
-#define GL_UNIFORM_NAME_LENGTH 0x8A39
-#define GL_UNIFORM_BLOCK_INDEX 0x8A3A
-#define GL_UNIFORM_OFFSET 0x8A3B
-#define GL_UNIFORM_ARRAY_STRIDE 0x8A3C
-#define GL_UNIFORM_MATRIX_STRIDE 0x8A3D
-#define GL_UNIFORM_IS_ROW_MAJOR 0x8A3E
-#define GL_UNIFORM_BLOCK_BINDING 0x8A3F
-#define GL_UNIFORM_BLOCK_DATA_SIZE 0x8A40
-#define GL_UNIFORM_BLOCK_NAME_LENGTH 0x8A41
-#define GL_UNIFORM_BLOCK_ACTIVE_UNIFORMS 0x8A42
-#define GL_UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES 0x8A43
-#define GL_UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER 0x8A44
-#define GL_UNIFORM_BLOCK_REFERENCED_BY_GEOMETRY_SHADER 0x8A45
-#define GL_UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER 0x8A46
-#define GL_INVALID_INDEX 0xFFFFFFFF
-#define GL_CONTEXT_CORE_PROFILE_BIT 0x00000001
-#define GL_CONTEXT_COMPATIBILITY_PROFILE_BIT 0x00000002
-#define GL_LINES_ADJACENCY 0x000A
-#define GL_LINE_STRIP_ADJACENCY 0x000B
-#define GL_TRIANGLES_ADJACENCY 0x000C
-#define GL_TRIANGLE_STRIP_ADJACENCY 0x000D
-#define GL_PROGRAM_POINT_SIZE 0x8642
-#define GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS 0x8C29
-#define GL_FRAMEBUFFER_ATTACHMENT_LAYERED 0x8DA7
-#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS 0x8DA8
-#define GL_GEOMETRY_SHADER 0x8DD9
-#define GL_GEOMETRY_VERTICES_OUT 0x8916
-#define GL_GEOMETRY_INPUT_TYPE 0x8917
-#define GL_GEOMETRY_OUTPUT_TYPE 0x8918
-#define GL_MAX_GEOMETRY_UNIFORM_COMPONENTS 0x8DDF
-#define GL_MAX_GEOMETRY_OUTPUT_VERTICES 0x8DE0
-#define GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS 0x8DE1
-#define GL_MAX_VERTEX_OUTPUT_COMPONENTS 0x9122
-#define GL_MAX_GEOMETRY_INPUT_COMPONENTS 0x9123
-#define GL_MAX_GEOMETRY_OUTPUT_COMPONENTS 0x9124
-#define GL_MAX_FRAGMENT_INPUT_COMPONENTS 0x9125
-#define GL_CONTEXT_PROFILE_MASK 0x9126
-#define GL_DEPTH_CLAMP 0x864F
-#define GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION 0x8E4C
-#define GL_FIRST_VERTEX_CONVENTION 0x8E4D
-#define GL_LAST_VERTEX_CONVENTION 0x8E4E
-#define GL_PROVOKING_VERTEX 0x8E4F
-#define GL_TEXTURE_CUBE_MAP_SEAMLESS 0x884F
-#define GL_MAX_SERVER_WAIT_TIMEOUT 0x9111
-#define GL_OBJECT_TYPE 0x9112
-#define GL_SYNC_CONDITION 0x9113
-#define GL_SYNC_STATUS 0x9114
-#define GL_SYNC_FLAGS 0x9115
-#define GL_SYNC_FENCE 0x9116
-#define GL_SYNC_GPU_COMMANDS_COMPLETE 0x9117
-#define GL_UNSIGNALED 0x9118
-#define GL_SIGNALED 0x9119
-#define GL_ALREADY_SIGNALED 0x911A
-#define GL_TIMEOUT_EXPIRED 0x911B
-#define GL_CONDITION_SATISFIED 0x911C
-#define GL_WAIT_FAILED 0x911D
-#define GL_TIMEOUT_IGNORED 0xFFFFFFFFFFFFFFFF
-#define GL_SYNC_FLUSH_COMMANDS_BIT 0x00000001
-#define GL_SAMPLE_POSITION 0x8E50
-#define GL_SAMPLE_MASK 0x8E51
-#define GL_SAMPLE_MASK_VALUE 0x8E52
-#define GL_MAX_SAMPLE_MASK_WORDS 0x8E59
-#define GL_TEXTURE_2D_MULTISAMPLE 0x9100
-#define GL_PROXY_TEXTURE_2D_MULTISAMPLE 0x9101
-#define GL_TEXTURE_2D_MULTISAMPLE_ARRAY 0x9102
-#define GL_PROXY_TEXTURE_2D_MULTISAMPLE_ARRAY 0x9103
-#define GL_TEXTURE_BINDING_2D_MULTISAMPLE 0x9104
-#define GL_TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY 0x9105
-#define GL_TEXTURE_SAMPLES 0x9106
-#define GL_TEXTURE_FIXED_SAMPLE_LOCATIONS 0x9107
-#define GL_SAMPLER_2D_MULTISAMPLE 0x9108
-#define GL_INT_SAMPLER_2D_MULTISAMPLE 0x9109
-#define GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE 0x910A
-#define GL_SAMPLER_2D_MULTISAMPLE_ARRAY 0x910B
-#define GL_INT_SAMPLER_2D_MULTISAMPLE_ARRAY 0x910C
-#define GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY 0x910D
-#define GL_MAX_COLOR_TEXTURE_SAMPLES 0x910E
-#define GL_MAX_DEPTH_TEXTURE_SAMPLES 0x910F
-#define GL_MAX_INTEGER_SAMPLES 0x9110
-#define GL_VERTEX_ATTRIB_ARRAY_DIVISOR 0x88FE
-#define GL_SRC1_COLOR 0x88F9
-#define GL_ONE_MINUS_SRC1_COLOR 0x88FA
-#define GL_ONE_MINUS_SRC1_ALPHA 0x88FB
-#define GL_MAX_DUAL_SOURCE_DRAW_BUFFERS 0x88FC
-#define GL_ANY_SAMPLES_PASSED 0x8C2F
-#define GL_SAMPLER_BINDING 0x8919
-#define GL_RGB10_A2UI 0x906F
-#define GL_TEXTURE_SWIZZLE_R 0x8E42
-#define GL_TEXTURE_SWIZZLE_G 0x8E43
-#define GL_TEXTURE_SWIZZLE_B 0x8E44
-#define GL_TEXTURE_SWIZZLE_A 0x8E45
-#define GL_TEXTURE_SWIZZLE_RGBA 0x8E46
-#define GL_TIME_ELAPSED 0x88BF
-#define GL_TIMESTAMP 0x8E28
-#define GL_INT_2_10_10_10_REV 0x8D9F
-#define GL_SAMPLE_SHADING 0x8C36
-#define GL_MIN_SAMPLE_SHADING_VALUE 0x8C37
-#define GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET 0x8E5E
-#define GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET 0x8E5F
-#define GL_TEXTURE_CUBE_MAP_ARRAY 0x9009
-#define GL_TEXTURE_BINDING_CUBE_MAP_ARRAY 0x900A
-#define GL_PROXY_TEXTURE_CUBE_MAP_ARRAY 0x900B
-#define GL_SAMPLER_CUBE_MAP_ARRAY 0x900C
-#define GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW 0x900D
-#define GL_INT_SAMPLER_CUBE_MAP_ARRAY 0x900E
-#define GL_UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY 0x900F
-#define GL_DRAW_INDIRECT_BUFFER 0x8F3F
-#define GL_DRAW_INDIRECT_BUFFER_BINDING 0x8F43
-#define GL_GEOMETRY_SHADER_INVOCATIONS 0x887F
-#define GL_MAX_GEOMETRY_SHADER_INVOCATIONS 0x8E5A
-#define GL_MIN_FRAGMENT_INTERPOLATION_OFFSET 0x8E5B
-#define GL_MAX_FRAGMENT_INTERPOLATION_OFFSET 0x8E5C
-#define GL_FRAGMENT_INTERPOLATION_OFFSET_BITS 0x8E5D
-#define GL_MAX_VERTEX_STREAMS 0x8E71
-#define GL_DOUBLE_VEC2 0x8FFC
-#define GL_DOUBLE_VEC3 0x8FFD
-#define GL_DOUBLE_VEC4 0x8FFE
-#define GL_DOUBLE_MAT2 0x8F46
-#define GL_DOUBLE_MAT3 0x8F47
-#define GL_DOUBLE_MAT4 0x8F48
-#define GL_DOUBLE_MAT2x3 0x8F49
-#define GL_DOUBLE_MAT2x4 0x8F4A
-#define GL_DOUBLE_MAT3x2 0x8F4B
-#define GL_DOUBLE_MAT3x4 0x8F4C
-#define GL_DOUBLE_MAT4x2 0x8F4D
-#define GL_DOUBLE_MAT4x3 0x8F4E
-#define GL_ACTIVE_SUBROUTINES 0x8DE5
-#define GL_ACTIVE_SUBROUTINE_UNIFORMS 0x8DE6
-#define GL_ACTIVE_SUBROUTINE_UNIFORM_LOCATIONS 0x8E47
-#define GL_ACTIVE_SUBROUTINE_MAX_LENGTH 0x8E48
-#define GL_ACTIVE_SUBROUTINE_UNIFORM_MAX_LENGTH 0x8E49
-#define GL_MAX_SUBROUTINES 0x8DE7
-#define GL_MAX_SUBROUTINE_UNIFORM_LOCATIONS 0x8DE8
-#define GL_NUM_COMPATIBLE_SUBROUTINES 0x8E4A
-#define GL_COMPATIBLE_SUBROUTINES 0x8E4B
-#define GL_PATCHES 0x000E
-#define GL_PATCH_VERTICES 0x8E72
-#define GL_PATCH_DEFAULT_INNER_LEVEL 0x8E73
-#define GL_PATCH_DEFAULT_OUTER_LEVEL 0x8E74
-#define GL_TESS_CONTROL_OUTPUT_VERTICES 0x8E75
-#define GL_TESS_GEN_MODE 0x8E76
-#define GL_TESS_GEN_SPACING 0x8E77
-#define GL_TESS_GEN_VERTEX_ORDER 0x8E78
-#define GL_TESS_GEN_POINT_MODE 0x8E79
-#define GL_ISOLINES 0x8E7A
-#define GL_QUADS 0x0007
-#define GL_FRACTIONAL_ODD 0x8E7B
-#define GL_FRACTIONAL_EVEN 0x8E7C
-#define GL_MAX_PATCH_VERTICES 0x8E7D
-#define GL_MAX_TESS_GEN_LEVEL 0x8E7E
-#define GL_MAX_TESS_CONTROL_UNIFORM_COMPONENTS 0x8E7F
-#define GL_MAX_TESS_EVALUATION_UNIFORM_COMPONENTS 0x8E80
-#define GL_MAX_TESS_CONTROL_TEXTURE_IMAGE_UNITS 0x8E81
-#define GL_MAX_TESS_EVALUATION_TEXTURE_IMAGE_UNITS 0x8E82
-#define GL_MAX_TESS_CONTROL_OUTPUT_COMPONENTS 0x8E83
-#define GL_MAX_TESS_PATCH_COMPONENTS 0x8E84
-#define GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS 0x8E85
-#define GL_MAX_TESS_EVALUATION_OUTPUT_COMPONENTS 0x8E86
-#define GL_MAX_TESS_CONTROL_UNIFORM_BLOCKS 0x8E89
-#define GL_MAX_TESS_EVALUATION_UNIFORM_BLOCKS 0x8E8A
-#define GL_MAX_TESS_CONTROL_INPUT_COMPONENTS 0x886C
-#define GL_MAX_TESS_EVALUATION_INPUT_COMPONENTS 0x886D
-#define GL_MAX_COMBINED_TESS_CONTROL_UNIFORM_COMPONENTS 0x8E1E
-#define GL_MAX_COMBINED_TESS_EVALUATION_UNIFORM_COMPONENTS 0x8E1F
-#define GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_CONTROL_SHADER 0x84F0
-#define GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_EVALUATION_SHADER 0x84F1
-#define GL_TESS_EVALUATION_SHADER 0x8E87
-#define GL_TESS_CONTROL_SHADER 0x8E88
-#define GL_TRANSFORM_FEEDBACK 0x8E22
-#define GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED 0x8E23
-#define GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE 0x8E24
-#define GL_TRANSFORM_FEEDBACK_BINDING 0x8E25
-#define GL_MAX_TRANSFORM_FEEDBACK_BUFFERS 0x8E70
-#define GL_FIXED 0x140C
-#define GL_IMPLEMENTATION_COLOR_READ_TYPE 0x8B9A
-#define GL_IMPLEMENTATION_COLOR_READ_FORMAT 0x8B9B
-#define GL_LOW_FLOAT 0x8DF0
-#define GL_MEDIUM_FLOAT 0x8DF1
-#define GL_HIGH_FLOAT 0x8DF2
-#define GL_LOW_INT 0x8DF3
-#define GL_MEDIUM_INT 0x8DF4
-#define GL_HIGH_INT 0x8DF5
-#define GL_SHADER_COMPILER 0x8DFA
-#define GL_SHADER_BINARY_FORMATS 0x8DF8
-#define GL_NUM_SHADER_BINARY_FORMATS 0x8DF9
-#define GL_MAX_VERTEX_UNIFORM_VECTORS 0x8DFB
-#define GL_MAX_VARYING_VECTORS 0x8DFC
-#define GL_MAX_FRAGMENT_UNIFORM_VECTORS 0x8DFD
-#define GL_RGB565 0x8D62
-#define GL_PROGRAM_BINARY_RETRIEVABLE_HINT 0x8257
-#define GL_PROGRAM_BINARY_LENGTH 0x8741
-#define GL_NUM_PROGRAM_BINARY_FORMATS 0x87FE
-#define GL_PROGRAM_BINARY_FORMATS 0x87FF
-#define GL_VERTEX_SHADER_BIT 0x00000001
-#define GL_FRAGMENT_SHADER_BIT 0x00000002
-#define GL_GEOMETRY_SHADER_BIT 0x00000004
-#define GL_TESS_CONTROL_SHADER_BIT 0x00000008
-#define GL_TESS_EVALUATION_SHADER_BIT 0x00000010
-#define GL_ALL_SHADER_BITS 0xFFFFFFFF
-#define GL_PROGRAM_SEPARABLE 0x8258
-#define GL_ACTIVE_PROGRAM 0x8259
-#define GL_PROGRAM_PIPELINE_BINDING 0x825A
-#define GL_MAX_VIEWPORTS 0x825B
-#define GL_VIEWPORT_SUBPIXEL_BITS 0x825C
-#define GL_VIEWPORT_BOUNDS_RANGE 0x825D
-#define GL_LAYER_PROVOKING_VERTEX 0x825E
-#define GL_VIEWPORT_INDEX_PROVOKING_VERTEX 0x825F
-#define GL_UNDEFINED_VERTEX 0x8260
-#define GL_COPY_READ_BUFFER_BINDING 0x8F36
-#define GL_COPY_WRITE_BUFFER_BINDING 0x8F37
-#define GL_TRANSFORM_FEEDBACK_ACTIVE 0x8E24
-#define GL_TRANSFORM_FEEDBACK_PAUSED 0x8E23
-#define GL_UNPACK_COMPRESSED_BLOCK_WIDTH 0x9127
-#define GL_UNPACK_COMPRESSED_BLOCK_HEIGHT 0x9128
-#define GL_UNPACK_COMPRESSED_BLOCK_DEPTH 0x9129
-#define GL_UNPACK_COMPRESSED_BLOCK_SIZE 0x912A
-#define GL_PACK_COMPRESSED_BLOCK_WIDTH 0x912B
-#define GL_PACK_COMPRESSED_BLOCK_HEIGHT 0x912C
-#define GL_PACK_COMPRESSED_BLOCK_DEPTH 0x912D
-#define GL_PACK_COMPRESSED_BLOCK_SIZE 0x912E
-#define GL_NUM_SAMPLE_COUNTS 0x9380
-#define GL_MIN_MAP_BUFFER_ALIGNMENT 0x90BC
-#define GL_ATOMIC_COUNTER_BUFFER 0x92C0
-#define GL_ATOMIC_COUNTER_BUFFER_BINDING 0x92C1
-#define GL_ATOMIC_COUNTER_BUFFER_START 0x92C2
-#define GL_ATOMIC_COUNTER_BUFFER_SIZE 0x92C3
-#define GL_ATOMIC_COUNTER_BUFFER_DATA_SIZE 0x92C4
-#define GL_ATOMIC_COUNTER_BUFFER_ACTIVE_ATOMIC_COUNTERS 0x92C5
-#define GL_ATOMIC_COUNTER_BUFFER_ACTIVE_ATOMIC_COUNTER_INDICES 0x92C6
-#define GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_VERTEX_SHADER 0x92C7
-#define GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_TESS_CONTROL_SHADER 0x92C8
-#define GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_TESS_EVALUATION_SHADER 0x92C9
-#define GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_GEOMETRY_SHADER 0x92CA
-#define GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_FRAGMENT_SHADER 0x92CB
-#define GL_MAX_VERTEX_ATOMIC_COUNTER_BUFFERS 0x92CC
-#define GL_MAX_TESS_CONTROL_ATOMIC_COUNTER_BUFFERS 0x92CD
-#define GL_MAX_TESS_EVALUATION_ATOMIC_COUNTER_BUFFERS 0x92CE
-#define GL_MAX_GEOMETRY_ATOMIC_COUNTER_BUFFERS 0x92CF
-#define GL_MAX_FRAGMENT_ATOMIC_COUNTER_BUFFERS 0x92D0
-#define GL_MAX_COMBINED_ATOMIC_COUNTER_BUFFERS 0x92D1
-#define GL_MAX_VERTEX_ATOMIC_COUNTERS 0x92D2
-#define GL_MAX_TESS_CONTROL_ATOMIC_COUNTERS 0x92D3
-#define GL_MAX_TESS_EVALUATION_ATOMIC_COUNTERS 0x92D4
-#define GL_MAX_GEOMETRY_ATOMIC_COUNTERS 0x92D5
-#define GL_MAX_FRAGMENT_ATOMIC_COUNTERS 0x92D6
-#define GL_MAX_COMBINED_ATOMIC_COUNTERS 0x92D7
-#define GL_MAX_ATOMIC_COUNTER_BUFFER_SIZE 0x92D8
-#define GL_MAX_ATOMIC_COUNTER_BUFFER_BINDINGS 0x92DC
-#define GL_ACTIVE_ATOMIC_COUNTER_BUFFERS 0x92D9
-#define GL_UNIFORM_ATOMIC_COUNTER_BUFFER_INDEX 0x92DA
-#define GL_UNSIGNED_INT_ATOMIC_COUNTER 0x92DB
-#define GL_VERTEX_ATTRIB_ARRAY_BARRIER_BIT 0x00000001
-#define GL_ELEMENT_ARRAY_BARRIER_BIT 0x00000002
-#define GL_UNIFORM_BARRIER_BIT 0x00000004
-#define GL_TEXTURE_FETCH_BARRIER_BIT 0x00000008
-#define GL_SHADER_IMAGE_ACCESS_BARRIER_BIT 0x00000020
-#define GL_COMMAND_BARRIER_BIT 0x00000040
-#define GL_PIXEL_BUFFER_BARRIER_BIT 0x00000080
-#define GL_TEXTURE_UPDATE_BARRIER_BIT 0x00000100
-#define GL_BUFFER_UPDATE_BARRIER_BIT 0x00000200
-#define GL_FRAMEBUFFER_BARRIER_BIT 0x00000400
-#define GL_TRANSFORM_FEEDBACK_BARRIER_BIT 0x00000800
-#define GL_ATOMIC_COUNTER_BARRIER_BIT 0x00001000
-#define GL_ALL_BARRIER_BITS 0xFFFFFFFF
-#define GL_MAX_IMAGE_UNITS 0x8F38
-#define GL_MAX_COMBINED_IMAGE_UNITS_AND_FRAGMENT_OUTPUTS 0x8F39
-#define GL_IMAGE_BINDING_NAME 0x8F3A
-#define GL_IMAGE_BINDING_LEVEL 0x8F3B
-#define GL_IMAGE_BINDING_LAYERED 0x8F3C
-#define GL_IMAGE_BINDING_LAYER 0x8F3D
-#define GL_IMAGE_BINDING_ACCESS 0x8F3E
-#define GL_IMAGE_1D 0x904C
-#define GL_IMAGE_2D 0x904D
-#define GL_IMAGE_3D 0x904E
-#define GL_IMAGE_2D_RECT 0x904F
-#define GL_IMAGE_CUBE 0x9050
-#define GL_IMAGE_BUFFER 0x9051
-#define GL_IMAGE_1D_ARRAY 0x9052
-#define GL_IMAGE_2D_ARRAY 0x9053
-#define GL_IMAGE_CUBE_MAP_ARRAY 0x9054
-#define GL_IMAGE_2D_MULTISAMPLE 0x9055
-#define GL_IMAGE_2D_MULTISAMPLE_ARRAY 0x9056
-#define GL_INT_IMAGE_1D 0x9057
-#define GL_INT_IMAGE_2D 0x9058
-#define GL_INT_IMAGE_3D 0x9059
-#define GL_INT_IMAGE_2D_RECT 0x905A
-#define GL_INT_IMAGE_CUBE 0x905B
-#define GL_INT_IMAGE_BUFFER 0x905C
-#define GL_INT_IMAGE_1D_ARRAY 0x905D
-#define GL_INT_IMAGE_2D_ARRAY 0x905E
-#define GL_INT_IMAGE_CUBE_MAP_ARRAY 0x905F
-#define GL_INT_IMAGE_2D_MULTISAMPLE 0x9060
-#define GL_INT_IMAGE_2D_MULTISAMPLE_ARRAY 0x9061
-#define GL_UNSIGNED_INT_IMAGE_1D 0x9062
-#define GL_UNSIGNED_INT_IMAGE_2D 0x9063
-#define GL_UNSIGNED_INT_IMAGE_3D 0x9064
-#define GL_UNSIGNED_INT_IMAGE_2D_RECT 0x9065
-#define GL_UNSIGNED_INT_IMAGE_CUBE 0x9066
-#define GL_UNSIGNED_INT_IMAGE_BUFFER 0x9067
-#define GL_UNSIGNED_INT_IMAGE_1D_ARRAY 0x9068
-#define GL_UNSIGNED_INT_IMAGE_2D_ARRAY 0x9069
-#define GL_UNSIGNED_INT_IMAGE_CUBE_MAP_ARRAY 0x906A
-#define GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE 0x906B
-#define GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_ARRAY 0x906C
-#define GL_MAX_IMAGE_SAMPLES 0x906D
-#define GL_IMAGE_BINDING_FORMAT 0x906E
-#define GL_IMAGE_FORMAT_COMPATIBILITY_TYPE 0x90C7
-#define GL_IMAGE_FORMAT_COMPATIBILITY_BY_SIZE 0x90C8
-#define GL_IMAGE_FORMAT_COMPATIBILITY_BY_CLASS 0x90C9
-#define GL_MAX_VERTEX_IMAGE_UNIFORMS 0x90CA
-#define GL_MAX_TESS_CONTROL_IMAGE_UNIFORMS 0x90CB
-#define GL_MAX_TESS_EVALUATION_IMAGE_UNIFORMS 0x90CC
-#define GL_MAX_GEOMETRY_IMAGE_UNIFORMS 0x90CD
-#define GL_MAX_FRAGMENT_IMAGE_UNIFORMS 0x90CE
-#define GL_MAX_COMBINED_IMAGE_UNIFORMS 0x90CF
-#define GL_COMPRESSED_RGBA_BPTC_UNORM 0x8E8C
-#define GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM 0x8E8D
-#define GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT 0x8E8E
-#define GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT 0x8E8F
-#define GL_TEXTURE_IMMUTABLE_FORMAT 0x912F
-#define GL_NUM_SHADING_LANGUAGE_VERSIONS 0x82E9
-#define GL_VERTEX_ATTRIB_ARRAY_LONG 0x874E
-#define GL_COMPRESSED_RGB8_ETC2 0x9274
-#define GL_COMPRESSED_SRGB8_ETC2 0x9275
-#define GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2 0x9276
-#define GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2 0x9277
-#define GL_COMPRESSED_RGBA8_ETC2_EAC 0x9278
-#define GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC 0x9279
-#define GL_COMPRESSED_R11_EAC 0x9270
-#define GL_COMPRESSED_SIGNED_R11_EAC 0x9271
-#define GL_COMPRESSED_RG11_EAC 0x9272
-#define GL_COMPRESSED_SIGNED_RG11_EAC 0x9273
-#define GL_PRIMITIVE_RESTART_FIXED_INDEX 0x8D69
-#define GL_ANY_SAMPLES_PASSED_CONSERVATIVE 0x8D6A
-#define GL_MAX_ELEMENT_INDEX 0x8D6B
-#define GL_COMPUTE_SHADER 0x91B9
-#define GL_MAX_COMPUTE_UNIFORM_BLOCKS 0x91BB
-#define GL_MAX_COMPUTE_TEXTURE_IMAGE_UNITS 0x91BC
-#define GL_MAX_COMPUTE_IMAGE_UNIFORMS 0x91BD
-#define GL_MAX_COMPUTE_SHARED_MEMORY_SIZE 0x8262
-#define GL_MAX_COMPUTE_UNIFORM_COMPONENTS 0x8263
-#define GL_MAX_COMPUTE_ATOMIC_COUNTER_BUFFERS 0x8264
-#define GL_MAX_COMPUTE_ATOMIC_COUNTERS 0x8265
-#define GL_MAX_COMBINED_COMPUTE_UNIFORM_COMPONENTS 0x8266
-#define GL_MAX_COMPUTE_WORK_GROUP_INVOCATIONS 0x90EB
-#define GL_MAX_COMPUTE_WORK_GROUP_COUNT 0x91BE
-#define GL_MAX_COMPUTE_WORK_GROUP_SIZE 0x91BF
-#define GL_COMPUTE_WORK_GROUP_SIZE 0x8267
-#define GL_UNIFORM_BLOCK_REFERENCED_BY_COMPUTE_SHADER 0x90EC
-#define GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_COMPUTE_SHADER 0x90ED
-#define GL_DISPATCH_INDIRECT_BUFFER 0x90EE
-#define GL_DISPATCH_INDIRECT_BUFFER_BINDING 0x90EF
-#define GL_COMPUTE_SHADER_BIT 0x00000020
-#define GL_DEBUG_OUTPUT_SYNCHRONOUS 0x8242
-#define GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH 0x8243
-#define GL_DEBUG_CALLBACK_FUNCTION 0x8244
-#define GL_DEBUG_CALLBACK_USER_PARAM 0x8245
-#define GL_DEBUG_SOURCE_API 0x8246
-#define GL_DEBUG_SOURCE_WINDOW_SYSTEM 0x8247
-#define GL_DEBUG_SOURCE_SHADER_COMPILER 0x8248
-#define GL_DEBUG_SOURCE_THIRD_PARTY 0x8249
-#define GL_DEBUG_SOURCE_APPLICATION 0x824A
-#define GL_DEBUG_SOURCE_OTHER 0x824B
-#define GL_DEBUG_TYPE_ERROR 0x824C
-#define GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR 0x824D
-#define GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR 0x824E
-#define GL_DEBUG_TYPE_PORTABILITY 0x824F
-#define GL_DEBUG_TYPE_PERFORMANCE 0x8250
-#define GL_DEBUG_TYPE_OTHER 0x8251
-#define GL_MAX_DEBUG_MESSAGE_LENGTH 0x9143
-#define GL_MAX_DEBUG_LOGGED_MESSAGES 0x9144
-#define GL_DEBUG_LOGGED_MESSAGES 0x9145
-#define GL_DEBUG_SEVERITY_HIGH 0x9146
-#define GL_DEBUG_SEVERITY_MEDIUM 0x9147
-#define GL_DEBUG_SEVERITY_LOW 0x9148
-#define GL_DEBUG_TYPE_MARKER 0x8268
-#define GL_DEBUG_TYPE_PUSH_GROUP 0x8269
-#define GL_DEBUG_TYPE_POP_GROUP 0x826A
-#define GL_DEBUG_SEVERITY_NOTIFICATION 0x826B
-#define GL_MAX_DEBUG_GROUP_STACK_DEPTH 0x826C
-#define GL_DEBUG_GROUP_STACK_DEPTH 0x826D
-#define GL_BUFFER 0x82E0
-#define GL_SHADER 0x82E1
-#define GL_PROGRAM 0x82E2
-#define GL_VERTEX_ARRAY 0x8074
-#define GL_QUERY 0x82E3
-#define GL_PROGRAM_PIPELINE 0x82E4
-#define GL_SAMPLER 0x82E6
-#define GL_MAX_LABEL_LENGTH 0x82E8
-#define GL_DEBUG_OUTPUT 0x92E0
-#define GL_CONTEXT_FLAG_DEBUG_BIT 0x00000002
-#define GL_MAX_UNIFORM_LOCATIONS 0x826E
-#define GL_FRAMEBUFFER_DEFAULT_WIDTH 0x9310
-#define GL_FRAMEBUFFER_DEFAULT_HEIGHT 0x9311
-#define GL_FRAMEBUFFER_DEFAULT_LAYERS 0x9312
-#define GL_FRAMEBUFFER_DEFAULT_SAMPLES 0x9313
-#define GL_FRAMEBUFFER_DEFAULT_FIXED_SAMPLE_LOCATIONS 0x9314
-#define GL_MAX_FRAMEBUFFER_WIDTH 0x9315
-#define GL_MAX_FRAMEBUFFER_HEIGHT 0x9316
-#define GL_MAX_FRAMEBUFFER_LAYERS 0x9317
-#define GL_MAX_FRAMEBUFFER_SAMPLES 0x9318
-#define GL_INTERNALFORMAT_SUPPORTED 0x826F
-#define GL_INTERNALFORMAT_PREFERRED 0x8270
-#define GL_INTERNALFORMAT_RED_SIZE 0x8271
-#define GL_INTERNALFORMAT_GREEN_SIZE 0x8272
-#define GL_INTERNALFORMAT_BLUE_SIZE 0x8273
-#define GL_INTERNALFORMAT_ALPHA_SIZE 0x8274
-#define GL_INTERNALFORMAT_DEPTH_SIZE 0x8275
-#define GL_INTERNALFORMAT_STENCIL_SIZE 0x8276
-#define GL_INTERNALFORMAT_SHARED_SIZE 0x8277
-#define GL_INTERNALFORMAT_RED_TYPE 0x8278
-#define GL_INTERNALFORMAT_GREEN_TYPE 0x8279
-#define GL_INTERNALFORMAT_BLUE_TYPE 0x827A
-#define GL_INTERNALFORMAT_ALPHA_TYPE 0x827B
-#define GL_INTERNALFORMAT_DEPTH_TYPE 0x827C
-#define GL_INTERNALFORMAT_STENCIL_TYPE 0x827D
-#define GL_MAX_WIDTH 0x827E
-#define GL_MAX_HEIGHT 0x827F
-#define GL_MAX_DEPTH 0x8280
-#define GL_MAX_LAYERS 0x8281
-#define GL_MAX_COMBINED_DIMENSIONS 0x8282
-#define GL_COLOR_COMPONENTS 0x8283
-#define GL_DEPTH_COMPONENTS 0x8284
-#define GL_STENCIL_COMPONENTS 0x8285
-#define GL_COLOR_RENDERABLE 0x8286
-#define GL_DEPTH_RENDERABLE 0x8287
-#define GL_STENCIL_RENDERABLE 0x8288
-#define GL_FRAMEBUFFER_RENDERABLE 0x8289
-#define GL_FRAMEBUFFER_RENDERABLE_LAYERED 0x828A
-#define GL_FRAMEBUFFER_BLEND 0x828B
-#define GL_READ_PIXELS 0x828C
-#define GL_READ_PIXELS_FORMAT 0x828D
-#define GL_READ_PIXELS_TYPE 0x828E
-#define GL_TEXTURE_IMAGE_FORMAT 0x828F
-#define GL_TEXTURE_IMAGE_TYPE 0x8290
-#define GL_GET_TEXTURE_IMAGE_FORMAT 0x8291
-#define GL_GET_TEXTURE_IMAGE_TYPE 0x8292
-#define GL_MIPMAP 0x8293
-#define GL_MANUAL_GENERATE_MIPMAP 0x8294
-#define GL_AUTO_GENERATE_MIPMAP 0x8295
-#define GL_COLOR_ENCODING 0x8296
-#define GL_SRGB_READ 0x8297
-#define GL_SRGB_WRITE 0x8298
-#define GL_FILTER 0x829A
-#define GL_VERTEX_TEXTURE 0x829B
-#define GL_TESS_CONTROL_TEXTURE 0x829C
-#define GL_TESS_EVALUATION_TEXTURE 0x829D
-#define GL_GEOMETRY_TEXTURE 0x829E
-#define GL_FRAGMENT_TEXTURE 0x829F
-#define GL_COMPUTE_TEXTURE 0x82A0
-#define GL_TEXTURE_SHADOW 0x82A1
-#define GL_TEXTURE_GATHER 0x82A2
-#define GL_TEXTURE_GATHER_SHADOW 0x82A3
-#define GL_SHADER_IMAGE_LOAD 0x82A4
-#define GL_SHADER_IMAGE_STORE 0x82A5
-#define GL_SHADER_IMAGE_ATOMIC 0x82A6
-#define GL_IMAGE_TEXEL_SIZE 0x82A7
-#define GL_IMAGE_COMPATIBILITY_CLASS 0x82A8
-#define GL_IMAGE_PIXEL_FORMAT 0x82A9
-#define GL_IMAGE_PIXEL_TYPE 0x82AA
-#define GL_SIMULTANEOUS_TEXTURE_AND_DEPTH_TEST 0x82AC
-#define GL_SIMULTANEOUS_TEXTURE_AND_STENCIL_TEST 0x82AD
-#define GL_SIMULTANEOUS_TEXTURE_AND_DEPTH_WRITE 0x82AE
-#define GL_SIMULTANEOUS_TEXTURE_AND_STENCIL_WRITE 0x82AF
-#define GL_TEXTURE_COMPRESSED_BLOCK_WIDTH 0x82B1
-#define GL_TEXTURE_COMPRESSED_BLOCK_HEIGHT 0x82B2
-#define GL_TEXTURE_COMPRESSED_BLOCK_SIZE 0x82B3
-#define GL_CLEAR_BUFFER 0x82B4
-#define GL_TEXTURE_VIEW 0x82B5
-#define GL_VIEW_COMPATIBILITY_CLASS 0x82B6
-#define GL_FULL_SUPPORT 0x82B7
-#define GL_CAVEAT_SUPPORT 0x82B8
-#define GL_IMAGE_CLASS_4_X_32 0x82B9
-#define GL_IMAGE_CLASS_2_X_32 0x82BA
-#define GL_IMAGE_CLASS_1_X_32 0x82BB
-#define GL_IMAGE_CLASS_4_X_16 0x82BC
-#define GL_IMAGE_CLASS_2_X_16 0x82BD
-#define GL_IMAGE_CLASS_1_X_16 0x82BE
-#define GL_IMAGE_CLASS_4_X_8 0x82BF
-#define GL_IMAGE_CLASS_2_X_8 0x82C0
-#define GL_IMAGE_CLASS_1_X_8 0x82C1
-#define GL_IMAGE_CLASS_11_11_10 0x82C2
-#define GL_IMAGE_CLASS_10_10_10_2 0x82C3
-#define GL_VIEW_CLASS_128_BITS 0x82C4
-#define GL_VIEW_CLASS_96_BITS 0x82C5
-#define GL_VIEW_CLASS_64_BITS 0x82C6
-#define GL_VIEW_CLASS_48_BITS 0x82C7
-#define GL_VIEW_CLASS_32_BITS 0x82C8
-#define GL_VIEW_CLASS_24_BITS 0x82C9
-#define GL_VIEW_CLASS_16_BITS 0x82CA
-#define GL_VIEW_CLASS_8_BITS 0x82CB
-#define GL_VIEW_CLASS_S3TC_DXT1_RGB 0x82CC
-#define GL_VIEW_CLASS_S3TC_DXT1_RGBA 0x82CD
-#define GL_VIEW_CLASS_S3TC_DXT3_RGBA 0x82CE
-#define GL_VIEW_CLASS_S3TC_DXT5_RGBA 0x82CF
-#define GL_VIEW_CLASS_RGTC1_RED 0x82D0
-#define GL_VIEW_CLASS_RGTC2_RG 0x82D1
-#define GL_VIEW_CLASS_BPTC_UNORM 0x82D2
-#define GL_VIEW_CLASS_BPTC_FLOAT 0x82D3
-#define GL_UNIFORM 0x92E1
-#define GL_UNIFORM_BLOCK 0x92E2
-#define GL_PROGRAM_INPUT 0x92E3
-#define GL_PROGRAM_OUTPUT 0x92E4
-#define GL_BUFFER_VARIABLE 0x92E5
-#define GL_SHADER_STORAGE_BLOCK 0x92E6
-#define GL_VERTEX_SUBROUTINE 0x92E8
-#define GL_TESS_CONTROL_SUBROUTINE 0x92E9
-#define GL_TESS_EVALUATION_SUBROUTINE 0x92EA
-#define GL_GEOMETRY_SUBROUTINE 0x92EB
-#define GL_FRAGMENT_SUBROUTINE 0x92EC
-#define GL_COMPUTE_SUBROUTINE 0x92ED
-#define GL_VERTEX_SUBROUTINE_UNIFORM 0x92EE
-#define GL_TESS_CONTROL_SUBROUTINE_UNIFORM 0x92EF
-#define GL_TESS_EVALUATION_SUBROUTINE_UNIFORM 0x92F0
-#define GL_GEOMETRY_SUBROUTINE_UNIFORM 0x92F1
-#define GL_FRAGMENT_SUBROUTINE_UNIFORM 0x92F2
-#define GL_COMPUTE_SUBROUTINE_UNIFORM 0x92F3
-#define GL_TRANSFORM_FEEDBACK_VARYING 0x92F4
-#define GL_ACTIVE_RESOURCES 0x92F5
-#define GL_MAX_NAME_LENGTH 0x92F6
-#define GL_MAX_NUM_ACTIVE_VARIABLES 0x92F7
-#define GL_MAX_NUM_COMPATIBLE_SUBROUTINES 0x92F8
-#define GL_NAME_LENGTH 0x92F9
-#define GL_TYPE 0x92FA
-#define GL_ARRAY_SIZE 0x92FB
-#define GL_OFFSET 0x92FC
-#define GL_BLOCK_INDEX 0x92FD
-#define GL_ARRAY_STRIDE 0x92FE
-#define GL_MATRIX_STRIDE 0x92FF
-#define GL_IS_ROW_MAJOR 0x9300
-#define GL_ATOMIC_COUNTER_BUFFER_INDEX 0x9301
-#define GL_BUFFER_BINDING 0x9302
-#define GL_BUFFER_DATA_SIZE 0x9303
-#define GL_NUM_ACTIVE_VARIABLES 0x9304
-#define GL_ACTIVE_VARIABLES 0x9305
-#define GL_REFERENCED_BY_VERTEX_SHADER 0x9306
-#define GL_REFERENCED_BY_TESS_CONTROL_SHADER 0x9307
-#define GL_REFERENCED_BY_TESS_EVALUATION_SHADER 0x9308
-#define GL_REFERENCED_BY_GEOMETRY_SHADER 0x9309
-#define GL_REFERENCED_BY_FRAGMENT_SHADER 0x930A
-#define GL_REFERENCED_BY_COMPUTE_SHADER 0x930B
-#define GL_TOP_LEVEL_ARRAY_SIZE 0x930C
-#define GL_TOP_LEVEL_ARRAY_STRIDE 0x930D
-#define GL_LOCATION 0x930E
-#define GL_LOCATION_INDEX 0x930F
-#define GL_IS_PER_PATCH 0x92E7
-#define GL_SHADER_STORAGE_BUFFER 0x90D2
-#define GL_SHADER_STORAGE_BUFFER_BINDING 0x90D3
-#define GL_SHADER_STORAGE_BUFFER_START 0x90D4
-#define GL_SHADER_STORAGE_BUFFER_SIZE 0x90D5
-#define GL_MAX_VERTEX_SHADER_STORAGE_BLOCKS 0x90D6
-#define GL_MAX_GEOMETRY_SHADER_STORAGE_BLOCKS 0x90D7
-#define GL_MAX_TESS_CONTROL_SHADER_STORAGE_BLOCKS 0x90D8
-#define GL_MAX_TESS_EVALUATION_SHADER_STORAGE_BLOCKS 0x90D9
-#define GL_MAX_FRAGMENT_SHADER_STORAGE_BLOCKS 0x90DA
-#define GL_MAX_COMPUTE_SHADER_STORAGE_BLOCKS 0x90DB
-#define GL_MAX_COMBINED_SHADER_STORAGE_BLOCKS 0x90DC
-#define GL_MAX_SHADER_STORAGE_BUFFER_BINDINGS 0x90DD
-#define GL_MAX_SHADER_STORAGE_BLOCK_SIZE 0x90DE
-#define GL_SHADER_STORAGE_BUFFER_OFFSET_ALIGNMENT 0x90DF
-#define GL_SHADER_STORAGE_BARRIER_BIT 0x00002000
-#define GL_MAX_COMBINED_SHADER_OUTPUT_RESOURCES 0x8F39
-#define GL_DEPTH_STENCIL_TEXTURE_MODE 0x90EA
-#define GL_TEXTURE_BUFFER_OFFSET 0x919D
-#define GL_TEXTURE_BUFFER_SIZE 0x919E
-#define GL_TEXTURE_BUFFER_OFFSET_ALIGNMENT 0x919F
-#define GL_TEXTURE_VIEW_MIN_LEVEL 0x82DB
-#define GL_TEXTURE_VIEW_NUM_LEVELS 0x82DC
-#define GL_TEXTURE_VIEW_MIN_LAYER 0x82DD
-#define GL_TEXTURE_VIEW_NUM_LAYERS 0x82DE
-#define GL_TEXTURE_IMMUTABLE_LEVELS 0x82DF
-#define GL_VERTEX_ATTRIB_BINDING 0x82D4
-#define GL_VERTEX_ATTRIB_RELATIVE_OFFSET 0x82D5
-#define GL_VERTEX_BINDING_DIVISOR 0x82D6
-#define GL_VERTEX_BINDING_OFFSET 0x82D7
-#define GL_VERTEX_BINDING_STRIDE 0x82D8
-#define GL_MAX_VERTEX_ATTRIB_RELATIVE_OFFSET 0x82D9
-#define GL_MAX_VERTEX_ATTRIB_BINDINGS 0x82DA
-#define GL_VERTEX_BINDING_BUFFER 0x8F4F
-#define GL_DISPLAY_LIST 0x82E7
-#define GL_STACK_UNDERFLOW 0x0504
-#define GL_STACK_OVERFLOW 0x0503
-#ifndef GL_VERSION_1_0
-#define GL_VERSION_1_0 1
-GLAPI int GLAD_GL_VERSION_1_0;
-typedef void (APIENTRYP PFNGLCULLFACEPROC)(GLenum mode);
-GLAPI PFNGLCULLFACEPROC glad_glCullFace;
-#define glCullFace glad_glCullFace
-typedef void (APIENTRYP PFNGLFRONTFACEPROC)(GLenum mode);
-GLAPI PFNGLFRONTFACEPROC glad_glFrontFace;
-#define glFrontFace glad_glFrontFace
-typedef void (APIENTRYP PFNGLHINTPROC)(GLenum target, GLenum mode);
-GLAPI PFNGLHINTPROC glad_glHint;
-#define glHint glad_glHint
-typedef void (APIENTRYP PFNGLLINEWIDTHPROC)(GLfloat width);
-GLAPI PFNGLLINEWIDTHPROC glad_glLineWidth;
-#define glLineWidth glad_glLineWidth
-typedef void (APIENTRYP PFNGLPOINTSIZEPROC)(GLfloat size);
-GLAPI PFNGLPOINTSIZEPROC glad_glPointSize;
-#define glPointSize glad_glPointSize
-typedef void (APIENTRYP PFNGLPOLYGONMODEPROC)(GLenum face, GLenum mode);
-GLAPI PFNGLPOLYGONMODEPROC glad_glPolygonMode;
-#define glPolygonMode glad_glPolygonMode
-typedef void (APIENTRYP PFNGLSCISSORPROC)(GLint x, GLint y, GLsizei width, GLsizei height);
-GLAPI PFNGLSCISSORPROC glad_glScissor;
-#define glScissor glad_glScissor
-typedef void (APIENTRYP PFNGLTEXPARAMETERFPROC)(GLenum target, GLenum pname, GLfloat param);
-GLAPI PFNGLTEXPARAMETERFPROC glad_glTexParameterf;
-#define glTexParameterf glad_glTexParameterf
-typedef void (APIENTRYP PFNGLTEXPARAMETERFVPROC)(GLenum target, GLenum pname, const GLfloat *params);
-GLAPI PFNGLTEXPARAMETERFVPROC glad_glTexParameterfv;
-#define glTexParameterfv glad_glTexParameterfv
-typedef void (APIENTRYP PFNGLTEXPARAMETERIPROC)(GLenum target, GLenum pname, GLint param);
-GLAPI PFNGLTEXPARAMETERIPROC glad_glTexParameteri;
-#define glTexParameteri glad_glTexParameteri
-typedef void (APIENTRYP PFNGLTEXPARAMETERIVPROC)(GLenum target, GLenum pname, const GLint *params);
-GLAPI PFNGLTEXPARAMETERIVPROC glad_glTexParameteriv;
-#define glTexParameteriv glad_glTexParameteriv
-typedef void (APIENTRYP PFNGLTEXIMAGE1DPROC)(GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const void *pixels);
-GLAPI PFNGLTEXIMAGE1DPROC glad_glTexImage1D;
-#define glTexImage1D glad_glTexImage1D
-typedef void (APIENTRYP PFNGLTEXIMAGE2DPROC)(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const void *pixels);
-GLAPI PFNGLTEXIMAGE2DPROC glad_glTexImage2D;
-#define glTexImage2D glad_glTexImage2D
-typedef void (APIENTRYP PFNGLDRAWBUFFERPROC)(GLenum buf);
-GLAPI PFNGLDRAWBUFFERPROC glad_glDrawBuffer;
-#define glDrawBuffer glad_glDrawBuffer
-typedef void (APIENTRYP PFNGLCLEARPROC)(GLbitfield mask);
-GLAPI PFNGLCLEARPROC glad_glClear;
-#define glClear glad_glClear
-typedef void (APIENTRYP PFNGLCLEARCOLORPROC)(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
-GLAPI PFNGLCLEARCOLORPROC glad_glClearColor;
-#define glClearColor glad_glClearColor
-typedef void (APIENTRYP PFNGLCLEARSTENCILPROC)(GLint s);
-GLAPI PFNGLCLEARSTENCILPROC glad_glClearStencil;
-#define glClearStencil glad_glClearStencil
-typedef void (APIENTRYP PFNGLCLEARDEPTHPROC)(GLdouble depth);
-GLAPI PFNGLCLEARDEPTHPROC glad_glClearDepth;
-#define glClearDepth glad_glClearDepth
-typedef void (APIENTRYP PFNGLSTENCILMASKPROC)(GLuint mask);
-GLAPI PFNGLSTENCILMASKPROC glad_glStencilMask;
-#define glStencilMask glad_glStencilMask
-typedef void (APIENTRYP PFNGLCOLORMASKPROC)(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
-GLAPI PFNGLCOLORMASKPROC glad_glColorMask;
-#define glColorMask glad_glColorMask
-typedef void (APIENTRYP PFNGLDEPTHMASKPROC)(GLboolean flag);
-GLAPI PFNGLDEPTHMASKPROC glad_glDepthMask;
-#define glDepthMask glad_glDepthMask
-typedef void (APIENTRYP PFNGLDISABLEPROC)(GLenum cap);
-GLAPI PFNGLDISABLEPROC glad_glDisable;
-#define glDisable glad_glDisable
-typedef void (APIENTRYP PFNGLENABLEPROC)(GLenum cap);
-GLAPI PFNGLENABLEPROC glad_glEnable;
-#define glEnable glad_glEnable
-typedef void (APIENTRYP PFNGLFINISHPROC)(void);
-GLAPI PFNGLFINISHPROC glad_glFinish;
-#define glFinish glad_glFinish
-typedef void (APIENTRYP PFNGLFLUSHPROC)(void);
-GLAPI PFNGLFLUSHPROC glad_glFlush;
-#define glFlush glad_glFlush
-typedef void (APIENTRYP PFNGLBLENDFUNCPROC)(GLenum sfactor, GLenum dfactor);
-GLAPI PFNGLBLENDFUNCPROC glad_glBlendFunc;
-#define glBlendFunc glad_glBlendFunc
-typedef void (APIENTRYP PFNGLLOGICOPPROC)(GLenum opcode);
-GLAPI PFNGLLOGICOPPROC glad_glLogicOp;
-#define glLogicOp glad_glLogicOp
-typedef void (APIENTRYP PFNGLSTENCILFUNCPROC)(GLenum func, GLint ref, GLuint mask);
-GLAPI PFNGLSTENCILFUNCPROC glad_glStencilFunc;
-#define glStencilFunc glad_glStencilFunc
-typedef void (APIENTRYP PFNGLSTENCILOPPROC)(GLenum fail, GLenum zfail, GLenum zpass);
-GLAPI PFNGLSTENCILOPPROC glad_glStencilOp;
-#define glStencilOp glad_glStencilOp
-typedef void (APIENTRYP PFNGLDEPTHFUNCPROC)(GLenum func);
-GLAPI PFNGLDEPTHFUNCPROC glad_glDepthFunc;
-#define glDepthFunc glad_glDepthFunc
-typedef void (APIENTRYP PFNGLPIXELSTOREFPROC)(GLenum pname, GLfloat param);
-GLAPI PFNGLPIXELSTOREFPROC glad_glPixelStoref;
-#define glPixelStoref glad_glPixelStoref
-typedef void (APIENTRYP PFNGLPIXELSTOREIPROC)(GLenum pname, GLint param);
-GLAPI PFNGLPIXELSTOREIPROC glad_glPixelStorei;
-#define glPixelStorei glad_glPixelStorei
-typedef void (APIENTRYP PFNGLREADBUFFERPROC)(GLenum src);
-GLAPI PFNGLREADBUFFERPROC glad_glReadBuffer;
-#define glReadBuffer glad_glReadBuffer
-typedef void (APIENTRYP PFNGLREADPIXELSPROC)(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, void *pixels);
-GLAPI PFNGLREADPIXELSPROC glad_glReadPixels;
-#define glReadPixels glad_glReadPixels
-typedef void (APIENTRYP PFNGLGETBOOLEANVPROC)(GLenum pname, GLboolean *data);
-GLAPI PFNGLGETBOOLEANVPROC glad_glGetBooleanv;
-#define glGetBooleanv glad_glGetBooleanv
-typedef void (APIENTRYP PFNGLGETDOUBLEVPROC)(GLenum pname, GLdouble *data);
-GLAPI PFNGLGETDOUBLEVPROC glad_glGetDoublev;
-#define glGetDoublev glad_glGetDoublev
-typedef GLenum (APIENTRYP PFNGLGETERRORPROC)(void);
-GLAPI PFNGLGETERRORPROC glad_glGetError;
-#define glGetError glad_glGetError
-typedef void (APIENTRYP PFNGLGETFLOATVPROC)(GLenum pname, GLfloat *data);
-GLAPI PFNGLGETFLOATVPROC glad_glGetFloatv;
-#define glGetFloatv glad_glGetFloatv
-typedef void (APIENTRYP PFNGLGETINTEGERVPROC)(GLenum pname, GLint *data);
-GLAPI PFNGLGETINTEGERVPROC glad_glGetIntegerv;
-#define glGetIntegerv glad_glGetIntegerv
-typedef const GLubyte * (APIENTRYP PFNGLGETSTRINGPROC)(GLenum name);
-GLAPI PFNGLGETSTRINGPROC glad_glGetString;
-#define glGetString glad_glGetString
-typedef void (APIENTRYP PFNGLGETTEXIMAGEPROC)(GLenum target, GLint level, GLenum format, GLenum type, void *pixels);
-GLAPI PFNGLGETTEXIMAGEPROC glad_glGetTexImage;
-#define glGetTexImage glad_glGetTexImage
-typedef void (APIENTRYP PFNGLGETTEXPARAMETERFVPROC)(GLenum target, GLenum pname, GLfloat *params);
-GLAPI PFNGLGETTEXPARAMETERFVPROC glad_glGetTexParameterfv;
-#define glGetTexParameterfv glad_glGetTexParameterfv
-typedef void (APIENTRYP PFNGLGETTEXPARAMETERIVPROC)(GLenum target, GLenum pname, GLint *params);
-GLAPI PFNGLGETTEXPARAMETERIVPROC glad_glGetTexParameteriv;
-#define glGetTexParameteriv glad_glGetTexParameteriv
-typedef void (APIENTRYP PFNGLGETTEXLEVELPARAMETERFVPROC)(GLenum target, GLint level, GLenum pname, GLfloat *params);
-GLAPI PFNGLGETTEXLEVELPARAMETERFVPROC glad_glGetTexLevelParameterfv;
-#define glGetTexLevelParameterfv glad_glGetTexLevelParameterfv
-typedef void (APIENTRYP PFNGLGETTEXLEVELPARAMETERIVPROC)(GLenum target, GLint level, GLenum pname, GLint *params);
-GLAPI PFNGLGETTEXLEVELPARAMETERIVPROC glad_glGetTexLevelParameteriv;
-#define glGetTexLevelParameteriv glad_glGetTexLevelParameteriv
-typedef GLboolean (APIENTRYP PFNGLISENABLEDPROC)(GLenum cap);
-GLAPI PFNGLISENABLEDPROC glad_glIsEnabled;
-#define glIsEnabled glad_glIsEnabled
-typedef void (APIENTRYP PFNGLDEPTHRANGEPROC)(GLdouble n, GLdouble f);
-GLAPI PFNGLDEPTHRANGEPROC glad_glDepthRange;
-#define glDepthRange glad_glDepthRange
-typedef void (APIENTRYP PFNGLVIEWPORTPROC)(GLint x, GLint y, GLsizei width, GLsizei height);
-GLAPI PFNGLVIEWPORTPROC glad_glViewport;
-#define glViewport glad_glViewport
-#endif
-#ifndef GL_VERSION_1_1
-#define GL_VERSION_1_1 1
-GLAPI int GLAD_GL_VERSION_1_1;
-typedef void (APIENTRYP PFNGLDRAWARRAYSPROC)(GLenum mode, GLint first, GLsizei count);
-GLAPI PFNGLDRAWARRAYSPROC glad_glDrawArrays;
-#define glDrawArrays glad_glDrawArrays
-typedef void (APIENTRYP PFNGLDRAWELEMENTSPROC)(GLenum mode, GLsizei count, GLenum type, const void *indices);
-GLAPI PFNGLDRAWELEMENTSPROC glad_glDrawElements;
-#define glDrawElements glad_glDrawElements
-typedef void (APIENTRYP PFNGLPOLYGONOFFSETPROC)(GLfloat factor, GLfloat units);
-GLAPI PFNGLPOLYGONOFFSETPROC glad_glPolygonOffset;
-#define glPolygonOffset glad_glPolygonOffset
-typedef void (APIENTRYP PFNGLCOPYTEXIMAGE1DPROC)(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
-GLAPI PFNGLCOPYTEXIMAGE1DPROC glad_glCopyTexImage1D;
-#define glCopyTexImage1D glad_glCopyTexImage1D
-typedef void (APIENTRYP PFNGLCOPYTEXIMAGE2DPROC)(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
-GLAPI PFNGLCOPYTEXIMAGE2DPROC glad_glCopyTexImage2D;
-#define glCopyTexImage2D glad_glCopyTexImage2D
-typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE1DPROC)(GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
-GLAPI PFNGLCOPYTEXSUBIMAGE1DPROC glad_glCopyTexSubImage1D;
-#define glCopyTexSubImage1D glad_glCopyTexSubImage1D
-typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE2DPROC)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-GLAPI PFNGLCOPYTEXSUBIMAGE2DPROC glad_glCopyTexSubImage2D;
-#define glCopyTexSubImage2D glad_glCopyTexSubImage2D
-typedef void (APIENTRYP PFNGLTEXSUBIMAGE1DPROC)(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const void *pixels);
-GLAPI PFNGLTEXSUBIMAGE1DPROC glad_glTexSubImage1D;
-#define glTexSubImage1D glad_glTexSubImage1D
-typedef void (APIENTRYP PFNGLTEXSUBIMAGE2DPROC)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels);
-GLAPI PFNGLTEXSUBIMAGE2DPROC glad_glTexSubImage2D;
-#define glTexSubImage2D glad_glTexSubImage2D
-typedef void (APIENTRYP PFNGLBINDTEXTUREPROC)(GLenum target, GLuint texture);
-GLAPI PFNGLBINDTEXTUREPROC glad_glBindTexture;
-#define glBindTexture glad_glBindTexture
-typedef void (APIENTRYP PFNGLDELETETEXTURESPROC)(GLsizei n, const GLuint *textures);
-GLAPI PFNGLDELETETEXTURESPROC glad_glDeleteTextures;
-#define glDeleteTextures glad_glDeleteTextures
-typedef void (APIENTRYP PFNGLGENTEXTURESPROC)(GLsizei n, GLuint *textures);
-GLAPI PFNGLGENTEXTURESPROC glad_glGenTextures;
-#define glGenTextures glad_glGenTextures
-typedef GLboolean (APIENTRYP PFNGLISTEXTUREPROC)(GLuint texture);
-GLAPI PFNGLISTEXTUREPROC glad_glIsTexture;
-#define glIsTexture glad_glIsTexture
-#endif
-#ifndef GL_VERSION_1_2
-#define GL_VERSION_1_2 1
-GLAPI int GLAD_GL_VERSION_1_2;
-typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSPROC)(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices);
-GLAPI PFNGLDRAWRANGEELEMENTSPROC glad_glDrawRangeElements;
-#define glDrawRangeElements glad_glDrawRangeElements
-typedef void (APIENTRYP PFNGLTEXIMAGE3DPROC)(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels);
-GLAPI PFNGLTEXIMAGE3DPROC glad_glTexImage3D;
-#define glTexImage3D glad_glTexImage3D
-typedef void (APIENTRYP PFNGLTEXSUBIMAGE3DPROC)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels);
-GLAPI PFNGLTEXSUBIMAGE3DPROC glad_glTexSubImage3D;
-#define glTexSubImage3D glad_glTexSubImage3D
-typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE3DPROC)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-GLAPI PFNGLCOPYTEXSUBIMAGE3DPROC glad_glCopyTexSubImage3D;
-#define glCopyTexSubImage3D glad_glCopyTexSubImage3D
-#endif
-#ifndef GL_VERSION_1_3
-#define GL_VERSION_1_3 1
-GLAPI int GLAD_GL_VERSION_1_3;
-typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC)(GLenum texture);
-GLAPI PFNGLACTIVETEXTUREPROC glad_glActiveTexture;
-#define glActiveTexture glad_glActiveTexture
-typedef void (APIENTRYP PFNGLSAMPLECOVERAGEPROC)(GLfloat value, GLboolean invert);
-GLAPI PFNGLSAMPLECOVERAGEPROC glad_glSampleCoverage;
-#define glSampleCoverage glad_glSampleCoverage
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DPROC)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *data);
-GLAPI PFNGLCOMPRESSEDTEXIMAGE3DPROC glad_glCompressedTexImage3D;
-#define glCompressedTexImage3D glad_glCompressedTexImage3D
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DPROC)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *data);
-GLAPI PFNGLCOMPRESSEDTEXIMAGE2DPROC glad_glCompressedTexImage2D;
-#define glCompressedTexImage2D glad_glCompressedTexImage2D
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE1DPROC)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const void *data);
-GLAPI PFNGLCOMPRESSEDTEXIMAGE1DPROC glad_glCompressedTexImage1D;
-#define glCompressedTexImage1D glad_glCompressedTexImage1D
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data);
-GLAPI PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC glad_glCompressedTexSubImage3D;
-#define glCompressedTexSubImage3D glad_glCompressedTexSubImage3D
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *data);
-GLAPI PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC glad_glCompressedTexSubImage2D;
-#define glCompressedTexSubImage2D glad_glCompressedTexSubImage2D
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC)(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *data);
-GLAPI PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC glad_glCompressedTexSubImage1D;
-#define glCompressedTexSubImage1D glad_glCompressedTexSubImage1D
-typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEPROC)(GLenum target, GLint level, void *img);
-GLAPI PFNGLGETCOMPRESSEDTEXIMAGEPROC glad_glGetCompressedTexImage;
-#define glGetCompressedTexImage glad_glGetCompressedTexImage
-#endif
-#ifndef GL_VERSION_1_4
-#define GL_VERSION_1_4 1
-GLAPI int GLAD_GL_VERSION_1_4;
-typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
-GLAPI PFNGLBLENDFUNCSEPARATEPROC glad_glBlendFuncSeparate;
-#define glBlendFuncSeparate glad_glBlendFuncSeparate
-typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSPROC)(GLenum mode, const GLint *first, const GLsizei *count, GLsizei drawcount);
-GLAPI PFNGLMULTIDRAWARRAYSPROC glad_glMultiDrawArrays;
-#define glMultiDrawArrays glad_glMultiDrawArrays
-typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSPROC)(GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei drawcount);
-GLAPI PFNGLMULTIDRAWELEMENTSPROC glad_glMultiDrawElements;
-#define glMultiDrawElements glad_glMultiDrawElements
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFPROC)(GLenum pname, GLfloat param);
-GLAPI PFNGLPOINTPARAMETERFPROC glad_glPointParameterf;
-#define glPointParameterf glad_glPointParameterf
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFVPROC)(GLenum pname, const GLfloat *params);
-GLAPI PFNGLPOINTPARAMETERFVPROC glad_glPointParameterfv;
-#define glPointParameterfv glad_glPointParameterfv
-typedef void (APIENTRYP PFNGLPOINTPARAMETERIPROC)(GLenum pname, GLint param);
-GLAPI PFNGLPOINTPARAMETERIPROC glad_glPointParameteri;
-#define glPointParameteri glad_glPointParameteri
-typedef void (APIENTRYP PFNGLPOINTPARAMETERIVPROC)(GLenum pname, const GLint *params);
-GLAPI PFNGLPOINTPARAMETERIVPROC glad_glPointParameteriv;
-#define glPointParameteriv glad_glPointParameteriv
-typedef void (APIENTRYP PFNGLBLENDCOLORPROC)(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
-GLAPI PFNGLBLENDCOLORPROC glad_glBlendColor;
-#define glBlendColor glad_glBlendColor
-typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC)(GLenum mode);
-GLAPI PFNGLBLENDEQUATIONPROC glad_glBlendEquation;
-#define glBlendEquation glad_glBlendEquation
-#endif
-#ifndef GL_VERSION_1_5
-#define GL_VERSION_1_5 1
-GLAPI int GLAD_GL_VERSION_1_5;
-typedef void (APIENTRYP PFNGLGENQUERIESPROC)(GLsizei n, GLuint *ids);
-GLAPI PFNGLGENQUERIESPROC glad_glGenQueries;
-#define glGenQueries glad_glGenQueries
-typedef void (APIENTRYP PFNGLDELETEQUERIESPROC)(GLsizei n, const GLuint *ids);
-GLAPI PFNGLDELETEQUERIESPROC glad_glDeleteQueries;
-#define glDeleteQueries glad_glDeleteQueries
-typedef GLboolean (APIENTRYP PFNGLISQUERYPROC)(GLuint id);
-GLAPI PFNGLISQUERYPROC glad_glIsQuery;
-#define glIsQuery glad_glIsQuery
-typedef void (APIENTRYP PFNGLBEGINQUERYPROC)(GLenum target, GLuint id);
-GLAPI PFNGLBEGINQUERYPROC glad_glBeginQuery;
-#define glBeginQuery glad_glBeginQuery
-typedef void (APIENTRYP PFNGLENDQUERYPROC)(GLenum target);
-GLAPI PFNGLENDQUERYPROC glad_glEndQuery;
-#define glEndQuery glad_glEndQuery
-typedef void (APIENTRYP PFNGLGETQUERYIVPROC)(GLenum target, GLenum pname, GLint *params);
-GLAPI PFNGLGETQUERYIVPROC glad_glGetQueryiv;
-#define glGetQueryiv glad_glGetQueryiv
-typedef void (APIENTRYP PFNGLGETQUERYOBJECTIVPROC)(GLuint id, GLenum pname, GLint *params);
-GLAPI PFNGLGETQUERYOBJECTIVPROC glad_glGetQueryObjectiv;
-#define glGetQueryObjectiv glad_glGetQueryObjectiv
-typedef void (APIENTRYP PFNGLGETQUERYOBJECTUIVPROC)(GLuint id, GLenum pname, GLuint *params);
-GLAPI PFNGLGETQUERYOBJECTUIVPROC glad_glGetQueryObjectuiv;
-#define glGetQueryObjectuiv glad_glGetQueryObjectuiv
-typedef void (APIENTRYP PFNGLBINDBUFFERPROC)(GLenum target, GLuint buffer);
-GLAPI PFNGLBINDBUFFERPROC glad_glBindBuffer;
-#define glBindBuffer glad_glBindBuffer
-typedef void (APIENTRYP PFNGLDELETEBUFFERSPROC)(GLsizei n, const GLuint *buffers);
-GLAPI PFNGLDELETEBUFFERSPROC glad_glDeleteBuffers;
-#define glDeleteBuffers glad_glDeleteBuffers
-typedef void (APIENTRYP PFNGLGENBUFFERSPROC)(GLsizei n, GLuint *buffers);
-GLAPI PFNGLGENBUFFERSPROC glad_glGenBuffers;
-#define glGenBuffers glad_glGenBuffers
-typedef GLboolean (APIENTRYP PFNGLISBUFFERPROC)(GLuint buffer);
-GLAPI PFNGLISBUFFERPROC glad_glIsBuffer;
-#define glIsBuffer glad_glIsBuffer
-typedef void (APIENTRYP PFNGLBUFFERDATAPROC)(GLenum target, GLsizeiptr size, const void *data, GLenum usage);
-GLAPI PFNGLBUFFERDATAPROC glad_glBufferData;
-#define glBufferData glad_glBufferData
-typedef void (APIENTRYP PFNGLBUFFERSUBDATAPROC)(GLenum target, GLintptr offset, GLsizeiptr size, const void *data);
-GLAPI PFNGLBUFFERSUBDATAPROC glad_glBufferSubData;
-#define glBufferSubData glad_glBufferSubData
-typedef void (APIENTRYP PFNGLGETBUFFERSUBDATAPROC)(GLenum target, GLintptr offset, GLsizeiptr size, void *data);
-GLAPI PFNGLGETBUFFERSUBDATAPROC glad_glGetBufferSubData;
-#define glGetBufferSubData glad_glGetBufferSubData
-typedef void * (APIENTRYP PFNGLMAPBUFFERPROC)(GLenum target, GLenum access);
-GLAPI PFNGLMAPBUFFERPROC glad_glMapBuffer;
-#define glMapBuffer glad_glMapBuffer
-typedef GLboolean (APIENTRYP PFNGLUNMAPBUFFERPROC)(GLenum target);
-GLAPI PFNGLUNMAPBUFFERPROC glad_glUnmapBuffer;
-#define glUnmapBuffer glad_glUnmapBuffer
-typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERIVPROC)(GLenum target, GLenum pname, GLint *params);
-GLAPI PFNGLGETBUFFERPARAMETERIVPROC glad_glGetBufferParameteriv;
-#define glGetBufferParameteriv glad_glGetBufferParameteriv
-typedef void (APIENTRYP PFNGLGETBUFFERPOINTERVPROC)(GLenum target, GLenum pname, void **params);
-GLAPI PFNGLGETBUFFERPOINTERVPROC glad_glGetBufferPointerv;
-#define glGetBufferPointerv glad_glGetBufferPointerv
-#endif
-#ifndef GL_VERSION_2_0
-#define GL_VERSION_2_0 1
-GLAPI int GLAD_GL_VERSION_2_0;
-typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEPROC)(GLenum modeRGB, GLenum modeAlpha);
-GLAPI PFNGLBLENDEQUATIONSEPARATEPROC glad_glBlendEquationSeparate;
-#define glBlendEquationSeparate glad_glBlendEquationSeparate
-typedef void (APIENTRYP PFNGLDRAWBUFFERSPROC)(GLsizei n, const GLenum *bufs);
-GLAPI PFNGLDRAWBUFFERSPROC glad_glDrawBuffers;
-#define glDrawBuffers glad_glDrawBuffers
-typedef void (APIENTRYP PFNGLSTENCILOPSEPARATEPROC)(GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
-GLAPI PFNGLSTENCILOPSEPARATEPROC glad_glStencilOpSeparate;
-#define glStencilOpSeparate glad_glStencilOpSeparate
-typedef void (APIENTRYP PFNGLSTENCILFUNCSEPARATEPROC)(GLenum face, GLenum func, GLint ref, GLuint mask);
-GLAPI PFNGLSTENCILFUNCSEPARATEPROC glad_glStencilFuncSeparate;
-#define glStencilFuncSeparate glad_glStencilFuncSeparate
-typedef void (APIENTRYP PFNGLSTENCILMASKSEPARATEPROC)(GLenum face, GLuint mask);
-GLAPI PFNGLSTENCILMASKSEPARATEPROC glad_glStencilMaskSeparate;
-#define glStencilMaskSeparate glad_glStencilMaskSeparate
-typedef void (APIENTRYP PFNGLATTACHSHADERPROC)(GLuint program, GLuint shader);
-GLAPI PFNGLATTACHSHADERPROC glad_glAttachShader;
-#define glAttachShader glad_glAttachShader
-typedef void (APIENTRYP PFNGLBINDATTRIBLOCATIONPROC)(GLuint program, GLuint index, const GLchar *name);
-GLAPI PFNGLBINDATTRIBLOCATIONPROC glad_glBindAttribLocation;
-#define glBindAttribLocation glad_glBindAttribLocation
-typedef void (APIENTRYP PFNGLCOMPILESHADERPROC)(GLuint shader);
-GLAPI PFNGLCOMPILESHADERPROC glad_glCompileShader;
-#define glCompileShader glad_glCompileShader
-typedef GLuint (APIENTRYP PFNGLCREATEPROGRAMPROC)(void);
-GLAPI PFNGLCREATEPROGRAMPROC glad_glCreateProgram;
-#define glCreateProgram glad_glCreateProgram
-typedef GLuint (APIENTRYP PFNGLCREATESHADERPROC)(GLenum type);
-GLAPI PFNGLCREATESHADERPROC glad_glCreateShader;
-#define glCreateShader glad_glCreateShader
-typedef void (APIENTRYP PFNGLDELETEPROGRAMPROC)(GLuint program);
-GLAPI PFNGLDELETEPROGRAMPROC glad_glDeleteProgram;
-#define glDeleteProgram glad_glDeleteProgram
-typedef void (APIENTRYP PFNGLDELETESHADERPROC)(GLuint shader);
-GLAPI PFNGLDELETESHADERPROC glad_glDeleteShader;
-#define glDeleteShader glad_glDeleteShader
-typedef void (APIENTRYP PFNGLDETACHSHADERPROC)(GLuint program, GLuint shader);
-GLAPI PFNGLDETACHSHADERPROC glad_glDetachShader;
-#define glDetachShader glad_glDetachShader
-typedef void (APIENTRYP PFNGLDISABLEVERTEXATTRIBARRAYPROC)(GLuint index);
-GLAPI PFNGLDISABLEVERTEXATTRIBARRAYPROC glad_glDisableVertexAttribArray;
-#define glDisableVertexAttribArray glad_glDisableVertexAttribArray
-typedef void (APIENTRYP PFNGLENABLEVERTEXATTRIBARRAYPROC)(GLuint index);
-GLAPI PFNGLENABLEVERTEXATTRIBARRAYPROC glad_glEnableVertexAttribArray;
-#define glEnableVertexAttribArray glad_glEnableVertexAttribArray
-typedef void (APIENTRYP PFNGLGETACTIVEATTRIBPROC)(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
-GLAPI PFNGLGETACTIVEATTRIBPROC glad_glGetActiveAttrib;
-#define glGetActiveAttrib glad_glGetActiveAttrib
-typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMPROC)(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
-GLAPI PFNGLGETACTIVEUNIFORMPROC glad_glGetActiveUniform;
-#define glGetActiveUniform glad_glGetActiveUniform
-typedef void (APIENTRYP PFNGLGETATTACHEDSHADERSPROC)(GLuint program, GLsizei maxCount, GLsizei *count, GLuint *shaders);
-GLAPI PFNGLGETATTACHEDSHADERSPROC glad_glGetAttachedShaders;
-#define glGetAttachedShaders glad_glGetAttachedShaders
-typedef GLint (APIENTRYP PFNGLGETATTRIBLOCATIONPROC)(GLuint program, const GLchar *name);
-GLAPI PFNGLGETATTRIBLOCATIONPROC glad_glGetAttribLocation;
-#define glGetAttribLocation glad_glGetAttribLocation
-typedef void (APIENTRYP PFNGLGETPROGRAMIVPROC)(GLuint program, GLenum pname, GLint *params);
-GLAPI PFNGLGETPROGRAMIVPROC glad_glGetProgramiv;
-#define glGetProgramiv glad_glGetProgramiv
-typedef void (APIENTRYP PFNGLGETPROGRAMINFOLOGPROC)(GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
-GLAPI PFNGLGETPROGRAMINFOLOGPROC glad_glGetProgramInfoLog;
-#define glGetProgramInfoLog glad_glGetProgramInfoLog
-typedef void (APIENTRYP PFNGLGETSHADERIVPROC)(GLuint shader, GLenum pname, GLint *params);
-GLAPI PFNGLGETSHADERIVPROC glad_glGetShaderiv;
-#define glGetShaderiv glad_glGetShaderiv
-typedef void (APIENTRYP PFNGLGETSHADERINFOLOGPROC)(GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
-GLAPI PFNGLGETSHADERINFOLOGPROC glad_glGetShaderInfoLog;
-#define glGetShaderInfoLog glad_glGetShaderInfoLog
-typedef void (APIENTRYP PFNGLGETSHADERSOURCEPROC)(GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source);
-GLAPI PFNGLGETSHADERSOURCEPROC glad_glGetShaderSource;
-#define glGetShaderSource glad_glGetShaderSource
-typedef GLint (APIENTRYP PFNGLGETUNIFORMLOCATIONPROC)(GLuint program, const GLchar *name);
-GLAPI PFNGLGETUNIFORMLOCATIONPROC glad_glGetUniformLocation;
-#define glGetUniformLocation glad_glGetUniformLocation
-typedef void (APIENTRYP PFNGLGETUNIFORMFVPROC)(GLuint program, GLint location, GLfloat *params);
-GLAPI PFNGLGETUNIFORMFVPROC glad_glGetUniformfv;
-#define glGetUniformfv glad_glGetUniformfv
-typedef void (APIENTRYP PFNGLGETUNIFORMIVPROC)(GLuint program, GLint location, GLint *params);
-GLAPI PFNGLGETUNIFORMIVPROC glad_glGetUniformiv;
-#define glGetUniformiv glad_glGetUniformiv
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVPROC)(GLuint index, GLenum pname, GLdouble *params);
-GLAPI PFNGLGETVERTEXATTRIBDVPROC glad_glGetVertexAttribdv;
-#define glGetVertexAttribdv glad_glGetVertexAttribdv
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVPROC)(GLuint index, GLenum pname, GLfloat *params);
-GLAPI PFNGLGETVERTEXATTRIBFVPROC glad_glGetVertexAttribfv;
-#define glGetVertexAttribfv glad_glGetVertexAttribfv
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVPROC)(GLuint index, GLenum pname, GLint *params);
-GLAPI PFNGLGETVERTEXATTRIBIVPROC glad_glGetVertexAttribiv;
-#define glGetVertexAttribiv glad_glGetVertexAttribiv
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVPROC)(GLuint index, GLenum pname, void **pointer);
-GLAPI PFNGLGETVERTEXATTRIBPOINTERVPROC glad_glGetVertexAttribPointerv;
-#define glGetVertexAttribPointerv glad_glGetVertexAttribPointerv
-typedef GLboolean (APIENTRYP PFNGLISPROGRAMPROC)(GLuint program);
-GLAPI PFNGLISPROGRAMPROC glad_glIsProgram;
-#define glIsProgram glad_glIsProgram
-typedef GLboolean (APIENTRYP PFNGLISSHADERPROC)(GLuint shader);
-GLAPI PFNGLISSHADERPROC glad_glIsShader;
-#define glIsShader glad_glIsShader
-typedef void (APIENTRYP PFNGLLINKPROGRAMPROC)(GLuint program);
-GLAPI PFNGLLINKPROGRAMPROC glad_glLinkProgram;
-#define glLinkProgram glad_glLinkProgram
-typedef void (APIENTRYP PFNGLSHADERSOURCEPROC)(GLuint shader, GLsizei count, const GLchar *const*string, const GLint *length);
-GLAPI PFNGLSHADERSOURCEPROC glad_glShaderSource;
-#define glShaderSource glad_glShaderSource
-typedef void (APIENTRYP PFNGLUSEPROGRAMPROC)(GLuint program);
-GLAPI PFNGLUSEPROGRAMPROC glad_glUseProgram;
-#define glUseProgram glad_glUseProgram
-typedef void (APIENTRYP PFNGLUNIFORM1FPROC)(GLint location, GLfloat v0);
-GLAPI PFNGLUNIFORM1FPROC glad_glUniform1f;
-#define glUniform1f glad_glUniform1f
-typedef void (APIENTRYP PFNGLUNIFORM2FPROC)(GLint location, GLfloat v0, GLfloat v1);
-GLAPI PFNGLUNIFORM2FPROC glad_glUniform2f;
-#define glUniform2f glad_glUniform2f
-typedef void (APIENTRYP PFNGLUNIFORM3FPROC)(GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
-GLAPI PFNGLUNIFORM3FPROC glad_glUniform3f;
-#define glUniform3f glad_glUniform3f
-typedef void (APIENTRYP PFNGLUNIFORM4FPROC)(GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
-GLAPI PFNGLUNIFORM4FPROC glad_glUniform4f;
-#define glUniform4f glad_glUniform4f
-typedef void (APIENTRYP PFNGLUNIFORM1IPROC)(GLint location, GLint v0);
-GLAPI PFNGLUNIFORM1IPROC glad_glUniform1i;
-#define glUniform1i glad_glUniform1i
-typedef void (APIENTRYP PFNGLUNIFORM2IPROC)(GLint location, GLint v0, GLint v1);
-GLAPI PFNGLUNIFORM2IPROC glad_glUniform2i;
-#define glUniform2i glad_glUniform2i
-typedef void (APIENTRYP PFNGLUNIFORM3IPROC)(GLint location, GLint v0, GLint v1, GLint v2);
-GLAPI PFNGLUNIFORM3IPROC glad_glUniform3i;
-#define glUniform3i glad_glUniform3i
-typedef void (APIENTRYP PFNGLUNIFORM4IPROC)(GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
-GLAPI PFNGLUNIFORM4IPROC glad_glUniform4i;
-#define glUniform4i glad_glUniform4i
-typedef void (APIENTRYP PFNGLUNIFORM1FVPROC)(GLint location, GLsizei count, const GLfloat *value);
-GLAPI PFNGLUNIFORM1FVPROC glad_glUniform1fv;
-#define glUniform1fv glad_glUniform1fv
-typedef void (APIENTRYP PFNGLUNIFORM2FVPROC)(GLint location, GLsizei count, const GLfloat *value);
-GLAPI PFNGLUNIFORM2FVPROC glad_glUniform2fv;
-#define glUniform2fv glad_glUniform2fv
-typedef void (APIENTRYP PFNGLUNIFORM3FVPROC)(GLint location, GLsizei count, const GLfloat *value);
-GLAPI PFNGLUNIFORM3FVPROC glad_glUniform3fv;
-#define glUniform3fv glad_glUniform3fv
-typedef void (APIENTRYP PFNGLUNIFORM4FVPROC)(GLint location, GLsizei count, const GLfloat *value);
-GLAPI PFNGLUNIFORM4FVPROC glad_glUniform4fv;
-#define glUniform4fv glad_glUniform4fv
-typedef void (APIENTRYP PFNGLUNIFORM1IVPROC)(GLint location, GLsizei count, const GLint *value);
-GLAPI PFNGLUNIFORM1IVPROC glad_glUniform1iv;
-#define glUniform1iv glad_glUniform1iv
-typedef void (APIENTRYP PFNGLUNIFORM2IVPROC)(GLint location, GLsizei count, const GLint *value);
-GLAPI PFNGLUNIFORM2IVPROC glad_glUniform2iv;
-#define glUniform2iv glad_glUniform2iv
-typedef void (APIENTRYP PFNGLUNIFORM3IVPROC)(GLint location, GLsizei count, const GLint *value);
-GLAPI PFNGLUNIFORM3IVPROC glad_glUniform3iv;
-#define glUniform3iv glad_glUniform3iv
-typedef void (APIENTRYP PFNGLUNIFORM4IVPROC)(GLint location, GLsizei count, const GLint *value);
-GLAPI PFNGLUNIFORM4IVPROC glad_glUniform4iv;
-#define glUniform4iv glad_glUniform4iv
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX2FVPROC)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GLAPI PFNGLUNIFORMMATRIX2FVPROC glad_glUniformMatrix2fv;
-#define glUniformMatrix2fv glad_glUniformMatrix2fv
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX3FVPROC)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GLAPI PFNGLUNIFORMMATRIX3FVPROC glad_glUniformMatrix3fv;
-#define glUniformMatrix3fv glad_glUniformMatrix3fv
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX4FVPROC)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GLAPI PFNGLUNIFORMMATRIX4FVPROC glad_glUniformMatrix4fv;
-#define glUniformMatrix4fv glad_glUniformMatrix4fv
-typedef void (APIENTRYP PFNGLVALIDATEPROGRAMPROC)(GLuint program);
-GLAPI PFNGLVALIDATEPROGRAMPROC glad_glValidateProgram;
-#define glValidateProgram glad_glValidateProgram
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1DPROC)(GLuint index, GLdouble x);
-GLAPI PFNGLVERTEXATTRIB1DPROC glad_glVertexAttrib1d;
-#define glVertexAttrib1d glad_glVertexAttrib1d
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVPROC)(GLuint index, const GLdouble *v);
-GLAPI PFNGLVERTEXATTRIB1DVPROC glad_glVertexAttrib1dv;
-#define glVertexAttrib1dv glad_glVertexAttrib1dv
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1FPROC)(GLuint index, GLfloat x);
-GLAPI PFNGLVERTEXATTRIB1FPROC glad_glVertexAttrib1f;
-#define glVertexAttrib1f glad_glVertexAttrib1f
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVPROC)(GLuint index, const GLfloat *v);
-GLAPI PFNGLVERTEXATTRIB1FVPROC glad_glVertexAttrib1fv;
-#define glVertexAttrib1fv glad_glVertexAttrib1fv
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1SPROC)(GLuint index, GLshort x);
-GLAPI PFNGLVERTEXATTRIB1SPROC glad_glVertexAttrib1s;
-#define glVertexAttrib1s glad_glVertexAttrib1s
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVPROC)(GLuint index, const GLshort *v);
-GLAPI PFNGLVERTEXATTRIB1SVPROC glad_glVertexAttrib1sv;
-#define glVertexAttrib1sv glad_glVertexAttrib1sv
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2DPROC)(GLuint index, GLdouble x, GLdouble y);
-GLAPI PFNGLVERTEXATTRIB2DPROC glad_glVertexAttrib2d;
-#define glVertexAttrib2d glad_glVertexAttrib2d
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVPROC)(GLuint index, const GLdouble *v);
-GLAPI PFNGLVERTEXATTRIB2DVPROC glad_glVertexAttrib2dv;
-#define glVertexAttrib2dv glad_glVertexAttrib2dv
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2FPROC)(GLuint index, GLfloat x, GLfloat y);
-GLAPI PFNGLVERTEXATTRIB2FPROC glad_glVertexAttrib2f;
-#define glVertexAttrib2f glad_glVertexAttrib2f
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVPROC)(GLuint index, const GLfloat *v);
-GLAPI PFNGLVERTEXATTRIB2FVPROC glad_glVertexAttrib2fv;
-#define glVertexAttrib2fv glad_glVertexAttrib2fv
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2SPROC)(GLuint index, GLshort x, GLshort y);
-GLAPI PFNGLVERTEXATTRIB2SPROC glad_glVertexAttrib2s;
-#define glVertexAttrib2s glad_glVertexAttrib2s
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVPROC)(GLuint index, const GLshort *v);
-GLAPI PFNGLVERTEXATTRIB2SVPROC glad_glVertexAttrib2sv;
-#define glVertexAttrib2sv glad_glVertexAttrib2sv
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3DPROC)(GLuint index, GLdouble x, GLdouble y, GLdouble z);
-GLAPI PFNGLVERTEXATTRIB3DPROC glad_glVertexAttrib3d;
-#define glVertexAttrib3d glad_glVertexAttrib3d
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVPROC)(GLuint index, const GLdouble *v);
-GLAPI PFNGLVERTEXATTRIB3DVPROC glad_glVertexAttrib3dv;
-#define glVertexAttrib3dv glad_glVertexAttrib3dv
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3FPROC)(GLuint index, GLfloat x, GLfloat y, GLfloat z);
-GLAPI PFNGLVERTEXATTRIB3FPROC glad_glVertexAttrib3f;
-#define glVertexAttrib3f glad_glVertexAttrib3f
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVPROC)(GLuint index, const GLfloat *v);
-GLAPI PFNGLVERTEXATTRIB3FVPROC glad_glVertexAttrib3fv;
-#define glVertexAttrib3fv glad_glVertexAttrib3fv
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3SPROC)(GLuint index, GLshort x, GLshort y, GLshort z);
-GLAPI PFNGLVERTEXATTRIB3SPROC glad_glVertexAttrib3s;
-#define glVertexAttrib3s glad_glVertexAttrib3s
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVPROC)(GLuint index, const GLshort *v);
-GLAPI PFNGLVERTEXATTRIB3SVPROC glad_glVertexAttrib3sv;
-#define glVertexAttrib3sv glad_glVertexAttrib3sv
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NBVPROC)(GLuint index, const GLbyte *v);
-GLAPI PFNGLVERTEXATTRIB4NBVPROC glad_glVertexAttrib4Nbv;
-#define glVertexAttrib4Nbv glad_glVertexAttrib4Nbv
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NIVPROC)(GLuint index, const GLint *v);
-GLAPI PFNGLVERTEXATTRIB4NIVPROC glad_glVertexAttrib4Niv;
-#define glVertexAttrib4Niv glad_glVertexAttrib4Niv
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NSVPROC)(GLuint index, const GLshort *v);
-GLAPI PFNGLVERTEXATTRIB4NSVPROC glad_glVertexAttrib4Nsv;
-#define glVertexAttrib4Nsv glad_glVertexAttrib4Nsv
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBPROC)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
-GLAPI PFNGLVERTEXATTRIB4NUBPROC glad_glVertexAttrib4Nub;
-#define glVertexAttrib4Nub glad_glVertexAttrib4Nub
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBVPROC)(GLuint index, const GLubyte *v);
-GLAPI PFNGLVERTEXATTRIB4NUBVPROC glad_glVertexAttrib4Nubv;
-#define glVertexAttrib4Nubv glad_glVertexAttrib4Nubv
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUIVPROC)(GLuint index, const GLuint *v);
-GLAPI PFNGLVERTEXATTRIB4NUIVPROC glad_glVertexAttrib4Nuiv;
-#define glVertexAttrib4Nuiv glad_glVertexAttrib4Nuiv
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUSVPROC)(GLuint index, const GLushort *v);
-GLAPI PFNGLVERTEXATTRIB4NUSVPROC glad_glVertexAttrib4Nusv;
-#define glVertexAttrib4Nusv glad_glVertexAttrib4Nusv
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4BVPROC)(GLuint index, const GLbyte *v);
-GLAPI PFNGLVERTEXATTRIB4BVPROC glad_glVertexAttrib4bv;
-#define glVertexAttrib4bv glad_glVertexAttrib4bv
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4DPROC)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-GLAPI PFNGLVERTEXATTRIB4DPROC glad_glVertexAttrib4d;
-#define glVertexAttrib4d glad_glVertexAttrib4d
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVPROC)(GLuint index, const GLdouble *v);
-GLAPI PFNGLVERTEXATTRIB4DVPROC glad_glVertexAttrib4dv;
-#define glVertexAttrib4dv glad_glVertexAttrib4dv
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4FPROC)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-GLAPI PFNGLVERTEXATTRIB4FPROC glad_glVertexAttrib4f;
-#define glVertexAttrib4f glad_glVertexAttrib4f
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVPROC)(GLuint index, const GLfloat *v);
-GLAPI PFNGLVERTEXATTRIB4FVPROC glad_glVertexAttrib4fv;
-#define glVertexAttrib4fv glad_glVertexAttrib4fv
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4IVPROC)(GLuint index, const GLint *v);
-GLAPI PFNGLVERTEXATTRIB4IVPROC glad_glVertexAttrib4iv;
-#define glVertexAttrib4iv glad_glVertexAttrib4iv
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4SPROC)(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
-GLAPI PFNGLVERTEXATTRIB4SPROC glad_glVertexAttrib4s;
-#define glVertexAttrib4s glad_glVertexAttrib4s
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVPROC)(GLuint index, const GLshort *v);
-GLAPI PFNGLVERTEXATTRIB4SVPROC glad_glVertexAttrib4sv;
-#define glVertexAttrib4sv glad_glVertexAttrib4sv
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVPROC)(GLuint index, const GLubyte *v);
-GLAPI PFNGLVERTEXATTRIB4UBVPROC glad_glVertexAttrib4ubv;
-#define glVertexAttrib4ubv glad_glVertexAttrib4ubv
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4UIVPROC)(GLuint index, const GLuint *v);
-GLAPI PFNGLVERTEXATTRIB4UIVPROC glad_glVertexAttrib4uiv;
-#define glVertexAttrib4uiv glad_glVertexAttrib4uiv
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4USVPROC)(GLuint index, const GLushort *v);
-GLAPI PFNGLVERTEXATTRIB4USVPROC glad_glVertexAttrib4usv;
-#define glVertexAttrib4usv glad_glVertexAttrib4usv
-typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERPROC)(GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void *pointer);
-GLAPI PFNGLVERTEXATTRIBPOINTERPROC glad_glVertexAttribPointer;
-#define glVertexAttribPointer glad_glVertexAttribPointer
-#endif
-#ifndef GL_VERSION_2_1
-#define GL_VERSION_2_1 1
-GLAPI int GLAD_GL_VERSION_2_1;
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X3FVPROC)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GLAPI PFNGLUNIFORMMATRIX2X3FVPROC glad_glUniformMatrix2x3fv;
-#define glUniformMatrix2x3fv glad_glUniformMatrix2x3fv
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X2FVPROC)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GLAPI PFNGLUNIFORMMATRIX3X2FVPROC glad_glUniformMatrix3x2fv;
-#define glUniformMatrix3x2fv glad_glUniformMatrix3x2fv
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X4FVPROC)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GLAPI PFNGLUNIFORMMATRIX2X4FVPROC glad_glUniformMatrix2x4fv;
-#define glUniformMatrix2x4fv glad_glUniformMatrix2x4fv
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X2FVPROC)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GLAPI PFNGLUNIFORMMATRIX4X2FVPROC glad_glUniformMatrix4x2fv;
-#define glUniformMatrix4x2fv glad_glUniformMatrix4x2fv
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X4FVPROC)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GLAPI PFNGLUNIFORMMATRIX3X4FVPROC glad_glUniformMatrix3x4fv;
-#define glUniformMatrix3x4fv glad_glUniformMatrix3x4fv
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X3FVPROC)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GLAPI PFNGLUNIFORMMATRIX4X3FVPROC glad_glUniformMatrix4x3fv;
-#define glUniformMatrix4x3fv glad_glUniformMatrix4x3fv
-#endif
-#ifndef GL_VERSION_3_0
-#define GL_VERSION_3_0 1
-GLAPI int GLAD_GL_VERSION_3_0;
-typedef void (APIENTRYP PFNGLCOLORMASKIPROC)(GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a);
-GLAPI PFNGLCOLORMASKIPROC glad_glColorMaski;
-#define glColorMaski glad_glColorMaski
-typedef void (APIENTRYP PFNGLGETBOOLEANI_VPROC)(GLenum target, GLuint index, GLboolean *data);
-GLAPI PFNGLGETBOOLEANI_VPROC glad_glGetBooleani_v;
-#define glGetBooleani_v glad_glGetBooleani_v
-typedef void (APIENTRYP PFNGLGETINTEGERI_VPROC)(GLenum target, GLuint index, GLint *data);
-GLAPI PFNGLGETINTEGERI_VPROC glad_glGetIntegeri_v;
-#define glGetIntegeri_v glad_glGetIntegeri_v
-typedef void (APIENTRYP PFNGLENABLEIPROC)(GLenum target, GLuint index);
-GLAPI PFNGLENABLEIPROC glad_glEnablei;
-#define glEnablei glad_glEnablei
-typedef void (APIENTRYP PFNGLDISABLEIPROC)(GLenum target, GLuint index);
-GLAPI PFNGLDISABLEIPROC glad_glDisablei;
-#define glDisablei glad_glDisablei
-typedef GLboolean (APIENTRYP PFNGLISENABLEDIPROC)(GLenum target, GLuint index);
-GLAPI PFNGLISENABLEDIPROC glad_glIsEnabledi;
-#define glIsEnabledi glad_glIsEnabledi
-typedef void (APIENTRYP PFNGLBEGINTRANSFORMFEEDBACKPROC)(GLenum primitiveMode);
-GLAPI PFNGLBEGINTRANSFORMFEEDBACKPROC glad_glBeginTransformFeedback;
-#define glBeginTransformFeedback glad_glBeginTransformFeedback
-typedef void (APIENTRYP PFNGLENDTRANSFORMFEEDBACKPROC)(void);
-GLAPI PFNGLENDTRANSFORMFEEDBACKPROC glad_glEndTransformFeedback;
-#define glEndTransformFeedback glad_glEndTransformFeedback
-typedef void (APIENTRYP PFNGLBINDBUFFERRANGEPROC)(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
-GLAPI PFNGLBINDBUFFERRANGEPROC glad_glBindBufferRange;
-#define glBindBufferRange glad_glBindBufferRange
-typedef void (APIENTRYP PFNGLBINDBUFFERBASEPROC)(GLenum target, GLuint index, GLuint buffer);
-GLAPI PFNGLBINDBUFFERBASEPROC glad_glBindBufferBase;
-#define glBindBufferBase glad_glBindBufferBase
-typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKVARYINGSPROC)(GLuint program, GLsizei count, const GLchar *const*varyings, GLenum bufferMode);
-GLAPI PFNGLTRANSFORMFEEDBACKVARYINGSPROC glad_glTransformFeedbackVaryings;
-#define glTransformFeedbackVaryings glad_glTransformFeedbackVaryings
-typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKVARYINGPROC)(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name);
-GLAPI PFNGLGETTRANSFORMFEEDBACKVARYINGPROC glad_glGetTransformFeedbackVarying;
-#define glGetTransformFeedbackVarying glad_glGetTransformFeedbackVarying
-typedef void (APIENTRYP PFNGLCLAMPCOLORPROC)(GLenum target, GLenum clamp);
-GLAPI PFNGLCLAMPCOLORPROC glad_glClampColor;
-#define glClampColor glad_glClampColor
-typedef void (APIENTRYP PFNGLBEGINCONDITIONALRENDERPROC)(GLuint id, GLenum mode);
-GLAPI PFNGLBEGINCONDITIONALRENDERPROC glad_glBeginConditionalRender;
-#define glBeginConditionalRender glad_glBeginConditionalRender
-typedef void (APIENTRYP PFNGLENDCONDITIONALRENDERPROC)(void);
-GLAPI PFNGLENDCONDITIONALRENDERPROC glad_glEndConditionalRender;
-#define glEndConditionalRender glad_glEndConditionalRender
-typedef void (APIENTRYP PFNGLVERTEXATTRIBIPOINTERPROC)(GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer);
-GLAPI PFNGLVERTEXATTRIBIPOINTERPROC glad_glVertexAttribIPointer;
-#define glVertexAttribIPointer glad_glVertexAttribIPointer
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIIVPROC)(GLuint index, GLenum pname, GLint *params);
-GLAPI PFNGLGETVERTEXATTRIBIIVPROC glad_glGetVertexAttribIiv;
-#define glGetVertexAttribIiv glad_glGetVertexAttribIiv
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIUIVPROC)(GLuint index, GLenum pname, GLuint *params);
-GLAPI PFNGLGETVERTEXATTRIBIUIVPROC glad_glGetVertexAttribIuiv;
-#define glGetVertexAttribIuiv glad_glGetVertexAttribIuiv
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IPROC)(GLuint index, GLint x);
-GLAPI PFNGLVERTEXATTRIBI1IPROC glad_glVertexAttribI1i;
-#define glVertexAttribI1i glad_glVertexAttribI1i
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IPROC)(GLuint index, GLint x, GLint y);
-GLAPI PFNGLVERTEXATTRIBI2IPROC glad_glVertexAttribI2i;
-#define glVertexAttribI2i glad_glVertexAttribI2i
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IPROC)(GLuint index, GLint x, GLint y, GLint z);
-GLAPI PFNGLVERTEXATTRIBI3IPROC glad_glVertexAttribI3i;
-#define glVertexAttribI3i glad_glVertexAttribI3i
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IPROC)(GLuint index, GLint x, GLint y, GLint z, GLint w);
-GLAPI PFNGLVERTEXATTRIBI4IPROC glad_glVertexAttribI4i;
-#define glVertexAttribI4i glad_glVertexAttribI4i
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIPROC)(GLuint index, GLuint x);
-GLAPI PFNGLVERTEXATTRIBI1UIPROC glad_glVertexAttribI1ui;
-#define glVertexAttribI1ui glad_glVertexAttribI1ui
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIPROC)(GLuint index, GLuint x, GLuint y);
-GLAPI PFNGLVERTEXATTRIBI2UIPROC glad_glVertexAttribI2ui;
-#define glVertexAttribI2ui glad_glVertexAttribI2ui
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIPROC)(GLuint index, GLuint x, GLuint y, GLuint z);
-GLAPI PFNGLVERTEXATTRIBI3UIPROC glad_glVertexAttribI3ui;
-#define glVertexAttribI3ui glad_glVertexAttribI3ui
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIPROC)(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
-GLAPI PFNGLVERTEXATTRIBI4UIPROC glad_glVertexAttribI4ui;
-#define glVertexAttribI4ui glad_glVertexAttribI4ui
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IVPROC)(GLuint index, const GLint *v);
-GLAPI PFNGLVERTEXATTRIBI1IVPROC glad_glVertexAttribI1iv;
-#define glVertexAttribI1iv glad_glVertexAttribI1iv
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IVPROC)(GLuint index, const GLint *v);
-GLAPI PFNGLVERTEXATTRIBI2IVPROC glad_glVertexAttribI2iv;
-#define glVertexAttribI2iv glad_glVertexAttribI2iv
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IVPROC)(GLuint index, const GLint *v);
-GLAPI PFNGLVERTEXATTRIBI3IVPROC glad_glVertexAttribI3iv;
-#define glVertexAttribI3iv glad_glVertexAttribI3iv
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IVPROC)(GLuint index, const GLint *v);
-GLAPI PFNGLVERTEXATTRIBI4IVPROC glad_glVertexAttribI4iv;
-#define glVertexAttribI4iv glad_glVertexAttribI4iv
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIVPROC)(GLuint index, const GLuint *v);
-GLAPI PFNGLVERTEXATTRIBI1UIVPROC glad_glVertexAttribI1uiv;
-#define glVertexAttribI1uiv glad_glVertexAttribI1uiv
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIVPROC)(GLuint index, const GLuint *v);
-GLAPI PFNGLVERTEXATTRIBI2UIVPROC glad_glVertexAttribI2uiv;
-#define glVertexAttribI2uiv glad_glVertexAttribI2uiv
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIVPROC)(GLuint index, const GLuint *v);
-GLAPI PFNGLVERTEXATTRIBI3UIVPROC glad_glVertexAttribI3uiv;
-#define glVertexAttribI3uiv glad_glVertexAttribI3uiv
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIVPROC)(GLuint index, const GLuint *v);
-GLAPI PFNGLVERTEXATTRIBI4UIVPROC glad_glVertexAttribI4uiv;
-#define glVertexAttribI4uiv glad_glVertexAttribI4uiv
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4BVPROC)(GLuint index, const GLbyte *v);
-GLAPI PFNGLVERTEXATTRIBI4BVPROC glad_glVertexAttribI4bv;
-#define glVertexAttribI4bv glad_glVertexAttribI4bv
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4SVPROC)(GLuint index, const GLshort *v);
-GLAPI PFNGLVERTEXATTRIBI4SVPROC glad_glVertexAttribI4sv;
-#define glVertexAttribI4sv glad_glVertexAttribI4sv
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UBVPROC)(GLuint index, const GLubyte *v);
-GLAPI PFNGLVERTEXATTRIBI4UBVPROC glad_glVertexAttribI4ubv;
-#define glVertexAttribI4ubv glad_glVertexAttribI4ubv
-typedef void (APIENTRYP PFNGLVERTEXATTRIBI4USVPROC)(GLuint index, const GLushort *v);
-GLAPI PFNGLVERTEXATTRIBI4USVPROC glad_glVertexAttribI4usv;
-#define glVertexAttribI4usv glad_glVertexAttribI4usv
-typedef void (APIENTRYP PFNGLGETUNIFORMUIVPROC)(GLuint program, GLint location, GLuint *params);
-GLAPI PFNGLGETUNIFORMUIVPROC glad_glGetUniformuiv;
-#define glGetUniformuiv glad_glGetUniformuiv
-typedef void (APIENTRYP PFNGLBINDFRAGDATALOCATIONPROC)(GLuint program, GLuint color, const GLchar *name);
-GLAPI PFNGLBINDFRAGDATALOCATIONPROC glad_glBindFragDataLocation;
-#define glBindFragDataLocation glad_glBindFragDataLocation
-typedef GLint (APIENTRYP PFNGLGETFRAGDATALOCATIONPROC)(GLuint program, const GLchar *name);
-GLAPI PFNGLGETFRAGDATALOCATIONPROC glad_glGetFragDataLocation;
-#define glGetFragDataLocation glad_glGetFragDataLocation
-typedef void (APIENTRYP PFNGLUNIFORM1UIPROC)(GLint location, GLuint v0);
-GLAPI PFNGLUNIFORM1UIPROC glad_glUniform1ui;
-#define glUniform1ui glad_glUniform1ui
-typedef void (APIENTRYP PFNGLUNIFORM2UIPROC)(GLint location, GLuint v0, GLuint v1);
-GLAPI PFNGLUNIFORM2UIPROC glad_glUniform2ui;
-#define glUniform2ui glad_glUniform2ui
-typedef void (APIENTRYP PFNGLUNIFORM3UIPROC)(GLint location, GLuint v0, GLuint v1, GLuint v2);
-GLAPI PFNGLUNIFORM3UIPROC glad_glUniform3ui;
-#define glUniform3ui glad_glUniform3ui
-typedef void (APIENTRYP PFNGLUNIFORM4UIPROC)(GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
-GLAPI PFNGLUNIFORM4UIPROC glad_glUniform4ui;
-#define glUniform4ui glad_glUniform4ui
-typedef void (APIENTRYP PFNGLUNIFORM1UIVPROC)(GLint location, GLsizei count, const GLuint *value);
-GLAPI PFNGLUNIFORM1UIVPROC glad_glUniform1uiv;
-#define glUniform1uiv glad_glUniform1uiv
-typedef void (APIENTRYP PFNGLUNIFORM2UIVPROC)(GLint location, GLsizei count, const GLuint *value);
-GLAPI PFNGLUNIFORM2UIVPROC glad_glUniform2uiv;
-#define glUniform2uiv glad_glUniform2uiv
-typedef void (APIENTRYP PFNGLUNIFORM3UIVPROC)(GLint location, GLsizei count, const GLuint *value);
-GLAPI PFNGLUNIFORM3UIVPROC glad_glUniform3uiv;
-#define glUniform3uiv glad_glUniform3uiv
-typedef void (APIENTRYP PFNGLUNIFORM4UIVPROC)(GLint location, GLsizei count, const GLuint *value);
-GLAPI PFNGLUNIFORM4UIVPROC glad_glUniform4uiv;
-#define glUniform4uiv glad_glUniform4uiv
-typedef void (APIENTRYP PFNGLTEXPARAMETERIIVPROC)(GLenum target, GLenum pname, const GLint *params);
-GLAPI PFNGLTEXPARAMETERIIVPROC glad_glTexParameterIiv;
-#define glTexParameterIiv glad_glTexParameterIiv
-typedef void (APIENTRYP PFNGLTEXPARAMETERIUIVPROC)(GLenum target, GLenum pname, const GLuint *params);
-GLAPI PFNGLTEXPARAMETERIUIVPROC glad_glTexParameterIuiv;
-#define glTexParameterIuiv glad_glTexParameterIuiv
-typedef void (APIENTRYP PFNGLGETTEXPARAMETERIIVPROC)(GLenum target, GLenum pname, GLint *params);
-GLAPI PFNGLGETTEXPARAMETERIIVPROC glad_glGetTexParameterIiv;
-#define glGetTexParameterIiv glad_glGetTexParameterIiv
-typedef void (APIENTRYP PFNGLGETTEXPARAMETERIUIVPROC)(GLenum target, GLenum pname, GLuint *params);
-GLAPI PFNGLGETTEXPARAMETERIUIVPROC glad_glGetTexParameterIuiv;
-#define glGetTexParameterIuiv glad_glGetTexParameterIuiv
-typedef void (APIENTRYP PFNGLCLEARBUFFERIVPROC)(GLenum buffer, GLint drawbuffer, const GLint *value);
-GLAPI PFNGLCLEARBUFFERIVPROC glad_glClearBufferiv;
-#define glClearBufferiv glad_glClearBufferiv
-typedef void (APIENTRYP PFNGLCLEARBUFFERUIVPROC)(GLenum buffer, GLint drawbuffer, const GLuint *value);
-GLAPI PFNGLCLEARBUFFERUIVPROC glad_glClearBufferuiv;
-#define glClearBufferuiv glad_glClearBufferuiv
-typedef void (APIENTRYP PFNGLCLEARBUFFERFVPROC)(GLenum buffer, GLint drawbuffer, const GLfloat *value);
-GLAPI PFNGLCLEARBUFFERFVPROC glad_glClearBufferfv;
-#define glClearBufferfv glad_glClearBufferfv
-typedef void (APIENTRYP PFNGLCLEARBUFFERFIPROC)(GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil);
-GLAPI PFNGLCLEARBUFFERFIPROC glad_glClearBufferfi;
-#define glClearBufferfi glad_glClearBufferfi
-typedef const GLubyte * (APIENTRYP PFNGLGETSTRINGIPROC)(GLenum name, GLuint index);
-GLAPI PFNGLGETSTRINGIPROC glad_glGetStringi;
-#define glGetStringi glad_glGetStringi
-typedef GLboolean (APIENTRYP PFNGLISRENDERBUFFERPROC)(GLuint renderbuffer);
-GLAPI PFNGLISRENDERBUFFERPROC glad_glIsRenderbuffer;
-#define glIsRenderbuffer glad_glIsRenderbuffer
-typedef void (APIENTRYP PFNGLBINDRENDERBUFFERPROC)(GLenum target, GLuint renderbuffer);
-GLAPI PFNGLBINDRENDERBUFFERPROC glad_glBindRenderbuffer;
-#define glBindRenderbuffer glad_glBindRenderbuffer
-typedef void (APIENTRYP PFNGLDELETERENDERBUFFERSPROC)(GLsizei n, const GLuint *renderbuffers);
-GLAPI PFNGLDELETERENDERBUFFERSPROC glad_glDeleteRenderbuffers;
-#define glDeleteRenderbuffers glad_glDeleteRenderbuffers
-typedef void (APIENTRYP PFNGLGENRENDERBUFFERSPROC)(GLsizei n, GLuint *renderbuffers);
-GLAPI PFNGLGENRENDERBUFFERSPROC glad_glGenRenderbuffers;
-#define glGenRenderbuffers glad_glGenRenderbuffers
-typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEPROC)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
-GLAPI PFNGLRENDERBUFFERSTORAGEPROC glad_glRenderbufferStorage;
-#define glRenderbufferStorage glad_glRenderbufferStorage
-typedef void (APIENTRYP PFNGLGETRENDERBUFFERPARAMETERIVPROC)(GLenum target, GLenum pname, GLint *params);
-GLAPI PFNGLGETRENDERBUFFERPARAMETERIVPROC glad_glGetRenderbufferParameteriv;
-#define glGetRenderbufferParameteriv glad_glGetRenderbufferParameteriv
-typedef GLboolean (APIENTRYP PFNGLISFRAMEBUFFERPROC)(GLuint framebuffer);
-GLAPI PFNGLISFRAMEBUFFERPROC glad_glIsFramebuffer;
-#define glIsFramebuffer glad_glIsFramebuffer
-typedef void (APIENTRYP PFNGLBINDFRAMEBUFFERPROC)(GLenum target, GLuint framebuffer);
-GLAPI PFNGLBINDFRAMEBUFFERPROC glad_glBindFramebuffer;
-#define glBindFramebuffer glad_glBindFramebuffer
-typedef void (APIENTRYP PFNGLDELETEFRAMEBUFFERSPROC)(GLsizei n, const GLuint *framebuffers);
-GLAPI PFNGLDELETEFRAMEBUFFERSPROC glad_glDeleteFramebuffers;
-#define glDeleteFramebuffers glad_glDeleteFramebuffers
-typedef void (APIENTRYP PFNGLGENFRAMEBUFFERSPROC)(GLsizei n, GLuint *framebuffers);
-GLAPI PFNGLGENFRAMEBUFFERSPROC glad_glGenFramebuffers;
-#define glGenFramebuffers glad_glGenFramebuffers
-typedef GLenum (APIENTRYP PFNGLCHECKFRAMEBUFFERSTATUSPROC)(GLenum target);
-GLAPI PFNGLCHECKFRAMEBUFFERSTATUSPROC glad_glCheckFramebufferStatus;
-#define glCheckFramebufferStatus glad_glCheckFramebufferStatus
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE1DPROC)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
-GLAPI PFNGLFRAMEBUFFERTEXTURE1DPROC glad_glFramebufferTexture1D;
-#define glFramebufferTexture1D glad_glFramebufferTexture1D
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DPROC)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
-GLAPI PFNGLFRAMEBUFFERTEXTURE2DPROC glad_glFramebufferTexture2D;
-#define glFramebufferTexture2D glad_glFramebufferTexture2D
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE3DPROC)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
-GLAPI PFNGLFRAMEBUFFERTEXTURE3DPROC glad_glFramebufferTexture3D;
-#define glFramebufferTexture3D glad_glFramebufferTexture3D
-typedef void (APIENTRYP PFNGLFRAMEBUFFERRENDERBUFFERPROC)(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
-GLAPI PFNGLFRAMEBUFFERRENDERBUFFERPROC glad_glFramebufferRenderbuffer;
-#define glFramebufferRenderbuffer glad_glFramebufferRenderbuffer
-typedef void (APIENTRYP PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVPROC)(GLenum target, GLenum attachment, GLenum pname, GLint *params);
-GLAPI PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVPROC glad_glGetFramebufferAttachmentParameteriv;
-#define glGetFramebufferAttachmentParameteriv glad_glGetFramebufferAttachmentParameteriv
-typedef void (APIENTRYP PFNGLGENERATEMIPMAPPROC)(GLenum target);
-GLAPI PFNGLGENERATEMIPMAPPROC glad_glGenerateMipmap;
-#define glGenerateMipmap glad_glGenerateMipmap
-typedef void (APIENTRYP PFNGLBLITFRAMEBUFFERPROC)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
-GLAPI PFNGLBLITFRAMEBUFFERPROC glad_glBlitFramebuffer;
-#define glBlitFramebuffer glad_glBlitFramebuffer
-typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEPROC)(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
-GLAPI PFNGLRENDERBUFFERSTORAGEMULTISAMPLEPROC glad_glRenderbufferStorageMultisample;
-#define glRenderbufferStorageMultisample glad_glRenderbufferStorageMultisample
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURELAYERPROC)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
-GLAPI PFNGLFRAMEBUFFERTEXTURELAYERPROC glad_glFramebufferTextureLayer;
-#define glFramebufferTextureLayer glad_glFramebufferTextureLayer
-typedef void * (APIENTRYP PFNGLMAPBUFFERRANGEPROC)(GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access);
-GLAPI PFNGLMAPBUFFERRANGEPROC glad_glMapBufferRange;
-#define glMapBufferRange glad_glMapBufferRange
-typedef void (APIENTRYP PFNGLFLUSHMAPPEDBUFFERRANGEPROC)(GLenum target, GLintptr offset, GLsizeiptr length);
-GLAPI PFNGLFLUSHMAPPEDBUFFERRANGEPROC glad_glFlushMappedBufferRange;
-#define glFlushMappedBufferRange glad_glFlushMappedBufferRange
-typedef void (APIENTRYP PFNGLBINDVERTEXARRAYPROC)(GLuint array);
-GLAPI PFNGLBINDVERTEXARRAYPROC glad_glBindVertexArray;
-#define glBindVertexArray glad_glBindVertexArray
-typedef void (APIENTRYP PFNGLDELETEVERTEXARRAYSPROC)(GLsizei n, const GLuint *arrays);
-GLAPI PFNGLDELETEVERTEXARRAYSPROC glad_glDeleteVertexArrays;
-#define glDeleteVertexArrays glad_glDeleteVertexArrays
-typedef void (APIENTRYP PFNGLGENVERTEXARRAYSPROC)(GLsizei n, GLuint *arrays);
-GLAPI PFNGLGENVERTEXARRAYSPROC glad_glGenVertexArrays;
-#define glGenVertexArrays glad_glGenVertexArrays
-typedef GLboolean (APIENTRYP PFNGLISVERTEXARRAYPROC)(GLuint array);
-GLAPI PFNGLISVERTEXARRAYPROC glad_glIsVertexArray;
-#define glIsVertexArray glad_glIsVertexArray
-#endif
-#ifndef GL_VERSION_3_1
-#define GL_VERSION_3_1 1
-GLAPI int GLAD_GL_VERSION_3_1;
-typedef void (APIENTRYP PFNGLDRAWARRAYSINSTANCEDPROC)(GLenum mode, GLint first, GLsizei count, GLsizei instancecount);
-GLAPI PFNGLDRAWARRAYSINSTANCEDPROC glad_glDrawArraysInstanced;
-#define glDrawArraysInstanced glad_glDrawArraysInstanced
-typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDPROC)(GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount);
-GLAPI PFNGLDRAWELEMENTSINSTANCEDPROC glad_glDrawElementsInstanced;
-#define glDrawElementsInstanced glad_glDrawElementsInstanced
-typedef void (APIENTRYP PFNGLTEXBUFFERPROC)(GLenum target, GLenum internalformat, GLuint buffer);
-GLAPI PFNGLTEXBUFFERPROC glad_glTexBuffer;
-#define glTexBuffer glad_glTexBuffer
-typedef void (APIENTRYP PFNGLPRIMITIVERESTARTINDEXPROC)(GLuint index);
-GLAPI PFNGLPRIMITIVERESTARTINDEXPROC glad_glPrimitiveRestartIndex;
-#define glPrimitiveRestartIndex glad_glPrimitiveRestartIndex
-typedef void (APIENTRYP PFNGLCOPYBUFFERSUBDATAPROC)(GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
-GLAPI PFNGLCOPYBUFFERSUBDATAPROC glad_glCopyBufferSubData;
-#define glCopyBufferSubData glad_glCopyBufferSubData
-typedef void (APIENTRYP PFNGLGETUNIFORMINDICESPROC)(GLuint program, GLsizei uniformCount, const GLchar *const*uniformNames, GLuint *uniformIndices);
-GLAPI PFNGLGETUNIFORMINDICESPROC glad_glGetUniformIndices;
-#define glGetUniformIndices glad_glGetUniformIndices
-typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMSIVPROC)(GLuint program, GLsizei uniformCount, const GLuint *uniformIndices, GLenum pname, GLint *params);
-GLAPI PFNGLGETACTIVEUNIFORMSIVPROC glad_glGetActiveUniformsiv;
-#define glGetActiveUniformsiv glad_glGetActiveUniformsiv
-typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMNAMEPROC)(GLuint program, GLuint uniformIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformName);
-GLAPI PFNGLGETACTIVEUNIFORMNAMEPROC glad_glGetActiveUniformName;
-#define glGetActiveUniformName glad_glGetActiveUniformName
-typedef GLuint (APIENTRYP PFNGLGETUNIFORMBLOCKINDEXPROC)(GLuint program, const GLchar *uniformBlockName);
-GLAPI PFNGLGETUNIFORMBLOCKINDEXPROC glad_glGetUniformBlockIndex;
-#define glGetUniformBlockIndex glad_glGetUniformBlockIndex
-typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMBLOCKIVPROC)(GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint *params);
-GLAPI PFNGLGETACTIVEUNIFORMBLOCKIVPROC glad_glGetActiveUniformBlockiv;
-#define glGetActiveUniformBlockiv glad_glGetActiveUniformBlockiv
-typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMBLOCKNAMEPROC)(GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformBlockName);
-GLAPI PFNGLGETACTIVEUNIFORMBLOCKNAMEPROC glad_glGetActiveUniformBlockName;
-#define glGetActiveUniformBlockName glad_glGetActiveUniformBlockName
-typedef void (APIENTRYP PFNGLUNIFORMBLOCKBINDINGPROC)(GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding);
-GLAPI PFNGLUNIFORMBLOCKBINDINGPROC glad_glUniformBlockBinding;
-#define glUniformBlockBinding glad_glUniformBlockBinding
-#endif
-#ifndef GL_VERSION_3_2
-#define GL_VERSION_3_2 1
-GLAPI int GLAD_GL_VERSION_3_2;
-typedef void (APIENTRYP PFNGLDRAWELEMENTSBASEVERTEXPROC)(GLenum mode, GLsizei count, GLenum type, const void *indices, GLint basevertex);
-GLAPI PFNGLDRAWELEMENTSBASEVERTEXPROC glad_glDrawElementsBaseVertex;
-#define glDrawElementsBaseVertex glad_glDrawElementsBaseVertex
-typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSBASEVERTEXPROC)(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices, GLint basevertex);
-GLAPI PFNGLDRAWRANGEELEMENTSBASEVERTEXPROC glad_glDrawRangeElementsBaseVertex;
-#define glDrawRangeElementsBaseVertex glad_glDrawRangeElementsBaseVertex
-typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXPROC)(GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLint basevertex);
-GLAPI PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXPROC glad_glDrawElementsInstancedBaseVertex;
-#define glDrawElementsInstancedBaseVertex glad_glDrawElementsInstancedBaseVertex
-typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSBASEVERTEXPROC)(GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei drawcount, const GLint *basevertex);
-GLAPI PFNGLMULTIDRAWELEMENTSBASEVERTEXPROC glad_glMultiDrawElementsBaseVertex;
-#define glMultiDrawElementsBaseVertex glad_glMultiDrawElementsBaseVertex
-typedef void (APIENTRYP PFNGLPROVOKINGVERTEXPROC)(GLenum mode);
-GLAPI PFNGLPROVOKINGVERTEXPROC glad_glProvokingVertex;
-#define glProvokingVertex glad_glProvokingVertex
-typedef GLsync (APIENTRYP PFNGLFENCESYNCPROC)(GLenum condition, GLbitfield flags);
-GLAPI PFNGLFENCESYNCPROC glad_glFenceSync;
-#define glFenceSync glad_glFenceSync
-typedef GLboolean (APIENTRYP PFNGLISSYNCPROC)(GLsync sync);
-GLAPI PFNGLISSYNCPROC glad_glIsSync;
-#define glIsSync glad_glIsSync
-typedef void (APIENTRYP PFNGLDELETESYNCPROC)(GLsync sync);
-GLAPI PFNGLDELETESYNCPROC glad_glDeleteSync;
-#define glDeleteSync glad_glDeleteSync
-typedef GLenum (APIENTRYP PFNGLCLIENTWAITSYNCPROC)(GLsync sync, GLbitfield flags, GLuint64 timeout);
-GLAPI PFNGLCLIENTWAITSYNCPROC glad_glClientWaitSync;
-#define glClientWaitSync glad_glClientWaitSync
-typedef void (APIENTRYP PFNGLWAITSYNCPROC)(GLsync sync, GLbitfield flags, GLuint64 timeout);
-GLAPI PFNGLWAITSYNCPROC glad_glWaitSync;
-#define glWaitSync glad_glWaitSync
-typedef void (APIENTRYP PFNGLGETINTEGER64VPROC)(GLenum pname, GLint64 *data);
-GLAPI PFNGLGETINTEGER64VPROC glad_glGetInteger64v;
-#define glGetInteger64v glad_glGetInteger64v
-typedef void (APIENTRYP PFNGLGETSYNCIVPROC)(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values);
-GLAPI PFNGLGETSYNCIVPROC glad_glGetSynciv;
-#define glGetSynciv glad_glGetSynciv
-typedef void (APIENTRYP PFNGLGETINTEGER64I_VPROC)(GLenum target, GLuint index, GLint64 *data);
-GLAPI PFNGLGETINTEGER64I_VPROC glad_glGetInteger64i_v;
-#define glGetInteger64i_v glad_glGetInteger64i_v
-typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERI64VPROC)(GLenum target, GLenum pname, GLint64 *params);
-GLAPI PFNGLGETBUFFERPARAMETERI64VPROC glad_glGetBufferParameteri64v;
-#define glGetBufferParameteri64v glad_glGetBufferParameteri64v
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREPROC)(GLenum target, GLenum attachment, GLuint texture, GLint level);
-GLAPI PFNGLFRAMEBUFFERTEXTUREPROC glad_glFramebufferTexture;
-#define glFramebufferTexture glad_glFramebufferTexture
-typedef void (APIENTRYP PFNGLTEXIMAGE2DMULTISAMPLEPROC)(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations);
-GLAPI PFNGLTEXIMAGE2DMULTISAMPLEPROC glad_glTexImage2DMultisample;
-#define glTexImage2DMultisample glad_glTexImage2DMultisample
-typedef void (APIENTRYP PFNGLTEXIMAGE3DMULTISAMPLEPROC)(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations);
-GLAPI PFNGLTEXIMAGE3DMULTISAMPLEPROC glad_glTexImage3DMultisample;
-#define glTexImage3DMultisample glad_glTexImage3DMultisample
-typedef void (APIENTRYP PFNGLGETMULTISAMPLEFVPROC)(GLenum pname, GLuint index, GLfloat *val);
-GLAPI PFNGLGETMULTISAMPLEFVPROC glad_glGetMultisamplefv;
-#define glGetMultisamplefv glad_glGetMultisamplefv
-typedef void (APIENTRYP PFNGLSAMPLEMASKIPROC)(GLuint maskNumber, GLbitfield mask);
-GLAPI PFNGLSAMPLEMASKIPROC glad_glSampleMaski;
-#define glSampleMaski glad_glSampleMaski
-#endif
-#ifndef GL_VERSION_3_3
-#define GL_VERSION_3_3 1
-GLAPI int GLAD_GL_VERSION_3_3;
-typedef void (APIENTRYP PFNGLBINDFRAGDATALOCATIONINDEXEDPROC)(GLuint program, GLuint colorNumber, GLuint index, const GLchar *name);
-GLAPI PFNGLBINDFRAGDATALOCATIONINDEXEDPROC glad_glBindFragDataLocationIndexed;
-#define glBindFragDataLocationIndexed glad_glBindFragDataLocationIndexed
-typedef GLint (APIENTRYP PFNGLGETFRAGDATAINDEXPROC)(GLuint program, const GLchar *name);
-GLAPI PFNGLGETFRAGDATAINDEXPROC glad_glGetFragDataIndex;
-#define glGetFragDataIndex glad_glGetFragDataIndex
-typedef void (APIENTRYP PFNGLGENSAMPLERSPROC)(GLsizei count, GLuint *samplers);
-GLAPI PFNGLGENSAMPLERSPROC glad_glGenSamplers;
-#define glGenSamplers glad_glGenSamplers
-typedef void (APIENTRYP PFNGLDELETESAMPLERSPROC)(GLsizei count, const GLuint *samplers);
-GLAPI PFNGLDELETESAMPLERSPROC glad_glDeleteSamplers;
-#define glDeleteSamplers glad_glDeleteSamplers
-typedef GLboolean (APIENTRYP PFNGLISSAMPLERPROC)(GLuint sampler);
-GLAPI PFNGLISSAMPLERPROC glad_glIsSampler;
-#define glIsSampler glad_glIsSampler
-typedef void (APIENTRYP PFNGLBINDSAMPLERPROC)(GLuint unit, GLuint sampler);
-GLAPI PFNGLBINDSAMPLERPROC glad_glBindSampler;
-#define glBindSampler glad_glBindSampler
-typedef void (APIENTRYP PFNGLSAMPLERPARAMETERIPROC)(GLuint sampler, GLenum pname, GLint param);
-GLAPI PFNGLSAMPLERPARAMETERIPROC glad_glSamplerParameteri;
-#define glSamplerParameteri glad_glSamplerParameteri
-typedef void (APIENTRYP PFNGLSAMPLERPARAMETERIVPROC)(GLuint sampler, GLenum pname, const GLint *param);
-GLAPI PFNGLSAMPLERPARAMETERIVPROC glad_glSamplerParameteriv;
-#define glSamplerParameteriv glad_glSamplerParameteriv
-typedef void (APIENTRYP PFNGLSAMPLERPARAMETERFPROC)(GLuint sampler, GLenum pname, GLfloat param);
-GLAPI PFNGLSAMPLERPARAMETERFPROC glad_glSamplerParameterf;
-#define glSamplerParameterf glad_glSamplerParameterf
-typedef void (APIENTRYP PFNGLSAMPLERPARAMETERFVPROC)(GLuint sampler, GLenum pname, const GLfloat *param);
-GLAPI PFNGLSAMPLERPARAMETERFVPROC glad_glSamplerParameterfv;
-#define glSamplerParameterfv glad_glSamplerParameterfv
-typedef void (APIENTRYP PFNGLSAMPLERPARAMETERIIVPROC)(GLuint sampler, GLenum pname, const GLint *param);
-GLAPI PFNGLSAMPLERPARAMETERIIVPROC glad_glSamplerParameterIiv;
-#define glSamplerParameterIiv glad_glSamplerParameterIiv
-typedef void (APIENTRYP PFNGLSAMPLERPARAMETERIUIVPROC)(GLuint sampler, GLenum pname, const GLuint *param);
-GLAPI PFNGLSAMPLERPARAMETERIUIVPROC glad_glSamplerParameterIuiv;
-#define glSamplerParameterIuiv glad_glSamplerParameterIuiv
-typedef void (APIENTRYP PFNGLGETSAMPLERPARAMETERIVPROC)(GLuint sampler, GLenum pname, GLint *params);
-GLAPI PFNGLGETSAMPLERPARAMETERIVPROC glad_glGetSamplerParameteriv;
-#define glGetSamplerParameteriv glad_glGetSamplerParameteriv
-typedef void (APIENTRYP PFNGLGETSAMPLERPARAMETERIIVPROC)(GLuint sampler, GLenum pname, GLint *params);
-GLAPI PFNGLGETSAMPLERPARAMETERIIVPROC glad_glGetSamplerParameterIiv;
-#define glGetSamplerParameterIiv glad_glGetSamplerParameterIiv
-typedef void (APIENTRYP PFNGLGETSAMPLERPARAMETERFVPROC)(GLuint sampler, GLenum pname, GLfloat *params);
-GLAPI PFNGLGETSAMPLERPARAMETERFVPROC glad_glGetSamplerParameterfv;
-#define glGetSamplerParameterfv glad_glGetSamplerParameterfv
-typedef void (APIENTRYP PFNGLGETSAMPLERPARAMETERIUIVPROC)(GLuint sampler, GLenum pname, GLuint *params);
-GLAPI PFNGLGETSAMPLERPARAMETERIUIVPROC glad_glGetSamplerParameterIuiv;
-#define glGetSamplerParameterIuiv glad_glGetSamplerParameterIuiv
-typedef void (APIENTRYP PFNGLQUERYCOUNTERPROC)(GLuint id, GLenum target);
-GLAPI PFNGLQUERYCOUNTERPROC glad_glQueryCounter;
-#define glQueryCounter glad_glQueryCounter
-typedef void (APIENTRYP PFNGLGETQUERYOBJECTI64VPROC)(GLuint id, GLenum pname, GLint64 *params);
-GLAPI PFNGLGETQUERYOBJECTI64VPROC glad_glGetQueryObjecti64v;
-#define glGetQueryObjecti64v glad_glGetQueryObjecti64v
-typedef void (APIENTRYP PFNGLGETQUERYOBJECTUI64VPROC)(GLuint id, GLenum pname, GLuint64 *params);
-GLAPI PFNGLGETQUERYOBJECTUI64VPROC glad_glGetQueryObjectui64v;
-#define glGetQueryObjectui64v glad_glGetQueryObjectui64v
-typedef void (APIENTRYP PFNGLVERTEXATTRIBDIVISORPROC)(GLuint index, GLuint divisor);
-GLAPI PFNGLVERTEXATTRIBDIVISORPROC glad_glVertexAttribDivisor;
-#define glVertexAttribDivisor glad_glVertexAttribDivisor
-typedef void (APIENTRYP PFNGLVERTEXATTRIBP1UIPROC)(GLuint index, GLenum type, GLboolean normalized, GLuint value);
-GLAPI PFNGLVERTEXATTRIBP1UIPROC glad_glVertexAttribP1ui;
-#define glVertexAttribP1ui glad_glVertexAttribP1ui
-typedef void (APIENTRYP PFNGLVERTEXATTRIBP1UIVPROC)(GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
-GLAPI PFNGLVERTEXATTRIBP1UIVPROC glad_glVertexAttribP1uiv;
-#define glVertexAttribP1uiv glad_glVertexAttribP1uiv
-typedef void (APIENTRYP PFNGLVERTEXATTRIBP2UIPROC)(GLuint index, GLenum type, GLboolean normalized, GLuint value);
-GLAPI PFNGLVERTEXATTRIBP2UIPROC glad_glVertexAttribP2ui;
-#define glVertexAttribP2ui glad_glVertexAttribP2ui
-typedef void (APIENTRYP PFNGLVERTEXATTRIBP2UIVPROC)(GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
-GLAPI PFNGLVERTEXATTRIBP2UIVPROC glad_glVertexAttribP2uiv;
-#define glVertexAttribP2uiv glad_glVertexAttribP2uiv
-typedef void (APIENTRYP PFNGLVERTEXATTRIBP3UIPROC)(GLuint index, GLenum type, GLboolean normalized, GLuint value);
-GLAPI PFNGLVERTEXATTRIBP3UIPROC glad_glVertexAttribP3ui;
-#define glVertexAttribP3ui glad_glVertexAttribP3ui
-typedef void (APIENTRYP PFNGLVERTEXATTRIBP3UIVPROC)(GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
-GLAPI PFNGLVERTEXATTRIBP3UIVPROC glad_glVertexAttribP3uiv;
-#define glVertexAttribP3uiv glad_glVertexAttribP3uiv
-typedef void (APIENTRYP PFNGLVERTEXATTRIBP4UIPROC)(GLuint index, GLenum type, GLboolean normalized, GLuint value);
-GLAPI PFNGLVERTEXATTRIBP4UIPROC glad_glVertexAttribP4ui;
-#define glVertexAttribP4ui glad_glVertexAttribP4ui
-typedef void (APIENTRYP PFNGLVERTEXATTRIBP4UIVPROC)(GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
-GLAPI PFNGLVERTEXATTRIBP4UIVPROC glad_glVertexAttribP4uiv;
-#define glVertexAttribP4uiv glad_glVertexAttribP4uiv
-typedef void (APIENTRYP PFNGLVERTEXP2UIPROC)(GLenum type, GLuint value);
-GLAPI PFNGLVERTEXP2UIPROC glad_glVertexP2ui;
-#define glVertexP2ui glad_glVertexP2ui
-typedef void (APIENTRYP PFNGLVERTEXP2UIVPROC)(GLenum type, const GLuint *value);
-GLAPI PFNGLVERTEXP2UIVPROC glad_glVertexP2uiv;
-#define glVertexP2uiv glad_glVertexP2uiv
-typedef void (APIENTRYP PFNGLVERTEXP3UIPROC)(GLenum type, GLuint value);
-GLAPI PFNGLVERTEXP3UIPROC glad_glVertexP3ui;
-#define glVertexP3ui glad_glVertexP3ui
-typedef void (APIENTRYP PFNGLVERTEXP3UIVPROC)(GLenum type, const GLuint *value);
-GLAPI PFNGLVERTEXP3UIVPROC glad_glVertexP3uiv;
-#define glVertexP3uiv glad_glVertexP3uiv
-typedef void (APIENTRYP PFNGLVERTEXP4UIPROC)(GLenum type, GLuint value);
-GLAPI PFNGLVERTEXP4UIPROC glad_glVertexP4ui;
-#define glVertexP4ui glad_glVertexP4ui
-typedef void (APIENTRYP PFNGLVERTEXP4UIVPROC)(GLenum type, const GLuint *value);
-GLAPI PFNGLVERTEXP4UIVPROC glad_glVertexP4uiv;
-#define glVertexP4uiv glad_glVertexP4uiv
-typedef void (APIENTRYP PFNGLTEXCOORDP1UIPROC)(GLenum type, GLuint coords);
-GLAPI PFNGLTEXCOORDP1UIPROC glad_glTexCoordP1ui;
-#define glTexCoordP1ui glad_glTexCoordP1ui
-typedef void (APIENTRYP PFNGLTEXCOORDP1UIVPROC)(GLenum type, const GLuint *coords);
-GLAPI PFNGLTEXCOORDP1UIVPROC glad_glTexCoordP1uiv;
-#define glTexCoordP1uiv glad_glTexCoordP1uiv
-typedef void (APIENTRYP PFNGLTEXCOORDP2UIPROC)(GLenum type, GLuint coords);
-GLAPI PFNGLTEXCOORDP2UIPROC glad_glTexCoordP2ui;
-#define glTexCoordP2ui glad_glTexCoordP2ui
-typedef void (APIENTRYP PFNGLTEXCOORDP2UIVPROC)(GLenum type, const GLuint *coords);
-GLAPI PFNGLTEXCOORDP2UIVPROC glad_glTexCoordP2uiv;
-#define glTexCoordP2uiv glad_glTexCoordP2uiv
-typedef void (APIENTRYP PFNGLTEXCOORDP3UIPROC)(GLenum type, GLuint coords);
-GLAPI PFNGLTEXCOORDP3UIPROC glad_glTexCoordP3ui;
-#define glTexCoordP3ui glad_glTexCoordP3ui
-typedef void (APIENTRYP PFNGLTEXCOORDP3UIVPROC)(GLenum type, const GLuint *coords);
-GLAPI PFNGLTEXCOORDP3UIVPROC glad_glTexCoordP3uiv;
-#define glTexCoordP3uiv glad_glTexCoordP3uiv
-typedef void (APIENTRYP PFNGLTEXCOORDP4UIPROC)(GLenum type, GLuint coords);
-GLAPI PFNGLTEXCOORDP4UIPROC glad_glTexCoordP4ui;
-#define glTexCoordP4ui glad_glTexCoordP4ui
-typedef void (APIENTRYP PFNGLTEXCOORDP4UIVPROC)(GLenum type, const GLuint *coords);
-GLAPI PFNGLTEXCOORDP4UIVPROC glad_glTexCoordP4uiv;
-#define glTexCoordP4uiv glad_glTexCoordP4uiv
-typedef void (APIENTRYP PFNGLMULTITEXCOORDP1UIPROC)(GLenum texture, GLenum type, GLuint coords);
-GLAPI PFNGLMULTITEXCOORDP1UIPROC glad_glMultiTexCoordP1ui;
-#define glMultiTexCoordP1ui glad_glMultiTexCoordP1ui
-typedef void (APIENTRYP PFNGLMULTITEXCOORDP1UIVPROC)(GLenum texture, GLenum type, const GLuint *coords);
-GLAPI PFNGLMULTITEXCOORDP1UIVPROC glad_glMultiTexCoordP1uiv;
-#define glMultiTexCoordP1uiv glad_glMultiTexCoordP1uiv
-typedef void (APIENTRYP PFNGLMULTITEXCOORDP2UIPROC)(GLenum texture, GLenum type, GLuint coords);
-GLAPI PFNGLMULTITEXCOORDP2UIPROC glad_glMultiTexCoordP2ui;
-#define glMultiTexCoordP2ui glad_glMultiTexCoordP2ui
-typedef void (APIENTRYP PFNGLMULTITEXCOORDP2UIVPROC)(GLenum texture, GLenum type, const GLuint *coords);
-GLAPI PFNGLMULTITEXCOORDP2UIVPROC glad_glMultiTexCoordP2uiv;
-#define glMultiTexCoordP2uiv glad_glMultiTexCoordP2uiv
-typedef void (APIENTRYP PFNGLMULTITEXCOORDP3UIPROC)(GLenum texture, GLenum type, GLuint coords);
-GLAPI PFNGLMULTITEXCOORDP3UIPROC glad_glMultiTexCoordP3ui;
-#define glMultiTexCoordP3ui glad_glMultiTexCoordP3ui
-typedef void (APIENTRYP PFNGLMULTITEXCOORDP3UIVPROC)(GLenum texture, GLenum type, const GLuint *coords);
-GLAPI PFNGLMULTITEXCOORDP3UIVPROC glad_glMultiTexCoordP3uiv;
-#define glMultiTexCoordP3uiv glad_glMultiTexCoordP3uiv
-typedef void (APIENTRYP PFNGLMULTITEXCOORDP4UIPROC)(GLenum texture, GLenum type, GLuint coords);
-GLAPI PFNGLMULTITEXCOORDP4UIPROC glad_glMultiTexCoordP4ui;
-#define glMultiTexCoordP4ui glad_glMultiTexCoordP4ui
-typedef void (APIENTRYP PFNGLMULTITEXCOORDP4UIVPROC)(GLenum texture, GLenum type, const GLuint *coords);
-GLAPI PFNGLMULTITEXCOORDP4UIVPROC glad_glMultiTexCoordP4uiv;
-#define glMultiTexCoordP4uiv glad_glMultiTexCoordP4uiv
-typedef void (APIENTRYP PFNGLNORMALP3UIPROC)(GLenum type, GLuint coords);
-GLAPI PFNGLNORMALP3UIPROC glad_glNormalP3ui;
-#define glNormalP3ui glad_glNormalP3ui
-typedef void (APIENTRYP PFNGLNORMALP3UIVPROC)(GLenum type, const GLuint *coords);
-GLAPI PFNGLNORMALP3UIVPROC glad_glNormalP3uiv;
-#define glNormalP3uiv glad_glNormalP3uiv
-typedef void (APIENTRYP PFNGLCOLORP3UIPROC)(GLenum type, GLuint color);
-GLAPI PFNGLCOLORP3UIPROC glad_glColorP3ui;
-#define glColorP3ui glad_glColorP3ui
-typedef void (APIENTRYP PFNGLCOLORP3UIVPROC)(GLenum type, const GLuint *color);
-GLAPI PFNGLCOLORP3UIVPROC glad_glColorP3uiv;
-#define glColorP3uiv glad_glColorP3uiv
-typedef void (APIENTRYP PFNGLCOLORP4UIPROC)(GLenum type, GLuint color);
-GLAPI PFNGLCOLORP4UIPROC glad_glColorP4ui;
-#define glColorP4ui glad_glColorP4ui
-typedef void (APIENTRYP PFNGLCOLORP4UIVPROC)(GLenum type, const GLuint *color);
-GLAPI PFNGLCOLORP4UIVPROC glad_glColorP4uiv;
-#define glColorP4uiv glad_glColorP4uiv
-typedef void (APIENTRYP PFNGLSECONDARYCOLORP3UIPROC)(GLenum type, GLuint color);
-GLAPI PFNGLSECONDARYCOLORP3UIPROC glad_glSecondaryColorP3ui;
-#define glSecondaryColorP3ui glad_glSecondaryColorP3ui
-typedef void (APIENTRYP PFNGLSECONDARYCOLORP3UIVPROC)(GLenum type, const GLuint *color);
-GLAPI PFNGLSECONDARYCOLORP3UIVPROC glad_glSecondaryColorP3uiv;
-#define glSecondaryColorP3uiv glad_glSecondaryColorP3uiv
-#endif
-#ifndef GL_VERSION_4_0
-#define GL_VERSION_4_0 1
-GLAPI int GLAD_GL_VERSION_4_0;
-typedef void (APIENTRYP PFNGLMINSAMPLESHADINGPROC)(GLfloat value);
-GLAPI PFNGLMINSAMPLESHADINGPROC glad_glMinSampleShading;
-#define glMinSampleShading glad_glMinSampleShading
-typedef void (APIENTRYP PFNGLBLENDEQUATIONIPROC)(GLuint buf, GLenum mode);
-GLAPI PFNGLBLENDEQUATIONIPROC glad_glBlendEquationi;
-#define glBlendEquationi glad_glBlendEquationi
-typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEIPROC)(GLuint buf, GLenum modeRGB, GLenum modeAlpha);
-GLAPI PFNGLBLENDEQUATIONSEPARATEIPROC glad_glBlendEquationSeparatei;
-#define glBlendEquationSeparatei glad_glBlendEquationSeparatei
-typedef void (APIENTRYP PFNGLBLENDFUNCIPROC)(GLuint buf, GLenum src, GLenum dst);
-GLAPI PFNGLBLENDFUNCIPROC glad_glBlendFunci;
-#define glBlendFunci glad_glBlendFunci
-typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEIPROC)(GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
-GLAPI PFNGLBLENDFUNCSEPARATEIPROC glad_glBlendFuncSeparatei;
-#define glBlendFuncSeparatei glad_glBlendFuncSeparatei
-typedef void (APIENTRYP PFNGLDRAWARRAYSINDIRECTPROC)(GLenum mode, const void *indirect);
-GLAPI PFNGLDRAWARRAYSINDIRECTPROC glad_glDrawArraysIndirect;
-#define glDrawArraysIndirect glad_glDrawArraysIndirect
-typedef void (APIENTRYP PFNGLDRAWELEMENTSINDIRECTPROC)(GLenum mode, GLenum type, const void *indirect);
-GLAPI PFNGLDRAWELEMENTSINDIRECTPROC glad_glDrawElementsIndirect;
-#define glDrawElementsIndirect glad_glDrawElementsIndirect
-typedef void (APIENTRYP PFNGLUNIFORM1DPROC)(GLint location, GLdouble x);
-GLAPI PFNGLUNIFORM1DPROC glad_glUniform1d;
-#define glUniform1d glad_glUniform1d
-typedef void (APIENTRYP PFNGLUNIFORM2DPROC)(GLint location, GLdouble x, GLdouble y);
-GLAPI PFNGLUNIFORM2DPROC glad_glUniform2d;
-#define glUniform2d glad_glUniform2d
-typedef void (APIENTRYP PFNGLUNIFORM3DPROC)(GLint location, GLdouble x, GLdouble y, GLdouble z);
-GLAPI PFNGLUNIFORM3DPROC glad_glUniform3d;
-#define glUniform3d glad_glUniform3d
-typedef void (APIENTRYP PFNGLUNIFORM4DPROC)(GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-GLAPI PFNGLUNIFORM4DPROC glad_glUniform4d;
-#define glUniform4d glad_glUniform4d
-typedef void (APIENTRYP PFNGLUNIFORM1DVPROC)(GLint location, GLsizei count, const GLdouble *value);
-GLAPI PFNGLUNIFORM1DVPROC glad_glUniform1dv;
-#define glUniform1dv glad_glUniform1dv
-typedef void (APIENTRYP PFNGLUNIFORM2DVPROC)(GLint location, GLsizei count, const GLdouble *value);
-GLAPI PFNGLUNIFORM2DVPROC glad_glUniform2dv;
-#define glUniform2dv glad_glUniform2dv
-typedef void (APIENTRYP PFNGLUNIFORM3DVPROC)(GLint location, GLsizei count, const GLdouble *value);
-GLAPI PFNGLUNIFORM3DVPROC glad_glUniform3dv;
-#define glUniform3dv glad_glUniform3dv
-typedef void (APIENTRYP PFNGLUNIFORM4DVPROC)(GLint location, GLsizei count, const GLdouble *value);
-GLAPI PFNGLUNIFORM4DVPROC glad_glUniform4dv;
-#define glUniform4dv glad_glUniform4dv
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX2DVPROC)(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI PFNGLUNIFORMMATRIX2DVPROC glad_glUniformMatrix2dv;
-#define glUniformMatrix2dv glad_glUniformMatrix2dv
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX3DVPROC)(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI PFNGLUNIFORMMATRIX3DVPROC glad_glUniformMatrix3dv;
-#define glUniformMatrix3dv glad_glUniformMatrix3dv
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX4DVPROC)(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI PFNGLUNIFORMMATRIX4DVPROC glad_glUniformMatrix4dv;
-#define glUniformMatrix4dv glad_glUniformMatrix4dv
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X3DVPROC)(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI PFNGLUNIFORMMATRIX2X3DVPROC glad_glUniformMatrix2x3dv;
-#define glUniformMatrix2x3dv glad_glUniformMatrix2x3dv
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X4DVPROC)(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI PFNGLUNIFORMMATRIX2X4DVPROC glad_glUniformMatrix2x4dv;
-#define glUniformMatrix2x4dv glad_glUniformMatrix2x4dv
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X2DVPROC)(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI PFNGLUNIFORMMATRIX3X2DVPROC glad_glUniformMatrix3x2dv;
-#define glUniformMatrix3x2dv glad_glUniformMatrix3x2dv
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X4DVPROC)(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI PFNGLUNIFORMMATRIX3X4DVPROC glad_glUniformMatrix3x4dv;
-#define glUniformMatrix3x4dv glad_glUniformMatrix3x4dv
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X2DVPROC)(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI PFNGLUNIFORMMATRIX4X2DVPROC glad_glUniformMatrix4x2dv;
-#define glUniformMatrix4x2dv glad_glUniformMatrix4x2dv
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X3DVPROC)(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI PFNGLUNIFORMMATRIX4X3DVPROC glad_glUniformMatrix4x3dv;
-#define glUniformMatrix4x3dv glad_glUniformMatrix4x3dv
-typedef void (APIENTRYP PFNGLGETUNIFORMDVPROC)(GLuint program, GLint location, GLdouble *params);
-GLAPI PFNGLGETUNIFORMDVPROC glad_glGetUniformdv;
-#define glGetUniformdv glad_glGetUniformdv
-typedef GLint (APIENTRYP PFNGLGETSUBROUTINEUNIFORMLOCATIONPROC)(GLuint program, GLenum shadertype, const GLchar *name);
-GLAPI PFNGLGETSUBROUTINEUNIFORMLOCATIONPROC glad_glGetSubroutineUniformLocation;
-#define glGetSubroutineUniformLocation glad_glGetSubroutineUniformLocation
-typedef GLuint (APIENTRYP PFNGLGETSUBROUTINEINDEXPROC)(GLuint program, GLenum shadertype, const GLchar *name);
-GLAPI PFNGLGETSUBROUTINEINDEXPROC glad_glGetSubroutineIndex;
-#define glGetSubroutineIndex glad_glGetSubroutineIndex
-typedef void (APIENTRYP PFNGLGETACTIVESUBROUTINEUNIFORMIVPROC)(GLuint program, GLenum shadertype, GLuint index, GLenum pname, GLint *values);
-GLAPI PFNGLGETACTIVESUBROUTINEUNIFORMIVPROC glad_glGetActiveSubroutineUniformiv;
-#define glGetActiveSubroutineUniformiv glad_glGetActiveSubroutineUniformiv
-typedef void (APIENTRYP PFNGLGETACTIVESUBROUTINEUNIFORMNAMEPROC)(GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name);
-GLAPI PFNGLGETACTIVESUBROUTINEUNIFORMNAMEPROC glad_glGetActiveSubroutineUniformName;
-#define glGetActiveSubroutineUniformName glad_glGetActiveSubroutineUniformName
-typedef void (APIENTRYP PFNGLGETACTIVESUBROUTINENAMEPROC)(GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name);
-GLAPI PFNGLGETACTIVESUBROUTINENAMEPROC glad_glGetActiveSubroutineName;
-#define glGetActiveSubroutineName glad_glGetActiveSubroutineName
-typedef void (APIENTRYP PFNGLUNIFORMSUBROUTINESUIVPROC)(GLenum shadertype, GLsizei count, const GLuint *indices);
-GLAPI PFNGLUNIFORMSUBROUTINESUIVPROC glad_glUniformSubroutinesuiv;
-#define glUniformSubroutinesuiv glad_glUniformSubroutinesuiv
-typedef void (APIENTRYP PFNGLGETUNIFORMSUBROUTINEUIVPROC)(GLenum shadertype, GLint location, GLuint *params);
-GLAPI PFNGLGETUNIFORMSUBROUTINEUIVPROC glad_glGetUniformSubroutineuiv;
-#define glGetUniformSubroutineuiv glad_glGetUniformSubroutineuiv
-typedef void (APIENTRYP PFNGLGETPROGRAMSTAGEIVPROC)(GLuint program, GLenum shadertype, GLenum pname, GLint *values);
-GLAPI PFNGLGETPROGRAMSTAGEIVPROC glad_glGetProgramStageiv;
-#define glGetProgramStageiv glad_glGetProgramStageiv
-typedef void (APIENTRYP PFNGLPATCHPARAMETERIPROC)(GLenum pname, GLint value);
-GLAPI PFNGLPATCHPARAMETERIPROC glad_glPatchParameteri;
-#define glPatchParameteri glad_glPatchParameteri
-typedef void (APIENTRYP PFNGLPATCHPARAMETERFVPROC)(GLenum pname, const GLfloat *values);
-GLAPI PFNGLPATCHPARAMETERFVPROC glad_glPatchParameterfv;
-#define glPatchParameterfv glad_glPatchParameterfv
-typedef void (APIENTRYP PFNGLBINDTRANSFORMFEEDBACKPROC)(GLenum target, GLuint id);
-GLAPI PFNGLBINDTRANSFORMFEEDBACKPROC glad_glBindTransformFeedback;
-#define glBindTransformFeedback glad_glBindTransformFeedback
-typedef void (APIENTRYP PFNGLDELETETRANSFORMFEEDBACKSPROC)(GLsizei n, const GLuint *ids);
-GLAPI PFNGLDELETETRANSFORMFEEDBACKSPROC glad_glDeleteTransformFeedbacks;
-#define glDeleteTransformFeedbacks glad_glDeleteTransformFeedbacks
-typedef void (APIENTRYP PFNGLGENTRANSFORMFEEDBACKSPROC)(GLsizei n, GLuint *ids);
-GLAPI PFNGLGENTRANSFORMFEEDBACKSPROC glad_glGenTransformFeedbacks;
-#define glGenTransformFeedbacks glad_glGenTransformFeedbacks
-typedef GLboolean (APIENTRYP PFNGLISTRANSFORMFEEDBACKPROC)(GLuint id);
-GLAPI PFNGLISTRANSFORMFEEDBACKPROC glad_glIsTransformFeedback;
-#define glIsTransformFeedback glad_glIsTransformFeedback
-typedef void (APIENTRYP PFNGLPAUSETRANSFORMFEEDBACKPROC)(void);
-GLAPI PFNGLPAUSETRANSFORMFEEDBACKPROC glad_glPauseTransformFeedback;
-#define glPauseTransformFeedback glad_glPauseTransformFeedback
-typedef void (APIENTRYP PFNGLRESUMETRANSFORMFEEDBACKPROC)(void);
-GLAPI PFNGLRESUMETRANSFORMFEEDBACKPROC glad_glResumeTransformFeedback;
-#define glResumeTransformFeedback glad_glResumeTransformFeedback
-typedef void (APIENTRYP PFNGLDRAWTRANSFORMFEEDBACKPROC)(GLenum mode, GLuint id);
-GLAPI PFNGLDRAWTRANSFORMFEEDBACKPROC glad_glDrawTransformFeedback;
-#define glDrawTransformFeedback glad_glDrawTransformFeedback
-typedef void (APIENTRYP PFNGLDRAWTRANSFORMFEEDBACKSTREAMPROC)(GLenum mode, GLuint id, GLuint stream);
-GLAPI PFNGLDRAWTRANSFORMFEEDBACKSTREAMPROC glad_glDrawTransformFeedbackStream;
-#define glDrawTransformFeedbackStream glad_glDrawTransformFeedbackStream
-typedef void (APIENTRYP PFNGLBEGINQUERYINDEXEDPROC)(GLenum target, GLuint index, GLuint id);
-GLAPI PFNGLBEGINQUERYINDEXEDPROC glad_glBeginQueryIndexed;
-#define glBeginQueryIndexed glad_glBeginQueryIndexed
-typedef void (APIENTRYP PFNGLENDQUERYINDEXEDPROC)(GLenum target, GLuint index);
-GLAPI PFNGLENDQUERYINDEXEDPROC glad_glEndQueryIndexed;
-#define glEndQueryIndexed glad_glEndQueryIndexed
-typedef void (APIENTRYP PFNGLGETQUERYINDEXEDIVPROC)(GLenum target, GLuint index, GLenum pname, GLint *params);
-GLAPI PFNGLGETQUERYINDEXEDIVPROC glad_glGetQueryIndexediv;
-#define glGetQueryIndexediv glad_glGetQueryIndexediv
-#endif
-#ifndef GL_VERSION_4_1
-#define GL_VERSION_4_1 1
-GLAPI int GLAD_GL_VERSION_4_1;
-typedef void (APIENTRYP PFNGLRELEASESHADERCOMPILERPROC)(void);
-GLAPI PFNGLRELEASESHADERCOMPILERPROC glad_glReleaseShaderCompiler;
-#define glReleaseShaderCompiler glad_glReleaseShaderCompiler
-typedef void (APIENTRYP PFNGLSHADERBINARYPROC)(GLsizei count, const GLuint *shaders, GLenum binaryformat, const void *binary, GLsizei length);
-GLAPI PFNGLSHADERBINARYPROC glad_glShaderBinary;
-#define glShaderBinary glad_glShaderBinary
-typedef void (APIENTRYP PFNGLGETSHADERPRECISIONFORMATPROC)(GLenum shadertype, GLenum precisiontype, GLint *range, GLint *precision);
-GLAPI PFNGLGETSHADERPRECISIONFORMATPROC glad_glGetShaderPrecisionFormat;
-#define glGetShaderPrecisionFormat glad_glGetShaderPrecisionFormat
-typedef void (APIENTRYP PFNGLDEPTHRANGEFPROC)(GLfloat n, GLfloat f);
-GLAPI PFNGLDEPTHRANGEFPROC glad_glDepthRangef;
-#define glDepthRangef glad_glDepthRangef
-typedef void (APIENTRYP PFNGLCLEARDEPTHFPROC)(GLfloat d);
-GLAPI PFNGLCLEARDEPTHFPROC glad_glClearDepthf;
-#define glClearDepthf glad_glClearDepthf
-typedef void (APIENTRYP PFNGLGETPROGRAMBINARYPROC)(GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, void *binary);
-GLAPI PFNGLGETPROGRAMBINARYPROC glad_glGetProgramBinary;
-#define glGetProgramBinary glad_glGetProgramBinary
-typedef void (APIENTRYP PFNGLPROGRAMBINARYPROC)(GLuint program, GLenum binaryFormat, const void *binary, GLsizei length);
-GLAPI PFNGLPROGRAMBINARYPROC glad_glProgramBinary;
-#define glProgramBinary glad_glProgramBinary
-typedef void (APIENTRYP PFNGLPROGRAMPARAMETERIPROC)(GLuint program, GLenum pname, GLint value);
-GLAPI PFNGLPROGRAMPARAMETERIPROC glad_glProgramParameteri;
-#define glProgramParameteri glad_glProgramParameteri
-typedef void (APIENTRYP PFNGLUSEPROGRAMSTAGESPROC)(GLuint pipeline, GLbitfield stages, GLuint program);
-GLAPI PFNGLUSEPROGRAMSTAGESPROC glad_glUseProgramStages;
-#define glUseProgramStages glad_glUseProgramStages
-typedef void (APIENTRYP PFNGLACTIVESHADERPROGRAMPROC)(GLuint pipeline, GLuint program);
-GLAPI PFNGLACTIVESHADERPROGRAMPROC glad_glActiveShaderProgram;
-#define glActiveShaderProgram glad_glActiveShaderProgram
-typedef GLuint (APIENTRYP PFNGLCREATESHADERPROGRAMVPROC)(GLenum type, GLsizei count, const GLchar *const*strings);
-GLAPI PFNGLCREATESHADERPROGRAMVPROC glad_glCreateShaderProgramv;
-#define glCreateShaderProgramv glad_glCreateShaderProgramv
-typedef void (APIENTRYP PFNGLBINDPROGRAMPIPELINEPROC)(GLuint pipeline);
-GLAPI PFNGLBINDPROGRAMPIPELINEPROC glad_glBindProgramPipeline;
-#define glBindProgramPipeline glad_glBindProgramPipeline
-typedef void (APIENTRYP PFNGLDELETEPROGRAMPIPELINESPROC)(GLsizei n, const GLuint *pipelines);
-GLAPI PFNGLDELETEPROGRAMPIPELINESPROC glad_glDeleteProgramPipelines;
-#define glDeleteProgramPipelines glad_glDeleteProgramPipelines
-typedef void (APIENTRYP PFNGLGENPROGRAMPIPELINESPROC)(GLsizei n, GLuint *pipelines);
-GLAPI PFNGLGENPROGRAMPIPELINESPROC glad_glGenProgramPipelines;
-#define glGenProgramPipelines glad_glGenProgramPipelines
-typedef GLboolean (APIENTRYP PFNGLISPROGRAMPIPELINEPROC)(GLuint pipeline);
-GLAPI PFNGLISPROGRAMPIPELINEPROC glad_glIsProgramPipeline;
-#define glIsProgramPipeline glad_glIsProgramPipeline
-typedef void (APIENTRYP PFNGLGETPROGRAMPIPELINEIVPROC)(GLuint pipeline, GLenum pname, GLint *params);
-GLAPI PFNGLGETPROGRAMPIPELINEIVPROC glad_glGetProgramPipelineiv;
-#define glGetProgramPipelineiv glad_glGetProgramPipelineiv
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1IPROC)(GLuint program, GLint location, GLint v0);
-GLAPI PFNGLPROGRAMUNIFORM1IPROC glad_glProgramUniform1i;
-#define glProgramUniform1i glad_glProgramUniform1i
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1IVPROC)(GLuint program, GLint location, GLsizei count, const GLint *value);
-GLAPI PFNGLPROGRAMUNIFORM1IVPROC glad_glProgramUniform1iv;
-#define glProgramUniform1iv glad_glProgramUniform1iv
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1FPROC)(GLuint program, GLint location, GLfloat v0);
-GLAPI PFNGLPROGRAMUNIFORM1FPROC glad_glProgramUniform1f;
-#define glProgramUniform1f glad_glProgramUniform1f
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1FVPROC)(GLuint program, GLint location, GLsizei count, const GLfloat *value);
-GLAPI PFNGLPROGRAMUNIFORM1FVPROC glad_glProgramUniform1fv;
-#define glProgramUniform1fv glad_glProgramUniform1fv
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1DPROC)(GLuint program, GLint location, GLdouble v0);
-GLAPI PFNGLPROGRAMUNIFORM1DPROC glad_glProgramUniform1d;
-#define glProgramUniform1d glad_glProgramUniform1d
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1DVPROC)(GLuint program, GLint location, GLsizei count, const GLdouble *value);
-GLAPI PFNGLPROGRAMUNIFORM1DVPROC glad_glProgramUniform1dv;
-#define glProgramUniform1dv glad_glProgramUniform1dv
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UIPROC)(GLuint program, GLint location, GLuint v0);
-GLAPI PFNGLPROGRAMUNIFORM1UIPROC glad_glProgramUniform1ui;
-#define glProgramUniform1ui glad_glProgramUniform1ui
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UIVPROC)(GLuint program, GLint location, GLsizei count, const GLuint *value);
-GLAPI PFNGLPROGRAMUNIFORM1UIVPROC glad_glProgramUniform1uiv;
-#define glProgramUniform1uiv glad_glProgramUniform1uiv
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2IPROC)(GLuint program, GLint location, GLint v0, GLint v1);
-GLAPI PFNGLPROGRAMUNIFORM2IPROC glad_glProgramUniform2i;
-#define glProgramUniform2i glad_glProgramUniform2i
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2IVPROC)(GLuint program, GLint location, GLsizei count, const GLint *value);
-GLAPI PFNGLPROGRAMUNIFORM2IVPROC glad_glProgramUniform2iv;
-#define glProgramUniform2iv glad_glProgramUniform2iv
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2FPROC)(GLuint program, GLint location, GLfloat v0, GLfloat v1);
-GLAPI PFNGLPROGRAMUNIFORM2FPROC glad_glProgramUniform2f;
-#define glProgramUniform2f glad_glProgramUniform2f
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2FVPROC)(GLuint program, GLint location, GLsizei count, const GLfloat *value);
-GLAPI PFNGLPROGRAMUNIFORM2FVPROC glad_glProgramUniform2fv;
-#define glProgramUniform2fv glad_glProgramUniform2fv
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2DPROC)(GLuint program, GLint location, GLdouble v0, GLdouble v1);
-GLAPI PFNGLPROGRAMUNIFORM2DPROC glad_glProgramUniform2d;
-#define glProgramUniform2d glad_glProgramUniform2d
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2DVPROC)(GLuint program, GLint location, GLsizei count, const GLdouble *value);
-GLAPI PFNGLPROGRAMUNIFORM2DVPROC glad_glProgramUniform2dv;
-#define glProgramUniform2dv glad_glProgramUniform2dv
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UIPROC)(GLuint program, GLint location, GLuint v0, GLuint v1);
-GLAPI PFNGLPROGRAMUNIFORM2UIPROC glad_glProgramUniform2ui;
-#define glProgramUniform2ui glad_glProgramUniform2ui
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UIVPROC)(GLuint program, GLint location, GLsizei count, const GLuint *value);
-GLAPI PFNGLPROGRAMUNIFORM2UIVPROC glad_glProgramUniform2uiv;
-#define glProgramUniform2uiv glad_glProgramUniform2uiv
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3IPROC)(GLuint program, GLint location, GLint v0, GLint v1, GLint v2);
-GLAPI PFNGLPROGRAMUNIFORM3IPROC glad_glProgramUniform3i;
-#define glProgramUniform3i glad_glProgramUniform3i
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3IVPROC)(GLuint program, GLint location, GLsizei count, const GLint *value);
-GLAPI PFNGLPROGRAMUNIFORM3IVPROC glad_glProgramUniform3iv;
-#define glProgramUniform3iv glad_glProgramUniform3iv
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3FPROC)(GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
-GLAPI PFNGLPROGRAMUNIFORM3FPROC glad_glProgramUniform3f;
-#define glProgramUniform3f glad_glProgramUniform3f
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3FVPROC)(GLuint program, GLint location, GLsizei count, const GLfloat *value);
-GLAPI PFNGLPROGRAMUNIFORM3FVPROC glad_glProgramUniform3fv;
-#define glProgramUniform3fv glad_glProgramUniform3fv
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3DPROC)(GLuint program, GLint location, GLdouble v0, GLdouble v1, GLdouble v2);
-GLAPI PFNGLPROGRAMUNIFORM3DPROC glad_glProgramUniform3d;
-#define glProgramUniform3d glad_glProgramUniform3d
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3DVPROC)(GLuint program, GLint location, GLsizei count, const GLdouble *value);
-GLAPI PFNGLPROGRAMUNIFORM3DVPROC glad_glProgramUniform3dv;
-#define glProgramUniform3dv glad_glProgramUniform3dv
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UIPROC)(GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2);
-GLAPI PFNGLPROGRAMUNIFORM3UIPROC glad_glProgramUniform3ui;
-#define glProgramUniform3ui glad_glProgramUniform3ui
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UIVPROC)(GLuint program, GLint location, GLsizei count, const GLuint *value);
-GLAPI PFNGLPROGRAMUNIFORM3UIVPROC glad_glProgramUniform3uiv;
-#define glProgramUniform3uiv glad_glProgramUniform3uiv
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4IPROC)(GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
-GLAPI PFNGLPROGRAMUNIFORM4IPROC glad_glProgramUniform4i;
-#define glProgramUniform4i glad_glProgramUniform4i
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4IVPROC)(GLuint program, GLint location, GLsizei count, const GLint *value);
-GLAPI PFNGLPROGRAMUNIFORM4IVPROC glad_glProgramUniform4iv;
-#define glProgramUniform4iv glad_glProgramUniform4iv
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4FPROC)(GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
-GLAPI PFNGLPROGRAMUNIFORM4FPROC glad_glProgramUniform4f;
-#define glProgramUniform4f glad_glProgramUniform4f
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4FVPROC)(GLuint program, GLint location, GLsizei count, const GLfloat *value);
-GLAPI PFNGLPROGRAMUNIFORM4FVPROC glad_glProgramUniform4fv;
-#define glProgramUniform4fv glad_glProgramUniform4fv
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4DPROC)(GLuint program, GLint location, GLdouble v0, GLdouble v1, GLdouble v2, GLdouble v3);
-GLAPI PFNGLPROGRAMUNIFORM4DPROC glad_glProgramUniform4d;
-#define glProgramUniform4d glad_glProgramUniform4d
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4DVPROC)(GLuint program, GLint location, GLsizei count, const GLdouble *value);
-GLAPI PFNGLPROGRAMUNIFORM4DVPROC glad_glProgramUniform4dv;
-#define glProgramUniform4dv glad_glProgramUniform4dv
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UIPROC)(GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
-GLAPI PFNGLPROGRAMUNIFORM4UIPROC glad_glProgramUniform4ui;
-#define glProgramUniform4ui glad_glProgramUniform4ui
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UIVPROC)(GLuint program, GLint location, GLsizei count, const GLuint *value);
-GLAPI PFNGLPROGRAMUNIFORM4UIVPROC glad_glProgramUniform4uiv;
-#define glProgramUniform4uiv glad_glProgramUniform4uiv
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2FVPROC)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GLAPI PFNGLPROGRAMUNIFORMMATRIX2FVPROC glad_glProgramUniformMatrix2fv;
-#define glProgramUniformMatrix2fv glad_glProgramUniformMatrix2fv
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3FVPROC)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GLAPI PFNGLPROGRAMUNIFORMMATRIX3FVPROC glad_glProgramUniformMatrix3fv;
-#define glProgramUniformMatrix3fv glad_glProgramUniformMatrix3fv
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4FVPROC)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GLAPI PFNGLPROGRAMUNIFORMMATRIX4FVPROC glad_glProgramUniformMatrix4fv;
-#define glProgramUniformMatrix4fv glad_glProgramUniformMatrix4fv
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2DVPROC)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI PFNGLPROGRAMUNIFORMMATRIX2DVPROC glad_glProgramUniformMatrix2dv;
-#define glProgramUniformMatrix2dv glad_glProgramUniformMatrix2dv
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3DVPROC)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI PFNGLPROGRAMUNIFORMMATRIX3DVPROC glad_glProgramUniformMatrix3dv;
-#define glProgramUniformMatrix3dv glad_glProgramUniformMatrix3dv
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4DVPROC)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI PFNGLPROGRAMUNIFORMMATRIX4DVPROC glad_glProgramUniformMatrix4dv;
-#define glProgramUniformMatrix4dv glad_glProgramUniformMatrix4dv
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X3FVPROC)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GLAPI PFNGLPROGRAMUNIFORMMATRIX2X3FVPROC glad_glProgramUniformMatrix2x3fv;
-#define glProgramUniformMatrix2x3fv glad_glProgramUniformMatrix2x3fv
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X2FVPROC)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GLAPI PFNGLPROGRAMUNIFORMMATRIX3X2FVPROC glad_glProgramUniformMatrix3x2fv;
-#define glProgramUniformMatrix3x2fv glad_glProgramUniformMatrix3x2fv
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X4FVPROC)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GLAPI PFNGLPROGRAMUNIFORMMATRIX2X4FVPROC glad_glProgramUniformMatrix2x4fv;
-#define glProgramUniformMatrix2x4fv glad_glProgramUniformMatrix2x4fv
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X2FVPROC)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GLAPI PFNGLPROGRAMUNIFORMMATRIX4X2FVPROC glad_glProgramUniformMatrix4x2fv;
-#define glProgramUniformMatrix4x2fv glad_glProgramUniformMatrix4x2fv
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X4FVPROC)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GLAPI PFNGLPROGRAMUNIFORMMATRIX3X4FVPROC glad_glProgramUniformMatrix3x4fv;
-#define glProgramUniformMatrix3x4fv glad_glProgramUniformMatrix3x4fv
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X3FVPROC)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-GLAPI PFNGLPROGRAMUNIFORMMATRIX4X3FVPROC glad_glProgramUniformMatrix4x3fv;
-#define glProgramUniformMatrix4x3fv glad_glProgramUniformMatrix4x3fv
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X3DVPROC)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI PFNGLPROGRAMUNIFORMMATRIX2X3DVPROC glad_glProgramUniformMatrix2x3dv;
-#define glProgramUniformMatrix2x3dv glad_glProgramUniformMatrix2x3dv
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X2DVPROC)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI PFNGLPROGRAMUNIFORMMATRIX3X2DVPROC glad_glProgramUniformMatrix3x2dv;
-#define glProgramUniformMatrix3x2dv glad_glProgramUniformMatrix3x2dv
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X4DVPROC)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI PFNGLPROGRAMUNIFORMMATRIX2X4DVPROC glad_glProgramUniformMatrix2x4dv;
-#define glProgramUniformMatrix2x4dv glad_glProgramUniformMatrix2x4dv
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X2DVPROC)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI PFNGLPROGRAMUNIFORMMATRIX4X2DVPROC glad_glProgramUniformMatrix4x2dv;
-#define glProgramUniformMatrix4x2dv glad_glProgramUniformMatrix4x2dv
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X4DVPROC)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI PFNGLPROGRAMUNIFORMMATRIX3X4DVPROC glad_glProgramUniformMatrix3x4dv;
-#define glProgramUniformMatrix3x4dv glad_glProgramUniformMatrix3x4dv
-typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X3DVPROC)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-GLAPI PFNGLPROGRAMUNIFORMMATRIX4X3DVPROC glad_glProgramUniformMatrix4x3dv;
-#define glProgramUniformMatrix4x3dv glad_glProgramUniformMatrix4x3dv
-typedef void (APIENTRYP PFNGLVALIDATEPROGRAMPIPELINEPROC)(GLuint pipeline);
-GLAPI PFNGLVALIDATEPROGRAMPIPELINEPROC glad_glValidateProgramPipeline;
-#define glValidateProgramPipeline glad_glValidateProgramPipeline
-typedef void (APIENTRYP PFNGLGETPROGRAMPIPELINEINFOLOGPROC)(GLuint pipeline, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
-GLAPI PFNGLGETPROGRAMPIPELINEINFOLOGPROC glad_glGetProgramPipelineInfoLog;
-#define glGetProgramPipelineInfoLog glad_glGetProgramPipelineInfoLog
-typedef void (APIENTRYP PFNGLVERTEXATTRIBL1DPROC)(GLuint index, GLdouble x);
-GLAPI PFNGLVERTEXATTRIBL1DPROC glad_glVertexAttribL1d;
-#define glVertexAttribL1d glad_glVertexAttribL1d
-typedef void (APIENTRYP PFNGLVERTEXATTRIBL2DPROC)(GLuint index, GLdouble x, GLdouble y);
-GLAPI PFNGLVERTEXATTRIBL2DPROC glad_glVertexAttribL2d;
-#define glVertexAttribL2d glad_glVertexAttribL2d
-typedef void (APIENTRYP PFNGLVERTEXATTRIBL3DPROC)(GLuint index, GLdouble x, GLdouble y, GLdouble z);
-GLAPI PFNGLVERTEXATTRIBL3DPROC glad_glVertexAttribL3d;
-#define glVertexAttribL3d glad_glVertexAttribL3d
-typedef void (APIENTRYP PFNGLVERTEXATTRIBL4DPROC)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-GLAPI PFNGLVERTEXATTRIBL4DPROC glad_glVertexAttribL4d;
-#define glVertexAttribL4d glad_glVertexAttribL4d
-typedef void (APIENTRYP PFNGLVERTEXATTRIBL1DVPROC)(GLuint index, const GLdouble *v);
-GLAPI PFNGLVERTEXATTRIBL1DVPROC glad_glVertexAttribL1dv;
-#define glVertexAttribL1dv glad_glVertexAttribL1dv
-typedef void (APIENTRYP PFNGLVERTEXATTRIBL2DVPROC)(GLuint index, const GLdouble *v);
-GLAPI PFNGLVERTEXATTRIBL2DVPROC glad_glVertexAttribL2dv;
-#define glVertexAttribL2dv glad_glVertexAttribL2dv
-typedef void (APIENTRYP PFNGLVERTEXATTRIBL3DVPROC)(GLuint index, const GLdouble *v);
-GLAPI PFNGLVERTEXATTRIBL3DVPROC glad_glVertexAttribL3dv;
-#define glVertexAttribL3dv glad_glVertexAttribL3dv
-typedef void (APIENTRYP PFNGLVERTEXATTRIBL4DVPROC)(GLuint index, const GLdouble *v);
-GLAPI PFNGLVERTEXATTRIBL4DVPROC glad_glVertexAttribL4dv;
-#define glVertexAttribL4dv glad_glVertexAttribL4dv
-typedef void (APIENTRYP PFNGLVERTEXATTRIBLPOINTERPROC)(GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer);
-GLAPI PFNGLVERTEXATTRIBLPOINTERPROC glad_glVertexAttribLPointer;
-#define glVertexAttribLPointer glad_glVertexAttribLPointer
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBLDVPROC)(GLuint index, GLenum pname, GLdouble *params);
-GLAPI PFNGLGETVERTEXATTRIBLDVPROC glad_glGetVertexAttribLdv;
-#define glGetVertexAttribLdv glad_glGetVertexAttribLdv
-typedef void (APIENTRYP PFNGLVIEWPORTARRAYVPROC)(GLuint first, GLsizei count, const GLfloat *v);
-GLAPI PFNGLVIEWPORTARRAYVPROC glad_glViewportArrayv;
-#define glViewportArrayv glad_glViewportArrayv
-typedef void (APIENTRYP PFNGLVIEWPORTINDEXEDFPROC)(GLuint index, GLfloat x, GLfloat y, GLfloat w, GLfloat h);
-GLAPI PFNGLVIEWPORTINDEXEDFPROC glad_glViewportIndexedf;
-#define glViewportIndexedf glad_glViewportIndexedf
-typedef void (APIENTRYP PFNGLVIEWPORTINDEXEDFVPROC)(GLuint index, const GLfloat *v);
-GLAPI PFNGLVIEWPORTINDEXEDFVPROC glad_glViewportIndexedfv;
-#define glViewportIndexedfv glad_glViewportIndexedfv
-typedef void (APIENTRYP PFNGLSCISSORARRAYVPROC)(GLuint first, GLsizei count, const GLint *v);
-GLAPI PFNGLSCISSORARRAYVPROC glad_glScissorArrayv;
-#define glScissorArrayv glad_glScissorArrayv
-typedef void (APIENTRYP PFNGLSCISSORINDEXEDPROC)(GLuint index, GLint left, GLint bottom, GLsizei width, GLsizei height);
-GLAPI PFNGLSCISSORINDEXEDPROC glad_glScissorIndexed;
-#define glScissorIndexed glad_glScissorIndexed
-typedef void (APIENTRYP PFNGLSCISSORINDEXEDVPROC)(GLuint index, const GLint *v);
-GLAPI PFNGLSCISSORINDEXEDVPROC glad_glScissorIndexedv;
-#define glScissorIndexedv glad_glScissorIndexedv
-typedef void (APIENTRYP PFNGLDEPTHRANGEARRAYVPROC)(GLuint first, GLsizei count, const GLdouble *v);
-GLAPI PFNGLDEPTHRANGEARRAYVPROC glad_glDepthRangeArrayv;
-#define glDepthRangeArrayv glad_glDepthRangeArrayv
-typedef void (APIENTRYP PFNGLDEPTHRANGEINDEXEDPROC)(GLuint index, GLdouble n, GLdouble f);
-GLAPI PFNGLDEPTHRANGEINDEXEDPROC glad_glDepthRangeIndexed;
-#define glDepthRangeIndexed glad_glDepthRangeIndexed
-typedef void (APIENTRYP PFNGLGETFLOATI_VPROC)(GLenum target, GLuint index, GLfloat *data);
-GLAPI PFNGLGETFLOATI_VPROC glad_glGetFloati_v;
-#define glGetFloati_v glad_glGetFloati_v
-typedef void (APIENTRYP PFNGLGETDOUBLEI_VPROC)(GLenum target, GLuint index, GLdouble *data);
-GLAPI PFNGLGETDOUBLEI_VPROC glad_glGetDoublei_v;
-#define glGetDoublei_v glad_glGetDoublei_v
-#endif
-#ifndef GL_VERSION_4_2
-#define GL_VERSION_4_2 1
-GLAPI int GLAD_GL_VERSION_4_2;
-typedef void (APIENTRYP PFNGLDRAWARRAYSINSTANCEDBASEINSTANCEPROC)(GLenum mode, GLint first, GLsizei count, GLsizei instancecount, GLuint baseinstance);
-GLAPI PFNGLDRAWARRAYSINSTANCEDBASEINSTANCEPROC glad_glDrawArraysInstancedBaseInstance;
-#define glDrawArraysInstancedBaseInstance glad_glDrawArraysInstancedBaseInstance
-typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDBASEINSTANCEPROC)(GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLuint baseinstance);
-GLAPI PFNGLDRAWELEMENTSINSTANCEDBASEINSTANCEPROC glad_glDrawElementsInstancedBaseInstance;
-#define glDrawElementsInstancedBaseInstance glad_glDrawElementsInstancedBaseInstance
-typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXBASEINSTANCEPROC)(GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLint basevertex, GLuint baseinstance);
-GLAPI PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXBASEINSTANCEPROC glad_glDrawElementsInstancedBaseVertexBaseInstance;
-#define glDrawElementsInstancedBaseVertexBaseInstance glad_glDrawElementsInstancedBaseVertexBaseInstance
-typedef void (APIENTRYP PFNGLGETINTERNALFORMATIVPROC)(GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint *params);
-GLAPI PFNGLGETINTERNALFORMATIVPROC glad_glGetInternalformativ;
-#define glGetInternalformativ glad_glGetInternalformativ
-typedef void (APIENTRYP PFNGLGETACTIVEATOMICCOUNTERBUFFERIVPROC)(GLuint program, GLuint bufferIndex, GLenum pname, GLint *params);
-GLAPI PFNGLGETACTIVEATOMICCOUNTERBUFFERIVPROC glad_glGetActiveAtomicCounterBufferiv;
-#define glGetActiveAtomicCounterBufferiv glad_glGetActiveAtomicCounterBufferiv
-typedef void (APIENTRYP PFNGLBINDIMAGETEXTUREPROC)(GLuint unit, GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum access, GLenum format);
-GLAPI PFNGLBINDIMAGETEXTUREPROC glad_glBindImageTexture;
-#define glBindImageTexture glad_glBindImageTexture
-typedef void (APIENTRYP PFNGLMEMORYBARRIERPROC)(GLbitfield barriers);
-GLAPI PFNGLMEMORYBARRIERPROC glad_glMemoryBarrier;
-#define glMemoryBarrier glad_glMemoryBarrier
-typedef void (APIENTRYP PFNGLTEXSTORAGE1DPROC)(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width);
-GLAPI PFNGLTEXSTORAGE1DPROC glad_glTexStorage1D;
-#define glTexStorage1D glad_glTexStorage1D
-typedef void (APIENTRYP PFNGLTEXSTORAGE2DPROC)(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
-GLAPI PFNGLTEXSTORAGE2DPROC glad_glTexStorage2D;
-#define glTexStorage2D glad_glTexStorage2D
-typedef void (APIENTRYP PFNGLTEXSTORAGE3DPROC)(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
-GLAPI PFNGLTEXSTORAGE3DPROC glad_glTexStorage3D;
-#define glTexStorage3D glad_glTexStorage3D
-typedef void (APIENTRYP PFNGLDRAWTRANSFORMFEEDBACKINSTANCEDPROC)(GLenum mode, GLuint id, GLsizei instancecount);
-GLAPI PFNGLDRAWTRANSFORMFEEDBACKINSTANCEDPROC glad_glDrawTransformFeedbackInstanced;
-#define glDrawTransformFeedbackInstanced glad_glDrawTransformFeedbackInstanced
-typedef void (APIENTRYP PFNGLDRAWTRANSFORMFEEDBACKSTREAMINSTANCEDPROC)(GLenum mode, GLuint id, GLuint stream, GLsizei instancecount);
-GLAPI PFNGLDRAWTRANSFORMFEEDBACKSTREAMINSTANCEDPROC glad_glDrawTransformFeedbackStreamInstanced;
-#define glDrawTransformFeedbackStreamInstanced glad_glDrawTransformFeedbackStreamInstanced
-#endif
-#ifndef GL_VERSION_4_3
-#define GL_VERSION_4_3 1
-GLAPI int GLAD_GL_VERSION_4_3;
-typedef void (APIENTRYP PFNGLCLEARBUFFERDATAPROC)(GLenum target, GLenum internalformat, GLenum format, GLenum type, const void *data);
-GLAPI PFNGLCLEARBUFFERDATAPROC glad_glClearBufferData;
-#define glClearBufferData glad_glClearBufferData
-typedef void (APIENTRYP PFNGLCLEARBUFFERSUBDATAPROC)(GLenum target, GLenum internalformat, GLintptr offset, GLsizeiptr size, GLenum format, GLenum type, const void *data);
-GLAPI PFNGLCLEARBUFFERSUBDATAPROC glad_glClearBufferSubData;
-#define glClearBufferSubData glad_glClearBufferSubData
-typedef void (APIENTRYP PFNGLDISPATCHCOMPUTEPROC)(GLuint num_groups_x, GLuint num_groups_y, GLuint num_groups_z);
-GLAPI PFNGLDISPATCHCOMPUTEPROC glad_glDispatchCompute;
-#define glDispatchCompute glad_glDispatchCompute
-typedef void (APIENTRYP PFNGLDISPATCHCOMPUTEINDIRECTPROC)(GLintptr indirect);
-GLAPI PFNGLDISPATCHCOMPUTEINDIRECTPROC glad_glDispatchComputeIndirect;
-#define glDispatchComputeIndirect glad_glDispatchComputeIndirect
-typedef void (APIENTRYP PFNGLCOPYIMAGESUBDATAPROC)(GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei srcWidth, GLsizei srcHeight, GLsizei srcDepth);
-GLAPI PFNGLCOPYIMAGESUBDATAPROC glad_glCopyImageSubData;
-#define glCopyImageSubData glad_glCopyImageSubData
-typedef void (APIENTRYP PFNGLFRAMEBUFFERPARAMETERIPROC)(GLenum target, GLenum pname, GLint param);
-GLAPI PFNGLFRAMEBUFFERPARAMETERIPROC glad_glFramebufferParameteri;
-#define glFramebufferParameteri glad_glFramebufferParameteri
-typedef void (APIENTRYP PFNGLGETFRAMEBUFFERPARAMETERIVPROC)(GLenum target, GLenum pname, GLint *params);
-GLAPI PFNGLGETFRAMEBUFFERPARAMETERIVPROC glad_glGetFramebufferParameteriv;
-#define glGetFramebufferParameteriv glad_glGetFramebufferParameteriv
-typedef void (APIENTRYP PFNGLGETINTERNALFORMATI64VPROC)(GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint64 *params);
-GLAPI PFNGLGETINTERNALFORMATI64VPROC glad_glGetInternalformati64v;
-#define glGetInternalformati64v glad_glGetInternalformati64v
-typedef void (APIENTRYP PFNGLINVALIDATETEXSUBIMAGEPROC)(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth);
-GLAPI PFNGLINVALIDATETEXSUBIMAGEPROC glad_glInvalidateTexSubImage;
-#define glInvalidateTexSubImage glad_glInvalidateTexSubImage
-typedef void (APIENTRYP PFNGLINVALIDATETEXIMAGEPROC)(GLuint texture, GLint level);
-GLAPI PFNGLINVALIDATETEXIMAGEPROC glad_glInvalidateTexImage;
-#define glInvalidateTexImage glad_glInvalidateTexImage
-typedef void (APIENTRYP PFNGLINVALIDATEBUFFERSUBDATAPROC)(GLuint buffer, GLintptr offset, GLsizeiptr length);
-GLAPI PFNGLINVALIDATEBUFFERSUBDATAPROC glad_glInvalidateBufferSubData;
-#define glInvalidateBufferSubData glad_glInvalidateBufferSubData
-typedef void (APIENTRYP PFNGLINVALIDATEBUFFERDATAPROC)(GLuint buffer);
-GLAPI PFNGLINVALIDATEBUFFERDATAPROC glad_glInvalidateBufferData;
-#define glInvalidateBufferData glad_glInvalidateBufferData
-typedef void (APIENTRYP PFNGLINVALIDATEFRAMEBUFFERPROC)(GLenum target, GLsizei numAttachments, const GLenum *attachments);
-GLAPI PFNGLINVALIDATEFRAMEBUFFERPROC glad_glInvalidateFramebuffer;
-#define glInvalidateFramebuffer glad_glInvalidateFramebuffer
-typedef void (APIENTRYP PFNGLINVALIDATESUBFRAMEBUFFERPROC)(GLenum target, GLsizei numAttachments, const GLenum *attachments, GLint x, GLint y, GLsizei width, GLsizei height);
-GLAPI PFNGLINVALIDATESUBFRAMEBUFFERPROC glad_glInvalidateSubFramebuffer;
-#define glInvalidateSubFramebuffer glad_glInvalidateSubFramebuffer
-typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSINDIRECTPROC)(GLenum mode, const void *indirect, GLsizei drawcount, GLsizei stride);
-GLAPI PFNGLMULTIDRAWARRAYSINDIRECTPROC glad_glMultiDrawArraysIndirect;
-#define glMultiDrawArraysIndirect glad_glMultiDrawArraysIndirect
-typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSINDIRECTPROC)(GLenum mode, GLenum type, const void *indirect, GLsizei drawcount, GLsizei stride);
-GLAPI PFNGLMULTIDRAWELEMENTSINDIRECTPROC glad_glMultiDrawElementsIndirect;
-#define glMultiDrawElementsIndirect glad_glMultiDrawElementsIndirect
-typedef void (APIENTRYP PFNGLGETPROGRAMINTERFACEIVPROC)(GLuint program, GLenum programInterface, GLenum pname, GLint *params);
-GLAPI PFNGLGETPROGRAMINTERFACEIVPROC glad_glGetProgramInterfaceiv;
-#define glGetProgramInterfaceiv glad_glGetProgramInterfaceiv
-typedef GLuint (APIENTRYP PFNGLGETPROGRAMRESOURCEINDEXPROC)(GLuint program, GLenum programInterface, const GLchar *name);
-GLAPI PFNGLGETPROGRAMRESOURCEINDEXPROC glad_glGetProgramResourceIndex;
-#define glGetProgramResourceIndex glad_glGetProgramResourceIndex
-typedef void (APIENTRYP PFNGLGETPROGRAMRESOURCENAMEPROC)(GLuint program, GLenum programInterface, GLuint index, GLsizei bufSize, GLsizei *length, GLchar *name);
-GLAPI PFNGLGETPROGRAMRESOURCENAMEPROC glad_glGetProgramResourceName;
-#define glGetProgramResourceName glad_glGetProgramResourceName
-typedef void (APIENTRYP PFNGLGETPROGRAMRESOURCEIVPROC)(GLuint program, GLenum programInterface, GLuint index, GLsizei propCount, const GLenum *props, GLsizei bufSize, GLsizei *length, GLint *params);
-GLAPI PFNGLGETPROGRAMRESOURCEIVPROC glad_glGetProgramResourceiv;
-#define glGetProgramResourceiv glad_glGetProgramResourceiv
-typedef GLint (APIENTRYP PFNGLGETPROGRAMRESOURCELOCATIONPROC)(GLuint program, GLenum programInterface, const GLchar *name);
-GLAPI PFNGLGETPROGRAMRESOURCELOCATIONPROC glad_glGetProgramResourceLocation;
-#define glGetProgramResourceLocation glad_glGetProgramResourceLocation
-typedef GLint (APIENTRYP PFNGLGETPROGRAMRESOURCELOCATIONINDEXPROC)(GLuint program, GLenum programInterface, const GLchar *name);
-GLAPI PFNGLGETPROGRAMRESOURCELOCATIONINDEXPROC glad_glGetProgramResourceLocationIndex;
-#define glGetProgramResourceLocationIndex glad_glGetProgramResourceLocationIndex
-typedef void (APIENTRYP PFNGLSHADERSTORAGEBLOCKBINDINGPROC)(GLuint program, GLuint storageBlockIndex, GLuint storageBlockBinding);
-GLAPI PFNGLSHADERSTORAGEBLOCKBINDINGPROC glad_glShaderStorageBlockBinding;
-#define glShaderStorageBlockBinding glad_glShaderStorageBlockBinding
-typedef void (APIENTRYP PFNGLTEXBUFFERRANGEPROC)(GLenum target, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size);
-GLAPI PFNGLTEXBUFFERRANGEPROC glad_glTexBufferRange;
-#define glTexBufferRange glad_glTexBufferRange
-typedef void (APIENTRYP PFNGLTEXSTORAGE2DMULTISAMPLEPROC)(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations);
-GLAPI PFNGLTEXSTORAGE2DMULTISAMPLEPROC glad_glTexStorage2DMultisample;
-#define glTexStorage2DMultisample glad_glTexStorage2DMultisample
-typedef void (APIENTRYP PFNGLTEXSTORAGE3DMULTISAMPLEPROC)(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations);
-GLAPI PFNGLTEXSTORAGE3DMULTISAMPLEPROC glad_glTexStorage3DMultisample;
-#define glTexStorage3DMultisample glad_glTexStorage3DMultisample
-typedef void (APIENTRYP PFNGLTEXTUREVIEWPROC)(GLuint texture, GLenum target, GLuint origtexture, GLenum internalformat, GLuint minlevel, GLuint numlevels, GLuint minlayer, GLuint numlayers);
-GLAPI PFNGLTEXTUREVIEWPROC glad_glTextureView;
-#define glTextureView glad_glTextureView
-typedef void (APIENTRYP PFNGLBINDVERTEXBUFFERPROC)(GLuint bindingindex, GLuint buffer, GLintptr offset, GLsizei stride);
-GLAPI PFNGLBINDVERTEXBUFFERPROC glad_glBindVertexBuffer;
-#define glBindVertexBuffer glad_glBindVertexBuffer
-typedef void (APIENTRYP PFNGLVERTEXATTRIBFORMATPROC)(GLuint attribindex, GLint size, GLenum type, GLboolean normalized, GLuint relativeoffset);
-GLAPI PFNGLVERTEXATTRIBFORMATPROC glad_glVertexAttribFormat;
-#define glVertexAttribFormat glad_glVertexAttribFormat
-typedef void (APIENTRYP PFNGLVERTEXATTRIBIFORMATPROC)(GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset);
-GLAPI PFNGLVERTEXATTRIBIFORMATPROC glad_glVertexAttribIFormat;
-#define glVertexAttribIFormat glad_glVertexAttribIFormat
-typedef void (APIENTRYP PFNGLVERTEXATTRIBLFORMATPROC)(GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset);
-GLAPI PFNGLVERTEXATTRIBLFORMATPROC glad_glVertexAttribLFormat;
-#define glVertexAttribLFormat glad_glVertexAttribLFormat
-typedef void (APIENTRYP PFNGLVERTEXATTRIBBINDINGPROC)(GLuint attribindex, GLuint bindingindex);
-GLAPI PFNGLVERTEXATTRIBBINDINGPROC glad_glVertexAttribBinding;
-#define glVertexAttribBinding glad_glVertexAttribBinding
-typedef void (APIENTRYP PFNGLVERTEXBINDINGDIVISORPROC)(GLuint bindingindex, GLuint divisor);
-GLAPI PFNGLVERTEXBINDINGDIVISORPROC glad_glVertexBindingDivisor;
-#define glVertexBindingDivisor glad_glVertexBindingDivisor
-typedef void (APIENTRYP PFNGLDEBUGMESSAGECONTROLPROC)(GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled);
-GLAPI PFNGLDEBUGMESSAGECONTROLPROC glad_glDebugMessageControl;
-#define glDebugMessageControl glad_glDebugMessageControl
-typedef void (APIENTRYP PFNGLDEBUGMESSAGEINSERTPROC)(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf);
-GLAPI PFNGLDEBUGMESSAGEINSERTPROC glad_glDebugMessageInsert;
-#define glDebugMessageInsert glad_glDebugMessageInsert
-typedef void (APIENTRYP PFNGLDEBUGMESSAGECALLBACKPROC)(GLDEBUGPROC callback, const void *userParam);
-GLAPI PFNGLDEBUGMESSAGECALLBACKPROC glad_glDebugMessageCallback;
-#define glDebugMessageCallback glad_glDebugMessageCallback
-typedef GLuint (APIENTRYP PFNGLGETDEBUGMESSAGELOGPROC)(GLuint count, GLsizei bufSize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog);
-GLAPI PFNGLGETDEBUGMESSAGELOGPROC glad_glGetDebugMessageLog;
-#define glGetDebugMessageLog glad_glGetDebugMessageLog
-typedef void (APIENTRYP PFNGLPUSHDEBUGGROUPPROC)(GLenum source, GLuint id, GLsizei length, const GLchar *message);
-GLAPI PFNGLPUSHDEBUGGROUPPROC glad_glPushDebugGroup;
-#define glPushDebugGroup glad_glPushDebugGroup
-typedef void (APIENTRYP PFNGLPOPDEBUGGROUPPROC)(void);
-GLAPI PFNGLPOPDEBUGGROUPPROC glad_glPopDebugGroup;
-#define glPopDebugGroup glad_glPopDebugGroup
-typedef void (APIENTRYP PFNGLOBJECTLABELPROC)(GLenum identifier, GLuint name, GLsizei length, const GLchar *label);
-GLAPI PFNGLOBJECTLABELPROC glad_glObjectLabel;
-#define glObjectLabel glad_glObjectLabel
-typedef void (APIENTRYP PFNGLGETOBJECTLABELPROC)(GLenum identifier, GLuint name, GLsizei bufSize, GLsizei *length, GLchar *label);
-GLAPI PFNGLGETOBJECTLABELPROC glad_glGetObjectLabel;
-#define glGetObjectLabel glad_glGetObjectLabel
-typedef void (APIENTRYP PFNGLOBJECTPTRLABELPROC)(const void *ptr, GLsizei length, const GLchar *label);
-GLAPI PFNGLOBJECTPTRLABELPROC glad_glObjectPtrLabel;
-#define glObjectPtrLabel glad_glObjectPtrLabel
-typedef void (APIENTRYP PFNGLGETOBJECTPTRLABELPROC)(const void *ptr, GLsizei bufSize, GLsizei *length, GLchar *label);
-GLAPI PFNGLGETOBJECTPTRLABELPROC glad_glGetObjectPtrLabel;
-#define glGetObjectPtrLabel glad_glGetObjectPtrLabel
-typedef void (APIENTRYP PFNGLGETPOINTERVPROC)(GLenum pname, void **params);
-GLAPI PFNGLGETPOINTERVPROC glad_glGetPointerv;
-#define glGetPointerv glad_glGetPointerv
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/Source/sys-clk/manager/lib/borealis/library/include/borealis/extern/libretro-common/boolean.h b/Source/sys-clk/manager/lib/borealis/library/include/borealis/extern/libretro-common/boolean.h
deleted file mode 100644
index f06ac5a7..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/include/borealis/extern/libretro-common/boolean.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright  (C) 2010-2018 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (boolean.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef __LIBRETRO_SDK_BOOLEAN_H
-#define __LIBRETRO_SDK_BOOLEAN_H
-
-#ifndef __cplusplus
-
-#if defined(_MSC_VER) && _MSC_VER < 1800 && !defined(SN_TARGET_PS3)
-/* Hack applied for MSVC when compiling in C89 mode as it isn't C99 compliant. */
-#define bool unsigned char
-#define true 1
-#define false 0
-#else
-#include <stdbool.h>
-#endif
-
-#endif
-
-#endif
diff --git a/Source/sys-clk/manager/lib/borealis/library/include/borealis/extern/libretro-common/compat/strl.h b/Source/sys-clk/manager/lib/borealis/library/include/borealis/extern/libretro-common/compat/strl.h
deleted file mode 100644
index c70f1195..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/include/borealis/extern/libretro-common/compat/strl.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Copyright  (C) 2010-2018 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (strl.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef __LIBRETRO_SDK_COMPAT_STRL_H
-#define __LIBRETRO_SDK_COMPAT_STRL_H
-
-#include <string.h>
-#include <stddef.h>
-
-#if defined(RARCH_INTERNAL) && defined(HAVE_CONFIG_H)
-#include "../../../config.h"
-#endif
-
-#include <retro_common_api.h>
-
-RETRO_BEGIN_DECLS
-
-#ifdef __MACH__
-#ifndef HAVE_STRL
-#define HAVE_STRL
-#endif
-#endif
-
-#ifndef HAVE_STRL
-/* Avoid possible naming collisions during link since
- * we prefer to use the actual name. */
-#define strlcpy(dst, src, size) strlcpy_retro__(dst, src, size)
-
-#define strlcat(dst, src, size) strlcat_retro__(dst, src, size)
-
-size_t strlcpy(char *dest, const char *source, size_t size);
-size_t strlcat(char *dest, const char *source, size_t size);
-
-#endif
-
-char *strldup(const char *s, size_t n);
-
-RETRO_END_DECLS
-
-#endif
diff --git a/Source/sys-clk/manager/lib/borealis/library/include/borealis/extern/libretro-common/encodings/utf.h b/Source/sys-clk/manager/lib/borealis/library/include/borealis/extern/libretro-common/encodings/utf.h
deleted file mode 100644
index b513f28a..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/include/borealis/extern/libretro-common/encodings/utf.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* Copyright  (C) 2010-2018 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (utf.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef _LIBRETRO_ENCODINGS_UTF_H
-#define _LIBRETRO_ENCODINGS_UTF_H
-
-#include <stdint.h>
-#include <stddef.h>
-
-#include <boolean.h>
-
-#include <retro_common_api.h>
-
-RETRO_BEGIN_DECLS
-
-enum CodePage
-{
-   CODEPAGE_LOCAL = 0, /* CP_ACP */
-   CODEPAGE_UTF8 = 65001 /* CP_UTF8 */
-};
-
-size_t utf8_conv_utf32(uint32_t *out, size_t out_chars,
-      const char *in, size_t in_size);
-
-bool utf16_conv_utf8(uint8_t *out, size_t *out_chars,
-      const uint16_t *in, size_t in_size);
-
-size_t utf8len(const char *string);
-
-size_t utf8cpy(char *d, size_t d_len, const char *s, size_t chars);
-
-const char *utf8skip(const char *str, size_t chars);
-
-uint32_t utf8_walk(const char **string);
-
-bool utf16_to_char_string(const uint16_t *in, char *s, size_t len);
-
-char* utf8_to_local_string_alloc(const char *str);
-
-char* local_to_utf8_string_alloc(const char *str);
-
-wchar_t* utf8_to_utf16_string_alloc(const char *str);
-
-char* utf16_to_utf8_string_alloc(const wchar_t *str);
-
-RETRO_END_DECLS
-
-#endif
diff --git a/Source/sys-clk/manager/lib/borealis/library/include/borealis/extern/libretro-common/features/features_cpu.h b/Source/sys-clk/manager/lib/borealis/library/include/borealis/extern/libretro-common/features/features_cpu.h
deleted file mode 100644
index 139d9b2d..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/include/borealis/extern/libretro-common/features/features_cpu.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* Copyright  (C) 2010-2018 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (features_cpu.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef _LIBRETRO_SDK_CPU_INFO_H
-#define _LIBRETRO_SDK_CPU_INFO_H
-
-#include <retro_common_api.h>
-
-#include <stdint.h>
-
-#include <libretro.h>
-
-RETRO_BEGIN_DECLS
-
-/**
- * cpu_features_get_perf_counter:
- *
- * Gets performance counter.
- *
- * Returns: performance counter.
- **/
-retro_perf_tick_t cpu_features_get_perf_counter(void);
-
-/**
- * cpu_features_get_time_usec:
- *
- * Gets time in microseconds, from an undefined epoch.
- * The epoch may change between computers or across reboots.
- *
- * Returns: time in microseconds
- **/
-retro_time_t cpu_features_get_time_usec(void);
-
-/**
- * cpu_features_get:
- *
- * Gets CPU features.
- *
- * Returns: bitmask of all CPU features available.
- **/
-uint64_t cpu_features_get(void);
-
-/**
- * cpu_features_get_core_amount:
- *
- * Gets the amount of available CPU cores.
- *
- * Returns: amount of CPU cores available.
- **/
-unsigned cpu_features_get_core_amount(void);
-
-void cpu_features_get_model_name(char *name, int len);
-
-RETRO_END_DECLS
-
-#endif
diff --git a/Source/sys-clk/manager/lib/borealis/library/include/borealis/extern/libretro-common/libretro.h b/Source/sys-clk/manager/lib/borealis/library/include/borealis/extern/libretro-common/libretro.h
deleted file mode 100644
index c3a7d40e..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/include/borealis/extern/libretro-common/libretro.h
+++ /dev/null
@@ -1,2537 +0,0 @@
-/* Copyright (C) 2010-2018 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this libretro API header (libretro.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef LIBRETRO_H__
-#define LIBRETRO_H__
-
-#include <stdint.h>
-#include <stddef.h>
-#include <limits.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef __cplusplus
-#if defined(_MSC_VER) && _MSC_VER < 1800 && !defined(SN_TARGET_PS3)
-/* Hack applied for MSVC when compiling in C89 mode
- * as it isn't C99-compliant. */
-#define bool unsigned char
-#define true 1
-#define false 0
-#else
-#include <stdbool.h>
-#endif
-#endif
-
-#ifndef RETRO_CALLCONV
-#  if defined(__GNUC__) && defined(__i386__) && !defined(__x86_64__)
-#    define RETRO_CALLCONV __attribute__((cdecl))
-#  elif defined(_MSC_VER) && defined(_M_X86) && !defined(_M_X64)
-#    define RETRO_CALLCONV __cdecl
-#  else
-#    define RETRO_CALLCONV /* all other platforms only have one calling convention each */
-#  endif
-#endif
-
-#ifndef RETRO_API
-#  if defined(_WIN32) || defined(__CYGWIN__) || defined(__MINGW32__)
-#    ifdef RETRO_IMPORT_SYMBOLS
-#      ifdef __GNUC__
-#        define RETRO_API RETRO_CALLCONV __attribute__((__dllimport__))
-#      else
-#        define RETRO_API RETRO_CALLCONV __declspec(dllimport)
-#      endif
-#    else
-#      ifdef __GNUC__
-#        define RETRO_API RETRO_CALLCONV __attribute__((__dllexport__))
-#      else
-#        define RETRO_API RETRO_CALLCONV __declspec(dllexport)
-#      endif
-#    endif
-#  else
-#      if defined(__GNUC__) && __GNUC__ >= 4 && !defined(__CELLOS_LV2__)
-#        define RETRO_API RETRO_CALLCONV __attribute__((__visibility__("default")))
-#      else
-#        define RETRO_API RETRO_CALLCONV
-#      endif
-#  endif
-#endif
-
-/* Used for checking API/ABI mismatches that can break libretro
- * implementations.
- * It is not incremented for compatible changes to the API.
- */
-#define RETRO_API_VERSION         1
-
-/*
- * Libretro's fundamental device abstractions.
- *
- * Libretro's input system consists of some standardized device types,
- * such as a joypad (with/without analog), mouse, keyboard, lightgun
- * and a pointer.
- *
- * The functionality of these devices are fixed, and individual cores
- * map their own concept of a controller to libretro's abstractions.
- * This makes it possible for frontends to map the abstract types to a
- * real input device, and not having to worry about binding input
- * correctly to arbitrary controller layouts.
- */
-
-#define RETRO_DEVICE_TYPE_SHIFT         8
-#define RETRO_DEVICE_MASK               ((1 << RETRO_DEVICE_TYPE_SHIFT) - 1)
-#define RETRO_DEVICE_SUBCLASS(base, id) (((id + 1) << RETRO_DEVICE_TYPE_SHIFT) | base)
-
-/* Input disabled. */
-#define RETRO_DEVICE_NONE         0
-
-/* The JOYPAD is called RetroPad. It is essentially a Super Nintendo
- * controller, but with additional L2/R2/L3/R3 buttons, similar to a
- * PS1 DualShock. */
-#define RETRO_DEVICE_JOYPAD       1
-
-/* The mouse is a simple mouse, similar to Super Nintendo's mouse.
- * X and Y coordinates are reported relatively to last poll (poll callback).
- * It is up to the libretro implementation to keep track of where the mouse
- * pointer is supposed to be on the screen.
- * The frontend must make sure not to interfere with its own hardware
- * mouse pointer.
- */
-#define RETRO_DEVICE_MOUSE        2
-
-/* KEYBOARD device lets one poll for raw key pressed.
- * It is poll based, so input callback will return with the current
- * pressed state.
- * For event/text based keyboard input, see
- * RETRO_ENVIRONMENT_SET_KEYBOARD_CALLBACK.
- */
-#define RETRO_DEVICE_KEYBOARD     3
-
-/* LIGHTGUN device is similar to Guncon-2 for PlayStation 2.
- * It reports X/Y coordinates in screen space (similar to the pointer)
- * in the range [-0x8000, 0x7fff] in both axes, with zero being center and
- * -0x8000 being out of bounds.
- * As well as reporting on/off screen state. It features a trigger,
- * start/select buttons, auxiliary action buttons and a
- * directional pad. A forced off-screen shot can be requested for
- * auto-reloading function in some games.
- */
-#define RETRO_DEVICE_LIGHTGUN     4
-
-/* The ANALOG device is an extension to JOYPAD (RetroPad).
- * Similar to DualShock2 it adds two analog sticks and all buttons can
- * be analog. This is treated as a separate device type as it returns
- * axis values in the full analog range of [-0x7fff, 0x7fff],
- * although some devices may return -0x8000.
- * Positive X axis is right. Positive Y axis is down.
- * Buttons are returned in the range [0, 0x7fff].
- * Only use ANALOG type when polling for analog values.
- */
-#define RETRO_DEVICE_ANALOG       5
-
-/* Abstracts the concept of a pointing mechanism, e.g. touch.
- * This allows libretro to query in absolute coordinates where on the
- * screen a mouse (or something similar) is being placed.
- * For a touch centric device, coordinates reported are the coordinates
- * of the press.
- *
- * Coordinates in X and Y are reported as:
- * [-0x7fff, 0x7fff]: -0x7fff corresponds to the far left/top of the screen,
- * and 0x7fff corresponds to the far right/bottom of the screen.
- * The "screen" is here defined as area that is passed to the frontend and
- * later displayed on the monitor.
- *
- * The frontend is free to scale/resize this screen as it sees fit, however,
- * (X, Y) = (-0x7fff, -0x7fff) will correspond to the top-left pixel of the
- * game image, etc.
- *
- * To check if the pointer coordinates are valid (e.g. a touch display
- * actually being touched), PRESSED returns 1 or 0.
- *
- * If using a mouse on a desktop, PRESSED will usually correspond to the
- * left mouse button, but this is a frontend decision.
- * PRESSED will only return 1 if the pointer is inside the game screen.
- *
- * For multi-touch, the index variable can be used to successively query
- * more presses.
- * If index = 0 returns true for _PRESSED, coordinates can be extracted
- * with _X, _Y for index = 0. One can then query _PRESSED, _X, _Y with
- * index = 1, and so on.
- * Eventually _PRESSED will return false for an index. No further presses
- * are registered at this point. */
-#define RETRO_DEVICE_POINTER      6
-
-/* Buttons for the RetroPad (JOYPAD).
- * The placement of these is equivalent to placements on the
- * Super Nintendo controller.
- * L2/R2/L3/R3 buttons correspond to the PS1 DualShock.
- * Also used as id values for RETRO_DEVICE_INDEX_ANALOG_BUTTON */
-#define RETRO_DEVICE_ID_JOYPAD_B        0
-#define RETRO_DEVICE_ID_JOYPAD_Y        1
-#define RETRO_DEVICE_ID_JOYPAD_SELECT   2
-#define RETRO_DEVICE_ID_JOYPAD_START    3
-#define RETRO_DEVICE_ID_JOYPAD_UP       4
-#define RETRO_DEVICE_ID_JOYPAD_DOWN     5
-#define RETRO_DEVICE_ID_JOYPAD_LEFT     6
-#define RETRO_DEVICE_ID_JOYPAD_RIGHT    7
-#define RETRO_DEVICE_ID_JOYPAD_A        8
-#define RETRO_DEVICE_ID_JOYPAD_X        9
-#define RETRO_DEVICE_ID_JOYPAD_L       10
-#define RETRO_DEVICE_ID_JOYPAD_R       11
-#define RETRO_DEVICE_ID_JOYPAD_L2      12
-#define RETRO_DEVICE_ID_JOYPAD_R2      13
-#define RETRO_DEVICE_ID_JOYPAD_L3      14
-#define RETRO_DEVICE_ID_JOYPAD_R3      15
-
-/* Index / Id values for ANALOG device. */
-#define RETRO_DEVICE_INDEX_ANALOG_LEFT       0
-#define RETRO_DEVICE_INDEX_ANALOG_RIGHT      1
-#define RETRO_DEVICE_INDEX_ANALOG_BUTTON     2
-#define RETRO_DEVICE_ID_ANALOG_X             0
-#define RETRO_DEVICE_ID_ANALOG_Y             1
-
-/* Id values for MOUSE. */
-#define RETRO_DEVICE_ID_MOUSE_X                0
-#define RETRO_DEVICE_ID_MOUSE_Y                1
-#define RETRO_DEVICE_ID_MOUSE_LEFT             2
-#define RETRO_DEVICE_ID_MOUSE_RIGHT            3
-#define RETRO_DEVICE_ID_MOUSE_WHEELUP          4
-#define RETRO_DEVICE_ID_MOUSE_WHEELDOWN        5
-#define RETRO_DEVICE_ID_MOUSE_MIDDLE           6
-#define RETRO_DEVICE_ID_MOUSE_HORIZ_WHEELUP    7
-#define RETRO_DEVICE_ID_MOUSE_HORIZ_WHEELDOWN  8
-#define RETRO_DEVICE_ID_MOUSE_BUTTON_4         9
-#define RETRO_DEVICE_ID_MOUSE_BUTTON_5         10
-
-/* Id values for LIGHTGUN. */
-#define RETRO_DEVICE_ID_LIGHTGUN_SCREEN_X        13 /*Absolute Position*/
-#define RETRO_DEVICE_ID_LIGHTGUN_SCREEN_Y        14 /*Absolute*/
-#define RETRO_DEVICE_ID_LIGHTGUN_IS_OFFSCREEN    15 /*Status Check*/
-#define RETRO_DEVICE_ID_LIGHTGUN_TRIGGER          2
-#define RETRO_DEVICE_ID_LIGHTGUN_RELOAD          16 /*Forced off-screen shot*/
-#define RETRO_DEVICE_ID_LIGHTGUN_AUX_A            3
-#define RETRO_DEVICE_ID_LIGHTGUN_AUX_B            4
-#define RETRO_DEVICE_ID_LIGHTGUN_START            6
-#define RETRO_DEVICE_ID_LIGHTGUN_SELECT           7
-#define RETRO_DEVICE_ID_LIGHTGUN_AUX_C            8
-#define RETRO_DEVICE_ID_LIGHTGUN_DPAD_UP          9
-#define RETRO_DEVICE_ID_LIGHTGUN_DPAD_DOWN       10
-#define RETRO_DEVICE_ID_LIGHTGUN_DPAD_LEFT       11
-#define RETRO_DEVICE_ID_LIGHTGUN_DPAD_RIGHT      12
-/* deprecated */
-#define RETRO_DEVICE_ID_LIGHTGUN_X                0 /*Relative Position*/
-#define RETRO_DEVICE_ID_LIGHTGUN_Y                1 /*Relative*/
-#define RETRO_DEVICE_ID_LIGHTGUN_CURSOR           3 /*Use Aux:A*/
-#define RETRO_DEVICE_ID_LIGHTGUN_TURBO            4 /*Use Aux:B*/
-#define RETRO_DEVICE_ID_LIGHTGUN_PAUSE            5 /*Use Start*/
-
-/* Id values for POINTER. */
-#define RETRO_DEVICE_ID_POINTER_X         0
-#define RETRO_DEVICE_ID_POINTER_Y         1
-#define RETRO_DEVICE_ID_POINTER_PRESSED   2
-
-/* Returned from retro_get_region(). */
-#define RETRO_REGION_NTSC  0
-#define RETRO_REGION_PAL   1
-
-/* Id values for LANGUAGE */
-enum retro_language
-{
-   RETRO_LANGUAGE_ENGLISH             = 0,
-   RETRO_LANGUAGE_JAPANESE            = 1,
-   RETRO_LANGUAGE_FRENCH              = 2,
-   RETRO_LANGUAGE_SPANISH             = 3,
-   RETRO_LANGUAGE_GERMAN              = 4,
-   RETRO_LANGUAGE_ITALIAN             = 5,
-   RETRO_LANGUAGE_DUTCH               = 6,
-   RETRO_LANGUAGE_PORTUGUESE_BRAZIL   = 7,
-   RETRO_LANGUAGE_PORTUGUESE_PORTUGAL = 8,
-   RETRO_LANGUAGE_RUSSIAN             = 9,
-   RETRO_LANGUAGE_KOREAN              = 10,
-   RETRO_LANGUAGE_CHINESE_TRADITIONAL = 11,
-   RETRO_LANGUAGE_CHINESE_SIMPLIFIED  = 12,
-   RETRO_LANGUAGE_ESPERANTO           = 13,
-   RETRO_LANGUAGE_POLISH              = 14,
-   RETRO_LANGUAGE_VIETNAMESE          = 15,
-   RETRO_LANGUAGE_ARABIC              = 16,
-   RETRO_LANGUAGE_GREEK               = 17,
-   RETRO_LANGUAGE_TURKISH             = 18,
-   RETRO_LANGUAGE_LAST,
-
-   /* Ensure sizeof(enum) == sizeof(int) */
-   RETRO_LANGUAGE_DUMMY          = INT_MAX
-};
-
-/* Passed to retro_get_memory_data/size().
- * If the memory type doesn't apply to the
- * implementation NULL/0 can be returned.
- */
-#define RETRO_MEMORY_MASK        0xff
-
-/* Regular save RAM. This RAM is usually found on a game cartridge,
- * backed up by a battery.
- * If save game data is too complex for a single memory buffer,
- * the SAVE_DIRECTORY (preferably) or SYSTEM_DIRECTORY environment
- * callback can be used. */
-#define RETRO_MEMORY_SAVE_RAM    0
-
-/* Some games have a built-in clock to keep track of time.
- * This memory is usually just a couple of bytes to keep track of time.
- */
-#define RETRO_MEMORY_RTC         1
-
-/* System ram lets a frontend peek into a game systems main RAM. */
-#define RETRO_MEMORY_SYSTEM_RAM  2
-
-/* Video ram lets a frontend peek into a game systems video RAM (VRAM). */
-#define RETRO_MEMORY_VIDEO_RAM   3
-
-/* Keysyms used for ID in input state callback when polling RETRO_KEYBOARD. */
-enum retro_key
-{
-   RETROK_UNKNOWN        = 0,
-   RETROK_FIRST          = 0,
-   RETROK_BACKSPACE      = 8,
-   RETROK_TAB            = 9,
-   RETROK_CLEAR          = 12,
-   RETROK_RETURN         = 13,
-   RETROK_PAUSE          = 19,
-   RETROK_ESCAPE         = 27,
-   RETROK_SPACE          = 32,
-   RETROK_EXCLAIM        = 33,
-   RETROK_QUOTEDBL       = 34,
-   RETROK_HASH           = 35,
-   RETROK_DOLLAR         = 36,
-   RETROK_AMPERSAND      = 38,
-   RETROK_QUOTE          = 39,
-   RETROK_LEFTPAREN      = 40,
-   RETROK_RIGHTPAREN     = 41,
-   RETROK_ASTERISK       = 42,
-   RETROK_PLUS           = 43,
-   RETROK_COMMA          = 44,
-   RETROK_MINUS          = 45,
-   RETROK_PERIOD         = 46,
-   RETROK_SLASH          = 47,
-   RETROK_0              = 48,
-   RETROK_1              = 49,
-   RETROK_2              = 50,
-   RETROK_3              = 51,
-   RETROK_4              = 52,
-   RETROK_5              = 53,
-   RETROK_6              = 54,
-   RETROK_7              = 55,
-   RETROK_8              = 56,
-   RETROK_9              = 57,
-   RETROK_COLON          = 58,
-   RETROK_SEMICOLON      = 59,
-   RETROK_LESS           = 60,
-   RETROK_EQUALS         = 61,
-   RETROK_GREATER        = 62,
-   RETROK_QUESTION       = 63,
-   RETROK_AT             = 64,
-   RETROK_LEFTBRACKET    = 91,
-   RETROK_BACKSLASH      = 92,
-   RETROK_RIGHTBRACKET   = 93,
-   RETROK_CARET          = 94,
-   RETROK_UNDERSCORE     = 95,
-   RETROK_BACKQUOTE      = 96,
-   RETROK_a              = 97,
-   RETROK_b              = 98,
-   RETROK_c              = 99,
-   RETROK_d              = 100,
-   RETROK_e              = 101,
-   RETROK_f              = 102,
-   RETROK_g              = 103,
-   RETROK_h              = 104,
-   RETROK_i              = 105,
-   RETROK_j              = 106,
-   RETROK_k              = 107,
-   RETROK_l              = 108,
-   RETROK_m              = 109,
-   RETROK_n              = 110,
-   RETROK_o              = 111,
-   RETROK_p              = 112,
-   RETROK_q              = 113,
-   RETROK_r              = 114,
-   RETROK_s              = 115,
-   RETROK_t              = 116,
-   RETROK_u              = 117,
-   RETROK_v              = 118,
-   RETROK_w              = 119,
-   RETROK_x              = 120,
-   RETROK_y              = 121,
-   RETROK_z              = 122,
-   RETROK_LEFTBRACE      = 123,
-   RETROK_BAR            = 124,
-   RETROK_RIGHTBRACE     = 125,
-   RETROK_TILDE          = 126,
-   RETROK_DELETE         = 127,
-
-   RETROK_KP0            = 256,
-   RETROK_KP1            = 257,
-   RETROK_KP2            = 258,
-   RETROK_KP3            = 259,
-   RETROK_KP4            = 260,
-   RETROK_KP5            = 261,
-   RETROK_KP6            = 262,
-   RETROK_KP7            = 263,
-   RETROK_KP8            = 264,
-   RETROK_KP9            = 265,
-   RETROK_KP_PERIOD      = 266,
-   RETROK_KP_DIVIDE      = 267,
-   RETROK_KP_MULTIPLY    = 268,
-   RETROK_KP_MINUS       = 269,
-   RETROK_KP_PLUS        = 270,
-   RETROK_KP_ENTER       = 271,
-   RETROK_KP_EQUALS      = 272,
-
-   RETROK_UP             = 273,
-   RETROK_DOWN           = 274,
-   RETROK_RIGHT          = 275,
-   RETROK_LEFT           = 276,
-   RETROK_INSERT         = 277,
-   RETROK_HOME           = 278,
-   RETROK_END            = 279,
-   RETROK_PAGEUP         = 280,
-   RETROK_PAGEDOWN       = 281,
-
-   RETROK_F1             = 282,
-   RETROK_F2             = 283,
-   RETROK_F3             = 284,
-   RETROK_F4             = 285,
-   RETROK_F5             = 286,
-   RETROK_F6             = 287,
-   RETROK_F7             = 288,
-   RETROK_F8             = 289,
-   RETROK_F9             = 290,
-   RETROK_F10            = 291,
-   RETROK_F11            = 292,
-   RETROK_F12            = 293,
-   RETROK_F13            = 294,
-   RETROK_F14            = 295,
-   RETROK_F15            = 296,
-
-   RETROK_NUMLOCK        = 300,
-   RETROK_CAPSLOCK       = 301,
-   RETROK_SCROLLOCK      = 302,
-   RETROK_RSHIFT         = 303,
-   RETROK_LSHIFT         = 304,
-   RETROK_RCTRL          = 305,
-   RETROK_LCTRL          = 306,
-   RETROK_RALT           = 307,
-   RETROK_LALT           = 308,
-   RETROK_RMETA          = 309,
-   RETROK_LMETA          = 310,
-   RETROK_LSUPER         = 311,
-   RETROK_RSUPER         = 312,
-   RETROK_MODE           = 313,
-   RETROK_COMPOSE        = 314,
-
-   RETROK_HELP           = 315,
-   RETROK_PRINT          = 316,
-   RETROK_SYSREQ         = 317,
-   RETROK_BREAK          = 318,
-   RETROK_MENU           = 319,
-   RETROK_POWER          = 320,
-   RETROK_EURO           = 321,
-   RETROK_UNDO           = 322,
-   RETROK_OEM_102        = 323,
-
-   RETROK_LAST,
-
-   RETROK_DUMMY          = INT_MAX /* Ensure sizeof(enum) == sizeof(int) */
-};
-
-enum retro_mod
-{
-   RETROKMOD_NONE       = 0x0000,
-
-   RETROKMOD_SHIFT      = 0x01,
-   RETROKMOD_CTRL       = 0x02,
-   RETROKMOD_ALT        = 0x04,
-   RETROKMOD_META       = 0x08,
-
-   RETROKMOD_NUMLOCK    = 0x10,
-   RETROKMOD_CAPSLOCK   = 0x20,
-   RETROKMOD_SCROLLOCK  = 0x40,
-
-   RETROKMOD_DUMMY = INT_MAX /* Ensure sizeof(enum) == sizeof(int) */
-};
-
-/* If set, this call is not part of the public libretro API yet. It can
- * change or be removed at any time. */
-#define RETRO_ENVIRONMENT_EXPERIMENTAL 0x10000
-/* Environment callback to be used internally in frontend. */
-#define RETRO_ENVIRONMENT_PRIVATE 0x20000
-
-/* Environment commands. */
-#define RETRO_ENVIRONMENT_SET_ROTATION  1  /* const unsigned * --
-                                            * Sets screen rotation of graphics.
-                                            * Valid values are 0, 1, 2, 3, which rotates screen by 0, 90, 180,
-                                            * 270 degrees counter-clockwise respectively.
-                                            */
-#define RETRO_ENVIRONMENT_GET_OVERSCAN  2  /* bool * --
-                                            * NOTE: As of 2019 this callback is considered deprecated in favor of
-                                            * using core options to manage overscan in a more nuanced, core-specific way.
-                                            *
-                                            * Boolean value whether or not the implementation should use overscan,
-                                            * or crop away overscan.
-                                            */
-#define RETRO_ENVIRONMENT_GET_CAN_DUPE  3  /* bool * --
-                                            * Boolean value whether or not frontend supports frame duping,
-                                            * passing NULL to video frame callback.
-                                            */
-
-                                           /* Environ 4, 5 are no longer supported (GET_VARIABLE / SET_VARIABLES),
-                                            * and reserved to avoid possible ABI clash.
-                                            */
-
-#define RETRO_ENVIRONMENT_SET_MESSAGE   6  /* const struct retro_message * --
-                                            * Sets a message to be displayed in implementation-specific manner
-                                            * for a certain amount of 'frames'.
-                                            * Should not be used for trivial messages, which should simply be
-                                            * logged via RETRO_ENVIRONMENT_GET_LOG_INTERFACE (or as a
-                                            * fallback, stderr).
-                                            */
-#define RETRO_ENVIRONMENT_SHUTDOWN      7  /* N/A (NULL) --
-                                            * Requests the frontend to shutdown.
-                                            * Should only be used if game has a specific
-                                            * way to shutdown the game from a menu item or similar.
-                                            */
-#define RETRO_ENVIRONMENT_SET_PERFORMANCE_LEVEL 8
-                                           /* const unsigned * --
-                                            * Gives a hint to the frontend how demanding this implementation
-                                            * is on a system. E.g. reporting a level of 2 means
-                                            * this implementation should run decently on all frontends
-                                            * of level 2 and up.
-                                            *
-                                            * It can be used by the frontend to potentially warn
-                                            * about too demanding implementations.
-                                            *
-                                            * The levels are "floating".
-                                            *
-                                            * This function can be called on a per-game basis,
-                                            * as certain games an implementation can play might be
-                                            * particularly demanding.
-                                            * If called, it should be called in retro_load_game().
-                                            */
-#define RETRO_ENVIRONMENT_GET_SYSTEM_DIRECTORY 9
-                                           /* const char ** --
-                                            * Returns the "system" directory of the frontend.
-                                            * This directory can be used to store system specific
-                                            * content such as BIOSes, configuration data, etc.
-                                            * The returned value can be NULL.
-                                            * If so, no such directory is defined,
-                                            * and it's up to the implementation to find a suitable directory.
-                                            *
-                                            * NOTE: Some cores used this folder also for "save" data such as
-                                            * memory cards, etc, for lack of a better place to put it.
-                                            * This is now discouraged, and if possible, cores should try to
-                                            * use the new GET_SAVE_DIRECTORY.
-                                            */
-#define RETRO_ENVIRONMENT_SET_PIXEL_FORMAT 10
-                                           /* const enum retro_pixel_format * --
-                                            * Sets the internal pixel format used by the implementation.
-                                            * The default pixel format is RETRO_PIXEL_FORMAT_0RGB1555.
-                                            * This pixel format however, is deprecated (see enum retro_pixel_format).
-                                            * If the call returns false, the frontend does not support this pixel
-                                            * format.
-                                            *
-                                            * This function should be called inside retro_load_game() or
-                                            * retro_get_system_av_info().
-                                            */
-#define RETRO_ENVIRONMENT_SET_INPUT_DESCRIPTORS 11
-                                           /* const struct retro_input_descriptor * --
-                                            * Sets an array of retro_input_descriptors.
-                                            * It is up to the frontend to present this in a usable way.
-                                            * The array is terminated by retro_input_descriptor::description
-                                            * being set to NULL.
-                                            * This function can be called at any time, but it is recommended
-                                            * to call it as early as possible.
-                                            */
-#define RETRO_ENVIRONMENT_SET_KEYBOARD_CALLBACK 12
-                                           /* const struct retro_keyboard_callback * --
-                                            * Sets a callback function used to notify core about keyboard events.
-                                            */
-#define RETRO_ENVIRONMENT_SET_DISK_CONTROL_INTERFACE 13
-                                           /* const struct retro_disk_control_callback * --
-                                            * Sets an interface which frontend can use to eject and insert
-                                            * disk images.
-                                            * This is used for games which consist of multiple images and
-                                            * must be manually swapped out by the user (e.g. PSX).
-                                            */
-#define RETRO_ENVIRONMENT_SET_HW_RENDER 14
-                                           /* struct retro_hw_render_callback * --
-                                            * Sets an interface to let a libretro core render with
-                                            * hardware acceleration.
-                                            * Should be called in retro_load_game().
-                                            * If successful, libretro cores will be able to render to a
-                                            * frontend-provided framebuffer.
-                                            * The size of this framebuffer will be at least as large as
-                                            * max_width/max_height provided in get_av_info().
-                                            * If HW rendering is used, pass only RETRO_HW_FRAME_BUFFER_VALID or
-                                            * NULL to retro_video_refresh_t.
-                                            */
-#define RETRO_ENVIRONMENT_GET_VARIABLE 15
-                                           /* struct retro_variable * --
-                                            * Interface to acquire user-defined information from environment
-                                            * that cannot feasibly be supported in a multi-system way.
-                                            * 'key' should be set to a key which has already been set by
-                                            * SET_VARIABLES.
-                                            * 'data' will be set to a value or NULL.
-                                            */
-#define RETRO_ENVIRONMENT_SET_VARIABLES 16
-                                           /* const struct retro_variable * --
-                                            * Allows an implementation to signal the environment
-                                            * which variables it might want to check for later using
-                                            * GET_VARIABLE.
-                                            * This allows the frontend to present these variables to
-                                            * a user dynamically.
-                                            * This should be called the first time as early as
-                                            * possible (ideally in retro_set_environment).
-                                            * Afterward it may be called again for the core to communicate
-                                            * updated options to the frontend, but the number of core
-                                            * options must not change from the number in the initial call.
-					    *
-                                            * 'data' points to an array of retro_variable structs
-                                            * terminated by a { NULL, NULL } element.
-                                            * retro_variable::key should be namespaced to not collide
-                                            * with other implementations' keys. E.g. A core called
-                                            * 'foo' should use keys named as 'foo_option'.
-                                            * retro_variable::value should contain a human readable
-                                            * description of the key as well as a '|' delimited list
-                                            * of expected values.
-                                            *
-                                            * The number of possible options should be very limited,
-                                            * i.e. it should be feasible to cycle through options
-                                            * without a keyboard.
-                                            *
-                                            * First entry should be treated as a default.
-                                            *
-                                            * Example entry:
-                                            * { "foo_option", "Speed hack coprocessor X; false|true" }
-                                            *
-                                            * Text before first ';' is description. This ';' must be
-                                            * followed by a space, and followed by a list of possible
-                                            * values split up with '|'.
-                                            *
-                                            * Only strings are operated on. The possible values will
-                                            * generally be displayed and stored as-is by the frontend.
-                                            */
-#define RETRO_ENVIRONMENT_GET_VARIABLE_UPDATE 17
-                                           /* bool * --
-                                            * Result is set to true if some variables are updated by
-                                            * frontend since last call to RETRO_ENVIRONMENT_GET_VARIABLE.
-                                            * Variables should be queried with GET_VARIABLE.
-                                            */
-#define RETRO_ENVIRONMENT_SET_SUPPORT_NO_GAME 18
-                                           /* const bool * --
-                                            * If true, the libretro implementation supports calls to
-                                            * retro_load_game() with NULL as argument.
-                                            * Used by cores which can run without particular game data.
-                                            * This should be called within retro_set_environment() only.
-                                            */
-#define RETRO_ENVIRONMENT_GET_LIBRETRO_PATH 19
-                                           /* const char ** --
-                                            * Retrieves the absolute path from where this libretro
-                                            * implementation was loaded.
-                                            * NULL is returned if the libretro was loaded statically
-                                            * (i.e. linked statically to frontend), or if the path cannot be
-                                            * determined.
-                                            * Mostly useful in cooperation with SET_SUPPORT_NO_GAME as assets can
-                                            * be loaded without ugly hacks.
-                                            */
-
-                                           /* Environment 20 was an obsolete version of SET_AUDIO_CALLBACK.
-                                            * It was not used by any known core at the time,
-                                            * and was removed from the API. */
-#define RETRO_ENVIRONMENT_SET_FRAME_TIME_CALLBACK 21
-                                           /* const struct retro_frame_time_callback * --
-                                            * Lets the core know how much time has passed since last
-                                            * invocation of retro_run().
-                                            * The frontend can tamper with the timing to fake fast-forward,
-                                            * slow-motion, frame stepping, etc.
-                                            * In this case the delta time will use the reference value
-                                            * in frame_time_callback..
-                                            */
-#define RETRO_ENVIRONMENT_SET_AUDIO_CALLBACK 22
-                                           /* const struct retro_audio_callback * --
-                                            * Sets an interface which is used to notify a libretro core about audio
-                                            * being available for writing.
-                                            * The callback can be called from any thread, so a core using this must
-                                            * have a thread safe audio implementation.
-                                            * It is intended for games where audio and video are completely
-                                            * asynchronous and audio can be generated on the fly.
-                                            * This interface is not recommended for use with emulators which have
-                                            * highly synchronous audio.
-                                            *
-                                            * The callback only notifies about writability; the libretro core still
-                                            * has to call the normal audio callbacks
-                                            * to write audio. The audio callbacks must be called from within the
-                                            * notification callback.
-                                            * The amount of audio data to write is up to the implementation.
-                                            * Generally, the audio callback will be called continously in a loop.
-                                            *
-                                            * Due to thread safety guarantees and lack of sync between audio and
-                                            * video, a frontend  can selectively disallow this interface based on
-                                            * internal configuration. A core using this interface must also
-                                            * implement the "normal" audio interface.
-                                            *
-                                            * A libretro core using SET_AUDIO_CALLBACK should also make use of
-                                            * SET_FRAME_TIME_CALLBACK.
-                                            */
-#define RETRO_ENVIRONMENT_GET_RUMBLE_INTERFACE 23
-                                           /* struct retro_rumble_interface * --
-                                            * Gets an interface which is used by a libretro core to set
-                                            * state of rumble motors in controllers.
-                                            * A strong and weak motor is supported, and they can be
-                                            * controlled indepedently.
-                                            */
-#define RETRO_ENVIRONMENT_GET_INPUT_DEVICE_CAPABILITIES 24
-                                           /* uint64_t * --
-                                            * Gets a bitmask telling which device type are expected to be
-                                            * handled properly in a call to retro_input_state_t.
-                                            * Devices which are not handled or recognized always return
-                                            * 0 in retro_input_state_t.
-                                            * Example bitmask: caps = (1 << RETRO_DEVICE_JOYPAD) | (1 << RETRO_DEVICE_ANALOG).
-                                            * Should only be called in retro_run().
-                                            */
-#define RETRO_ENVIRONMENT_GET_SENSOR_INTERFACE (25 | RETRO_ENVIRONMENT_EXPERIMENTAL)
-                                           /* struct retro_sensor_interface * --
-                                            * Gets access to the sensor interface.
-                                            * The purpose of this interface is to allow
-                                            * setting state related to sensors such as polling rate,
-                                            * enabling/disable it entirely, etc.
-                                            * Reading sensor state is done via the normal
-                                            * input_state_callback API.
-                                            */
-#define RETRO_ENVIRONMENT_GET_CAMERA_INTERFACE (26 | RETRO_ENVIRONMENT_EXPERIMENTAL)
-                                           /* struct retro_camera_callback * --
-                                            * Gets an interface to a video camera driver.
-                                            * A libretro core can use this interface to get access to a
-                                            * video camera.
-                                            * New video frames are delivered in a callback in same
-                                            * thread as retro_run().
-                                            *
-                                            * GET_CAMERA_INTERFACE should be called in retro_load_game().
-                                            *
-                                            * Depending on the camera implementation used, camera frames
-                                            * will be delivered as a raw framebuffer,
-                                            * or as an OpenGL texture directly.
-                                            *
-                                            * The core has to tell the frontend here which types of
-                                            * buffers can be handled properly.
-                                            * An OpenGL texture can only be handled when using a
-                                            * libretro GL core (SET_HW_RENDER).
-                                            * It is recommended to use a libretro GL core when
-                                            * using camera interface.
-                                            *
-                                            * The camera is not started automatically. The retrieved start/stop
-                                            * functions must be used to explicitly
-                                            * start and stop the camera driver.
-                                            */
-#define RETRO_ENVIRONMENT_GET_LOG_INTERFACE 27
-                                           /* struct retro_log_callback * --
-                                            * Gets an interface for logging. This is useful for
-                                            * logging in a cross-platform way
-                                            * as certain platforms cannot use stderr for logging.
-                                            * It also allows the frontend to
-                                            * show logging information in a more suitable way.
-                                            * If this interface is not used, libretro cores should
-                                            * log to stderr as desired.
-                                            */
-#define RETRO_ENVIRONMENT_GET_PERF_INTERFACE 28
-                                           /* struct retro_perf_callback * --
-                                            * Gets an interface for performance counters. This is useful
-                                            * for performance logging in a cross-platform way and for detecting
-                                            * architecture-specific features, such as SIMD support.
-                                            */
-#define RETRO_ENVIRONMENT_GET_LOCATION_INTERFACE 29
-                                           /* struct retro_location_callback * --
-                                            * Gets access to the location interface.
-                                            * The purpose of this interface is to be able to retrieve
-                                            * location-based information from the host device,
-                                            * such as current latitude / longitude.
-                                            */
-#define RETRO_ENVIRONMENT_GET_CONTENT_DIRECTORY 30 /* Old name, kept for compatibility. */
-#define RETRO_ENVIRONMENT_GET_CORE_ASSETS_DIRECTORY 30
-                                           /* const char ** --
-                                            * Returns the "core assets" directory of the frontend.
-                                            * This directory can be used to store specific assets that the
-                                            * core relies upon, such as art assets,
-                                            * input data, etc etc.
-                                            * The returned value can be NULL.
-                                            * If so, no such directory is defined,
-                                            * and it's up to the implementation to find a suitable directory.
-                                            */
-#define RETRO_ENVIRONMENT_GET_SAVE_DIRECTORY 31
-                                           /* const char ** --
-                                            * Returns the "save" directory of the frontend, unless there is no
-                                            * save directory available. The save directory should be used to
-                                            * store SRAM, memory cards, high scores, etc, if the libretro core
-                                            * cannot use the regular memory interface (retro_get_memory_data()).
-                                            *
-                                            * If the frontend cannot designate a save directory, it will return
-                                            * NULL to indicate that the core should attempt to operate without a
-                                            * save directory set.
-                                            *
-                                            * NOTE: early libretro cores used the system directory for save
-                                            * files. Cores that need to be backwards-compatible can still check
-                                            * GET_SYSTEM_DIRECTORY.
-                                            */
-#define RETRO_ENVIRONMENT_SET_SYSTEM_AV_INFO 32
-                                           /* const struct retro_system_av_info * --
-                                            * Sets a new av_info structure. This can only be called from
-                                            * within retro_run().
-                                            * This should *only* be used if the core is completely altering the
-                                            * internal resolutions, aspect ratios, timings, sampling rate, etc.
-                                            * Calling this can require a full reinitialization of video/audio
-                                            * drivers in the frontend,
-                                            *
-                                            * so it is important to call it very sparingly, and usually only with
-                                            * the users explicit consent.
-                                            * An eventual driver reinitialize will happen so that video and
-                                            * audio callbacks
-                                            * happening after this call within the same retro_run() call will
-                                            * target the newly initialized driver.
-                                            *
-                                            * This callback makes it possible to support configurable resolutions
-                                            * in games, which can be useful to
-                                            * avoid setting the "worst case" in max_width/max_height.
-                                            *
-                                            * ***HIGHLY RECOMMENDED*** Do not call this callback every time
-                                            * resolution changes in an emulator core if it's
-                                            * expected to be a temporary change, for the reasons of possible
-                                            * driver reinitialization.
-                                            * This call is not a free pass for not trying to provide
-                                            * correct values in retro_get_system_av_info(). If you need to change
-                                            * things like aspect ratio or nominal width/height,
-                                            * use RETRO_ENVIRONMENT_SET_GEOMETRY, which is a softer variant
-                                            * of SET_SYSTEM_AV_INFO.
-                                            *
-                                            * If this returns false, the frontend does not acknowledge a
-                                            * changed av_info struct.
-                                            */
-#define RETRO_ENVIRONMENT_SET_PROC_ADDRESS_CALLBACK 33
-                                           /* const struct retro_get_proc_address_interface * --
-                                            * Allows a libretro core to announce support for the
-                                            * get_proc_address() interface.
-                                            * This interface allows for a standard way to extend libretro where
-                                            * use of environment calls are too indirect,
-                                            * e.g. for cases where the frontend wants to call directly into the core.
-                                            *
-                                            * If a core wants to expose this interface, SET_PROC_ADDRESS_CALLBACK
-                                            * **MUST** be called from within retro_set_environment().
-                                            */
-#define RETRO_ENVIRONMENT_SET_SUBSYSTEM_INFO 34
-                                           /* const struct retro_subsystem_info * --
-                                            * This environment call introduces the concept of libretro "subsystems".
-                                            * A subsystem is a variant of a libretro core which supports
-                                            * different kinds of games.
-                                            * The purpose of this is to support e.g. emulators which might
-                                            * have special needs, e.g. Super Nintendo's Super GameBoy, Sufami Turbo.
-                                            * It can also be used to pick among subsystems in an explicit way
-                                            * if the libretro implementation is a multi-system emulator itself.
-                                            *
-                                            * Loading a game via a subsystem is done with retro_load_game_special(),
-                                            * and this environment call allows a libretro core to expose which
-                                            * subsystems are supported for use with retro_load_game_special().
-                                            * A core passes an array of retro_game_special_info which is terminated
-                                            * with a zeroed out retro_game_special_info struct.
-                                            *
-                                            * If a core wants to use this functionality, SET_SUBSYSTEM_INFO
-                                            * **MUST** be called from within retro_set_environment().
-                                            */
-#define RETRO_ENVIRONMENT_SET_CONTROLLER_INFO 35
-                                           /* const struct retro_controller_info * --
-                                            * This environment call lets a libretro core tell the frontend
-                                            * which controller subclasses are recognized in calls to
-                                            * retro_set_controller_port_device().
-                                            *
-                                            * Some emulators such as Super Nintendo support multiple lightgun
-                                            * types which must be specifically selected from. It is therefore
-                                            * sometimes necessary for a frontend to be able to tell the core
-                                            * about a special kind of input device which is not specifcally
-                                            * provided by the Libretro API.
-                                            *
-                                            * In order for a frontend to understand the workings of those devices,
-                                            * they must be defined as a specialized subclass of the generic device
-                                            * types already defined in the libretro API.
-                                            *
-                                            * The core must pass an array of const struct retro_controller_info which
-                                            * is terminated with a blanked out struct. Each element of the
-                                            * retro_controller_info struct corresponds to the ascending port index
-                                            * that is passed to retro_set_controller_port_device() when that function
-                                            * is called to indicate to the core that the frontend has changed the
-                                            * active device subclass. SEE ALSO: retro_set_controller_port_device()
-                                            *
-                                            * The ascending input port indexes provided by the core in the struct
-                                            * are generally presented by frontends as ascending User # or Player #,
-                                            * such as Player 1, Player 2, Player 3, etc. Which device subclasses are
-                                            * supported can vary per input port.
-                                            *
-                                            * The first inner element of each entry in the retro_controller_info array
-                                            * is a retro_controller_description struct that specifies the names and
-                                            * codes of all device subclasses that are available for the corresponding
-                                            * User or Player, beginning with the generic Libretro device that the
-                                            * subclasses are derived from. The second inner element of each entry is the
-                                            * total number of subclasses that are listed in the retro_controller_description.
-                                            *
-                                            * NOTE: Even if special device types are set in the libretro core,
-                                            * libretro should only poll input based on the base input device types.
-                                            */
-#define RETRO_ENVIRONMENT_SET_MEMORY_MAPS (36 | RETRO_ENVIRONMENT_EXPERIMENTAL)
-                                           /* const struct retro_memory_map * --
-                                            * This environment call lets a libretro core tell the frontend
-                                            * about the memory maps this core emulates.
-                                            * This can be used to implement, for example, cheats in a core-agnostic way.
-                                            *
-                                            * Should only be used by emulators; it doesn't make much sense for
-                                            * anything else.
-                                            * It is recommended to expose all relevant pointers through
-                                            * retro_get_memory_* as well.
-                                            *
-                                            * Can be called from retro_init and retro_load_game.
-                                            */
-#define RETRO_ENVIRONMENT_SET_GEOMETRY 37
-                                           /* const struct retro_game_geometry * --
-                                            * This environment call is similar to SET_SYSTEM_AV_INFO for changing
-                                            * video parameters, but provides a guarantee that drivers will not be
-                                            * reinitialized.
-                                            * This can only be called from within retro_run().
-                                            *
-                                            * The purpose of this call is to allow a core to alter nominal
-                                            * width/heights as well as aspect ratios on-the-fly, which can be
-                                            * useful for some emulators to change in run-time.
-                                            *
-                                            * max_width/max_height arguments are ignored and cannot be changed
-                                            * with this call as this could potentially require a reinitialization or a
-                                            * non-constant time operation.
-                                            * If max_width/max_height are to be changed, SET_SYSTEM_AV_INFO is required.
-                                            *
-                                            * A frontend must guarantee that this environment call completes in
-                                            * constant time.
-                                            */
-#define RETRO_ENVIRONMENT_GET_USERNAME 38
-                                           /* const char **
-                                            * Returns the specified username of the frontend, if specified by the user.
-                                            * This username can be used as a nickname for a core that has online facilities
-                                            * or any other mode where personalization of the user is desirable.
-                                            * The returned value can be NULL.
-                                            * If this environ callback is used by a core that requires a valid username,
-                                            * a default username should be specified by the core.
-                                            */
-#define RETRO_ENVIRONMENT_GET_LANGUAGE 39
-                                           /* unsigned * --
-                                            * Returns the specified language of the frontend, if specified by the user.
-                                            * It can be used by the core for localization purposes.
-                                            */
-#define RETRO_ENVIRONMENT_GET_CURRENT_SOFTWARE_FRAMEBUFFER (40 | RETRO_ENVIRONMENT_EXPERIMENTAL)
-                                           /* struct retro_framebuffer * --
-                                            * Returns a preallocated framebuffer which the core can use for rendering
-                                            * the frame into when not using SET_HW_RENDER.
-                                            * The framebuffer returned from this call must not be used
-                                            * after the current call to retro_run() returns.
-                                            *
-                                            * The goal of this call is to allow zero-copy behavior where a core
-                                            * can render directly into video memory, avoiding extra bandwidth cost by copying
-                                            * memory from core to video memory.
-                                            *
-                                            * If this call succeeds and the core renders into it,
-                                            * the framebuffer pointer and pitch can be passed to retro_video_refresh_t.
-                                            * If the buffer from GET_CURRENT_SOFTWARE_FRAMEBUFFER is to be used,
-                                            * the core must pass the exact
-                                            * same pointer as returned by GET_CURRENT_SOFTWARE_FRAMEBUFFER;
-                                            * i.e. passing a pointer which is offset from the
-                                            * buffer is undefined. The width, height and pitch parameters
-                                            * must also match exactly to the values obtained from GET_CURRENT_SOFTWARE_FRAMEBUFFER.
-                                            *
-                                            * It is possible for a frontend to return a different pixel format
-                                            * than the one used in SET_PIXEL_FORMAT. This can happen if the frontend
-                                            * needs to perform conversion.
-                                            *
-                                            * It is still valid for a core to render to a different buffer
-                                            * even if GET_CURRENT_SOFTWARE_FRAMEBUFFER succeeds.
-                                            *
-                                            * A frontend must make sure that the pointer obtained from this function is
-                                            * writeable (and readable).
-                                            */
-#define RETRO_ENVIRONMENT_GET_HW_RENDER_INTERFACE (41 | RETRO_ENVIRONMENT_EXPERIMENTAL)
-                                           /* const struct retro_hw_render_interface ** --
-                                            * Returns an API specific rendering interface for accessing API specific data.
-                                            * Not all HW rendering APIs support or need this.
-                                            * The contents of the returned pointer is specific to the rendering API
-                                            * being used. See the various headers like libretro_vulkan.h, etc.
-                                            *
-                                            * GET_HW_RENDER_INTERFACE cannot be called before context_reset has been called.
-                                            * Similarly, after context_destroyed callback returns,
-                                            * the contents of the HW_RENDER_INTERFACE are invalidated.
-                                            */
-#define RETRO_ENVIRONMENT_SET_SUPPORT_ACHIEVEMENTS (42 | RETRO_ENVIRONMENT_EXPERIMENTAL)
-                                           /* const bool * --
-                                            * If true, the libretro implementation supports achievements
-                                            * either via memory descriptors set with RETRO_ENVIRONMENT_SET_MEMORY_MAPS
-                                            * or via retro_get_memory_data/retro_get_memory_size.
-                                            *
-                                            * This must be called before the first call to retro_run.
-                                            */
-#define RETRO_ENVIRONMENT_SET_HW_RENDER_CONTEXT_NEGOTIATION_INTERFACE (43 | RETRO_ENVIRONMENT_EXPERIMENTAL)
-                                           /* const struct retro_hw_render_context_negotiation_interface * --
-                                            * Sets an interface which lets the libretro core negotiate with frontend how a context is created.
-                                            * The semantics of this interface depends on which API is used in SET_HW_RENDER earlier.
-                                            * This interface will be used when the frontend is trying to create a HW rendering context,
-                                            * so it will be used after SET_HW_RENDER, but before the context_reset callback.
-                                            */
-#define RETRO_ENVIRONMENT_SET_SERIALIZATION_QUIRKS 44
-                                           /* uint64_t * --
-                                            * Sets quirk flags associated with serialization. The frontend will zero any flags it doesn't
-                                            * recognize or support. Should be set in either retro_init or retro_load_game, but not both.
-                                            */
-#define RETRO_ENVIRONMENT_SET_HW_SHARED_CONTEXT (44 | RETRO_ENVIRONMENT_EXPERIMENTAL)
-                                           /* N/A (null) * --
-                                            * The frontend will try to use a 'shared' hardware context (mostly applicable
-                                            * to OpenGL) when a hardware context is being set up.
-                                            *
-                                            * Returns true if the frontend supports shared hardware contexts and false
-                                            * if the frontend does not support shared hardware contexts.
-                                            *
-                                            * This will do nothing on its own until SET_HW_RENDER env callbacks are
-                                            * being used.
-                                            */
-#define RETRO_ENVIRONMENT_GET_VFS_INTERFACE (45 | RETRO_ENVIRONMENT_EXPERIMENTAL)
-                                           /* struct retro_vfs_interface_info * --
-                                            * Gets access to the VFS interface.
-                                            * VFS presence needs to be queried prior to load_game or any
-                                            * get_system/save/other_directory being called to let front end know
-                                            * core supports VFS before it starts handing out paths.
-                                            * It is recomended to do so in retro_set_environment
-                                            */
-#define RETRO_ENVIRONMENT_GET_LED_INTERFACE (46 | RETRO_ENVIRONMENT_EXPERIMENTAL)
-                                           /* struct retro_led_interface * --
-                                            * Gets an interface which is used by a libretro core to set
-                                            * state of LEDs.
-                                            */
-#define RETRO_ENVIRONMENT_GET_AUDIO_VIDEO_ENABLE (47 | RETRO_ENVIRONMENT_EXPERIMENTAL)
-                                           /* int * --
-                                            * Tells the core if the frontend wants audio or video.
-                                            * If disabled, the frontend will discard the audio or video,
-                                            * so the core may decide to skip generating a frame or generating audio.
-                                            * This is mainly used for increasing performance.
-                                            * Bit 0 (value 1): Enable Video
-                                            * Bit 1 (value 2): Enable Audio
-                                            * Bit 2 (value 4): Use Fast Savestates.
-                                            * Bit 3 (value 8): Hard Disable Audio
-                                            * Other bits are reserved for future use and will default to zero.
-                                            * If video is disabled:
-                                            * * The frontend wants the core to not generate any video,
-                                            *   including presenting frames via hardware acceleration.
-                                            * * The frontend's video frame callback will do nothing.
-                                            * * After running the frame, the video output of the next frame should be
-                                            *   no different than if video was enabled, and saving and loading state
-                                            *   should have no issues.
-                                            * If audio is disabled:
-                                            * * The frontend wants the core to not generate any audio.
-                                            * * The frontend's audio callbacks will do nothing.
-                                            * * After running the frame, the audio output of the next frame should be
-                                            *   no different than if audio was enabled, and saving and loading state
-                                            *   should have no issues.
-                                            * Fast Savestates:
-                                            * * Guaranteed to be created by the same binary that will load them.
-                                            * * Will not be written to or read from the disk.
-                                            * * Suggest that the core assumes loading state will succeed.
-                                            * * Suggest that the core updates its memory buffers in-place if possible.
-                                            * * Suggest that the core skips clearing memory.
-                                            * * Suggest that the core skips resetting the system.
-                                            * * Suggest that the core may skip validation steps.
-                                            * Hard Disable Audio:
-                                            * * Used for a secondary core when running ahead.
-                                            * * Indicates that the frontend will never need audio from the core.
-                                            * * Suggests that the core may stop synthesizing audio, but this should not
-                                            *   compromise emulation accuracy.
-                                            * * Audio output for the next frame does not matter, and the frontend will
-                                            *   never need an accurate audio state in the future.
-                                            * * State will never be saved when using Hard Disable Audio.
-                                            */
-#define RETRO_ENVIRONMENT_GET_MIDI_INTERFACE (48 | RETRO_ENVIRONMENT_EXPERIMENTAL)
-                                           /* struct retro_midi_interface ** --
-                                            * Returns a MIDI interface that can be used for raw data I/O.
-                                            */
-
-#define RETRO_ENVIRONMENT_GET_FASTFORWARDING (49 | RETRO_ENVIRONMENT_EXPERIMENTAL)
-                                            /* bool * --
-                                            * Boolean value that indicates whether or not the frontend is in
-                                            * fastforwarding mode.
-                                            */
-
-#define RETRO_ENVIRONMENT_GET_TARGET_REFRESH_RATE (50 | RETRO_ENVIRONMENT_EXPERIMENTAL)
-                                            /* float * --
-                                            * Float value that lets us know what target refresh rate 
-                                            * is curently in use by the frontend.
-                                            *
-                                            * The core can use the returned value to set an ideal 
-                                            * refresh rate/framerate.
-                                            */
-
-/* VFS functionality */
-
-/* File paths:
- * File paths passed as parameters when using this api shall be well formed UNIX-style,
- * using "/" (unquoted forward slash) as directory separator regardless of the platform's native separator.
- * Paths shall also include at least one forward slash ("game.bin" is an invalid path, use "./game.bin" instead).
- * Other than the directory separator, cores shall not make assumptions about path format:
- * "C:/path/game.bin", "http://example.com/game.bin", "#game/game.bin", "./game.bin" (without quotes) are all valid paths.
- * Cores may replace the basename or remove path components from the end, and/or add new components;
- * however, cores shall not append "./", "../" or multiple consecutive forward slashes ("//") to paths they request to front end.
- * The frontend is encouraged to make such paths work as well as it can, but is allowed to give up if the core alters paths too much.
- * Frontends are encouraged, but not required, to support native file system paths (modulo replacing the directory separator, if applicable).
- * Cores are allowed to try using them, but must remain functional if the front rejects such requests.
- * Cores are encouraged to use the libretro-common filestream functions for file I/O,
- * as they seamlessly integrate with VFS, deal with directory separator replacement as appropriate
- * and provide platform-specific fallbacks in cases where front ends do not support VFS. */
-
-/* Opaque file handle
- * Introduced in VFS API v1 */
-struct retro_vfs_file_handle;
-
-/* Opaque directory handle
- * Introduced in VFS API v3 */
-struct retro_vfs_dir_handle;
-
-/* File open flags
- * Introduced in VFS API v1 */
-#define RETRO_VFS_FILE_ACCESS_READ            (1 << 0) /* Read only mode */
-#define RETRO_VFS_FILE_ACCESS_WRITE           (1 << 1) /* Write only mode, discard contents and overwrites existing file unless RETRO_VFS_FILE_ACCESS_UPDATE is also specified */
-#define RETRO_VFS_FILE_ACCESS_READ_WRITE      (RETRO_VFS_FILE_ACCESS_READ | RETRO_VFS_FILE_ACCESS_WRITE) /* Read-write mode, discard contents and overwrites existing file unless RETRO_VFS_FILE_ACCESS_UPDATE is also specified*/
-#define RETRO_VFS_FILE_ACCESS_UPDATE_EXISTING (1 << 2) /* Prevents discarding content of existing files opened for writing */
-
-/* These are only hints. The frontend may choose to ignore them. Other than RAM/CPU/etc use,
-   and how they react to unlikely external interference (for example someone else writing to that file,
-   or the file's server going down), behavior will not change. */
-#define RETRO_VFS_FILE_ACCESS_HINT_NONE              (0)
-/* Indicate that the file will be accessed many times. The frontend should aggressively cache everything. */
-#define RETRO_VFS_FILE_ACCESS_HINT_FREQUENT_ACCESS   (1 << 0)
-
-/* Seek positions */
-#define RETRO_VFS_SEEK_POSITION_START    0
-#define RETRO_VFS_SEEK_POSITION_CURRENT  1
-#define RETRO_VFS_SEEK_POSITION_END      2
-
-/* stat() result flags
- * Introduced in VFS API v3 */
-#define RETRO_VFS_STAT_IS_VALID               (1 << 0)
-#define RETRO_VFS_STAT_IS_DIRECTORY           (1 << 1)
-#define RETRO_VFS_STAT_IS_CHARACTER_SPECIAL   (1 << 2)
-
-/* Get path from opaque handle. Returns the exact same path passed to file_open when getting the handle
- * Introduced in VFS API v1 */
-typedef const char *(RETRO_CALLCONV *retro_vfs_get_path_t)(struct retro_vfs_file_handle *stream);
-
-/* Open a file for reading or writing. If path points to a directory, this will
- * fail. Returns the opaque file handle, or NULL for error.
- * Introduced in VFS API v1 */
-typedef struct retro_vfs_file_handle *(RETRO_CALLCONV *retro_vfs_open_t)(const char *path, unsigned mode, unsigned hints);
-
-/* Close the file and release its resources. Must be called if open_file returns non-NULL. Returns 0 on success, -1 on failure.
- * Whether the call succeeds ot not, the handle passed as parameter becomes invalid and should no longer be used.
- * Introduced in VFS API v1 */
-typedef int (RETRO_CALLCONV *retro_vfs_close_t)(struct retro_vfs_file_handle *stream);
-
-/* Return the size of the file in bytes, or -1 for error.
- * Introduced in VFS API v1 */
-typedef int64_t (RETRO_CALLCONV *retro_vfs_size_t)(struct retro_vfs_file_handle *stream);
-
-/* Truncate file to specified size. Returns 0 on success or -1 on error
- * Introduced in VFS API v2 */
-typedef int64_t (RETRO_CALLCONV *retro_vfs_truncate_t)(struct retro_vfs_file_handle *stream, int64_t length);
-
-/* Get the current read / write position for the file. Returns -1 for error.
- * Introduced in VFS API v1 */
-typedef int64_t (RETRO_CALLCONV *retro_vfs_tell_t)(struct retro_vfs_file_handle *stream);
-
-/* Set the current read/write position for the file. Returns the new position, -1 for error.
- * Introduced in VFS API v1 */
-typedef int64_t (RETRO_CALLCONV *retro_vfs_seek_t)(struct retro_vfs_file_handle *stream, int64_t offset, int seek_position);
-
-/* Read data from a file. Returns the number of bytes read, or -1 for error.
- * Introduced in VFS API v1 */
-typedef int64_t (RETRO_CALLCONV *retro_vfs_read_t)(struct retro_vfs_file_handle *stream, void *s, uint64_t len);
-
-/* Write data to a file. Returns the number of bytes written, or -1 for error.
- * Introduced in VFS API v1 */
-typedef int64_t (RETRO_CALLCONV *retro_vfs_write_t)(struct retro_vfs_file_handle *stream, const void *s, uint64_t len);
-
-/* Flush pending writes to file, if using buffered IO. Returns 0 on sucess, or -1 on failure.
- * Introduced in VFS API v1 */
-typedef int (RETRO_CALLCONV *retro_vfs_flush_t)(struct retro_vfs_file_handle *stream);
-
-/* Delete the specified file. Returns 0 on success, -1 on failure
- * Introduced in VFS API v1 */
-typedef int (RETRO_CALLCONV *retro_vfs_remove_t)(const char *path);
-
-/* Rename the specified file. Returns 0 on success, -1 on failure
- * Introduced in VFS API v1 */
-typedef int (RETRO_CALLCONV *retro_vfs_rename_t)(const char *old_path, const char *new_path);
-
-/* Stat the specified file. Retruns a bitmask of RETRO_VFS_STAT_* flags, none are set if path was not valid.
- * Additionally stores file size in given variable, unless NULL is given.
- * Introduced in VFS API v3 */
-typedef int (RETRO_CALLCONV *retro_vfs_stat_t)(const char *path, int32_t *size);
-
-/* Create the specified directory. Returns 0 on success, -1 on unknown failure, -2 if already exists.
- * Introduced in VFS API v3 */
-typedef int (RETRO_CALLCONV *retro_vfs_mkdir_t)(const char *dir);
-
-/* Open the specified directory for listing. Returns the opaque dir handle, or NULL for error.
- * Support for the include_hidden argument may vary depending on the platform.
- * Introduced in VFS API v3 */
-typedef struct retro_vfs_dir_handle *(RETRO_CALLCONV *retro_vfs_opendir_t)(const char *dir, bool include_hidden);
-
-/* Read the directory entry at the current position, and move the read pointer to the next position.
- * Returns true on success, false if already on the last entry.
- * Introduced in VFS API v3 */
-typedef bool (RETRO_CALLCONV *retro_vfs_readdir_t)(struct retro_vfs_dir_handle *dirstream);
-
-/* Get the name of the last entry read. Returns a string on success, or NULL for error.
- * The returned string pointer is valid until the next call to readdir or closedir.
- * Introduced in VFS API v3 */
-typedef const char *(RETRO_CALLCONV *retro_vfs_dirent_get_name_t)(struct retro_vfs_dir_handle *dirstream);
-
-/* Check if the last entry read was a directory. Returns true if it was, false otherwise (or on error).
- * Introduced in VFS API v3 */
-typedef bool (RETRO_CALLCONV *retro_vfs_dirent_is_dir_t)(struct retro_vfs_dir_handle *dirstream);
-
-/* Close the directory and release its resources. Must be called if opendir returns non-NULL. Returns 0 on success, -1 on failure.
- * Whether the call succeeds ot not, the handle passed as parameter becomes invalid and should no longer be used.
- * Introduced in VFS API v3 */
-typedef int (RETRO_CALLCONV *retro_vfs_closedir_t)(struct retro_vfs_dir_handle *dirstream);
-
-struct retro_vfs_interface
-{
-   /* VFS API v1 */
-	retro_vfs_get_path_t get_path;
-	retro_vfs_open_t open;
-	retro_vfs_close_t close;
-	retro_vfs_size_t size;
-	retro_vfs_tell_t tell;
-	retro_vfs_seek_t seek;
-	retro_vfs_read_t read;
-	retro_vfs_write_t write;
-	retro_vfs_flush_t flush;
-	retro_vfs_remove_t remove;
-	retro_vfs_rename_t rename;
-   /* VFS API v2 */
-   retro_vfs_truncate_t truncate;
-   /* VFS API v3 */
-   retro_vfs_stat_t stat;
-   retro_vfs_mkdir_t mkdir;
-   retro_vfs_opendir_t opendir;
-   retro_vfs_readdir_t readdir;
-   retro_vfs_dirent_get_name_t dirent_get_name;
-   retro_vfs_dirent_is_dir_t dirent_is_dir;
-   retro_vfs_closedir_t closedir;
-};
-
-struct retro_vfs_interface_info
-{
-   /* Set by core: should this be higher than the version the front end supports,
-    * front end will return false in the RETRO_ENVIRONMENT_GET_VFS_INTERFACE call
-    * Introduced in VFS API v1 */
-   uint32_t required_interface_version;
-
-   /* Frontend writes interface pointer here. The frontend also sets the actual
-    * version, must be at least required_interface_version.
-    * Introduced in VFS API v1 */
-   struct retro_vfs_interface *iface;
-};
-
-enum retro_hw_render_interface_type
-{
-	RETRO_HW_RENDER_INTERFACE_VULKAN = 0,
-	RETRO_HW_RENDER_INTERFACE_D3D9   = 1,
-	RETRO_HW_RENDER_INTERFACE_D3D10  = 2,
-	RETRO_HW_RENDER_INTERFACE_D3D11  = 3,
-	RETRO_HW_RENDER_INTERFACE_D3D12  = 4,
-   RETRO_HW_RENDER_INTERFACE_GSKIT_PS2  = 5,
-   RETRO_HW_RENDER_INTERFACE_DUMMY  = INT_MAX
-};
-
-/* Base struct. All retro_hw_render_interface_* types
- * contain at least these fields. */
-struct retro_hw_render_interface
-{
-   enum retro_hw_render_interface_type interface_type;
-   unsigned interface_version;
-};
-
-typedef void (RETRO_CALLCONV *retro_set_led_state_t)(int led, int state);
-struct retro_led_interface
-{
-    retro_set_led_state_t set_led_state;
-};
-
-/* Retrieves the current state of the MIDI input.
- * Returns true if it's enabled, false otherwise. */
-typedef bool (RETRO_CALLCONV *retro_midi_input_enabled_t)(void);
-
-/* Retrieves the current state of the MIDI output.
- * Returns true if it's enabled, false otherwise */
-typedef bool (RETRO_CALLCONV *retro_midi_output_enabled_t)(void);
-
-/* Reads next byte from the input stream.
- * Returns true if byte is read, false otherwise. */
-typedef bool (RETRO_CALLCONV *retro_midi_read_t)(uint8_t *byte);
-
-/* Writes byte to the output stream.
- * 'delta_time' is in microseconds and represent time elapsed since previous write.
- * Returns true if byte is written, false otherwise. */
-typedef bool (RETRO_CALLCONV *retro_midi_write_t)(uint8_t byte, uint32_t delta_time);
-
-/* Flushes previously written data.
- * Returns true if successful, false otherwise. */
-typedef bool (RETRO_CALLCONV *retro_midi_flush_t)(void);
-
-struct retro_midi_interface
-{
-   retro_midi_input_enabled_t input_enabled;
-   retro_midi_output_enabled_t output_enabled;
-   retro_midi_read_t read;
-   retro_midi_write_t write;
-   retro_midi_flush_t flush;
-};
-
-enum retro_hw_render_context_negotiation_interface_type
-{
-   RETRO_HW_RENDER_CONTEXT_NEGOTIATION_INTERFACE_VULKAN = 0,
-   RETRO_HW_RENDER_CONTEXT_NEGOTIATION_INTERFACE_DUMMY = INT_MAX
-};
-
-/* Base struct. All retro_hw_render_context_negotiation_interface_* types
- * contain at least these fields. */
-struct retro_hw_render_context_negotiation_interface
-{
-   enum retro_hw_render_context_negotiation_interface_type interface_type;
-   unsigned interface_version;
-};
-
-/* Serialized state is incomplete in some way. Set if serialization is
- * usable in typical end-user cases but should not be relied upon to
- * implement frame-sensitive frontend features such as netplay or
- * rerecording. */
-#define RETRO_SERIALIZATION_QUIRK_INCOMPLETE (1 << 0)
-/* The core must spend some time initializing before serialization is
- * supported. retro_serialize() will initially fail; retro_unserialize()
- * and retro_serialize_size() may or may not work correctly either. */
-#define RETRO_SERIALIZATION_QUIRK_MUST_INITIALIZE (1 << 1)
-/* Serialization size may change within a session. */
-#define RETRO_SERIALIZATION_QUIRK_CORE_VARIABLE_SIZE (1 << 2)
-/* Set by the frontend to acknowledge that it supports variable-sized
- * states. */
-#define RETRO_SERIALIZATION_QUIRK_FRONT_VARIABLE_SIZE (1 << 3)
-/* Serialized state can only be loaded during the same session. */
-#define RETRO_SERIALIZATION_QUIRK_SINGLE_SESSION (1 << 4)
-/* Serialized state cannot be loaded on an architecture with a different
- * endianness from the one it was saved on. */
-#define RETRO_SERIALIZATION_QUIRK_ENDIAN_DEPENDENT (1 << 5)
-/* Serialized state cannot be loaded on a different platform from the one it
- * was saved on for reasons other than endianness, such as word size
- * dependence */
-#define RETRO_SERIALIZATION_QUIRK_PLATFORM_DEPENDENT (1 << 6)
-
-#define RETRO_MEMDESC_CONST      (1 << 0)   /* The frontend will never change this memory area once retro_load_game has returned. */
-#define RETRO_MEMDESC_BIGENDIAN  (1 << 1)   /* The memory area contains big endian data. Default is little endian. */
-#define RETRO_MEMDESC_SYSTEM_RAM (1 << 2)   /* The memory area is system RAM.  This is main RAM of the gaming system. */
-#define RETRO_MEMDESC_SAVE_RAM   (1 << 3)   /* The memory area is save RAM. This RAM is usually found on a game cartridge, backed up by a battery. */
-#define RETRO_MEMDESC_VIDEO_RAM  (1 << 4)   /* The memory area is video RAM (VRAM) */
-#define RETRO_MEMDESC_ALIGN_2    (1 << 16)  /* All memory access in this area is aligned to their own size, or 2, whichever is smaller. */
-#define RETRO_MEMDESC_ALIGN_4    (2 << 16)
-#define RETRO_MEMDESC_ALIGN_8    (3 << 16)
-#define RETRO_MEMDESC_MINSIZE_2  (1 << 24)  /* All memory in this region is accessed at least 2 bytes at the time. */
-#define RETRO_MEMDESC_MINSIZE_4  (2 << 24)
-#define RETRO_MEMDESC_MINSIZE_8  (3 << 24)
-struct retro_memory_descriptor
-{
-   uint64_t flags;
-
-   /* Pointer to the start of the relevant ROM or RAM chip.
-    * It's strongly recommended to use 'offset' if possible, rather than
-    * doing math on the pointer.
-    *
-    * If the same byte is mapped my multiple descriptors, their descriptors
-    * must have the same pointer.
-    * If 'start' does not point to the first byte in the pointer, put the
-    * difference in 'offset' instead.
-    *
-    * May be NULL if there's nothing usable here (e.g. hardware registers and
-    * open bus). No flags should be set if the pointer is NULL.
-    * It's recommended to minimize the number of descriptors if possible,
-    * but not mandatory. */
-   void *ptr;
-   size_t offset;
-
-   /* This is the location in the emulated address space
-    * where the mapping starts. */
-   size_t start;
-
-   /* Which bits must be same as in 'start' for this mapping to apply.
-    * The first memory descriptor to claim a certain byte is the one
-    * that applies.
-    * A bit which is set in 'start' must also be set in this.
-    * Can be zero, in which case each byte is assumed mapped exactly once.
-    * In this case, 'len' must be a power of two. */
-   size_t select;
-
-   /* If this is nonzero, the set bits are assumed not connected to the
-    * memory chip's address pins. */
-   size_t disconnect;
-
-   /* This one tells the size of the current memory area.
-    * If, after start+disconnect are applied, the address is higher than
-    * this, the highest bit of the address is cleared.
-    *
-    * If the address is still too high, the next highest bit is cleared.
-    * Can be zero, in which case it's assumed to be infinite (as limited
-    * by 'select' and 'disconnect'). */
-   size_t len;
-
-   /* To go from emulated address to physical address, the following
-    * order applies:
-    * Subtract 'start', pick off 'disconnect', apply 'len', add 'offset'. */
-
-   /* The address space name must consist of only a-zA-Z0-9_-,
-    * should be as short as feasible (maximum length is 8 plus the NUL),
-    * and may not be any other address space plus one or more 0-9A-F
-    * at the end.
-    * However, multiple memory descriptors for the same address space is
-    * allowed, and the address space name can be empty. NULL is treated
-    * as empty.
-    *
-    * Address space names are case sensitive, but avoid lowercase if possible.
-    * The same pointer may exist in multiple address spaces.
-    *
-    * Examples:
-    * blank+blank - valid (multiple things may be mapped in the same namespace)
-    * 'Sp'+'Sp' - valid (multiple things may be mapped in the same namespace)
-    * 'A'+'B' - valid (neither is a prefix of each other)
-    * 'S'+blank - valid ('S' is not in 0-9A-F)
-    * 'a'+blank - valid ('a' is not in 0-9A-F)
-    * 'a'+'A' - valid (neither is a prefix of each other)
-    * 'AR'+blank - valid ('R' is not in 0-9A-F)
-    * 'ARB'+blank - valid (the B can't be part of the address either, because
-    *                      there is no namespace 'AR')
-    * blank+'B' - not valid, because it's ambigous which address space B1234
-    *             would refer to.
-    * The length can't be used for that purpose; the frontend may want
-    * to append arbitrary data to an address, without a separator. */
-   const char *addrspace;
-
-   /* TODO: When finalizing this one, add a description field, which should be
-    * "WRAM" or something roughly equally long. */
-
-   /* TODO: When finalizing this one, replace 'select' with 'limit', which tells
-    * which bits can vary and still refer to the same address (limit = ~select).
-    * TODO: limit? range? vary? something else? */
-
-   /* TODO: When finalizing this one, if 'len' is above what 'select' (or
-    * 'limit') allows, it's bankswitched. Bankswitched data must have both 'len'
-    * and 'select' != 0, and the mappings don't tell how the system switches the
-    * banks. */
-
-   /* TODO: When finalizing this one, fix the 'len' bit removal order.
-    * For len=0x1800, pointer 0x1C00 should go to 0x1400, not 0x0C00.
-    * Algorithm: Take bits highest to lowest, but if it goes above len, clear
-    * the most recent addition and continue on the next bit.
-    * TODO: Can the above be optimized? Is "remove the lowest bit set in both
-    * pointer and 'len'" equivalent? */
-
-   /* TODO: Some emulators (MAME?) emulate big endian systems by only accessing
-    * the emulated memory in 32-bit chunks, native endian. But that's nothing
-    * compared to Darek Mihocka <http://www.emulators.com/docs/nx07_vm101.htm>
-    * (section Emulation 103 - Nearly Free Byte Reversal) - he flips the ENTIRE
-    * RAM backwards! I'll want to represent both of those, via some flags.
-    *
-    * I suspect MAME either didn't think of that idea, or don't want the #ifdef.
-    * Not sure which, nor do I really care. */
-
-   /* TODO: Some of those flags are unused and/or don't really make sense. Clean
-    * them up. */
-};
-
-/* The frontend may use the largest value of 'start'+'select' in a
- * certain namespace to infer the size of the address space.
- *
- * If the address space is larger than that, a mapping with .ptr=NULL
- * should be at the end of the array, with .select set to all ones for
- * as long as the address space is big.
- *
- * Sample descriptors (minus .ptr, and RETRO_MEMFLAG_ on the flags):
- * SNES WRAM:
- * .start=0x7E0000, .len=0x20000
- * (Note that this must be mapped before the ROM in most cases; some of the
- * ROM mappers
- * try to claim $7E0000, or at least $7E8000.)
- * SNES SPC700 RAM:
- * .addrspace="S", .len=0x10000
- * SNES WRAM mirrors:
- * .flags=MIRROR, .start=0x000000, .select=0xC0E000, .len=0x2000
- * .flags=MIRROR, .start=0x800000, .select=0xC0E000, .len=0x2000
- * SNES WRAM mirrors, alternate equivalent descriptor:
- * .flags=MIRROR, .select=0x40E000, .disconnect=~0x1FFF
- * (Various similar constructions can be created by combining parts of
- * the above two.)
- * SNES LoROM (512KB, mirrored a couple of times):
- * .flags=CONST, .start=0x008000, .select=0x408000, .disconnect=0x8000, .len=512*1024
- * .flags=CONST, .start=0x400000, .select=0x400000, .disconnect=0x8000, .len=512*1024
- * SNES HiROM (4MB):
- * .flags=CONST,                 .start=0x400000, .select=0x400000, .len=4*1024*1024
- * .flags=CONST, .offset=0x8000, .start=0x008000, .select=0x408000, .len=4*1024*1024
- * SNES ExHiROM (8MB):
- * .flags=CONST, .offset=0,                  .start=0xC00000, .select=0xC00000, .len=4*1024*1024
- * .flags=CONST, .offset=4*1024*1024,        .start=0x400000, .select=0xC00000, .len=4*1024*1024
- * .flags=CONST, .offset=0x8000,             .start=0x808000, .select=0xC08000, .len=4*1024*1024
- * .flags=CONST, .offset=4*1024*1024+0x8000, .start=0x008000, .select=0xC08000, .len=4*1024*1024
- * Clarify the size of the address space:
- * .ptr=NULL, .select=0xFFFFFF
- * .len can be implied by .select in many of them, but was included for clarity.
- */
-
-struct retro_memory_map
-{
-   const struct retro_memory_descriptor *descriptors;
-   unsigned num_descriptors;
-};
-
-struct retro_controller_description
-{
-   /* Human-readable description of the controller. Even if using a generic
-    * input device type, this can be set to the particular device type the
-    * core uses. */
-   const char *desc;
-
-   /* Device type passed to retro_set_controller_port_device(). If the device
-    * type is a sub-class of a generic input device type, use the
-    * RETRO_DEVICE_SUBCLASS macro to create an ID.
-    *
-    * E.g. RETRO_DEVICE_SUBCLASS(RETRO_DEVICE_JOYPAD, 1). */
-   unsigned id;
-};
-
-struct retro_controller_info
-{
-   const struct retro_controller_description *types;
-   unsigned num_types;
-};
-
-struct retro_subsystem_memory_info
-{
-   /* The extension associated with a memory type, e.g. "psram". */
-   const char *extension;
-
-   /* The memory type for retro_get_memory(). This should be at
-    * least 0x100 to avoid conflict with standardized
-    * libretro memory types. */
-   unsigned type;
-};
-
-struct retro_subsystem_rom_info
-{
-   /* Describes what the content is (SGB BIOS, GB ROM, etc). */
-   const char *desc;
-
-   /* Same definition as retro_get_system_info(). */
-   const char *valid_extensions;
-
-   /* Same definition as retro_get_system_info(). */
-   bool need_fullpath;
-
-   /* Same definition as retro_get_system_info(). */
-   bool block_extract;
-
-   /* This is set if the content is required to load a game.
-    * If this is set to false, a zeroed-out retro_game_info can be passed. */
-   bool required;
-
-   /* Content can have multiple associated persistent
-    * memory types (retro_get_memory()). */
-   const struct retro_subsystem_memory_info *memory;
-   unsigned num_memory;
-};
-
-struct retro_subsystem_info
-{
-   /* Human-readable string of the subsystem type, e.g. "Super GameBoy" */
-   const char *desc;
-
-   /* A computer friendly short string identifier for the subsystem type.
-    * This name must be [a-z].
-    * E.g. if desc is "Super GameBoy", this can be "sgb".
-    * This identifier can be used for command-line interfaces, etc.
-    */
-   const char *ident;
-
-   /* Infos for each content file. The first entry is assumed to be the
-    * "most significant" content for frontend purposes.
-    * E.g. with Super GameBoy, the first content should be the GameBoy ROM,
-    * as it is the most "significant" content to a user.
-    * If a frontend creates new file paths based on the content used
-    * (e.g. savestates), it should use the path for the first ROM to do so. */
-   const struct retro_subsystem_rom_info *roms;
-
-   /* Number of content files associated with a subsystem. */
-   unsigned num_roms;
-
-   /* The type passed to retro_load_game_special(). */
-   unsigned id;
-};
-
-typedef void (RETRO_CALLCONV *retro_proc_address_t)(void);
-
-/* libretro API extension functions:
- * (None here so far).
- *
- * Get a symbol from a libretro core.
- * Cores should only return symbols which are actual
- * extensions to the libretro API.
- *
- * Frontends should not use this to obtain symbols to standard
- * libretro entry points (static linking or dlsym).
- *
- * The symbol name must be equal to the function name,
- * e.g. if void retro_foo(void); exists, the symbol must be called "retro_foo".
- * The returned function pointer must be cast to the corresponding type.
- */
-typedef retro_proc_address_t (RETRO_CALLCONV *retro_get_proc_address_t)(const char *sym);
-
-struct retro_get_proc_address_interface
-{
-   retro_get_proc_address_t get_proc_address;
-};
-
-enum retro_log_level
-{
-   RETRO_LOG_DEBUG = 0,
-   RETRO_LOG_INFO,
-   RETRO_LOG_WARN,
-   RETRO_LOG_ERROR,
-
-   RETRO_LOG_DUMMY = INT_MAX
-};
-
-/* Logging function. Takes log level argument as well. */
-typedef void (RETRO_CALLCONV *retro_log_printf_t)(enum retro_log_level level,
-      const char *fmt, ...);
-
-struct retro_log_callback
-{
-   retro_log_printf_t log;
-};
-
-/* Performance related functions */
-
-/* ID values for SIMD CPU features */
-#define RETRO_SIMD_SSE      (1 << 0)
-#define RETRO_SIMD_SSE2     (1 << 1)
-#define RETRO_SIMD_VMX      (1 << 2)
-#define RETRO_SIMD_VMX128   (1 << 3)
-#define RETRO_SIMD_AVX      (1 << 4)
-#define RETRO_SIMD_NEON     (1 << 5)
-#define RETRO_SIMD_SSE3     (1 << 6)
-#define RETRO_SIMD_SSSE3    (1 << 7)
-#define RETRO_SIMD_MMX      (1 << 8)
-#define RETRO_SIMD_MMXEXT   (1 << 9)
-#define RETRO_SIMD_SSE4     (1 << 10)
-#define RETRO_SIMD_SSE42    (1 << 11)
-#define RETRO_SIMD_AVX2     (1 << 12)
-#define RETRO_SIMD_VFPU     (1 << 13)
-#define RETRO_SIMD_PS       (1 << 14)
-#define RETRO_SIMD_AES      (1 << 15)
-#define RETRO_SIMD_VFPV3    (1 << 16)
-#define RETRO_SIMD_VFPV4    (1 << 17)
-#define RETRO_SIMD_POPCNT   (1 << 18)
-#define RETRO_SIMD_MOVBE    (1 << 19)
-#define RETRO_SIMD_CMOV     (1 << 20)
-#define RETRO_SIMD_ASIMD    (1 << 21)
-
-typedef uint64_t retro_perf_tick_t;
-typedef int64_t retro_time_t;
-
-struct retro_perf_counter
-{
-   const char *ident;
-   retro_perf_tick_t start;
-   retro_perf_tick_t total;
-   retro_perf_tick_t call_cnt;
-
-   bool registered;
-};
-
-/* Returns current time in microseconds.
- * Tries to use the most accurate timer available.
- */
-typedef retro_time_t (RETRO_CALLCONV *retro_perf_get_time_usec_t)(void);
-
-/* A simple counter. Usually nanoseconds, but can also be CPU cycles.
- * Can be used directly if desired (when creating a more sophisticated
- * performance counter system).
- * */
-typedef retro_perf_tick_t (RETRO_CALLCONV *retro_perf_get_counter_t)(void);
-
-/* Returns a bit-mask of detected CPU features (RETRO_SIMD_*). */
-typedef uint64_t (RETRO_CALLCONV *retro_get_cpu_features_t)(void);
-
-/* Asks frontend to log and/or display the state of performance counters.
- * Performance counters can always be poked into manually as well.
- */
-typedef void (RETRO_CALLCONV *retro_perf_log_t)(void);
-
-/* Register a performance counter.
- * ident field must be set with a discrete value and other values in
- * retro_perf_counter must be 0.
- * Registering can be called multiple times. To avoid calling to
- * frontend redundantly, you can check registered field first. */
-typedef void (RETRO_CALLCONV *retro_perf_register_t)(struct retro_perf_counter *counter);
-
-/* Starts a registered counter. */
-typedef void (RETRO_CALLCONV *retro_perf_start_t)(struct retro_perf_counter *counter);
-
-/* Stops a registered counter. */
-typedef void (RETRO_CALLCONV *retro_perf_stop_t)(struct retro_perf_counter *counter);
-
-/* For convenience it can be useful to wrap register, start and stop in macros.
- * E.g.:
- * #ifdef LOG_PERFORMANCE
- * #define RETRO_PERFORMANCE_INIT(perf_cb, name) static struct retro_perf_counter name = {#name}; if (!name.registered) perf_cb.perf_register(&(name))
- * #define RETRO_PERFORMANCE_START(perf_cb, name) perf_cb.perf_start(&(name))
- * #define RETRO_PERFORMANCE_STOP(perf_cb, name) perf_cb.perf_stop(&(name))
- * #else
- * ... Blank macros ...
- * #endif
- *
- * These can then be used mid-functions around code snippets.
- *
- * extern struct retro_perf_callback perf_cb;  * Somewhere in the core.
- *
- * void do_some_heavy_work(void)
- * {
- *    RETRO_PERFORMANCE_INIT(cb, work_1;
- *    RETRO_PERFORMANCE_START(cb, work_1);
- *    heavy_work_1();
- *    RETRO_PERFORMANCE_STOP(cb, work_1);
- *
- *    RETRO_PERFORMANCE_INIT(cb, work_2);
- *    RETRO_PERFORMANCE_START(cb, work_2);
- *    heavy_work_2();
- *    RETRO_PERFORMANCE_STOP(cb, work_2);
- * }
- *
- * void retro_deinit(void)
- * {
- *    perf_cb.perf_log();  * Log all perf counters here for example.
- * }
- */
-
-struct retro_perf_callback
-{
-   retro_perf_get_time_usec_t    get_time_usec;
-   retro_get_cpu_features_t      get_cpu_features;
-
-   retro_perf_get_counter_t      get_perf_counter;
-   retro_perf_register_t         perf_register;
-   retro_perf_start_t            perf_start;
-   retro_perf_stop_t             perf_stop;
-   retro_perf_log_t              perf_log;
-};
-
-/* FIXME: Document the sensor API and work out behavior.
- * It will be marked as experimental until then.
- */
-enum retro_sensor_action
-{
-   RETRO_SENSOR_ACCELEROMETER_ENABLE = 0,
-   RETRO_SENSOR_ACCELEROMETER_DISABLE,
-
-   RETRO_SENSOR_DUMMY = INT_MAX
-};
-
-/* Id values for SENSOR types. */
-#define RETRO_SENSOR_ACCELEROMETER_X 0
-#define RETRO_SENSOR_ACCELEROMETER_Y 1
-#define RETRO_SENSOR_ACCELEROMETER_Z 2
-
-typedef bool (RETRO_CALLCONV *retro_set_sensor_state_t)(unsigned port,
-      enum retro_sensor_action action, unsigned rate);
-
-typedef float (RETRO_CALLCONV *retro_sensor_get_input_t)(unsigned port, unsigned id);
-
-struct retro_sensor_interface
-{
-   retro_set_sensor_state_t set_sensor_state;
-   retro_sensor_get_input_t get_sensor_input;
-};
-
-enum retro_camera_buffer
-{
-   RETRO_CAMERA_BUFFER_OPENGL_TEXTURE = 0,
-   RETRO_CAMERA_BUFFER_RAW_FRAMEBUFFER,
-
-   RETRO_CAMERA_BUFFER_DUMMY = INT_MAX
-};
-
-/* Starts the camera driver. Can only be called in retro_run(). */
-typedef bool (RETRO_CALLCONV *retro_camera_start_t)(void);
-
-/* Stops the camera driver. Can only be called in retro_run(). */
-typedef void (RETRO_CALLCONV *retro_camera_stop_t)(void);
-
-/* Callback which signals when the camera driver is initialized
- * and/or deinitialized.
- * retro_camera_start_t can be called in initialized callback.
- */
-typedef void (RETRO_CALLCONV *retro_camera_lifetime_status_t)(void);
-
-/* A callback for raw framebuffer data. buffer points to an XRGB8888 buffer.
- * Width, height and pitch are similar to retro_video_refresh_t.
- * First pixel is top-left origin.
- */
-typedef void (RETRO_CALLCONV *retro_camera_frame_raw_framebuffer_t)(const uint32_t *buffer,
-      unsigned width, unsigned height, size_t pitch);
-
-/* A callback for when OpenGL textures are used.
- *
- * texture_id is a texture owned by camera driver.
- * Its state or content should be considered immutable, except for things like
- * texture filtering and clamping.
- *
- * texture_target is the texture target for the GL texture.
- * These can include e.g. GL_TEXTURE_2D, GL_TEXTURE_RECTANGLE, and possibly
- * more depending on extensions.
- *
- * affine points to a packed 3x3 column-major matrix used to apply an affine
- * transform to texture coordinates. (affine_matrix * vec3(coord_x, coord_y, 1.0))
- * After transform, normalized texture coord (0, 0) should be bottom-left
- * and (1, 1) should be top-right (or (width, height) for RECTANGLE).
- *
- * GL-specific typedefs are avoided here to avoid relying on gl.h in
- * the API definition.
- */
-typedef void (RETRO_CALLCONV *retro_camera_frame_opengl_texture_t)(unsigned texture_id,
-      unsigned texture_target, const float *affine);
-
-struct retro_camera_callback
-{
-   /* Set by libretro core.
-    * Example bitmask: caps = (1 << RETRO_CAMERA_BUFFER_OPENGL_TEXTURE) | (1 << RETRO_CAMERA_BUFFER_RAW_FRAMEBUFFER).
-    */
-   uint64_t caps;
-
-   /* Desired resolution for camera. Is only used as a hint. */
-   unsigned width;
-   unsigned height;
-
-   /* Set by frontend. */
-   retro_camera_start_t start;
-   retro_camera_stop_t stop;
-
-   /* Set by libretro core if raw framebuffer callbacks will be used. */
-   retro_camera_frame_raw_framebuffer_t frame_raw_framebuffer;
-
-   /* Set by libretro core if OpenGL texture callbacks will be used. */
-   retro_camera_frame_opengl_texture_t frame_opengl_texture;
-
-   /* Set by libretro core. Called after camera driver is initialized and
-    * ready to be started.
-    * Can be NULL, in which this callback is not called.
-    */
-   retro_camera_lifetime_status_t initialized;
-
-   /* Set by libretro core. Called right before camera driver is
-    * deinitialized.
-    * Can be NULL, in which this callback is not called.
-    */
-   retro_camera_lifetime_status_t deinitialized;
-};
-
-/* Sets the interval of time and/or distance at which to update/poll
- * location-based data.
- *
- * To ensure compatibility with all location-based implementations,
- * values for both interval_ms and interval_distance should be provided.
- *
- * interval_ms is the interval expressed in milliseconds.
- * interval_distance is the distance interval expressed in meters.
- */
-typedef void (RETRO_CALLCONV *retro_location_set_interval_t)(unsigned interval_ms,
-      unsigned interval_distance);
-
-/* Start location services. The device will start listening for changes to the
- * current location at regular intervals (which are defined with
- * retro_location_set_interval_t). */
-typedef bool (RETRO_CALLCONV *retro_location_start_t)(void);
-
-/* Stop location services. The device will stop listening for changes
- * to the current location. */
-typedef void (RETRO_CALLCONV *retro_location_stop_t)(void);
-
-/* Get the position of the current location. Will set parameters to
- * 0 if no new  location update has happened since the last time. */
-typedef bool (RETRO_CALLCONV *retro_location_get_position_t)(double *lat, double *lon,
-      double *horiz_accuracy, double *vert_accuracy);
-
-/* Callback which signals when the location driver is initialized
- * and/or deinitialized.
- * retro_location_start_t can be called in initialized callback.
- */
-typedef void (RETRO_CALLCONV *retro_location_lifetime_status_t)(void);
-
-struct retro_location_callback
-{
-   retro_location_start_t         start;
-   retro_location_stop_t          stop;
-   retro_location_get_position_t  get_position;
-   retro_location_set_interval_t  set_interval;
-
-   retro_location_lifetime_status_t initialized;
-   retro_location_lifetime_status_t deinitialized;
-};
-
-enum retro_rumble_effect
-{
-   RETRO_RUMBLE_STRONG = 0,
-   RETRO_RUMBLE_WEAK = 1,
-
-   RETRO_RUMBLE_DUMMY = INT_MAX
-};
-
-/* Sets rumble state for joypad plugged in port 'port'.
- * Rumble effects are controlled independently,
- * and setting e.g. strong rumble does not override weak rumble.
- * Strength has a range of [0, 0xffff].
- *
- * Returns true if rumble state request was honored.
- * Calling this before first retro_run() is likely to return false. */
-typedef bool (RETRO_CALLCONV *retro_set_rumble_state_t)(unsigned port,
-      enum retro_rumble_effect effect, uint16_t strength);
-
-struct retro_rumble_interface
-{
-   retro_set_rumble_state_t set_rumble_state;
-};
-
-/* Notifies libretro that audio data should be written. */
-typedef void (RETRO_CALLCONV *retro_audio_callback_t)(void);
-
-/* True: Audio driver in frontend is active, and callback is
- * expected to be called regularily.
- * False: Audio driver in frontend is paused or inactive.
- * Audio callback will not be called until set_state has been
- * called with true.
- * Initial state is false (inactive).
- */
-typedef void (RETRO_CALLCONV *retro_audio_set_state_callback_t)(bool enabled);
-
-struct retro_audio_callback
-{
-   retro_audio_callback_t callback;
-   retro_audio_set_state_callback_t set_state;
-};
-
-/* Notifies a libretro core of time spent since last invocation
- * of retro_run() in microseconds.
- *
- * It will be called right before retro_run() every frame.
- * The frontend can tamper with timing to support cases like
- * fast-forward, slow-motion and framestepping.
- *
- * In those scenarios the reference frame time value will be used. */
-typedef int64_t retro_usec_t;
-typedef void (RETRO_CALLCONV *retro_frame_time_callback_t)(retro_usec_t usec);
-struct retro_frame_time_callback
-{
-   retro_frame_time_callback_t callback;
-   /* Represents the time of one frame. It is computed as
-    * 1000000 / fps, but the implementation will resolve the
-    * rounding to ensure that framestepping, etc is exact. */
-   retro_usec_t reference;
-};
-
-/* Pass this to retro_video_refresh_t if rendering to hardware.
- * Passing NULL to retro_video_refresh_t is still a frame dupe as normal.
- * */
-#define RETRO_HW_FRAME_BUFFER_VALID ((void*)-1)
-
-/* Invalidates the current HW context.
- * Any GL state is lost, and must not be deinitialized explicitly.
- * If explicit deinitialization is desired by the libretro core,
- * it should implement context_destroy callback.
- * If called, all GPU resources must be reinitialized.
- * Usually called when frontend reinits video driver.
- * Also called first time video driver is initialized,
- * allowing libretro core to initialize resources.
- */
-typedef void (RETRO_CALLCONV *retro_hw_context_reset_t)(void);
-
-/* Gets current framebuffer which is to be rendered to.
- * Could change every frame potentially.
- */
-typedef uintptr_t (RETRO_CALLCONV *retro_hw_get_current_framebuffer_t)(void);
-
-/* Get a symbol from HW context. */
-typedef retro_proc_address_t (RETRO_CALLCONV *retro_hw_get_proc_address_t)(const char *sym);
-
-enum retro_hw_context_type
-{
-   RETRO_HW_CONTEXT_NONE             = 0,
-   /* OpenGL 2.x. Driver can choose to use latest compatibility context. */
-   RETRO_HW_CONTEXT_OPENGL           = 1,
-   /* OpenGL ES 2.0. */
-   RETRO_HW_CONTEXT_OPENGLES2        = 2,
-   /* Modern desktop core GL context. Use version_major/
-    * version_minor fields to set GL version. */
-   RETRO_HW_CONTEXT_OPENGL_CORE      = 3,
-   /* OpenGL ES 3.0 */
-   RETRO_HW_CONTEXT_OPENGLES3        = 4,
-   /* OpenGL ES 3.1+. Set version_major/version_minor. For GLES2 and GLES3,
-    * use the corresponding enums directly. */
-   RETRO_HW_CONTEXT_OPENGLES_VERSION = 5,
-
-   /* Vulkan, see RETRO_ENVIRONMENT_GET_HW_RENDER_INTERFACE. */
-   RETRO_HW_CONTEXT_VULKAN           = 6,
-
-   /* Direct3D, set version_major to select the type of interface
-    * returned by RETRO_ENVIRONMENT_GET_HW_RENDER_INTERFACE */
-   RETRO_HW_CONTEXT_DIRECT3D         = 7,
-
-   RETRO_HW_CONTEXT_DUMMY = INT_MAX
-};
-
-struct retro_hw_render_callback
-{
-   /* Which API to use. Set by libretro core. */
-   enum retro_hw_context_type context_type;
-
-   /* Called when a context has been created or when it has been reset.
-    * An OpenGL context is only valid after context_reset() has been called.
-    *
-    * When context_reset is called, OpenGL resources in the libretro
-    * implementation are guaranteed to be invalid.
-    *
-    * It is possible that context_reset is called multiple times during an
-    * application lifecycle.
-    * If context_reset is called without any notification (context_destroy),
-    * the OpenGL context was lost and resources should just be recreated
-    * without any attempt to "free" old resources.
-    */
-   retro_hw_context_reset_t context_reset;
-
-   /* Set by frontend.
-    * TODO: This is rather obsolete. The frontend should not
-    * be providing preallocated framebuffers. */
-   retro_hw_get_current_framebuffer_t get_current_framebuffer;
-
-   /* Set by frontend.
-    * Can return all relevant functions, including glClear on Windows. */
-   retro_hw_get_proc_address_t get_proc_address;
-
-   /* Set if render buffers should have depth component attached.
-    * TODO: Obsolete. */
-   bool depth;
-
-   /* Set if stencil buffers should be attached.
-    * TODO: Obsolete. */
-   bool stencil;
-
-   /* If depth and stencil are true, a packed 24/8 buffer will be added.
-    * Only attaching stencil is invalid and will be ignored. */
-
-   /* Use conventional bottom-left origin convention. If false,
-    * standard libretro top-left origin semantics are used.
-    * TODO: Move to GL specific interface. */
-   bool bottom_left_origin;
-
-   /* Major version number for core GL context or GLES 3.1+. */
-   unsigned version_major;
-
-   /* Minor version number for core GL context or GLES 3.1+. */
-   unsigned version_minor;
-
-   /* If this is true, the frontend will go very far to avoid
-    * resetting context in scenarios like toggling fullscreen, etc.
-    * TODO: Obsolete? Maybe frontend should just always assume this ...
-    */
-   bool cache_context;
-
-   /* The reset callback might still be called in extreme situations
-    * such as if the context is lost beyond recovery.
-    *
-    * For optimal stability, set this to false, and allow context to be
-    * reset at any time.
-    */
-
-   /* A callback to be called before the context is destroyed in a
-    * controlled way by the frontend. */
-   retro_hw_context_reset_t context_destroy;
-
-   /* OpenGL resources can be deinitialized cleanly at this step.
-    * context_destroy can be set to NULL, in which resources will
-    * just be destroyed without any notification.
-    *
-    * Even when context_destroy is non-NULL, it is possible that
-    * context_reset is called without any destroy notification.
-    * This happens if context is lost by external factors (such as
-    * notified by GL_ARB_robustness).
-    *
-    * In this case, the context is assumed to be already dead,
-    * and the libretro implementation must not try to free any OpenGL
-    * resources in the subsequent context_reset.
-    */
-
-   /* Creates a debug context. */
-   bool debug_context;
-};
-
-/* Callback type passed in RETRO_ENVIRONMENT_SET_KEYBOARD_CALLBACK.
- * Called by the frontend in response to keyboard events.
- * down is set if the key is being pressed, or false if it is being released.
- * keycode is the RETROK value of the char.
- * character is the text character of the pressed key. (UTF-32).
- * key_modifiers is a set of RETROKMOD values or'ed together.
- *
- * The pressed/keycode state can be indepedent of the character.
- * It is also possible that multiple characters are generated from a
- * single keypress.
- * Keycode events should be treated separately from character events.
- * However, when possible, the frontend should try to synchronize these.
- * If only a character is posted, keycode should be RETROK_UNKNOWN.
- *
- * Similarily if only a keycode event is generated with no corresponding
- * character, character should be 0.
- */
-typedef void (RETRO_CALLCONV *retro_keyboard_event_t)(bool down, unsigned keycode,
-      uint32_t character, uint16_t key_modifiers);
-
-struct retro_keyboard_callback
-{
-   retro_keyboard_event_t callback;
-};
-
-/* Callbacks for RETRO_ENVIRONMENT_SET_DISK_CONTROL_INTERFACE.
- * Should be set for implementations which can swap out multiple disk
- * images in runtime.
- *
- * If the implementation can do this automatically, it should strive to do so.
- * However, there are cases where the user must manually do so.
- *
- * Overview: To swap a disk image, eject the disk image with
- * set_eject_state(true).
- * Set the disk index with set_image_index(index). Insert the disk again
- * with set_eject_state(false).
- */
-
-/* If ejected is true, "ejects" the virtual disk tray.
- * When ejected, the disk image index can be set.
- */
-typedef bool (RETRO_CALLCONV *retro_set_eject_state_t)(bool ejected);
-
-/* Gets current eject state. The initial state is 'not ejected'. */
-typedef bool (RETRO_CALLCONV *retro_get_eject_state_t)(void);
-
-/* Gets current disk index. First disk is index 0.
- * If return value is >= get_num_images(), no disk is currently inserted.
- */
-typedef unsigned (RETRO_CALLCONV *retro_get_image_index_t)(void);
-
-/* Sets image index. Can only be called when disk is ejected.
- * The implementation supports setting "no disk" by using an
- * index >= get_num_images().
- */
-typedef bool (RETRO_CALLCONV *retro_set_image_index_t)(unsigned index);
-
-/* Gets total number of images which are available to use. */
-typedef unsigned (RETRO_CALLCONV *retro_get_num_images_t)(void);
-
-struct retro_game_info;
-
-/* Replaces the disk image associated with index.
- * Arguments to pass in info have same requirements as retro_load_game().
- * Virtual disk tray must be ejected when calling this.
- *
- * Replacing a disk image with info = NULL will remove the disk image
- * from the internal list.
- * As a result, calls to get_image_index() can change.
- *
- * E.g. replace_image_index(1, NULL), and previous get_image_index()
- * returned 4 before.
- * Index 1 will be removed, and the new index is 3.
- */
-typedef bool (RETRO_CALLCONV *retro_replace_image_index_t)(unsigned index,
-      const struct retro_game_info *info);
-
-/* Adds a new valid index (get_num_images()) to the internal disk list.
- * This will increment subsequent return values from get_num_images() by 1.
- * This image index cannot be used until a disk image has been set
- * with replace_image_index. */
-typedef bool (RETRO_CALLCONV *retro_add_image_index_t)(void);
-
-struct retro_disk_control_callback
-{
-   retro_set_eject_state_t set_eject_state;
-   retro_get_eject_state_t get_eject_state;
-
-   retro_get_image_index_t get_image_index;
-   retro_set_image_index_t set_image_index;
-   retro_get_num_images_t  get_num_images;
-
-   retro_replace_image_index_t replace_image_index;
-   retro_add_image_index_t add_image_index;
-};
-
-enum retro_pixel_format
-{
-   /* 0RGB1555, native endian.
-    * 0 bit must be set to 0.
-    * This pixel format is default for compatibility concerns only.
-    * If a 15/16-bit pixel format is desired, consider using RGB565. */
-   RETRO_PIXEL_FORMAT_0RGB1555 = 0,
-
-   /* XRGB8888, native endian.
-    * X bits are ignored. */
-   RETRO_PIXEL_FORMAT_XRGB8888 = 1,
-
-   /* RGB565, native endian.
-    * This pixel format is the recommended format to use if a 15/16-bit
-    * format is desired as it is the pixel format that is typically
-    * available on a wide range of low-power devices.
-    *
-    * It is also natively supported in APIs like OpenGL ES. */
-   RETRO_PIXEL_FORMAT_RGB565   = 2,
-
-   /* Ensure sizeof() == sizeof(int). */
-   RETRO_PIXEL_FORMAT_UNKNOWN  = INT_MAX
-};
-
-struct retro_message
-{
-   const char *msg;        /* Message to be displayed. */
-   unsigned    frames;     /* Duration in frames of message. */
-};
-
-/* Describes how the libretro implementation maps a libretro input bind
- * to its internal input system through a human readable string.
- * This string can be used to better let a user configure input. */
-struct retro_input_descriptor
-{
-   /* Associates given parameters with a description. */
-   unsigned port;
-   unsigned device;
-   unsigned index;
-   unsigned id;
-
-   /* Human readable description for parameters.
-    * The pointer must remain valid until
-    * retro_unload_game() is called. */
-   const char *description;
-};
-
-struct retro_system_info
-{
-   /* All pointers are owned by libretro implementation, and pointers must
-    * remain valid until retro_deinit() is called. */
-
-   const char *library_name;      /* Descriptive name of library. Should not
-                                   * contain any version numbers, etc. */
-   const char *library_version;   /* Descriptive version of core. */
-
-   const char *valid_extensions;  /* A string listing probably content
-                                   * extensions the core will be able to
-                                   * load, separated with pipe.
-                                   * I.e. "bin|rom|iso".
-                                   * Typically used for a GUI to filter
-                                   * out extensions. */
-
-   /* Libretro cores that need to have direct access to their content
-    * files, including cores which use the path of the content files to
-    * determine the paths of other files, should set need_fullpath to true.
-    *
-    * Cores should strive for setting need_fullpath to false,
-    * as it allows the frontend to perform patching, etc.
-    *
-    * If need_fullpath is true and retro_load_game() is called:
-    *    - retro_game_info::path is guaranteed to have a valid path
-    *    - retro_game_info::data and retro_game_info::size are invalid
-    *
-    * If need_fullpath is false and retro_load_game() is called:
-    *    - retro_game_info::path may be NULL
-    *    - retro_game_info::data and retro_game_info::size are guaranteed
-    *      to be valid
-    *
-    * See also:
-    *    - RETRO_ENVIRONMENT_GET_SYSTEM_DIRECTORY
-    *    - RETRO_ENVIRONMENT_GET_SAVE_DIRECTORY
-    */
-   bool        need_fullpath;
-
-   /* If true, the frontend is not allowed to extract any archives before
-    * loading the real content.
-    * Necessary for certain libretro implementations that load games
-    * from zipped archives. */
-   bool        block_extract;
-};
-
-struct retro_game_geometry
-{
-   unsigned base_width;    /* Nominal video width of game. */
-   unsigned base_height;   /* Nominal video height of game. */
-   unsigned max_width;     /* Maximum possible width of game. */
-   unsigned max_height;    /* Maximum possible height of game. */
-
-   float    aspect_ratio;  /* Nominal aspect ratio of game. If
-                            * aspect_ratio is <= 0.0, an aspect ratio
-                            * of base_width / base_height is assumed.
-                            * A frontend could override this setting,
-                            * if desired. */
-};
-
-struct retro_system_timing
-{
-   double fps;             /* FPS of video content. */
-   double sample_rate;     /* Sampling rate of audio. */
-};
-
-struct retro_system_av_info
-{
-   struct retro_game_geometry geometry;
-   struct retro_system_timing timing;
-};
-
-struct retro_variable
-{
-   /* Variable to query in RETRO_ENVIRONMENT_GET_VARIABLE.
-    * If NULL, obtains the complete environment string if more
-    * complex parsing is necessary.
-    * The environment string is formatted as key-value pairs
-    * delimited by semicolons as so:
-    * "key1=value1;key2=value2;..."
-    */
-   const char *key;
-
-   /* Value to be obtained. If key does not exist, it is set to NULL. */
-   const char *value;
-};
-
-struct retro_game_info
-{
-   const char *path;       /* Path to game, UTF-8 encoded.
-                            * Sometimes used as a reference for building other paths.
-                            * May be NULL if game was loaded from stdin or similar,
-                            * but in this case some cores will be unable to load `data`.
-                            * So, it is preferable to fabricate something here instead
-                            * of passing NULL, which will help more cores to succeed.
-                            * retro_system_info::need_fullpath requires
-                            * that this path is valid. */
-   const void *data;       /* Memory buffer of loaded game. Will be NULL
-                            * if need_fullpath was set. */
-   size_t      size;       /* Size of memory buffer. */
-   const char *meta;       /* String of implementation specific meta-data. */
-};
-
-#define RETRO_MEMORY_ACCESS_WRITE (1 << 0)
-   /* The core will write to the buffer provided by retro_framebuffer::data. */
-#define RETRO_MEMORY_ACCESS_READ (1 << 1)
-   /* The core will read from retro_framebuffer::data. */
-#define RETRO_MEMORY_TYPE_CACHED (1 << 0)
-   /* The memory in data is cached.
-    * If not cached, random writes and/or reading from the buffer is expected to be very slow. */
-struct retro_framebuffer
-{
-   void *data;                      /* The framebuffer which the core can render into.
-                                       Set by frontend in GET_CURRENT_SOFTWARE_FRAMEBUFFER.
-                                       The initial contents of data are unspecified. */
-   unsigned width;                  /* The framebuffer width used by the core. Set by core. */
-   unsigned height;                 /* The framebuffer height used by the core. Set by core. */
-   size_t pitch;                    /* The number of bytes between the beginning of a scanline,
-                                       and beginning of the next scanline.
-                                       Set by frontend in GET_CURRENT_SOFTWARE_FRAMEBUFFER. */
-   enum retro_pixel_format format;  /* The pixel format the core must use to render into data.
-                                       This format could differ from the format used in
-                                       SET_PIXEL_FORMAT.
-                                       Set by frontend in GET_CURRENT_SOFTWARE_FRAMEBUFFER. */
-
-   unsigned access_flags;           /* How the core will access the memory in the framebuffer.
-                                       RETRO_MEMORY_ACCESS_* flags.
-                                       Set by core. */
-   unsigned memory_flags;           /* Flags telling core how the memory has been mapped.
-                                       RETRO_MEMORY_TYPE_* flags.
-                                       Set by frontend in GET_CURRENT_SOFTWARE_FRAMEBUFFER. */
-};
-
-/* Callbacks */
-
-/* Environment callback. Gives implementations a way of performing
- * uncommon tasks. Extensible. */
-typedef bool (RETRO_CALLCONV *retro_environment_t)(unsigned cmd, void *data);
-
-/* Render a frame. Pixel format is 15-bit 0RGB1555 native endian
- * unless changed (see RETRO_ENVIRONMENT_SET_PIXEL_FORMAT).
- *
- * Width and height specify dimensions of buffer.
- * Pitch specifices length in bytes between two lines in buffer.
- *
- * For performance reasons, it is highly recommended to have a frame
- * that is packed in memory, i.e. pitch == width * byte_per_pixel.
- * Certain graphic APIs, such as OpenGL ES, do not like textures
- * that are not packed in memory.
- */
-typedef void (RETRO_CALLCONV *retro_video_refresh_t)(const void *data, unsigned width,
-      unsigned height, size_t pitch);
-
-/* Renders a single audio frame. Should only be used if implementation
- * generates a single sample at a time.
- * Format is signed 16-bit native endian.
- */
-typedef void (RETRO_CALLCONV *retro_audio_sample_t)(int16_t left, int16_t right);
-
-/* Renders multiple audio frames in one go.
- *
- * One frame is defined as a sample of left and right channels, interleaved.
- * I.e. int16_t buf[4] = { l, r, l, r }; would be 2 frames.
- * Only one of the audio callbacks must ever be used.
- */
-typedef size_t (RETRO_CALLCONV *retro_audio_sample_batch_t)(const int16_t *data,
-      size_t frames);
-
-/* Polls input. */
-typedef void (RETRO_CALLCONV *retro_input_poll_t)(void);
-
-/* Queries for input for player 'port'. device will be masked with
- * RETRO_DEVICE_MASK.
- *
- * Specialization of devices such as RETRO_DEVICE_JOYPAD_MULTITAP that
- * have been set with retro_set_controller_port_device()
- * will still use the higher level RETRO_DEVICE_JOYPAD to request input.
- */
-typedef int16_t (RETRO_CALLCONV *retro_input_state_t)(unsigned port, unsigned device,
-      unsigned index, unsigned id);
-
-/* Sets callbacks. retro_set_environment() is guaranteed to be called
- * before retro_init().
- *
- * The rest of the set_* functions are guaranteed to have been called
- * before the first call to retro_run() is made. */
-RETRO_API void retro_set_environment(retro_environment_t);
-RETRO_API void retro_set_video_refresh(retro_video_refresh_t);
-RETRO_API void retro_set_audio_sample(retro_audio_sample_t);
-RETRO_API void retro_set_audio_sample_batch(retro_audio_sample_batch_t);
-RETRO_API void retro_set_input_poll(retro_input_poll_t);
-RETRO_API void retro_set_input_state(retro_input_state_t);
-
-/* Library global initialization/deinitialization. */
-RETRO_API void retro_init(void);
-RETRO_API void retro_deinit(void);
-
-/* Must return RETRO_API_VERSION. Used to validate ABI compatibility
- * when the API is revised. */
-RETRO_API unsigned retro_api_version(void);
-
-/* Gets statically known system info. Pointers provided in *info
- * must be statically allocated.
- * Can be called at any time, even before retro_init(). */
-RETRO_API void retro_get_system_info(struct retro_system_info *info);
-
-/* Gets information about system audio/video timings and geometry.
- * Can be called only after retro_load_game() has successfully completed.
- * NOTE: The implementation of this function might not initialize every
- * variable if needed.
- * E.g. geom.aspect_ratio might not be initialized if core doesn't
- * desire a particular aspect ratio. */
-RETRO_API void retro_get_system_av_info(struct retro_system_av_info *info);
-
-/* Sets device to be used for player 'port'.
- * By default, RETRO_DEVICE_JOYPAD is assumed to be plugged into all
- * available ports.
- * Setting a particular device type is not a guarantee that libretro cores
- * will only poll input based on that particular device type. It is only a
- * hint to the libretro core when a core cannot automatically detect the
- * appropriate input device type on its own. It is also relevant when a
- * core can change its behavior depending on device type.
- *
- * As part of the core's implementation of retro_set_controller_port_device,
- * the core should call RETRO_ENVIRONMENT_SET_INPUT_DESCRIPTORS to notify the
- * frontend if the descriptions for any controls have changed as a
- * result of changing the device type.
- */
-RETRO_API void retro_set_controller_port_device(unsigned port, unsigned device);
-
-/* Resets the current game. */
-RETRO_API void retro_reset(void);
-
-/* Runs the game for one video frame.
- * During retro_run(), input_poll callback must be called at least once.
- *
- * If a frame is not rendered for reasons where a game "dropped" a frame,
- * this still counts as a frame, and retro_run() should explicitly dupe
- * a frame if GET_CAN_DUPE returns true.
- * In this case, the video callback can take a NULL argument for data.
- */
-RETRO_API void retro_run(void);
-
-/* Returns the amount of data the implementation requires to serialize
- * internal state (save states).
- * Between calls to retro_load_game() and retro_unload_game(), the
- * returned size is never allowed to be larger than a previous returned
- * value, to ensure that the frontend can allocate a save state buffer once.
- */
-RETRO_API size_t retro_serialize_size(void);
-
-/* Serializes internal state. If failed, or size is lower than
- * retro_serialize_size(), it should return false, true otherwise. */
-RETRO_API bool retro_serialize(void *data, size_t size);
-RETRO_API bool retro_unserialize(const void *data, size_t size);
-
-RETRO_API void retro_cheat_reset(void);
-RETRO_API void retro_cheat_set(unsigned index, bool enabled, const char *code);
-
-/* Loads a game.
- * Return true to indicate successful loading and false to indicate load failure.
- */
-RETRO_API bool retro_load_game(const struct retro_game_info *game);
-
-/* Loads a "special" kind of game. Should not be used,
- * except in extreme cases. */
-RETRO_API bool retro_load_game_special(
-  unsigned game_type,
-  const struct retro_game_info *info, size_t num_info
-);
-
-/* Unloads the currently loaded game. Called before retro_deinit(void). */
-RETRO_API void retro_unload_game(void);
-
-/* Gets region of game. */
-RETRO_API unsigned retro_get_region(void);
-
-/* Gets region of memory. */
-RETRO_API void *retro_get_memory_data(unsigned id);
-RETRO_API size_t retro_get_memory_size(unsigned id);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/Source/sys-clk/manager/lib/borealis/library/include/borealis/extern/libretro-common/retro_assert.h b/Source/sys-clk/manager/lib/borealis/library/include/borealis/extern/libretro-common/retro_assert.h
deleted file mode 100644
index 13db8cf8..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/include/borealis/extern/libretro-common/retro_assert.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright  (C) 2010-2018 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (retro_assert.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef __RETRO_ASSERT_H
-#define __RETRO_ASSERT_H
-
-#include <assert.h>
-
-#ifdef RARCH_INTERNAL
-#include <stdio.h>
-#define retro_assert(cond) do { \
-   if (!(cond)) { printf("Assertion failed at %s:%d.\n", __FILE__, __LINE__); abort(); } \
-} while(0)
-#else
-#define retro_assert(cond) assert(cond)
-#endif
-
-#endif
diff --git a/Source/sys-clk/manager/lib/borealis/library/include/borealis/extern/libretro-common/retro_common_api.h b/Source/sys-clk/manager/lib/borealis/library/include/borealis/extern/libretro-common/retro_common_api.h
deleted file mode 100644
index fc4f7454..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/include/borealis/extern/libretro-common/retro_common_api.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/* Copyright  (C) 2010-2018 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (retro_common_api.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef _LIBRETRO_COMMON_RETRO_COMMON_API_H
-#define _LIBRETRO_COMMON_RETRO_COMMON_API_H
-
-/*
-This file is designed to normalize the libretro-common compiling environment
-for public API headers. This should be leaner than a normal compiling environment,
-since it gets #included into other project's sources.
-*/
-
-/* ------------------------------------ */
-
-/*
-Ordinarily we want to put #ifdef __cplusplus extern "C" in C library
-headers to enable them to get used by c++ sources.
-However, we want to support building this library as C++ as well, so a
-special technique is called for.
-*/
-
-#define RETRO_BEGIN_DECLS
-#define RETRO_END_DECLS
-
-#ifdef __cplusplus
-
-#ifdef CXX_BUILD
-/* build wants everything to be built as c++, so no extern "C" */
-#else
-#undef RETRO_BEGIN_DECLS
-#undef RETRO_END_DECLS
-#define RETRO_BEGIN_DECLS extern "C" {
-#define RETRO_END_DECLS }
-#endif
-
-#else
-
-/* header is included by a C source file, so no extern "C" */
-
-#endif
-
-/*
-IMO, this non-standard ssize_t should not be used.
-However, it's a good example of how to handle something like this.
-*/
-#ifdef _MSC_VER
-#ifndef HAVE_SSIZE_T
-#define HAVE_SSIZE_T
-#if defined(_WIN64)
-typedef __int64 ssize_t;
-#elif defined(_WIN32)
-typedef int ssize_t;
-#endif
-#endif
-#elif defined(__MACH__)
-#include <sys/types.h>
-#endif
-
-#ifdef _MSC_VER
-#if _MSC_VER >= 1800
-#include <inttypes.h>
-#else
-#ifndef PRId64
-#define PRId64 "I64d"
-#define PRIu64 "I64u"
-#define PRIuPTR "Iu"
-#endif
-#endif
-#else
-/* C++11 says this one isn't needed, but apparently (some versions of) mingw require it anyways */
-/* https://stackoverflow.com/questions/8132399/how-to-printf-uint64-t-fails-with-spurious-trailing-in-format */
-/* https://github.com/libretro/RetroArch/issues/6009 */
-#define __STDC_FORMAT_MACROS
-#include <inttypes.h>
-#endif
-#ifndef PRId64
-#error "inttypes.h is being screwy"
-#endif
-#define STRING_REP_INT64 "%" PRId64
-#define STRING_REP_UINT64 "%" PRIu64
-#define STRING_REP_USIZE "%" PRIuPTR
-
-/*
-I would like to see retro_inline.h moved in here; possibly boolean too.
-
-rationale: these are used in public APIs, and it is easier to find problems
-and write code that works the first time portably when theyre included uniformly
-than to do the analysis from scratch each time you think you need it, for each feature.
-
-Moreover it helps force you to make hard decisions: if you EVER bring in boolean.h,
-then you should pay the price everywhere, so you can see how much grief it will cause.
-
-Of course, another school of thought is that you should do as little damage as possible
-in as few places as possible...
-*/
-
-/* _LIBRETRO_COMMON_RETRO_COMMON_API_H */
-#endif
diff --git a/Source/sys-clk/manager/lib/borealis/library/include/borealis/extern/libretro-common/retro_inline.h b/Source/sys-clk/manager/lib/borealis/library/include/borealis/extern/libretro-common/retro_inline.h
deleted file mode 100644
index e4a21f6c..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/include/borealis/extern/libretro-common/retro_inline.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright  (C) 2010-2018 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (retro_inline.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef __LIBRETRO_SDK_INLINE_H
-#define __LIBRETRO_SDK_INLINE_H
-
-#ifndef INLINE
-
-#if defined(_WIN32) || defined(__INTEL_COMPILER)
-#define INLINE __inline
-#elif defined(__STDC_VERSION__) && __STDC_VERSION__>=199901L
-#define INLINE inline
-#elif defined(__GNUC__)
-#define INLINE __inline__
-#else
-#define INLINE
-#endif
-
-#endif
-#endif
diff --git a/Source/sys-clk/manager/lib/borealis/library/include/borealis/extern/libretro-common/retro_math.h b/Source/sys-clk/manager/lib/borealis/library/include/borealis/extern/libretro-common/retro_math.h
deleted file mode 100644
index 03d31dd5..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/include/borealis/extern/libretro-common/retro_math.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/* Copyright  (C) 2010-2018 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (retro_math.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef _LIBRETRO_COMMON_MATH_H
-#define _LIBRETRO_COMMON_MATH_H
-
-#include <stdint.h>
-
-#if defined(_WIN32) && !defined(_XBOX)
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#elif defined(_WIN32) && defined(_XBOX)
-#include <Xtl.h>
-#endif
-
-#include <limits.h>
-
-#ifdef _MSC_VER
-#include <compat/msvc.h>
-#endif
-#include <retro_inline.h>
-
-#ifndef M_PI
-#if !defined(USE_MATH_DEFINES)
-#define M_PI 3.14159265358979323846264338327
-#endif
-#endif
-
-#ifndef MAX
-#define MAX(a, b) ((a) > (b) ? (a) : (b))
-#endif
-
-#ifndef MIN
-#define MIN(a, b) ((a) < (b) ? (a) : (b))
-#endif
-
-/**
- * next_pow2:
- * @v         : initial value
- *
- * Get next power of 2 value based on  initial value.
- *
- * Returns: next power of 2 value (derived from @v).
- **/
-static INLINE uint32_t next_pow2(uint32_t v)
-{
-   v--;
-   v |= v >> 1;
-   v |= v >> 2;
-   v |= v >> 4;
-   v |= v >> 8;
-   v |= v >> 16;
-   v++;
-   return v;
-}
-
-/**
- * prev_pow2:
- * @v         : initial value
- *
- * Get previous power of 2 value based on initial value.
- *
- * Returns: previous power of 2 value (derived from @v).
- **/
-static INLINE uint32_t prev_pow2(uint32_t v)
-{
-   v |= v >> 1;
-   v |= v >> 2;
-   v |= v >> 4;
-   v |= v >> 8;
-   v |= v >> 16;
-   return v - (v >> 1);
-}
-
-#endif
diff --git a/Source/sys-clk/manager/lib/borealis/library/include/borealis/extern/libretro-common/retro_miscellaneous.h b/Source/sys-clk/manager/lib/borealis/library/include/borealis/extern/libretro-common/retro_miscellaneous.h
deleted file mode 100644
index 3893416e..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/include/borealis/extern/libretro-common/retro_miscellaneous.h
+++ /dev/null
@@ -1,182 +0,0 @@
-/* Copyright  (C) 2010-2018 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (retro_miscellaneous.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef __RARCH_MISCELLANEOUS_H
-#define __RARCH_MISCELLANEOUS_H
-
-#define RARCH_MAX_SUBSYSTEMS 10
-#define RARCH_MAX_SUBSYSTEM_ROMS 10
-
-#include <stdint.h>
-#include <boolean.h>
-#include <retro_inline.h>
-
-#if defined(_WIN32) && !defined(_XBOX)
-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN
-#endif
-#include <windows.h>
-#elif defined(_WIN32) && defined(_XBOX)
-#include <Xtl.h>
-#endif
-
-#if defined(__CELLOS_LV2__)
-#include <sys/fs_external.h>
-#endif
-
-#include <limits.h>
-
-#ifdef _MSC_VER
-#include <compat/msvc.h>
-#endif
-
-static INLINE void bits_or_bits(uint32_t *a, uint32_t *b, uint32_t count)
-{
-   uint32_t i;
-   for (i = 0; i < count;i++)
-      a[i] |= b[i];
-}
-
-static INLINE void bits_clear_bits(uint32_t *a, uint32_t *b, uint32_t count)
-{
-   uint32_t i;
-   for (i = 0; i < count;i++)
-      a[i] &= ~b[i];
-}
-
-static INLINE bool bits_any_set(uint32_t* ptr, uint32_t count)
-{
-   uint32_t i;
-   for (i = 0; i < count; i++)
-   {
-      if (ptr[i] != 0)
-         return true;
-   }
-   return false;
-}
-
-#ifndef PATH_MAX_LENGTH
-#if defined(__CELLOS_LV2__)
-#define PATH_MAX_LENGTH CELL_FS_MAX_FS_PATH_LENGTH
-#elif defined(_XBOX1) || defined(_3DS) || defined(PSP) || defined(PS2) || defined(GEKKO)|| defined(WIIU) || defined(ORBIS)
-#define PATH_MAX_LENGTH 512
-#else
-#define PATH_MAX_LENGTH 4096
-#endif
-#endif
-
-#ifndef MAX
-#define MAX(a, b) ((a) > (b) ? (a) : (b))
-#endif
-
-#ifndef MIN
-#define MIN(a, b) ((a) < (b) ? (a) : (b))
-#endif
-
-#define ARRAY_SIZE(a)              (sizeof(a) / sizeof((a)[0]))
-
-#define BITS_GET_ELEM(a, i)        ((a).data[i])
-#define BITS_GET_ELEM_PTR(a, i)    ((a)->data[i])
-
-#define BIT_SET(a, bit)   ((a)[(bit) >> 3] |=  (1 << ((bit) & 7)))
-#define BIT_CLEAR(a, bit) ((a)[(bit) >> 3] &= ~(1 << ((bit) & 7)))
-#define BIT_GET(a, bit)   (((a)[(bit) >> 3] >> ((bit) & 7)) & 1)
-
-#define BIT16_SET(a, bit)    ((a) |=  (1 << ((bit) & 15)))
-#define BIT16_CLEAR(a, bit)  ((a) &= ~(1 << ((bit) & 15)))
-#define BIT16_GET(a, bit)    (((a) >> ((bit) & 15)) & 1)
-#define BIT16_CLEAR_ALL(a)   ((a) = 0)
-
-#define BIT32_SET(a, bit)    ((a) |=  (1 << ((bit) & 31)))
-#define BIT32_CLEAR(a, bit)  ((a) &= ~(1 << ((bit) & 31)))
-#define BIT32_GET(a, bit)    (((a) >> ((bit) & 31)) & 1)
-#define BIT32_CLEAR_ALL(a)   ((a) = 0)
-
-#define BIT64_SET(a, bit)    ((a) |=  (UINT64_C(1) << ((bit) & 63)))
-#define BIT64_CLEAR(a, bit)  ((a) &= ~(UINT64_C(1) << ((bit) & 63)))
-#define BIT64_GET(a, bit)    (((a) >> ((bit) & 63)) & 1)
-#define BIT64_CLEAR_ALL(a)   ((a) = 0)
-
-#define BIT128_SET(a, bit)   ((a).data[(bit) >> 5] |=  (1 << ((bit) & 31)))
-#define BIT128_CLEAR(a, bit) ((a).data[(bit) >> 5] &= ~(1 << ((bit) & 31)))
-#define BIT128_GET(a, bit)   (((a).data[(bit) >> 5] >> ((bit) & 31)) & 1)
-#define BIT128_CLEAR_ALL(a)  memset(&(a), 0, sizeof(a))
-
-#define BIT128_SET_PTR(a, bit)   BIT128_SET(*a, bit)
-#define BIT128_CLEAR_PTR(a, bit) BIT128_CLEAR(*a, bit)
-#define BIT128_GET_PTR(a, bit)   BIT128_GET(*a, bit)
-#define BIT128_CLEAR_ALL_PTR(a)  BIT128_CLEAR_ALL(*a)
-
-#define BIT256_SET(a, bit)       BIT128_SET(a, bit)
-#define BIT256_CLEAR(a, bit)     BIT128_CLEAR(a, bit)
-#define BIT256_GET(a, bit)       BIT128_GET(a, bit)
-#define BIT256_CLEAR_ALL(a)      BIT128_CLEAR_ALL(a)
-
-#define BIT256_SET_PTR(a, bit)   BIT256_SET(*a, bit)
-#define BIT256_CLEAR_PTR(a, bit) BIT256_CLEAR(*a, bit)
-#define BIT256_GET_PTR(a, bit)   BIT256_GET(*a, bit)
-#define BIT256_CLEAR_ALL_PTR(a)  BIT256_CLEAR_ALL(*a)
-
-#define BITS_COPY16_PTR(a,bits) \
-{ \
-   BIT128_CLEAR_ALL_PTR(a); \
-   BITS_GET_ELEM_PTR(a, 0) = (bits) & 0xffff; \
-}
-
-#define BITS_COPY32_PTR(a,bits) \
-{ \
-   BIT128_CLEAR_ALL_PTR(a); \
-   BITS_GET_ELEM_PTR(a, 0) = (bits); \
-}
-
-/* Helper macros and struct to keep track of many booleans. */
-/* This struct has 256 bits. */
-typedef struct
-{
-   uint32_t data[8];
-} retro_bits_t;
-
-#ifdef _WIN32
-#  ifdef _WIN64
-#    define PRI_SIZET PRIu64
-#  else
-#    if _MSC_VER == 1800
-#      define PRI_SIZET PRIu32
-#    else
-#      define PRI_SIZET "u"
-#    endif
-#  endif
-#elif PS2
-#  define PRI_SIZET "u"
-#else
-#  if (SIZE_MAX == 0xFFFF)
-#    define PRI_SIZET "hu"
-#  elif (SIZE_MAX == 0xFFFFFFFF)
-#    define PRI_SIZET "u"
-#  elif (SIZE_MAX == 0xFFFFFFFFFFFFFFFF)
-#    define PRI_SIZET "lu"
-#  else
-#    error PRI_SIZET: unknown SIZE_MAX
-#  endif
-#endif
-
-#endif
diff --git a/Source/sys-clk/manager/lib/borealis/library/include/borealis/extern/libretro-common/retro_timers.h b/Source/sys-clk/manager/lib/borealis/library/include/borealis/extern/libretro-common/retro_timers.h
deleted file mode 100644
index 884c0789..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/include/borealis/extern/libretro-common/retro_timers.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/* Copyright  (C) 2010-2018 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (retro_timers.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef __LIBRETRO_COMMON_TIMERS_H
-#define __LIBRETRO_COMMON_TIMERS_H
-
-#include <stdint.h>
-
-#if defined(__CELLOS_LV2__) && !defined(__PSL1GHT__)
-#include <sys/timer.h>
-#elif defined(XENON)
-#include <time/time.h>
-#elif defined(GEKKO) || defined(__PSL1GHT__) || defined(__QNX__)
-#include <unistd.h>
-#elif defined(WIIU)
-#include <wiiu/os/thread.h>
-#elif defined(PSP)
-#include <pspthreadman.h>
-#elif defined(VITA)
-#include <psp2/kernel/threadmgr.h>
-#elif defined(PS2)
-#include <SDL/SDL_timer.h>
-#elif defined(_3DS)
-#include <3ds.h>
-#else
-#include <time.h>
-#endif
-
-#if defined(_WIN32) && !defined(_XBOX)
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#elif defined(_WIN32) && defined(_XBOX)
-#include <Xtl.h>
-#endif
-
-#include <limits.h>
-
-#ifdef _MSC_VER
-#include <compat/msvc.h>
-#endif
-#include <retro_inline.h>
-
-#ifdef DJGPP
-#define timespec timeval
-#define tv_nsec tv_usec
-#include <unistd.h>
-
-extern int nanosleep(const struct timespec *rqtp, struct timespec *rmtp);
-
-static int nanosleepDOS(const struct timespec *rqtp, struct timespec *rmtp)
-{
-   usleep(1000000 * rqtp->tv_sec + rqtp->tv_nsec / 1000);
-
-   if (rmtp)
-      rmtp->tv_sec = rmtp->tv_nsec=0;
-
-   return 0;
-}
-
-#define nanosleep nanosleepDOS
-#endif
-
-/**
- * retro_sleep:
- * @msec         : amount in milliseconds to sleep
- *
- * Sleeps for a specified amount of milliseconds (@msec).
- **/
-static INLINE void retro_sleep(unsigned msec)
-{
-#if defined(__CELLOS_LV2__) && !defined(__PSL1GHT__)
-   sys_timer_usleep(1000 * msec);
-#elif defined(PSP) || defined(VITA)
-   sceKernelDelayThread(1000 * msec);
-#elif defined(PS2)
-   SDL_Delay(msec);
-#elif defined(_3DS)
-   svcSleepThread(1000000 * (s64)msec);
-#elif defined(__WINRT__) || defined(WINAPI_FAMILY) && WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP
-   SleepEx(msec, FALSE);
-#elif defined(_WIN32)
-   Sleep(msec);
-#elif defined(XENON)
-   udelay(1000 * msec);
-#elif defined(GEKKO) || defined(__PSL1GHT__) || defined(__QNX__)
-   usleep(1000 * msec);
-#elif defined(WIIU)
-   OSSleepTicks(ms_to_ticks(msec));
-#else
-   struct timespec tv = {0};
-   tv.tv_sec = msec / 1000;
-   tv.tv_nsec = (msec % 1000) * 1000000;
-   nanosleep(&tv, NULL);
-#endif
-}
-
-#endif
diff --git a/Source/sys-clk/manager/lib/borealis/library/include/borealis/extern/libretro-common/streams/file_stream.h b/Source/sys-clk/manager/lib/borealis/library/include/borealis/extern/libretro-common/streams/file_stream.h
deleted file mode 100644
index 8e83f6d9..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/include/borealis/extern/libretro-common/streams/file_stream.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/* Copyright  (C) 2010-2018 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (file_stream.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef __LIBRETRO_SDK_FILE_STREAM_H
-#define __LIBRETRO_SDK_FILE_STREAM_H
-
-#include <stdio.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <stddef.h>
-
-#include <sys/types.h>
-
-#include <libretro.h>
-#include <retro_common_api.h>
-#include <retro_inline.h>
-#include <boolean.h>
-
-#include <stdarg.h>
-
-#define FILESTREAM_REQUIRED_VFS_VERSION 2
-
-RETRO_BEGIN_DECLS
-
-typedef struct RFILE RFILE;
-
-#define FILESTREAM_REQUIRED_VFS_VERSION 2
-
-void filestream_vfs_init(const struct retro_vfs_interface_info* vfs_info);
-
-int64_t filestream_get_size(RFILE *stream);
-
-int64_t filestream_truncate(RFILE *stream, int64_t length);
-
-/**
- * filestream_open:
- * @path               : path to file
- * @mode               : file mode to use when opening (read/write)
- * @bufsize            : optional buffer size (-1 or 0 to use default)
- *
- * Opens a file for reading or writing, depending on the requested mode.
- * Returns a pointer to an RFILE if opened successfully, otherwise NULL.
- **/
-RFILE *filestream_open(const char *path, unsigned mode, unsigned hints);
-
-int64_t filestream_seek(RFILE *stream, int64_t offset, int seek_position);
-
-int64_t filestream_read(RFILE *stream, void *data, int64_t len);
-
-int64_t filestream_write(RFILE *stream, const void *data, int64_t len);
-
-int64_t filestream_tell(RFILE *stream);
-
-void filestream_rewind(RFILE *stream);
-
-int filestream_close(RFILE *stream);
-
-int64_t filestream_read_file(const char *path, void **buf, int64_t *len);
-
-char *filestream_gets(RFILE *stream, char *s, size_t len);
-
-int filestream_getc(RFILE *stream);
-
-int filestream_scanf(RFILE *stream, const char* format, ...);
-
-int filestream_eof(RFILE *stream);
-
-bool filestream_write_file(const char *path, const void *data, int64_t size);
-
-int filestream_putc(RFILE *stream, int c);
-
-int filestream_vprintf(RFILE *stream, const char* format, va_list args);
-
-int filestream_printf(RFILE *stream, const char* format, ...);
-
-int filestream_error(RFILE *stream);
-
-int filestream_flush(RFILE *stream);
-
-int filestream_delete(const char *path);
-
-int filestream_rename(const char *old_path, const char *new_path);
-
-const char *filestream_get_path(RFILE *stream);
-
-bool filestream_exists(const char *path);
-
-char *filestream_getline(RFILE *stream);
-
-RETRO_END_DECLS
-
-#endif
diff --git a/Source/sys-clk/manager/lib/borealis/library/include/borealis/extern/libretro-common/string/stdstring.h b/Source/sys-clk/manager/lib/borealis/library/include/borealis/extern/libretro-common/string/stdstring.h
deleted file mode 100644
index 74c9bdc1..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/include/borealis/extern/libretro-common/string/stdstring.h
+++ /dev/null
@@ -1,134 +0,0 @@
-/* Copyright  (C) 2010-2019 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (stdstring.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef __LIBRETRO_SDK_STDSTRING_H
-#define __LIBRETRO_SDK_STDSTRING_H
-
-#include <stdlib.h>
-#include <stddef.h>
-#include <ctype.h>
-#include <string.h>
-#include <boolean.h>
-
-#include <retro_common_api.h>
-#include <retro_inline.h>
-#include <compat/strl.h>
-
-RETRO_BEGIN_DECLS
-
-static INLINE bool string_is_empty(const char *data)
-{
-   return !data || (*data == '\0');
-}
-
-static INLINE bool string_is_equal(const char *a, const char *b)
-{
-   return (a && b) ? !strcmp(a, b) : false;
-}
-
-#define STRLEN_CONST(x)                   ((sizeof((x))-1))
-
-#define string_is_not_equal(a, b)         !string_is_equal((a), (b))
-
-#define string_add_pair_open(s, size)     strlcat((s), " (", (size))
-#define string_add_pair_close(s, size)    strlcat((s), ")",  (size))
-#define string_add_bracket_open(s, size)  strlcat((s), "{",  (size))
-#define string_add_bracket_close(s, size) strlcat((s), "}",  (size))
-#define string_add_single_quote(s, size)  strlcat((s), "'",  (size))
-#define string_add_quote(s, size)         strlcat((s), "\"",  (size))
-#define string_add_colon(s, size)         strlcat((s), ":",  (size))
-#define string_add_glob_open(s, size)     strlcat((s), "glob('*",  (size))
-#define string_add_glob_close(s, size)    strlcat((s), "*')",  (size))
-
-#define string_is_not_equal_fast(a, b, size) (memcmp(a, b, size) != 0)
-#define string_is_equal_fast(a, b, size)     (memcmp(a, b, size) == 0)
-
-static INLINE void string_add_between_pairs(char *s, const char *str,
-      size_t size)
-{
-   string_add_pair_open(s, size);
-   strlcat(s, str,  size);
-   string_add_pair_close(s, size);
-}
-
-static INLINE bool string_is_equal_case_insensitive(const char *a,
-      const char *b)
-{
-   int result              = 0;
-   const unsigned char *p1 = (const unsigned char*)a;
-   const unsigned char *p2 = (const unsigned char*)b;
-
-   if (!a || !b)
-      return false;
-   if (p1 == p2)
-      return true;
-
-   while ((result = tolower (*p1) - tolower (*p2++)) == 0)
-      if (*p1++ == '\0')
-         break;
-
-   return (result == 0);
-}
-
-static INLINE bool string_is_equal_noncase(const char *a, const char *b)
-{
-   int result              = 0;
-   const unsigned char *p1 = (const unsigned char*)a;
-   const unsigned char *p2 = (const unsigned char*)b;
-
-   if (!a || !b)
-      return false;
-   if (p1 == p2)
-      return false;
-
-   while ((result = tolower (*p1) - tolower (*p2++)) == 0)
-      if (*p1++ == '\0')
-         break;
-
-   return (result == 0);
-}
-
-char *string_to_upper(char *s);
-
-char *string_to_lower(char *s);
-
-char *string_ucwords(char *s);
-
-char *string_replace_substring(const char *in, const char *pattern,
-      const char *by);
-
-/* Remove leading whitespaces */
-char *string_trim_whitespace_left(char *const s);
-
-/* Remove trailing whitespaces */
-char *string_trim_whitespace_right(char *const s);
-
-/* Remove leading and trailing whitespaces */
-char *string_trim_whitespace(char *const s);
-
-/* max_lines == 0 means no limit */
-char *word_wrap(char *buffer, const char *string,
-      int line_width, bool unicode, unsigned max_lines);
-
-RETRO_END_DECLS
-
-#endif
diff --git a/Source/sys-clk/manager/lib/borealis/library/include/borealis/extern/nanovg/LICENSE.txt b/Source/sys-clk/manager/lib/borealis/library/include/borealis/extern/nanovg/LICENSE.txt
deleted file mode 100644
index c9a15346..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/include/borealis/extern/nanovg/LICENSE.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-Copyright (c) 2013 Mikko Mononen memon@inside.org
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-claim that you wrote the original software. If you use this software
-in a product, an acknowledgment in the product documentation would be
-appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-
diff --git a/Source/sys-clk/manager/lib/borealis/library/include/borealis/extern/nanovg/fontstash.h b/Source/sys-clk/manager/lib/borealis/library/include/borealis/extern/nanovg/fontstash.h
deleted file mode 100644
index cbdb6093..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/include/borealis/extern/nanovg/fontstash.h
+++ /dev/null
@@ -1,1768 +0,0 @@
-//
-// Copyright (c) 2009-2013 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#ifndef FONS_H
-#define FONS_H
-
-#define FONS_INVALID -1
-
-enum FONSflags {
-	FONS_ZERO_TOPLEFT = 1,
-	FONS_ZERO_BOTTOMLEFT = 2,
-};
-
-enum FONSalign {
-	// Horizontal align
-	FONS_ALIGN_LEFT 	= 1<<0,	// Default
-	FONS_ALIGN_CENTER 	= 1<<1,
-	FONS_ALIGN_RIGHT 	= 1<<2,
-	// Vertical align
-	FONS_ALIGN_TOP 		= 1<<3,
-	FONS_ALIGN_MIDDLE	= 1<<4,
-	FONS_ALIGN_BOTTOM	= 1<<5,
-	FONS_ALIGN_BASELINE	= 1<<6, // Default
-};
-
-enum FONSglyphBitmap {
-	FONS_GLYPH_BITMAP_OPTIONAL = 1,
-	FONS_GLYPH_BITMAP_REQUIRED = 2,
-};
-
-enum FONSerrorCode {
-	// Font atlas is full.
-	FONS_ATLAS_FULL = 1,
-	// Scratch memory used to render glyphs is full, requested size reported in 'val', you may need to bump up FONS_SCRATCH_BUF_SIZE.
-	FONS_SCRATCH_FULL = 2,
-	// Calls to fonsPushState has created too large stack, if you need deep state stack bump up FONS_MAX_STATES.
-	FONS_STATES_OVERFLOW = 3,
-	// Trying to pop too many states fonsPopState().
-	FONS_STATES_UNDERFLOW = 4,
-};
-
-struct FONSparams {
-	int width, height;
-	unsigned char flags;
-	void* userPtr;
-	int (*renderCreate)(void* uptr, int width, int height);
-	int (*renderResize)(void* uptr, int width, int height);
-	void (*renderUpdate)(void* uptr, int* rect, const unsigned char* data);
-	void (*renderDraw)(void* uptr, const float* verts, const float* tcoords, const unsigned int* colors, int nverts);
-	void (*renderDelete)(void* uptr);
-};
-typedef struct FONSparams FONSparams;
-
-struct FONSquad
-{
-	float x0,y0,s0,t0;
-	float x1,y1,s1,t1;
-};
-typedef struct FONSquad FONSquad;
-
-struct FONStextIter {
-	float x, y, nextx, nexty, scale, spacing;
-	unsigned int codepoint;
-	short isize, iblur;
-	struct FONSfont* font;
-	int prevGlyphIndex;
-	const char* str;
-	const char* next;
-	const char* end;
-	unsigned int utf8state;
-	int bitmapOption;
-};
-typedef struct FONStextIter FONStextIter;
-
-typedef struct FONScontext FONScontext;
-
-// Constructor and destructor.
-FONScontext* fonsCreateInternal(FONSparams* params);
-void fonsDeleteInternal(FONScontext* s);
-
-void fonsSetErrorCallback(FONScontext* s, void (*callback)(void* uptr, int error, int val), void* uptr);
-// Returns current atlas size.
-void fonsGetAtlasSize(FONScontext* s, int* width, int* height);
-// Expands the atlas size.
-int fonsExpandAtlas(FONScontext* s, int width, int height);
-// Resets the whole stash.
-int fonsResetAtlas(FONScontext* stash, int width, int height);
-
-// Add fonts
-int fonsAddFont(FONScontext* s, const char* name, const char* path);
-int fonsAddFontMem(FONScontext* s, const char* name, unsigned char* data, int ndata, int freeData);
-int fonsGetFontByName(FONScontext* s, const char* name);
-
-// State handling
-void fonsPushState(FONScontext* s);
-void fonsPopState(FONScontext* s);
-void fonsClearState(FONScontext* s);
-
-// State setting
-void fonsSetSize(FONScontext* s, float size);
-void fonsSetColor(FONScontext* s, unsigned int color);
-void fonsSetSpacing(FONScontext* s, float spacing);
-void fonsSetBlur(FONScontext* s, float blur);
-void fonsSetAlign(FONScontext* s, int align);
-void fonsSetFont(FONScontext* s, int font);
-
-// Draw text
-float fonsDrawText(FONScontext* s, float x, float y, const char* string, const char* end);
-
-// Measure text
-float fonsTextBounds(FONScontext* s, float x, float y, const char* string, const char* end, float* bounds);
-void fonsLineBounds(FONScontext* s, float y, float* miny, float* maxy);
-void fonsVertMetrics(FONScontext* s, float* ascender, float* descender, float* lineh);
-
-// Text iterator
-int fonsTextIterInit(FONScontext* stash, FONStextIter* iter, float x, float y, const char* str, const char* end, int bitmapOption);
-int fonsTextIterNext(FONScontext* stash, FONStextIter* iter, struct FONSquad* quad);
-
-// Pull texture changes
-const unsigned char* fonsGetTextureData(FONScontext* stash, int* width, int* height);
-int fonsValidateTexture(FONScontext* s, int* dirty);
-
-// Draws the stash texture for debugging
-void fonsDrawDebug(FONScontext* s, float x, float y);
-
-#endif // FONTSTASH_H
-
-
-#ifdef FONTSTASH_IMPLEMENTATION
-
-#define FONS_NOTUSED(v)  (void)sizeof(v)
-
-#ifdef FONS_USE_FREETYPE
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-#include FT_ADVANCES_H
-#include <math.h>
-
-struct FONSttFontImpl {
-	FT_Face font;
-};
-typedef struct FONSttFontImpl FONSttFontImpl;
-
-static FT_Library ftLibrary;
-
-int fons__tt_init(FONScontext *context)
-{
-	FT_Error ftError;
-	FONS_NOTUSED(context);
-	ftError = FT_Init_FreeType(&ftLibrary);
-	return ftError == 0;
-}
-
-int fons__tt_done(FONScontext *context)
-{
-	FT_Error ftError;
-	FONS_NOTUSED(context);
-	ftError = FT_Done_FreeType(ftLibrary);
-	return ftError == 0;
-}
-
-int fons__tt_loadFont(FONScontext *context, FONSttFontImpl *font, unsigned char *data, int dataSize)
-{
-	FT_Error ftError;
-	FONS_NOTUSED(context);
-
-	//font->font.userdata = stash;
-	ftError = FT_New_Memory_Face(ftLibrary, (const FT_Byte*)data, dataSize, 0, &font->font);
-	return ftError == 0;
-}
-
-void fons__tt_getFontVMetrics(FONSttFontImpl *font, int *ascent, int *descent, int *lineGap)
-{
-	*ascent = font->font->ascender;
-	*descent = font->font->descender;
-	*lineGap = font->font->height - (*ascent - *descent);
-}
-
-float fons__tt_getPixelHeightScale(FONSttFontImpl *font, float size)
-{
-	return size / (font->font->ascender - font->font->descender);
-}
-
-int fons__tt_getGlyphIndex(FONSttFontImpl *font, int codepoint)
-{
-	return FT_Get_Char_Index(font->font, codepoint);
-}
-
-int fons__tt_buildGlyphBitmap(FONSttFontImpl *font, int glyph, float size, float scale,
-							  int *advance, int *lsb, int *x0, int *y0, int *x1, int *y1)
-{
-	FT_Error ftError;
-	FT_GlyphSlot ftGlyph;
-	FT_Fixed advFixed;
-	FONS_NOTUSED(scale);
-
-	ftError = FT_Set_Pixel_Sizes(font->font, 0, (FT_UInt)(size * (float)font->font->units_per_EM / (float)(font->font->ascender - font->font->descender)));
-	if (ftError) return 0;
-	ftError = FT_Load_Glyph(font->font, glyph, FT_LOAD_RENDER | FT_LOAD_FORCE_AUTOHINT);
-	if (ftError) return 0;
-	ftError = FT_Get_Advance(font->font, glyph, FT_LOAD_NO_SCALE, &advFixed);
-	if (ftError) return 0;
-	ftGlyph = font->font->glyph;
-	*advance = (int)advFixed;
-	*lsb = (int)ftGlyph->metrics.horiBearingX;
-	*x0 = ftGlyph->bitmap_left;
-	*x1 = *x0 + ftGlyph->bitmap.width;
-	*y0 = -ftGlyph->bitmap_top;
-	*y1 = *y0 + ftGlyph->bitmap.rows;
-	return 1;
-}
-
-void fons__tt_renderGlyphBitmap(FONSttFontImpl *font, unsigned char *output, int outWidth, int outHeight, int outStride,
-								float scaleX, float scaleY, int glyph)
-{
-	FT_GlyphSlot ftGlyph = font->font->glyph;
-	int ftGlyphOffset = 0;
-	int x, y;
-	FONS_NOTUSED(outWidth);
-	FONS_NOTUSED(outHeight);
-	FONS_NOTUSED(scaleX);
-	FONS_NOTUSED(scaleY);
-	FONS_NOTUSED(glyph);	// glyph has already been loaded by fons__tt_buildGlyphBitmap
-
-	for ( y = 0; y < ftGlyph->bitmap.rows; y++ ) {
-		for ( x = 0; x < ftGlyph->bitmap.width; x++ ) {
-			output[(y * outStride) + x] = ftGlyph->bitmap.buffer[ftGlyphOffset++];
-		}
-	}
-}
-
-int fons__tt_getGlyphKernAdvance(FONSttFontImpl *font, int glyph1, int glyph2)
-{
-	FT_Vector ftKerning;
-	FT_Get_Kerning(font->font, glyph1, glyph2, FT_KERNING_DEFAULT, &ftKerning);
-	return (int)((ftKerning.x + 32) >> 6);  // Round up and convert to integer
-}
-
-#else
-
-#define STB_TRUETYPE_IMPLEMENTATION
-static void* fons__tmpalloc(size_t size, void* up);
-static void fons__tmpfree(void* ptr, void* up);
-#define STBTT_malloc(x,u)    fons__tmpalloc(x,u)
-#define STBTT_free(x,u)      fons__tmpfree(x,u)
-#include "stb_truetype.h"
-
-struct FONSttFontImpl {
-	stbtt_fontinfo font;
-};
-typedef struct FONSttFontImpl FONSttFontImpl;
-
-int fons__tt_init(FONScontext *context)
-{
-	FONS_NOTUSED(context);
-	return 1;
-}
-
-int fons__tt_done(FONScontext *context)
-{
-	FONS_NOTUSED(context);
-	return 1;
-}
-
-int fons__tt_loadFont(FONScontext *context, FONSttFontImpl *font, unsigned char *data, int dataSize)
-{
-	int stbError;
-	FONS_NOTUSED(dataSize);
-
-	font->font.userdata = context;
-	stbError = stbtt_InitFont(&font->font, data, 0);
-	return stbError;
-}
-
-void fons__tt_getFontVMetrics(FONSttFontImpl *font, int *ascent, int *descent, int *lineGap)
-{
-	stbtt_GetFontVMetrics(&font->font, ascent, descent, lineGap);
-}
-
-float fons__tt_getPixelHeightScale(FONSttFontImpl *font, float size)
-{
-	return stbtt_ScaleForPixelHeight(&font->font, size);
-}
-
-int fons__tt_getGlyphIndex(FONSttFontImpl *font, int codepoint)
-{
-	return stbtt_FindGlyphIndex(&font->font, codepoint);
-}
-
-int fons__tt_buildGlyphBitmap(FONSttFontImpl *font, int glyph, float size, float scale,
-							  int *advance, int *lsb, int *x0, int *y0, int *x1, int *y1)
-{
-	FONS_NOTUSED(size);
-	stbtt_GetGlyphHMetrics(&font->font, glyph, advance, lsb);
-	stbtt_GetGlyphBitmapBox(&font->font, glyph, scale, scale, x0, y0, x1, y1);
-	return 1;
-}
-
-void fons__tt_renderGlyphBitmap(FONSttFontImpl *font, unsigned char *output, int outWidth, int outHeight, int outStride,
-								float scaleX, float scaleY, int glyph)
-{
-	stbtt_MakeGlyphBitmap(&font->font, output, outWidth, outHeight, outStride, scaleX, scaleY, glyph);
-}
-
-int fons__tt_getGlyphKernAdvance(FONSttFontImpl *font, int glyph1, int glyph2)
-{
-	return stbtt_GetGlyphKernAdvance(&font->font, glyph1, glyph2);
-}
-
-#endif
-
-#ifndef FONS_SCRATCH_BUF_SIZE
-#	define FONS_SCRATCH_BUF_SIZE 96000
-#endif
-#ifndef FONS_HASH_LUT_SIZE
-#	define FONS_HASH_LUT_SIZE 256
-#endif
-#ifndef FONS_INIT_FONTS
-#	define FONS_INIT_FONTS 4
-#endif
-#ifndef FONS_INIT_GLYPHS
-#	define FONS_INIT_GLYPHS 256
-#endif
-#ifndef FONS_INIT_ATLAS_NODES
-#	define FONS_INIT_ATLAS_NODES 256
-#endif
-#ifndef FONS_VERTEX_COUNT
-#	define FONS_VERTEX_COUNT 1024
-#endif
-#ifndef FONS_MAX_STATES
-#	define FONS_MAX_STATES 20
-#endif
-#ifndef FONS_MAX_FALLBACKS
-#	define FONS_MAX_FALLBACKS 20
-#endif
-
-static unsigned int fons__hashint(unsigned int a)
-{
-	a += ~(a<<15);
-	a ^=  (a>>10);
-	a +=  (a<<3);
-	a ^=  (a>>6);
-	a += ~(a<<11);
-	a ^=  (a>>16);
-	return a;
-}
-
-static int fons__mini(int a, int b)
-{
-	return a < b ? a : b;
-}
-
-static int fons__maxi(int a, int b)
-{
-	return a > b ? a : b;
-}
-
-struct FONSglyph
-{
-	unsigned int codepoint;
-	int index;
-	int next;
-	short size, blur;
-	short x0,y0,x1,y1;
-	short xadv,xoff,yoff;
-};
-typedef struct FONSglyph FONSglyph;
-
-struct FONSfont
-{
-	FONSttFontImpl font;
-	char name[64];
-	unsigned char* data;
-	int dataSize;
-	unsigned char freeData;
-	float ascender;
-	float descender;
-	float lineh;
-	FONSglyph* glyphs;
-	int cglyphs;
-	int nglyphs;
-	int lut[FONS_HASH_LUT_SIZE];
-	int fallbacks[FONS_MAX_FALLBACKS];
-	int nfallbacks;
-};
-typedef struct FONSfont FONSfont;
-
-struct FONSstate
-{
-	int font;
-	int align;
-	float size;
-	unsigned int color;
-	float blur;
-	float spacing;
-};
-typedef struct FONSstate FONSstate;
-
-struct FONSatlasNode {
-    short x, y, width;
-};
-typedef struct FONSatlasNode FONSatlasNode;
-
-struct FONSatlas
-{
-	int width, height;
-	FONSatlasNode* nodes;
-	int nnodes;
-	int cnodes;
-};
-typedef struct FONSatlas FONSatlas;
-
-struct FONScontext
-{
-	FONSparams params;
-	float itw,ith;
-	unsigned char* texData;
-	int dirtyRect[4];
-	FONSfont** fonts;
-	FONSatlas* atlas;
-	int cfonts;
-	int nfonts;
-	float verts[FONS_VERTEX_COUNT*2];
-	float tcoords[FONS_VERTEX_COUNT*2];
-	unsigned int colors[FONS_VERTEX_COUNT];
-	int nverts;
-	unsigned char* scratch;
-	int nscratch;
-	FONSstate states[FONS_MAX_STATES];
-	int nstates;
-	void (*handleError)(void* uptr, int error, int val);
-	void* errorUptr;
-};
-
-#ifdef STB_TRUETYPE_IMPLEMENTATION
-
-static void* fons__tmpalloc(size_t size, void* up)
-{
-	unsigned char* ptr;
-	FONScontext* stash = (FONScontext*)up;
-
-	// 16-byte align the returned pointer
-	size = (size + 0xf) & ~0xf;
-
-	if (stash->nscratch+(int)size > FONS_SCRATCH_BUF_SIZE) {
-		if (stash->handleError)
-			stash->handleError(stash->errorUptr, FONS_SCRATCH_FULL, stash->nscratch+(int)size);
-		return NULL;
-	}
-	ptr = stash->scratch + stash->nscratch;
-	stash->nscratch += (int)size;
-	return ptr;
-}
-
-static void fons__tmpfree(void* ptr, void* up)
-{
-	(void)ptr;
-	(void)up;
-	// empty
-}
-
-#endif // STB_TRUETYPE_IMPLEMENTATION
-
-// Copyright (c) 2008-2010 Bjoern Hoehrmann <bjoern@hoehrmann.de>
-// See http://bjoern.hoehrmann.de/utf-8/decoder/dfa/ for details.
-
-#define FONS_UTF8_ACCEPT 0
-#define FONS_UTF8_REJECT 12
-
-static unsigned int fons__decutf8(unsigned int* state, unsigned int* codep, unsigned int byte)
-{
-	static const unsigned char utf8d[] = {
-		// The first part of the table maps bytes to character classes that
-		// to reduce the size of the transition table and create bitmasks.
-		0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-		0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-		0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-		0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-		1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,  9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
-		7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,  7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
-		8,8,2,2,2,2,2,2,2,2,2,2,2,2,2,2,  2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-		10,3,3,3,3,3,3,3,3,3,3,3,3,4,3,3, 11,6,6,6,5,8,8,8,8,8,8,8,8,8,8,8,
-
-		// The second part is a transition table that maps a combination
-		// of a state of the automaton and a character class to a state.
-		0,12,24,36,60,96,84,12,12,12,48,72, 12,12,12,12,12,12,12,12,12,12,12,12,
-		12, 0,12,12,12,12,12, 0,12, 0,12,12, 12,24,12,12,12,12,12,24,12,24,12,12,
-		12,12,12,12,12,12,12,24,12,12,12,12, 12,24,12,12,12,12,12,12,12,24,12,12,
-		12,12,12,12,12,12,12,36,12,36,12,12, 12,36,12,12,12,12,12,36,12,36,12,12,
-		12,36,12,12,12,12,12,12,12,12,12,12,
-    };
-
-	unsigned int type = utf8d[byte];
-
-    *codep = (*state != FONS_UTF8_ACCEPT) ?
-		(byte & 0x3fu) | (*codep << 6) :
-		(0xff >> type) & (byte);
-
-	*state = utf8d[256 + *state + type];
-	return *state;
-}
-
-// Atlas based on Skyline Bin Packer by Jukka Jylänki
-
-static void fons__deleteAtlas(FONSatlas* atlas)
-{
-	if (atlas == NULL) return;
-	if (atlas->nodes != NULL) free(atlas->nodes);
-	free(atlas);
-}
-
-static FONSatlas* fons__allocAtlas(int w, int h, int nnodes)
-{
-	FONSatlas* atlas = NULL;
-
-	// Allocate memory for the font stash.
-	atlas = (FONSatlas*)malloc(sizeof(FONSatlas));
-	if (atlas == NULL) goto error;
-	memset(atlas, 0, sizeof(FONSatlas));
-
-	atlas->width = w;
-	atlas->height = h;
-
-	// Allocate space for skyline nodes
-	atlas->nodes = (FONSatlasNode*)malloc(sizeof(FONSatlasNode) * nnodes);
-	if (atlas->nodes == NULL) goto error;
-	memset(atlas->nodes, 0, sizeof(FONSatlasNode) * nnodes);
-	atlas->nnodes = 0;
-	atlas->cnodes = nnodes;
-
-	// Init root node.
-	atlas->nodes[0].x = 0;
-	atlas->nodes[0].y = 0;
-	atlas->nodes[0].width = (short)w;
-	atlas->nnodes++;
-
-	return atlas;
-
-error:
-	if (atlas) fons__deleteAtlas(atlas);
-	return NULL;
-}
-
-static int fons__atlasInsertNode(FONSatlas* atlas, int idx, int x, int y, int w)
-{
-	int i;
-	// Insert node
-	if (atlas->nnodes+1 > atlas->cnodes) {
-		atlas->cnodes = atlas->cnodes == 0 ? 8 : atlas->cnodes * 2;
-		atlas->nodes = (FONSatlasNode*)realloc(atlas->nodes, sizeof(FONSatlasNode) * atlas->cnodes);
-		if (atlas->nodes == NULL)
-			return 0;
-	}
-	for (i = atlas->nnodes; i > idx; i--)
-		atlas->nodes[i] = atlas->nodes[i-1];
-	atlas->nodes[idx].x = (short)x;
-	atlas->nodes[idx].y = (short)y;
-	atlas->nodes[idx].width = (short)w;
-	atlas->nnodes++;
-
-	return 1;
-}
-
-static void fons__atlasRemoveNode(FONSatlas* atlas, int idx)
-{
-	int i;
-	if (atlas->nnodes == 0) return;
-	for (i = idx; i < atlas->nnodes-1; i++)
-		atlas->nodes[i] = atlas->nodes[i+1];
-	atlas->nnodes--;
-}
-
-static void fons__atlasExpand(FONSatlas* atlas, int w, int h)
-{
-	// Insert node for empty space
-	if (w > atlas->width)
-		fons__atlasInsertNode(atlas, atlas->nnodes, atlas->width, 0, w - atlas->width);
-	atlas->width = w;
-	atlas->height = h;
-}
-
-static void fons__atlasReset(FONSatlas* atlas, int w, int h)
-{
-	atlas->width = w;
-	atlas->height = h;
-	atlas->nnodes = 0;
-
-	// Init root node.
-	atlas->nodes[0].x = 0;
-	atlas->nodes[0].y = 0;
-	atlas->nodes[0].width = (short)w;
-	atlas->nnodes++;
-}
-
-static int fons__atlasAddSkylineLevel(FONSatlas* atlas, int idx, int x, int y, int w, int h)
-{
-	int i;
-
-	// Insert new node
-	if (fons__atlasInsertNode(atlas, idx, x, y+h, w) == 0)
-		return 0;
-
-	// Delete skyline segments that fall under the shadow of the new segment.
-	for (i = idx+1; i < atlas->nnodes; i++) {
-		if (atlas->nodes[i].x < atlas->nodes[i-1].x + atlas->nodes[i-1].width) {
-			int shrink = atlas->nodes[i-1].x + atlas->nodes[i-1].width - atlas->nodes[i].x;
-			atlas->nodes[i].x += (short)shrink;
-			atlas->nodes[i].width -= (short)shrink;
-			if (atlas->nodes[i].width <= 0) {
-				fons__atlasRemoveNode(atlas, i);
-				i--;
-			} else {
-				break;
-			}
-		} else {
-			break;
-		}
-	}
-
-	// Merge same height skyline segments that are next to each other.
-	for (i = 0; i < atlas->nnodes-1; i++) {
-		if (atlas->nodes[i].y == atlas->nodes[i+1].y) {
-			atlas->nodes[i].width += atlas->nodes[i+1].width;
-			fons__atlasRemoveNode(atlas, i+1);
-			i--;
-		}
-	}
-
-	return 1;
-}
-
-static int fons__atlasRectFits(FONSatlas* atlas, int i, int w, int h)
-{
-	// Checks if there is enough space at the location of skyline span 'i',
-	// and return the max height of all skyline spans under that at that location,
-	// (think tetris block being dropped at that position). Or -1 if no space found.
-	int x = atlas->nodes[i].x;
-	int y = atlas->nodes[i].y;
-	int spaceLeft;
-	if (x + w > atlas->width)
-		return -1;
-	spaceLeft = w;
-	while (spaceLeft > 0) {
-		if (i == atlas->nnodes) return -1;
-		y = fons__maxi(y, atlas->nodes[i].y);
-		if (y + h > atlas->height) return -1;
-		spaceLeft -= atlas->nodes[i].width;
-		++i;
-	}
-	return y;
-}
-
-static int fons__atlasAddRect(FONSatlas* atlas, int rw, int rh, int* rx, int* ry)
-{
-	int besth = atlas->height, bestw = atlas->width, besti = -1;
-	int bestx = -1, besty = -1, i;
-
-	// Bottom left fit heuristic.
-	for (i = 0; i < atlas->nnodes; i++) {
-		int y = fons__atlasRectFits(atlas, i, rw, rh);
-		if (y != -1) {
-			if (y + rh < besth || (y + rh == besth && atlas->nodes[i].width < bestw)) {
-				besti = i;
-				bestw = atlas->nodes[i].width;
-				besth = y + rh;
-				bestx = atlas->nodes[i].x;
-				besty = y;
-			}
-		}
-	}
-
-	if (besti == -1)
-		return 0;
-
-	// Perform the actual packing.
-	if (fons__atlasAddSkylineLevel(atlas, besti, bestx, besty, rw, rh) == 0)
-		return 0;
-
-	*rx = bestx;
-	*ry = besty;
-
-	return 1;
-}
-
-static void fons__addWhiteRect(FONScontext* stash, int w, int h)
-{
-	int x, y, gx, gy;
-	unsigned char* dst;
-	if (fons__atlasAddRect(stash->atlas, w, h, &gx, &gy) == 0)
-		return;
-
-	// Rasterize
-	dst = &stash->texData[gx + gy * stash->params.width];
-	for (y = 0; y < h; y++) {
-		for (x = 0; x < w; x++)
-			dst[x] = 0xff;
-		dst += stash->params.width;
-	}
-
-	stash->dirtyRect[0] = fons__mini(stash->dirtyRect[0], gx);
-	stash->dirtyRect[1] = fons__mini(stash->dirtyRect[1], gy);
-	stash->dirtyRect[2] = fons__maxi(stash->dirtyRect[2], gx+w);
-	stash->dirtyRect[3] = fons__maxi(stash->dirtyRect[3], gy+h);
-}
-
-FONScontext* fonsCreateInternal(FONSparams* params)
-{
-	FONScontext* stash = NULL;
-
-	// Allocate memory for the font stash.
-	stash = (FONScontext*)malloc(sizeof(FONScontext));
-	if (stash == NULL) goto error;
-	memset(stash, 0, sizeof(FONScontext));
-
-	stash->params = *params;
-
-	// Allocate scratch buffer.
-	stash->scratch = (unsigned char*)malloc(FONS_SCRATCH_BUF_SIZE);
-	if (stash->scratch == NULL) goto error;
-
-	// Initialize implementation library
-	if (!fons__tt_init(stash)) goto error;
-
-	if (stash->params.renderCreate != NULL) {
-		if (stash->params.renderCreate(stash->params.userPtr, stash->params.width, stash->params.height) == 0)
-			goto error;
-	}
-
-	stash->atlas = fons__allocAtlas(stash->params.width, stash->params.height, FONS_INIT_ATLAS_NODES);
-	if (stash->atlas == NULL) goto error;
-
-	// Allocate space for fonts.
-	stash->fonts = (FONSfont**)malloc(sizeof(FONSfont*) * FONS_INIT_FONTS);
-	if (stash->fonts == NULL) goto error;
-	memset(stash->fonts, 0, sizeof(FONSfont*) * FONS_INIT_FONTS);
-	stash->cfonts = FONS_INIT_FONTS;
-	stash->nfonts = 0;
-
-	// Create texture for the cache.
-	stash->itw = 1.0f/stash->params.width;
-	stash->ith = 1.0f/stash->params.height;
-	stash->texData = (unsigned char*)malloc(stash->params.width * stash->params.height);
-	if (stash->texData == NULL) goto error;
-	memset(stash->texData, 0, stash->params.width * stash->params.height);
-
-	stash->dirtyRect[0] = stash->params.width;
-	stash->dirtyRect[1] = stash->params.height;
-	stash->dirtyRect[2] = 0;
-	stash->dirtyRect[3] = 0;
-
-	// Add white rect at 0,0 for debug drawing.
-	fons__addWhiteRect(stash, 2,2);
-
-	fonsPushState(stash);
-	fonsClearState(stash);
-
-	return stash;
-
-error:
-	fonsDeleteInternal(stash);
-	return NULL;
-}
-
-static FONSstate* fons__getState(FONScontext* stash)
-{
-	return &stash->states[stash->nstates-1];
-}
-
-int fonsAddFallbackFont(FONScontext* stash, int base, int fallback)
-{
-	FONSfont* baseFont = stash->fonts[base];
-	if (baseFont->nfallbacks < FONS_MAX_FALLBACKS) {
-		baseFont->fallbacks[baseFont->nfallbacks++] = fallback;
-		return 1;
-	}
-	return 0;
-}
-
-void fonsSetSize(FONScontext* stash, float size)
-{
-	fons__getState(stash)->size = size;
-}
-
-void fonsSetColor(FONScontext* stash, unsigned int color)
-{
-	fons__getState(stash)->color = color;
-}
-
-void fonsSetSpacing(FONScontext* stash, float spacing)
-{
-	fons__getState(stash)->spacing = spacing;
-}
-
-void fonsSetBlur(FONScontext* stash, float blur)
-{
-	fons__getState(stash)->blur = blur;
-}
-
-void fonsSetAlign(FONScontext* stash, int align)
-{
-	fons__getState(stash)->align = align;
-}
-
-void fonsSetFont(FONScontext* stash, int font)
-{
-	fons__getState(stash)->font = font;
-}
-
-void fonsPushState(FONScontext* stash)
-{
-	if (stash->nstates >= FONS_MAX_STATES) {
-		if (stash->handleError)
-			stash->handleError(stash->errorUptr, FONS_STATES_OVERFLOW, 0);
-		return;
-	}
-	if (stash->nstates > 0)
-		memcpy(&stash->states[stash->nstates], &stash->states[stash->nstates-1], sizeof(FONSstate));
-	stash->nstates++;
-}
-
-void fonsPopState(FONScontext* stash)
-{
-	if (stash->nstates <= 1) {
-		if (stash->handleError)
-			stash->handleError(stash->errorUptr, FONS_STATES_UNDERFLOW, 0);
-		return;
-	}
-	stash->nstates--;
-}
-
-void fonsClearState(FONScontext* stash)
-{
-	FONSstate* state = fons__getState(stash);
-	state->size = 12.0f;
-	state->color = 0xffffffff;
-	state->font = 0;
-	state->blur = 0;
-	state->spacing = 0;
-	state->align = FONS_ALIGN_LEFT | FONS_ALIGN_BASELINE;
-}
-
-static void fons__freeFont(FONSfont* font)
-{
-	if (font == NULL) return;
-	if (font->glyphs) free(font->glyphs);
-	if (font->freeData && font->data) free(font->data);
-	free(font);
-}
-
-static int fons__allocFont(FONScontext* stash)
-{
-	FONSfont* font = NULL;
-	if (stash->nfonts+1 > stash->cfonts) {
-		stash->cfonts = stash->cfonts == 0 ? 8 : stash->cfonts * 2;
-		stash->fonts = (FONSfont**)realloc(stash->fonts, sizeof(FONSfont*) * stash->cfonts);
-		if (stash->fonts == NULL)
-			return -1;
-	}
-	font = (FONSfont*)malloc(sizeof(FONSfont));
-	if (font == NULL) goto error;
-	memset(font, 0, sizeof(FONSfont));
-
-	font->glyphs = (FONSglyph*)malloc(sizeof(FONSglyph) * FONS_INIT_GLYPHS);
-	if (font->glyphs == NULL) goto error;
-	font->cglyphs = FONS_INIT_GLYPHS;
-	font->nglyphs = 0;
-
-	stash->fonts[stash->nfonts++] = font;
-	return stash->nfonts-1;
-
-error:
-	fons__freeFont(font);
-
-	return FONS_INVALID;
-}
-
-int fonsAddFont(FONScontext* stash, const char* name, const char* path)
-{
-	FILE* fp = 0;
-	int dataSize = 0;
-	size_t readed;
-	unsigned char* data = NULL;
-
-	// Read in the font data.
-	fp = fopen(path, "rb");
-	if (fp == NULL) goto error;
-	fseek(fp,0,SEEK_END);
-	dataSize = (int)ftell(fp);
-	fseek(fp,0,SEEK_SET);
-	data = (unsigned char*)malloc(dataSize);
-	if (data == NULL) goto error;
-	readed = fread(data, 1, dataSize, fp);
-	fclose(fp);
-	fp = 0;
-	if (readed != dataSize) goto error;
-
-	return fonsAddFontMem(stash, name, data, dataSize, 1);
-
-error:
-	if (data) free(data);
-	if (fp) fclose(fp);
-	return FONS_INVALID;
-}
-
-int fonsAddFontMem(FONScontext* stash, const char* name, unsigned char* data, int dataSize, int freeData)
-{
-	int i, ascent, descent, fh, lineGap;
-	FONSfont* font;
-
-	int idx = fons__allocFont(stash);
-	if (idx == FONS_INVALID)
-		return FONS_INVALID;
-
-	font = stash->fonts[idx];
-
-	strncpy(font->name, name, sizeof(font->name));
-	font->name[sizeof(font->name)-1] = '\0';
-
-	// Init hash lookup.
-	for (i = 0; i < FONS_HASH_LUT_SIZE; ++i)
-		font->lut[i] = -1;
-
-	// Read in the font data.
-	font->dataSize = dataSize;
-	font->data = data;
-	font->freeData = (unsigned char)freeData;
-
-	// Init font
-	stash->nscratch = 0;
-	if (!fons__tt_loadFont(stash, &font->font, data, dataSize)) goto error;
-
-	// Store normalized line height. The real line height is got
-	// by multiplying the lineh by font size.
-	fons__tt_getFontVMetrics( &font->font, &ascent, &descent, &lineGap);
-	fh = ascent - descent;
-	font->ascender = (float)ascent / (float)fh;
-	font->descender = (float)descent / (float)fh;
-	font->lineh = (float)(fh + lineGap) / (float)fh;
-
-	return idx;
-
-error:
-	fons__freeFont(font);
-	stash->nfonts--;
-	return FONS_INVALID;
-}
-
-int fonsGetFontByName(FONScontext* s, const char* name)
-{
-	int i;
-	for (i = 0; i < s->nfonts; i++) {
-		if (strcmp(s->fonts[i]->name, name) == 0)
-			return i;
-	}
-	return FONS_INVALID;
-}
-
-
-static FONSglyph* fons__allocGlyph(FONSfont* font)
-{
-	if (font->nglyphs+1 > font->cglyphs) {
-		font->cglyphs = font->cglyphs == 0 ? 8 : font->cglyphs * 2;
-		font->glyphs = (FONSglyph*)realloc(font->glyphs, sizeof(FONSglyph) * font->cglyphs);
-		if (font->glyphs == NULL) return NULL;
-	}
-	font->nglyphs++;
-	return &font->glyphs[font->nglyphs-1];
-}
-
-
-// Based on Exponential blur, Jani Huhtanen, 2006
-
-#define APREC 16
-#define ZPREC 7
-
-static void fons__blurCols(unsigned char* dst, int w, int h, int dstStride, int alpha)
-{
-	int x, y;
-	for (y = 0; y < h; y++) {
-		int z = 0; // force zero border
-		for (x = 1; x < w; x++) {
-			z += (alpha * (((int)(dst[x]) << ZPREC) - z)) >> APREC;
-			dst[x] = (unsigned char)(z >> ZPREC);
-		}
-		dst[w-1] = 0; // force zero border
-		z = 0;
-		for (x = w-2; x >= 0; x--) {
-			z += (alpha * (((int)(dst[x]) << ZPREC) - z)) >> APREC;
-			dst[x] = (unsigned char)(z >> ZPREC);
-		}
-		dst[0] = 0; // force zero border
-		dst += dstStride;
-	}
-}
-
-static void fons__blurRows(unsigned char* dst, int w, int h, int dstStride, int alpha)
-{
-	int x, y;
-	for (x = 0; x < w; x++) {
-		int z = 0; // force zero border
-		for (y = dstStride; y < h*dstStride; y += dstStride) {
-			z += (alpha * (((int)(dst[y]) << ZPREC) - z)) >> APREC;
-			dst[y] = (unsigned char)(z >> ZPREC);
-		}
-		dst[(h-1)*dstStride] = 0; // force zero border
-		z = 0;
-		for (y = (h-2)*dstStride; y >= 0; y -= dstStride) {
-			z += (alpha * (((int)(dst[y]) << ZPREC) - z)) >> APREC;
-			dst[y] = (unsigned char)(z >> ZPREC);
-		}
-		dst[0] = 0; // force zero border
-		dst++;
-	}
-}
-
-
-static void fons__blur(FONScontext* stash, unsigned char* dst, int w, int h, int dstStride, int blur)
-{
-	int alpha;
-	float sigma;
-	(void)stash;
-
-	if (blur < 1)
-		return;
-	// Calculate the alpha such that 90% of the kernel is within the radius. (Kernel extends to infinity)
-	sigma = (float)blur * 0.57735f; // 1 / sqrt(3)
-	alpha = (int)((1<<APREC) * (1.0f - expf(-2.3f / (sigma+1.0f))));
-	fons__blurRows(dst, w, h, dstStride, alpha);
-	fons__blurCols(dst, w, h, dstStride, alpha);
-	fons__blurRows(dst, w, h, dstStride, alpha);
-	fons__blurCols(dst, w, h, dstStride, alpha);
-//	fons__blurrows(dst, w, h, dstStride, alpha);
-//	fons__blurcols(dst, w, h, dstStride, alpha);
-}
-
-static FONSglyph* fons__getGlyph(FONScontext* stash, FONSfont* font, unsigned int codepoint,
-								 short isize, short iblur, int bitmapOption)
-{
-	int i, g, advance, lsb, x0, y0, x1, y1, gw, gh, gx, gy, x, y;
-	float scale;
-	FONSglyph* glyph = NULL;
-	unsigned int h;
-	float size = isize/10.0f;
-	int pad, added;
-	unsigned char* bdst;
-	unsigned char* dst;
-	FONSfont* renderFont = font;
-
-	if (isize < 2) return NULL;
-	if (iblur > 20) iblur = 20;
-	pad = iblur+2;
-
-	// Reset allocator.
-	stash->nscratch = 0;
-
-	// Find code point and size.
-	h = fons__hashint(codepoint) & (FONS_HASH_LUT_SIZE-1);
-	i = font->lut[h];
-	while (i != -1) {
-		if (font->glyphs[i].codepoint == codepoint && font->glyphs[i].size == isize && font->glyphs[i].blur == iblur) {
-			glyph = &font->glyphs[i];
-			if (bitmapOption == FONS_GLYPH_BITMAP_OPTIONAL || (glyph->x0 >= 0 && glyph->y0 >= 0)) {
-			  return glyph;
-			}
-			// At this point, glyph exists but the bitmap data is not yet created.
-			break;
-		}
-		i = font->glyphs[i].next;
-	}
-
-	// Create a new glyph or rasterize bitmap data for a cached glyph.
-	g = fons__tt_getGlyphIndex(&font->font, codepoint);
-	// Try to find the glyph in fallback fonts.
-	if (g == 0) {
-		for (i = 0; i < font->nfallbacks; ++i) {
-			FONSfont* fallbackFont = stash->fonts[font->fallbacks[i]];
-			int fallbackIndex = fons__tt_getGlyphIndex(&fallbackFont->font, codepoint);
-			if (fallbackIndex != 0) {
-				g = fallbackIndex;
-				renderFont = fallbackFont;
-				break;
-			}
-		}
-		// It is possible that we did not find a fallback glyph.
-		// In that case the glyph index 'g' is 0, and we'll proceed below and cache empty glyph.
-	}
-	scale = fons__tt_getPixelHeightScale(&renderFont->font, size);
-	fons__tt_buildGlyphBitmap(&renderFont->font, g, size, scale, &advance, &lsb, &x0, &y0, &x1, &y1);
-	gw = x1-x0 + pad*2;
-	gh = y1-y0 + pad*2;
-
-	// Determines the spot to draw glyph in the atlas.
-	if (bitmapOption == FONS_GLYPH_BITMAP_REQUIRED) {
-		// Find free spot for the rect in the atlas
-		added = fons__atlasAddRect(stash->atlas, gw, gh, &gx, &gy);
-		if (added == 0 && stash->handleError != NULL) {
-			// Atlas is full, let the user to resize the atlas (or not), and try again.
-			stash->handleError(stash->errorUptr, FONS_ATLAS_FULL, 0);
-			added = fons__atlasAddRect(stash->atlas, gw, gh, &gx, &gy);
-		}
-		if (added == 0) return NULL;
-	} else {
-		// Negative coordinate indicates there is no bitmap data created.
-		gx = -1;
-		gy = -1;
-	}
-
-	// Init glyph.
-	if (glyph == NULL) {
-		glyph = fons__allocGlyph(font);
-		glyph->codepoint = codepoint;
-		glyph->size = isize;
-		glyph->blur = iblur;
-		glyph->next = 0;
-
-		// Insert char to hash lookup.
-		glyph->next = font->lut[h];
-		font->lut[h] = font->nglyphs-1;
-	}
-	glyph->index = g;
-	glyph->x0 = (short)gx;
-	glyph->y0 = (short)gy;
-	glyph->x1 = (short)(glyph->x0+gw);
-	glyph->y1 = (short)(glyph->y0+gh);
-	glyph->xadv = (short)(scale * advance * 10.0f);
-	glyph->xoff = (short)(x0 - pad);
-	glyph->yoff = (short)(y0 - pad);
-
-	if (bitmapOption == FONS_GLYPH_BITMAP_OPTIONAL) {
-		return glyph;
-	}
-
-	// Rasterize
-	dst = &stash->texData[(glyph->x0+pad) + (glyph->y0+pad) * stash->params.width];
-	fons__tt_renderGlyphBitmap(&renderFont->font, dst, gw-pad*2,gh-pad*2, stash->params.width, scale, scale, g);
-
-	// Make sure there is one pixel empty border.
-	dst = &stash->texData[glyph->x0 + glyph->y0 * stash->params.width];
-	for (y = 0; y < gh; y++) {
-		dst[y*stash->params.width] = 0;
-		dst[gw-1 + y*stash->params.width] = 0;
-	}
-	for (x = 0; x < gw; x++) {
-		dst[x] = 0;
-		dst[x + (gh-1)*stash->params.width] = 0;
-	}
-
-	// Debug code to color the glyph background
-/*	unsigned char* fdst = &stash->texData[glyph->x0 + glyph->y0 * stash->params.width];
-	for (y = 0; y < gh; y++) {
-		for (x = 0; x < gw; x++) {
-			int a = (int)fdst[x+y*stash->params.width] + 20;
-			if (a > 255) a = 255;
-			fdst[x+y*stash->params.width] = a;
-		}
-	}*/
-
-	// Blur
-	if (iblur > 0) {
-		stash->nscratch = 0;
-		bdst = &stash->texData[glyph->x0 + glyph->y0 * stash->params.width];
-		fons__blur(stash, bdst, gw, gh, stash->params.width, iblur);
-	}
-
-	stash->dirtyRect[0] = fons__mini(stash->dirtyRect[0], glyph->x0);
-	stash->dirtyRect[1] = fons__mini(stash->dirtyRect[1], glyph->y0);
-	stash->dirtyRect[2] = fons__maxi(stash->dirtyRect[2], glyph->x1);
-	stash->dirtyRect[3] = fons__maxi(stash->dirtyRect[3], glyph->y1);
-
-	return glyph;
-}
-
-static void fons__getQuad(FONScontext* stash, FONSfont* font,
-						   int prevGlyphIndex, FONSglyph* glyph,
-						   float scale, float spacing, float* x, float* y, FONSquad* q)
-{
-	float rx,ry,xoff,yoff,x0,y0,x1,y1;
-
-	if (prevGlyphIndex != -1) {
-		float adv = fons__tt_getGlyphKernAdvance(&font->font, prevGlyphIndex, glyph->index) * scale;
-		*x += (int)(adv + spacing + 0.5f);
-	}
-
-	// Each glyph has 2px border to allow good interpolation,
-	// one pixel to prevent leaking, and one to allow good interpolation for rendering.
-	// Inset the texture region by one pixel for correct interpolation.
-	xoff = (short)(glyph->xoff+1);
-	yoff = (short)(glyph->yoff+1);
-	x0 = (float)(glyph->x0+1);
-	y0 = (float)(glyph->y0+1);
-	x1 = (float)(glyph->x1-1);
-	y1 = (float)(glyph->y1-1);
-
-	if (stash->params.flags & FONS_ZERO_TOPLEFT) {
-		rx = (float)(int)(*x + xoff);
-		ry = (float)(int)(*y + yoff);
-
-		q->x0 = rx;
-		q->y0 = ry;
-		q->x1 = rx + x1 - x0;
-		q->y1 = ry + y1 - y0;
-
-		q->s0 = x0 * stash->itw;
-		q->t0 = y0 * stash->ith;
-		q->s1 = x1 * stash->itw;
-		q->t1 = y1 * stash->ith;
-	} else {
-		rx = (float)(int)(*x + xoff);
-		ry = (float)(int)(*y - yoff);
-
-		q->x0 = rx;
-		q->y0 = ry;
-		q->x1 = rx + x1 - x0;
-		q->y1 = ry - y1 + y0;
-
-		q->s0 = x0 * stash->itw;
-		q->t0 = y0 * stash->ith;
-		q->s1 = x1 * stash->itw;
-		q->t1 = y1 * stash->ith;
-	}
-
-	*x += (int)(glyph->xadv / 10.0f + 0.5f);
-}
-
-static void fons__flush(FONScontext* stash)
-{
-	// Flush texture
-	if (stash->dirtyRect[0] < stash->dirtyRect[2] && stash->dirtyRect[1] < stash->dirtyRect[3]) {
-		if (stash->params.renderUpdate != NULL)
-			stash->params.renderUpdate(stash->params.userPtr, stash->dirtyRect, stash->texData);
-		// Reset dirty rect
-		stash->dirtyRect[0] = stash->params.width;
-		stash->dirtyRect[1] = stash->params.height;
-		stash->dirtyRect[2] = 0;
-		stash->dirtyRect[3] = 0;
-	}
-
-	// Flush triangles
-	if (stash->nverts > 0) {
-		if (stash->params.renderDraw != NULL)
-			stash->params.renderDraw(stash->params.userPtr, stash->verts, stash->tcoords, stash->colors, stash->nverts);
-		stash->nverts = 0;
-	}
-}
-
-static __inline void fons__vertex(FONScontext* stash, float x, float y, float s, float t, unsigned int c)
-{
-	stash->verts[stash->nverts*2+0] = x;
-	stash->verts[stash->nverts*2+1] = y;
-	stash->tcoords[stash->nverts*2+0] = s;
-	stash->tcoords[stash->nverts*2+1] = t;
-	stash->colors[stash->nverts] = c;
-	stash->nverts++;
-}
-
-static float fons__getVertAlign(FONScontext* stash, FONSfont* font, int align, short isize)
-{
-	if (stash->params.flags & FONS_ZERO_TOPLEFT) {
-		if (align & FONS_ALIGN_TOP) {
-			return font->ascender * (float)isize/10.0f;
-		} else if (align & FONS_ALIGN_MIDDLE) {
-			return (font->ascender + font->descender) / 2.0f * (float)isize/10.0f;
-		} else if (align & FONS_ALIGN_BASELINE) {
-			return 0.0f;
-		} else if (align & FONS_ALIGN_BOTTOM) {
-			return font->descender * (float)isize/10.0f;
-		}
-	} else {
-		if (align & FONS_ALIGN_TOP) {
-			return -font->ascender * (float)isize/10.0f;
-		} else if (align & FONS_ALIGN_MIDDLE) {
-			return -(font->ascender + font->descender) / 2.0f * (float)isize/10.0f;
-		} else if (align & FONS_ALIGN_BASELINE) {
-			return 0.0f;
-		} else if (align & FONS_ALIGN_BOTTOM) {
-			return -font->descender * (float)isize/10.0f;
-		}
-	}
-	return 0.0;
-}
-
-float fonsDrawText(FONScontext* stash,
-				   float x, float y,
-				   const char* str, const char* end)
-{
-	FONSstate* state = fons__getState(stash);
-	unsigned int codepoint;
-	unsigned int utf8state = 0;
-	FONSglyph* glyph = NULL;
-	FONSquad q;
-	int prevGlyphIndex = -1;
-	short isize = (short)(state->size*10.0f);
-	short iblur = (short)state->blur;
-	float scale;
-	FONSfont* font;
-	float width;
-
-	if (stash == NULL) return x;
-	if (state->font < 0 || state->font >= stash->nfonts) return x;
-	font = stash->fonts[state->font];
-	if (font->data == NULL) return x;
-
-	scale = fons__tt_getPixelHeightScale(&font->font, (float)isize/10.0f);
-
-	if (end == NULL)
-		end = str + strlen(str);
-
-	// Align horizontally
-	if (state->align & FONS_ALIGN_LEFT) {
-		// empty
-	} else if (state->align & FONS_ALIGN_RIGHT) {
-		width = fonsTextBounds(stash, x,y, str, end, NULL);
-		x -= width;
-	} else if (state->align & FONS_ALIGN_CENTER) {
-		width = fonsTextBounds(stash, x,y, str, end, NULL);
-		x -= width * 0.5f;
-	}
-	// Align vertically.
-	y += fons__getVertAlign(stash, font, state->align, isize);
-
-	for (; str != end; ++str) {
-		if (fons__decutf8(&utf8state, &codepoint, *(const unsigned char*)str))
-			continue;
-		glyph = fons__getGlyph(stash, font, codepoint, isize, iblur, FONS_GLYPH_BITMAP_REQUIRED);
-		if (glyph != NULL) {
-			fons__getQuad(stash, font, prevGlyphIndex, glyph, scale, state->spacing, &x, &y, &q);
-
-			if (stash->nverts+6 > FONS_VERTEX_COUNT)
-				fons__flush(stash);
-
-			fons__vertex(stash, q.x0, q.y0, q.s0, q.t0, state->color);
-			fons__vertex(stash, q.x1, q.y1, q.s1, q.t1, state->color);
-			fons__vertex(stash, q.x1, q.y0, q.s1, q.t0, state->color);
-
-			fons__vertex(stash, q.x0, q.y0, q.s0, q.t0, state->color);
-			fons__vertex(stash, q.x0, q.y1, q.s0, q.t1, state->color);
-			fons__vertex(stash, q.x1, q.y1, q.s1, q.t1, state->color);
-		}
-		prevGlyphIndex = glyph != NULL ? glyph->index : -1;
-	}
-	fons__flush(stash);
-
-	return x;
-}
-
-int fonsTextIterInit(FONScontext* stash, FONStextIter* iter,
-					 float x, float y, const char* str, const char* end, int bitmapOption)
-{
-	FONSstate* state = fons__getState(stash);
-	float width;
-
-	memset(iter, 0, sizeof(*iter));
-
-	if (stash == NULL) return 0;
-	if (state->font < 0 || state->font >= stash->nfonts) return 0;
-	iter->font = stash->fonts[state->font];
-	if (iter->font->data == NULL) return 0;
-
-	iter->isize = (short)(state->size*10.0f);
-	iter->iblur = (short)state->blur;
-	iter->scale = fons__tt_getPixelHeightScale(&iter->font->font, (float)iter->isize/10.0f);
-
-	// Align horizontally
-	if (state->align & FONS_ALIGN_LEFT) {
-		// empty
-	} else if (state->align & FONS_ALIGN_RIGHT) {
-		width = fonsTextBounds(stash, x,y, str, end, NULL);
-		x -= width;
-	} else if (state->align & FONS_ALIGN_CENTER) {
-		width = fonsTextBounds(stash, x,y, str, end, NULL);
-		x -= width * 0.5f;
-	}
-	// Align vertically.
-	y += fons__getVertAlign(stash, iter->font, state->align, iter->isize);
-
-	if (end == NULL)
-		end = str + strlen(str);
-
-	iter->x = iter->nextx = x;
-	iter->y = iter->nexty = y;
-	iter->spacing = state->spacing;
-	iter->str = str;
-	iter->next = str;
-	iter->end = end;
-	iter->codepoint = 0;
-	iter->prevGlyphIndex = -1;
-	iter->bitmapOption = bitmapOption;
-
-	return 1;
-}
-
-int fonsTextIterNext(FONScontext* stash, FONStextIter* iter, FONSquad* quad)
-{
-	FONSglyph* glyph = NULL;
-	const char* str = iter->next;
-	iter->str = iter->next;
-
-	if (str == iter->end)
-		return 0;
-
-	for (; str != iter->end; str++) {
-		if (fons__decutf8(&iter->utf8state, &iter->codepoint, *(const unsigned char*)str))
-			continue;
-		str++;
-		// Get glyph and quad
-		iter->x = iter->nextx;
-		iter->y = iter->nexty;
-		glyph = fons__getGlyph(stash, iter->font, iter->codepoint, iter->isize, iter->iblur, iter->bitmapOption);
-		// If the iterator was initialized with FONS_GLYPH_BITMAP_OPTIONAL, then the UV coordinates of the quad will be invalid.
-		if (glyph != NULL)
-			fons__getQuad(stash, iter->font, iter->prevGlyphIndex, glyph, iter->scale, iter->spacing, &iter->nextx, &iter->nexty, quad);
-		iter->prevGlyphIndex = glyph != NULL ? glyph->index : -1;
-		break;
-	}
-	iter->next = str;
-
-	return 1;
-}
-
-void fonsDrawDebug(FONScontext* stash, float x, float y)
-{
-	int i;
-	int w = stash->params.width;
-	int h = stash->params.height;
-	float u = w == 0 ? 0 : (1.0f / w);
-	float v = h == 0 ? 0 : (1.0f / h);
-
-	if (stash->nverts+6+6 > FONS_VERTEX_COUNT)
-		fons__flush(stash);
-
-	// Draw background
-	fons__vertex(stash, x+0, y+0, u, v, 0x0fffffff);
-	fons__vertex(stash, x+w, y+h, u, v, 0x0fffffff);
-	fons__vertex(stash, x+w, y+0, u, v, 0x0fffffff);
-
-	fons__vertex(stash, x+0, y+0, u, v, 0x0fffffff);
-	fons__vertex(stash, x+0, y+h, u, v, 0x0fffffff);
-	fons__vertex(stash, x+w, y+h, u, v, 0x0fffffff);
-
-	// Draw texture
-	fons__vertex(stash, x+0, y+0, 0, 0, 0xffffffff);
-	fons__vertex(stash, x+w, y+h, 1, 1, 0xffffffff);
-	fons__vertex(stash, x+w, y+0, 1, 0, 0xffffffff);
-
-	fons__vertex(stash, x+0, y+0, 0, 0, 0xffffffff);
-	fons__vertex(stash, x+0, y+h, 0, 1, 0xffffffff);
-	fons__vertex(stash, x+w, y+h, 1, 1, 0xffffffff);
-
-	// Drawbug draw atlas
-	for (i = 0; i < stash->atlas->nnodes; i++) {
-		FONSatlasNode* n = &stash->atlas->nodes[i];
-
-		if (stash->nverts+6 > FONS_VERTEX_COUNT)
-			fons__flush(stash);
-
-		fons__vertex(stash, x+n->x+0, y+n->y+0, u, v, 0xc00000ff);
-		fons__vertex(stash, x+n->x+n->width, y+n->y+1, u, v, 0xc00000ff);
-		fons__vertex(stash, x+n->x+n->width, y+n->y+0, u, v, 0xc00000ff);
-
-		fons__vertex(stash, x+n->x+0, y+n->y+0, u, v, 0xc00000ff);
-		fons__vertex(stash, x+n->x+0, y+n->y+1, u, v, 0xc00000ff);
-		fons__vertex(stash, x+n->x+n->width, y+n->y+1, u, v, 0xc00000ff);
-	}
-
-	fons__flush(stash);
-}
-
-float fonsTextBounds(FONScontext* stash,
-					 float x, float y,
-					 const char* str, const char* end,
-					 float* bounds)
-{
-	FONSstate* state = fons__getState(stash);
-	unsigned int codepoint;
-	unsigned int utf8state = 0;
-	FONSquad q;
-	FONSglyph* glyph = NULL;
-	int prevGlyphIndex = -1;
-	short isize = (short)(state->size*10.0f);
-	short iblur = (short)state->blur;
-	float scale;
-	FONSfont* font;
-	float startx, advance;
-	float minx, miny, maxx, maxy;
-
-	if (stash == NULL) return 0;
-	if (state->font < 0 || state->font >= stash->nfonts) return 0;
-	font = stash->fonts[state->font];
-	if (font->data == NULL) return 0;
-
-	scale = fons__tt_getPixelHeightScale(&font->font, (float)isize/10.0f);
-
-	// Align vertically.
-	y += fons__getVertAlign(stash, font, state->align, isize);
-
-	minx = maxx = x;
-	miny = maxy = y;
-	startx = x;
-
-	if (end == NULL)
-		end = str + strlen(str);
-
-	for (; str != end; ++str) {
-		if (fons__decutf8(&utf8state, &codepoint, *(const unsigned char*)str))
-			continue;
-		glyph = fons__getGlyph(stash, font, codepoint, isize, iblur, FONS_GLYPH_BITMAP_OPTIONAL);
-		if (glyph != NULL) {
-			fons__getQuad(stash, font, prevGlyphIndex, glyph, scale, state->spacing, &x, &y, &q);
-			if (q.x0 < minx) minx = q.x0;
-			if (q.x1 > maxx) maxx = q.x1;
-			if (stash->params.flags & FONS_ZERO_TOPLEFT) {
-				if (q.y0 < miny) miny = q.y0;
-				if (q.y1 > maxy) maxy = q.y1;
-			} else {
-				if (q.y1 < miny) miny = q.y1;
-				if (q.y0 > maxy) maxy = q.y0;
-			}
-		}
-		prevGlyphIndex = glyph != NULL ? glyph->index : -1;
-	}
-
-	advance = x - startx;
-
-	// Align horizontally
-	if (state->align & FONS_ALIGN_LEFT) {
-		// empty
-	} else if (state->align & FONS_ALIGN_RIGHT) {
-		minx -= advance;
-		maxx -= advance;
-	} else if (state->align & FONS_ALIGN_CENTER) {
-		minx -= advance * 0.5f;
-		maxx -= advance * 0.5f;
-	}
-
-	if (bounds) {
-		bounds[0] = minx;
-		bounds[1] = miny;
-		bounds[2] = maxx;
-		bounds[3] = maxy;
-	}
-
-	return advance;
-}
-
-void fonsVertMetrics(FONScontext* stash,
-					 float* ascender, float* descender, float* lineh)
-{
-	FONSfont* font;
-	FONSstate* state = fons__getState(stash);
-	short isize;
-
-	if (stash == NULL) return;
-	if (state->font < 0 || state->font >= stash->nfonts) return;
-	font = stash->fonts[state->font];
-	isize = (short)(state->size*10.0f);
-	if (font->data == NULL) return;
-
-	if (ascender)
-		*ascender = font->ascender*isize/10.0f;
-	if (descender)
-		*descender = font->descender*isize/10.0f;
-	if (lineh)
-		*lineh = font->lineh*isize/10.0f;
-}
-
-void fonsLineBounds(FONScontext* stash, float y, float* miny, float* maxy)
-{
-	FONSfont* font;
-	FONSstate* state = fons__getState(stash);
-	short isize;
-
-	if (stash == NULL) return;
-	if (state->font < 0 || state->font >= stash->nfonts) return;
-	font = stash->fonts[state->font];
-	isize = (short)(state->size*10.0f);
-	if (font->data == NULL) return;
-
-	y += fons__getVertAlign(stash, font, state->align, isize);
-
-	if (stash->params.flags & FONS_ZERO_TOPLEFT) {
-		*miny = y - font->ascender * (float)isize/10.0f;
-		*maxy = *miny + font->lineh*isize/10.0f;
-	} else {
-		*maxy = y + font->descender * (float)isize/10.0f;
-		*miny = *maxy - font->lineh*isize/10.0f;
-	}
-}
-
-const unsigned char* fonsGetTextureData(FONScontext* stash, int* width, int* height)
-{
-	if (width != NULL)
-		*width = stash->params.width;
-	if (height != NULL)
-		*height = stash->params.height;
-	return stash->texData;
-}
-
-int fonsValidateTexture(FONScontext* stash, int* dirty)
-{
-	if (stash->dirtyRect[0] < stash->dirtyRect[2] && stash->dirtyRect[1] < stash->dirtyRect[3]) {
-		dirty[0] = stash->dirtyRect[0];
-		dirty[1] = stash->dirtyRect[1];
-		dirty[2] = stash->dirtyRect[2];
-		dirty[3] = stash->dirtyRect[3];
-		// Reset dirty rect
-		stash->dirtyRect[0] = stash->params.width;
-		stash->dirtyRect[1] = stash->params.height;
-		stash->dirtyRect[2] = 0;
-		stash->dirtyRect[3] = 0;
-		return 1;
-	}
-	return 0;
-}
-
-void fonsDeleteInternal(FONScontext* stash)
-{
-	int i;
-	if (stash == NULL) return;
-
-	if (stash->params.renderDelete)
-		stash->params.renderDelete(stash->params.userPtr);
-
-	for (i = 0; i < stash->nfonts; ++i)
-		fons__freeFont(stash->fonts[i]);
-
-	if (stash->atlas) fons__deleteAtlas(stash->atlas);
-	if (stash->fonts) free(stash->fonts);
-	if (stash->texData) free(stash->texData);
-	if (stash->scratch) free(stash->scratch);
-	fons__tt_done(stash);
-	free(stash);
-}
-
-void fonsSetErrorCallback(FONScontext* stash, void (*callback)(void* uptr, int error, int val), void* uptr)
-{
-	if (stash == NULL) return;
-	stash->handleError = callback;
-	stash->errorUptr = uptr;
-}
-
-void fonsGetAtlasSize(FONScontext* stash, int* width, int* height)
-{
-	if (stash == NULL) return;
-	*width = stash->params.width;
-	*height = stash->params.height;
-}
-
-int fonsExpandAtlas(FONScontext* stash, int width, int height)
-{
-	int i, maxy = 0;
-	unsigned char* data = NULL;
-	if (stash == NULL) return 0;
-
-	width = fons__maxi(width, stash->params.width);
-	height = fons__maxi(height, stash->params.height);
-
-	if (width == stash->params.width && height == stash->params.height)
-		return 1;
-
-	// Flush pending glyphs.
-	fons__flush(stash);
-
-	// Create new texture
-	if (stash->params.renderResize != NULL) {
-		if (stash->params.renderResize(stash->params.userPtr, width, height) == 0)
-			return 0;
-	}
-	// Copy old texture data over.
-	data = (unsigned char*)malloc(width * height);
-	if (data == NULL)
-		return 0;
-	for (i = 0; i < stash->params.height; i++) {
-		unsigned char* dst = &data[i*width];
-		unsigned char* src = &stash->texData[i*stash->params.width];
-		memcpy(dst, src, stash->params.width);
-		if (width > stash->params.width)
-			memset(dst+stash->params.width, 0, width - stash->params.width);
-	}
-	if (height > stash->params.height)
-		memset(&data[stash->params.height * width], 0, (height - stash->params.height) * width);
-
-	free(stash->texData);
-	stash->texData = data;
-
-	// Increase atlas size
-	fons__atlasExpand(stash->atlas, width, height);
-
-	// Add existing data as dirty.
-	for (i = 0; i < stash->atlas->nnodes; i++)
-		maxy = fons__maxi(maxy, stash->atlas->nodes[i].y);
-	stash->dirtyRect[0] = 0;
-	stash->dirtyRect[1] = 0;
-	stash->dirtyRect[2] = stash->params.width;
-	stash->dirtyRect[3] = maxy;
-
-	stash->params.width = width;
-	stash->params.height = height;
-	stash->itw = 1.0f/stash->params.width;
-	stash->ith = 1.0f/stash->params.height;
-
-	return 1;
-}
-
-int fonsResetAtlas(FONScontext* stash, int width, int height)
-{
-	int i, j;
-	if (stash == NULL) return 0;
-
-	// Flush pending glyphs.
-	fons__flush(stash);
-
-	// Create new texture
-	if (stash->params.renderResize != NULL) {
-		if (stash->params.renderResize(stash->params.userPtr, width, height) == 0)
-			return 0;
-	}
-
-	// Reset atlas
-	fons__atlasReset(stash->atlas, width, height);
-
-	// Clear texture data.
-	stash->texData = (unsigned char*)realloc(stash->texData, width * height);
-	if (stash->texData == NULL) return 0;
-	memset(stash->texData, 0, width * height);
-
-	// Reset dirty rect
-	stash->dirtyRect[0] = width;
-	stash->dirtyRect[1] = height;
-	stash->dirtyRect[2] = 0;
-	stash->dirtyRect[3] = 0;
-
-	// Reset cached glyphs
-	for (i = 0; i < stash->nfonts; i++) {
-		FONSfont* font = stash->fonts[i];
-		font->nglyphs = 0;
-		for (j = 0; j < FONS_HASH_LUT_SIZE; j++)
-			font->lut[j] = -1;
-	}
-
-	stash->params.width = width;
-	stash->params.height = height;
-	stash->itw = 1.0f/stash->params.width;
-	stash->ith = 1.0f/stash->params.height;
-
-	// Add white rect at 0,0 for debug drawing.
-	fons__addWhiteRect(stash, 2,2);
-
-	return 1;
-}
-
-
-#endif
diff --git a/Source/sys-clk/manager/lib/borealis/library/include/borealis/extern/nanovg/nanovg.h b/Source/sys-clk/manager/lib/borealis/library/include/borealis/extern/nanovg/nanovg.h
deleted file mode 100644
index 2255d6a6..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/include/borealis/extern/nanovg/nanovg.h
+++ /dev/null
@@ -1,685 +0,0 @@
-//
-// Copyright (c) 2013 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#ifndef NANOVG_H
-#define NANOVG_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define NVG_PI 3.14159265358979323846264338327f
-
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable: 4201)  // nonstandard extension used : nameless struct/union
-#endif
-
-typedef struct NVGcontext NVGcontext;
-
-struct NVGcolor {
-	union {
-		float rgba[4];
-		struct {
-			float r,g,b,a;
-		};
-	};
-};
-typedef struct NVGcolor NVGcolor;
-
-struct NVGpaint {
-	float xform[6];
-	float extent[2];
-	float radius;
-	float feather;
-	NVGcolor innerColor;
-	NVGcolor outerColor;
-	int image;
-};
-typedef struct NVGpaint NVGpaint;
-
-enum NVGwinding {
-	NVG_CCW = 1,			// Winding for solid shapes
-	NVG_CW = 2,				// Winding for holes
-};
-
-enum NVGsolidity {
-	NVG_SOLID = 1,			// CCW
-	NVG_HOLE = 2,			// CW
-};
-
-enum NVGlineCap {
-	NVG_BUTT,
-	NVG_ROUND,
-	NVG_SQUARE,
-	NVG_BEVEL,
-	NVG_MITER,
-};
-
-enum NVGalign {
-	// Horizontal align
-	NVG_ALIGN_LEFT 		= 1<<0,	// Default, align text horizontally to left.
-	NVG_ALIGN_CENTER 	= 1<<1,	// Align text horizontally to center.
-	NVG_ALIGN_RIGHT 	= 1<<2,	// Align text horizontally to right.
-	// Vertical align
-	NVG_ALIGN_TOP 		= 1<<3,	// Align text vertically to top.
-	NVG_ALIGN_MIDDLE	= 1<<4,	// Align text vertically to middle.
-	NVG_ALIGN_BOTTOM	= 1<<5,	// Align text vertically to bottom.
-	NVG_ALIGN_BASELINE	= 1<<6, // Default, align text vertically to baseline.
-};
-
-enum NVGblendFactor {
-	NVG_ZERO = 1<<0,
-	NVG_ONE = 1<<1,
-	NVG_SRC_COLOR = 1<<2,
-	NVG_ONE_MINUS_SRC_COLOR = 1<<3,
-	NVG_DST_COLOR = 1<<4,
-	NVG_ONE_MINUS_DST_COLOR = 1<<5,
-	NVG_SRC_ALPHA = 1<<6,
-	NVG_ONE_MINUS_SRC_ALPHA = 1<<7,
-	NVG_DST_ALPHA = 1<<8,
-	NVG_ONE_MINUS_DST_ALPHA = 1<<9,
-	NVG_SRC_ALPHA_SATURATE = 1<<10,
-};
-
-enum NVGcompositeOperation {
-	NVG_SOURCE_OVER,
-	NVG_SOURCE_IN,
-	NVG_SOURCE_OUT,
-	NVG_ATOP,
-	NVG_DESTINATION_OVER,
-	NVG_DESTINATION_IN,
-	NVG_DESTINATION_OUT,
-	NVG_DESTINATION_ATOP,
-	NVG_LIGHTER,
-	NVG_COPY,
-	NVG_XOR,
-};
-
-struct NVGcompositeOperationState {
-	int srcRGB;
-	int dstRGB;
-	int srcAlpha;
-	int dstAlpha;
-};
-typedef struct NVGcompositeOperationState NVGcompositeOperationState;
-
-struct NVGglyphPosition {
-	const char* str;	// Position of the glyph in the input string.
-	float x;			// The x-coordinate of the logical glyph position.
-	float minx, maxx;	// The bounds of the glyph shape.
-};
-typedef struct NVGglyphPosition NVGglyphPosition;
-
-struct NVGtextRow {
-	const char* start;	// Pointer to the input text where the row starts.
-	const char* end;	// Pointer to the input text where the row ends (one past the last character).
-	const char* next;	// Pointer to the beginning of the next row.
-	float width;		// Logical width of the row.
-	float minx, maxx;	// Actual bounds of the row. Logical with and bounds can differ because of kerning and some parts over extending.
-};
-typedef struct NVGtextRow NVGtextRow;
-
-enum NVGimageFlags {
-    NVG_IMAGE_GENERATE_MIPMAPS	= 1<<0,     // Generate mipmaps during creation of the image.
-	NVG_IMAGE_REPEATX			= 1<<1,		// Repeat image in X direction.
-	NVG_IMAGE_REPEATY			= 1<<2,		// Repeat image in Y direction.
-	NVG_IMAGE_FLIPY				= 1<<3,		// Flips (inverses) image in Y direction when rendered.
-	NVG_IMAGE_PREMULTIPLIED		= 1<<4,		// Image data has premultiplied alpha.
-	NVG_IMAGE_NEAREST			= 1<<5,		// Image interpolation is Nearest instead Linear
-};
-
-// Begin drawing a new frame
-// Calls to nanovg drawing API should be wrapped in nvgBeginFrame() & nvgEndFrame()
-// nvgBeginFrame() defines the size of the window to render to in relation currently
-// set viewport (i.e. glViewport on GL backends). Device pixel ration allows to
-// control the rendering on Hi-DPI devices.
-// For example, GLFW returns two dimension for an opened window: window size and
-// frame buffer size. In that case you would set windowWidth/Height to the window size
-// devicePixelRatio to: frameBufferWidth / windowWidth.
-void nvgBeginFrame(NVGcontext* ctx, float windowWidth, float windowHeight, float devicePixelRatio);
-
-// Cancels drawing the current frame.
-void nvgCancelFrame(NVGcontext* ctx);
-
-// Ends drawing flushing remaining render state.
-void nvgEndFrame(NVGcontext* ctx);
-
-//
-// Composite operation
-//
-// The composite operations in NanoVG are modeled after HTML Canvas API, and
-// the blend func is based on OpenGL (see corresponding manuals for more info).
-// The colors in the blending state have premultiplied alpha.
-
-// Sets the composite operation. The op parameter should be one of NVGcompositeOperation.
-void nvgGlobalCompositeOperation(NVGcontext* ctx, int op);
-
-// Sets the composite operation with custom pixel arithmetic. The parameters should be one of NVGblendFactor.
-void nvgGlobalCompositeBlendFunc(NVGcontext* ctx, int sfactor, int dfactor);
-
-// Sets the composite operation with custom pixel arithmetic for RGB and alpha components separately. The parameters should be one of NVGblendFactor.
-void nvgGlobalCompositeBlendFuncSeparate(NVGcontext* ctx, int srcRGB, int dstRGB, int srcAlpha, int dstAlpha);
-
-//
-// Color utils
-//
-// Colors in NanoVG are stored as unsigned ints in ABGR format.
-
-// Returns a color value from red, green, blue values. Alpha will be set to 255 (1.0f).
-NVGcolor nvgRGB(unsigned char r, unsigned char g, unsigned char b);
-
-// Returns a color value from red, green, blue values. Alpha will be set to 1.0f.
-NVGcolor nvgRGBf(float r, float g, float b);
-
-
-// Returns a color value from red, green, blue and alpha values.
-NVGcolor nvgRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a);
-
-// Returns a color value from red, green, blue and alpha values.
-NVGcolor nvgRGBAf(float r, float g, float b, float a);
-
-
-// Linearly interpolates from color c0 to c1, and returns resulting color value.
-NVGcolor nvgLerpRGBA(NVGcolor c0, NVGcolor c1, float u);
-
-// Sets transparency of a color value.
-NVGcolor nvgTransRGBA(NVGcolor c0, unsigned char a);
-
-// Sets transparency of a color value.
-NVGcolor nvgTransRGBAf(NVGcolor c0, float a);
-
-// Returns color value specified by hue, saturation and lightness.
-// HSL values are all in range [0..1], alpha will be set to 255.
-NVGcolor nvgHSL(float h, float s, float l);
-
-// Returns color value specified by hue, saturation and lightness and alpha.
-// HSL values are all in range [0..1], alpha in range [0..255]
-NVGcolor nvgHSLA(float h, float s, float l, unsigned char a);
-
-//
-// State Handling
-//
-// NanoVG contains state which represents how paths will be rendered.
-// The state contains transform, fill and stroke styles, text and font styles,
-// and scissor clipping.
-
-// Pushes and saves the current render state into a state stack.
-// A matching nvgRestore() must be used to restore the state.
-void nvgSave(NVGcontext* ctx);
-
-// Pops and restores current render state.
-void nvgRestore(NVGcontext* ctx);
-
-// Resets current render state to default values. Does not affect the render state stack.
-void nvgReset(NVGcontext* ctx);
-
-//
-// Render styles
-//
-// Fill and stroke render style can be either a solid color or a paint which is a gradient or a pattern.
-// Solid color is simply defined as a color value, different kinds of paints can be created
-// using nvgLinearGradient(), nvgBoxGradient(), nvgRadialGradient() and nvgImagePattern().
-//
-// Current render style can be saved and restored using nvgSave() and nvgRestore().
-
-// Sets whether to draw antialias for nvgStroke() and nvgFill(). It's enabled by default.
-void nvgShapeAntiAlias(NVGcontext* ctx, int enabled);
-
-// Sets current stroke style to a solid color.
-void nvgStrokeColor(NVGcontext* ctx, NVGcolor color);
-
-// Sets current stroke style to a paint, which can be a one of the gradients or a pattern.
-void nvgStrokePaint(NVGcontext* ctx, NVGpaint paint);
-
-// Sets current fill style to a solid color.
-void nvgFillColor(NVGcontext* ctx, NVGcolor color);
-
-// Sets current fill style to a paint, which can be a one of the gradients or a pattern.
-void nvgFillPaint(NVGcontext* ctx, NVGpaint paint);
-
-// Sets the miter limit of the stroke style.
-// Miter limit controls when a sharp corner is beveled.
-void nvgMiterLimit(NVGcontext* ctx, float limit);
-
-// Sets the stroke width of the stroke style.
-void nvgStrokeWidth(NVGcontext* ctx, float size);
-
-// Sets how the end of the line (cap) is drawn,
-// Can be one of: NVG_BUTT (default), NVG_ROUND, NVG_SQUARE.
-void nvgLineCap(NVGcontext* ctx, int cap);
-
-// Sets how sharp path corners are drawn.
-// Can be one of NVG_MITER (default), NVG_ROUND, NVG_BEVEL.
-void nvgLineJoin(NVGcontext* ctx, int join);
-
-// Sets the transparency applied to all rendered shapes.
-// Already transparent paths will get proportionally more transparent as well.
-void nvgGlobalAlpha(NVGcontext* ctx, float alpha);
-
-//
-// Transforms
-//
-// The paths, gradients, patterns and scissor region are transformed by an transformation
-// matrix at the time when they are passed to the API.
-// The current transformation matrix is a affine matrix:
-//   [sx kx tx]
-//   [ky sy ty]
-//   [ 0  0  1]
-// Where: sx,sy define scaling, kx,ky skewing, and tx,ty translation.
-// The last row is assumed to be 0,0,1 and is not stored.
-//
-// Apart from nvgResetTransform(), each transformation function first creates
-// specific transformation matrix and pre-multiplies the current transformation by it.
-//
-// Current coordinate system (transformation) can be saved and restored using nvgSave() and nvgRestore().
-
-// Resets current transform to a identity matrix.
-void nvgResetTransform(NVGcontext* ctx);
-
-// Premultiplies current coordinate system by specified matrix.
-// The parameters are interpreted as matrix as follows:
-//   [a c e]
-//   [b d f]
-//   [0 0 1]
-void nvgTransform(NVGcontext* ctx, float a, float b, float c, float d, float e, float f);
-
-// Translates current coordinate system.
-void nvgTranslate(NVGcontext* ctx, float x, float y);
-
-// Rotates current coordinate system. Angle is specified in radians.
-void nvgRotate(NVGcontext* ctx, float angle);
-
-// Skews the current coordinate system along X axis. Angle is specified in radians.
-void nvgSkewX(NVGcontext* ctx, float angle);
-
-// Skews the current coordinate system along Y axis. Angle is specified in radians.
-void nvgSkewY(NVGcontext* ctx, float angle);
-
-// Scales the current coordinate system.
-void nvgScale(NVGcontext* ctx, float x, float y);
-
-// Stores the top part (a-f) of the current transformation matrix in to the specified buffer.
-//   [a c e]
-//   [b d f]
-//   [0 0 1]
-// There should be space for 6 floats in the return buffer for the values a-f.
-void nvgCurrentTransform(NVGcontext* ctx, float* xform);
-
-
-// The following functions can be used to make calculations on 2x3 transformation matrices.
-// A 2x3 matrix is represented as float[6].
-
-// Sets the transform to identity matrix.
-void nvgTransformIdentity(float* dst);
-
-// Sets the transform to translation matrix matrix.
-void nvgTransformTranslate(float* dst, float tx, float ty);
-
-// Sets the transform to scale matrix.
-void nvgTransformScale(float* dst, float sx, float sy);
-
-// Sets the transform to rotate matrix. Angle is specified in radians.
-void nvgTransformRotate(float* dst, float a);
-
-// Sets the transform to skew-x matrix. Angle is specified in radians.
-void nvgTransformSkewX(float* dst, float a);
-
-// Sets the transform to skew-y matrix. Angle is specified in radians.
-void nvgTransformSkewY(float* dst, float a);
-
-// Sets the transform to the result of multiplication of two transforms, of A = A*B.
-void nvgTransformMultiply(float* dst, const float* src);
-
-// Sets the transform to the result of multiplication of two transforms, of A = B*A.
-void nvgTransformPremultiply(float* dst, const float* src);
-
-// Sets the destination to inverse of specified transform.
-// Returns 1 if the inverse could be calculated, else 0.
-int nvgTransformInverse(float* dst, const float* src);
-
-// Transform a point by given transform.
-void nvgTransformPoint(float* dstx, float* dsty, const float* xform, float srcx, float srcy);
-
-// Converts degrees to radians and vice versa.
-float nvgDegToRad(float deg);
-float nvgRadToDeg(float rad);
-
-//
-// Images
-//
-// NanoVG allows you to load jpg, png, psd, tga, pic and gif files to be used for rendering.
-// In addition you can upload your own image. The image loading is provided by stb_image.
-// The parameter imageFlags is combination of flags defined in NVGimageFlags.
-
-// Creates image by loading it from the disk from specified file name.
-// Returns handle to the image.
-int nvgCreateImage(NVGcontext* ctx, const char* filename, int imageFlags);
-
-// Creates image by loading it from the specified chunk of memory.
-// Returns handle to the image.
-int nvgCreateImageMem(NVGcontext* ctx, int imageFlags, unsigned char* data, int ndata);
-
-// Creates image from specified image data.
-// Returns handle to the image.
-int nvgCreateImageRGBA(NVGcontext* ctx, int w, int h, int imageFlags, const unsigned char* data);
-
-// Updates image data specified by image handle.
-void nvgUpdateImage(NVGcontext* ctx, int image, const unsigned char* data);
-
-// Returns the dimensions of a created image.
-void nvgImageSize(NVGcontext* ctx, int image, int* w, int* h);
-
-// Deletes created image.
-void nvgDeleteImage(NVGcontext* ctx, int image);
-
-//
-// Paints
-//
-// NanoVG supports four types of paints: linear gradient, box gradient, radial gradient and image pattern.
-// These can be used as paints for strokes and fills.
-
-// Creates and returns a linear gradient. Parameters (sx,sy)-(ex,ey) specify the start and end coordinates
-// of the linear gradient, icol specifies the start color and ocol the end color.
-// The gradient is transformed by the current transform when it is passed to nvgFillPaint() or nvgStrokePaint().
-NVGpaint nvgLinearGradient(NVGcontext* ctx, float sx, float sy, float ex, float ey,
-						   NVGcolor icol, NVGcolor ocol);
-
-// Creates and returns a box gradient. Box gradient is a feathered rounded rectangle, it is useful for rendering
-// drop shadows or highlights for boxes. Parameters (x,y) define the top-left corner of the rectangle,
-// (w,h) define the size of the rectangle, r defines the corner radius, and f feather. Feather defines how blurry
-// the border of the rectangle is. Parameter icol specifies the inner color and ocol the outer color of the gradient.
-// The gradient is transformed by the current transform when it is passed to nvgFillPaint() or nvgStrokePaint().
-NVGpaint nvgBoxGradient(NVGcontext* ctx, float x, float y, float w, float h,
-						float r, float f, NVGcolor icol, NVGcolor ocol);
-
-// Creates and returns a radial gradient. Parameters (cx,cy) specify the center, inr and outr specify
-// the inner and outer radius of the gradient, icol specifies the start color and ocol the end color.
-// The gradient is transformed by the current transform when it is passed to nvgFillPaint() or nvgStrokePaint().
-NVGpaint nvgRadialGradient(NVGcontext* ctx, float cx, float cy, float inr, float outr,
-						   NVGcolor icol, NVGcolor ocol);
-
-// Creates and returns an image patter. Parameters (ox,oy) specify the left-top location of the image pattern,
-// (ex,ey) the size of one image, angle rotation around the top-left corner, image is handle to the image to render.
-// The gradient is transformed by the current transform when it is passed to nvgFillPaint() or nvgStrokePaint().
-NVGpaint nvgImagePattern(NVGcontext* ctx, float ox, float oy, float ex, float ey,
-						 float angle, int image, float alpha);
-
-//
-// Scissoring
-//
-// Scissoring allows you to clip the rendering into a rectangle. This is useful for various
-// user interface cases like rendering a text edit or a timeline.
-
-// Sets the current scissor rectangle.
-// The scissor rectangle is transformed by the current transform.
-void nvgScissor(NVGcontext* ctx, float x, float y, float w, float h);
-
-// Intersects current scissor rectangle with the specified rectangle.
-// The scissor rectangle is transformed by the current transform.
-// Note: in case the rotation of previous scissor rect differs from
-// the current one, the intersection will be done between the specified
-// rectangle and the previous scissor rectangle transformed in the current
-// transform space. The resulting shape is always rectangle.
-void nvgIntersectScissor(NVGcontext* ctx, float x, float y, float w, float h);
-
-// Reset and disables scissoring.
-void nvgResetScissor(NVGcontext* ctx);
-
-//
-// Paths
-//
-// Drawing a new shape starts with nvgBeginPath(), it clears all the currently defined paths.
-// Then you define one or more paths and sub-paths which describe the shape. The are functions
-// to draw common shapes like rectangles and circles, and lower level step-by-step functions,
-// which allow to define a path curve by curve.
-//
-// NanoVG uses even-odd fill rule to draw the shapes. Solid shapes should have counter clockwise
-// winding and holes should have counter clockwise order. To specify winding of a path you can
-// call nvgPathWinding(). This is useful especially for the common shapes, which are drawn CCW.
-//
-// Finally you can fill the path using current fill style by calling nvgFill(), and stroke it
-// with current stroke style by calling nvgStroke().
-//
-// The curve segments and sub-paths are transformed by the current transform.
-
-// Clears the current path and sub-paths.
-void nvgBeginPath(NVGcontext* ctx);
-
-// Starts new sub-path with specified point as first point.
-void nvgMoveTo(NVGcontext* ctx, float x, float y);
-
-// Adds line segment from the last point in the path to the specified point.
-void nvgLineTo(NVGcontext* ctx, float x, float y);
-
-// Adds cubic bezier segment from last point in the path via two control points to the specified point.
-void nvgBezierTo(NVGcontext* ctx, float c1x, float c1y, float c2x, float c2y, float x, float y);
-
-// Adds quadratic bezier segment from last point in the path via a control point to the specified point.
-void nvgQuadTo(NVGcontext* ctx, float cx, float cy, float x, float y);
-
-// Adds an arc segment at the corner defined by the last path point, and two specified points.
-void nvgArcTo(NVGcontext* ctx, float x1, float y1, float x2, float y2, float radius);
-
-// Closes current sub-path with a line segment.
-void nvgClosePath(NVGcontext* ctx);
-
-// Sets the current sub-path winding, see NVGwinding and NVGsolidity.
-void nvgPathWinding(NVGcontext* ctx, int dir);
-
-// Creates new circle arc shaped sub-path. The arc center is at cx,cy, the arc radius is r,
-// and the arc is drawn from angle a0 to a1, and swept in direction dir (NVG_CCW, or NVG_CW).
-// Angles are specified in radians.
-void nvgArc(NVGcontext* ctx, float cx, float cy, float r, float a0, float a1, int dir);
-
-// Creates new rectangle shaped sub-path.
-void nvgRect(NVGcontext* ctx, float x, float y, float w, float h);
-
-// Creates new rounded rectangle shaped sub-path.
-void nvgRoundedRect(NVGcontext* ctx, float x, float y, float w, float h, float r);
-
-// Creates new rounded rectangle shaped sub-path with varying radii for each corner.
-void nvgRoundedRectVarying(NVGcontext* ctx, float x, float y, float w, float h, float radTopLeft, float radTopRight, float radBottomRight, float radBottomLeft);
-
-// Creates new ellipse shaped sub-path.
-void nvgEllipse(NVGcontext* ctx, float cx, float cy, float rx, float ry);
-
-// Creates new circle shaped sub-path.
-void nvgCircle(NVGcontext* ctx, float cx, float cy, float r);
-
-// Fills the current path with current fill style.
-void nvgFill(NVGcontext* ctx);
-
-// Fills the current path with current stroke style.
-void nvgStroke(NVGcontext* ctx);
-
-
-//
-// Text
-//
-// NanoVG allows you to load .ttf files and use the font to render text.
-//
-// The appearance of the text can be defined by setting the current text style
-// and by specifying the fill color. Common text and font settings such as
-// font size, letter spacing and text align are supported. Font blur allows you
-// to create simple text effects such as drop shadows.
-//
-// At render time the font face can be set based on the font handles or name.
-//
-// Font measure functions return values in local space, the calculations are
-// carried in the same resolution as the final rendering. This is done because
-// the text glyph positions are snapped to the nearest pixels sharp rendering.
-//
-// The local space means that values are not rotated or scale as per the current
-// transformation. For example if you set font size to 12, which would mean that
-// line height is 16, then regardless of the current scaling and rotation, the
-// returned line height is always 16. Some measures may vary because of the scaling
-// since aforementioned pixel snapping.
-//
-// While this may sound a little odd, the setup allows you to always render the
-// same way regardless of scaling. I.e. following works regardless of scaling:
-//
-//		const char* txt = "Text me up.";
-//		nvgTextBounds(vg, x,y, txt, NULL, bounds);
-//		nvgBeginPath(vg);
-//		nvgRoundedRect(vg, bounds[0],bounds[1], bounds[2]-bounds[0], bounds[3]-bounds[1]);
-//		nvgFill(vg);
-//
-// Note: currently only solid color fill is supported for text.
-
-// Creates font by loading it from the disk from specified file name.
-// Returns handle to the font.
-int nvgCreateFont(NVGcontext* ctx, const char* name, const char* filename);
-
-// Creates font by loading it from the specified memory chunk.
-// Returns handle to the font.
-int nvgCreateFontMem(NVGcontext* ctx, const char* name, unsigned char* data, int ndata, int freeData);
-
-// Finds a loaded font of specified name, and returns handle to it, or -1 if the font is not found.
-int nvgFindFont(NVGcontext* ctx, const char* name);
-
-// Adds a fallback font by handle.
-int nvgAddFallbackFontId(NVGcontext* ctx, int baseFont, int fallbackFont);
-
-// Adds a fallback font by name.
-int nvgAddFallbackFont(NVGcontext* ctx, const char* baseFont, const char* fallbackFont);
-
-// Sets the font size of current text style.
-void nvgFontSize(NVGcontext* ctx, float size);
-
-// Sets the blur of current text style.
-void nvgFontBlur(NVGcontext* ctx, float blur);
-
-// Sets the letter spacing of current text style.
-void nvgTextLetterSpacing(NVGcontext* ctx, float spacing);
-
-// Sets the proportional line height of current text style. The line height is specified as multiple of font size.
-void nvgTextLineHeight(NVGcontext* ctx, float lineHeight);
-
-// Sets the text align of current text style, see NVGalign for options.
-void nvgTextAlign(NVGcontext* ctx, int align);
-
-// Sets the font face based on specified id of current text style.
-void nvgFontFaceId(NVGcontext* ctx, int font);
-
-// Sets the font face based on specified name of current text style.
-void nvgFontFace(NVGcontext* ctx, const char* font);
-
-// Draws text string at specified location. If end is specified only the sub-string up to the end is drawn.
-float nvgText(NVGcontext* ctx, float x, float y, const char* string, const char* end);
-
-// Draws multi-line text string at specified location wrapped at the specified width. If end is specified only the sub-string up to the end is drawn.
-// White space is stripped at the beginning of the rows, the text is split at word boundaries or when new-line characters are encountered.
-// Words longer than the max width are slit at nearest character (i.e. no hyphenation).
-void nvgTextBox(NVGcontext* ctx, float x, float y, float breakRowWidth, const char* string, const char* end);
-
-// Measures the specified text string. Parameter bounds should be a pointer to float[4],
-// if the bounding box of the text should be returned. The bounds value are [xmin,ymin, xmax,ymax]
-// Returns the horizontal advance of the measured text (i.e. where the next character should drawn).
-// Measured values are returned in local coordinate space.
-float nvgTextBounds(NVGcontext* ctx, float x, float y, const char* string, const char* end, float* bounds);
-
-// Measures the specified multi-text string. Parameter bounds should be a pointer to float[4],
-// if the bounding box of the text should be returned. The bounds value are [xmin,ymin, xmax,ymax]
-// Measured values are returned in local coordinate space.
-void nvgTextBoxBounds(NVGcontext* ctx, float x, float y, float breakRowWidth, const char* string, const char* end, float* bounds);
-
-// Calculates the glyph x positions of the specified text. If end is specified only the sub-string will be used.
-// Measured values are returned in local coordinate space.
-int nvgTextGlyphPositions(NVGcontext* ctx, float x, float y, const char* string, const char* end, NVGglyphPosition* positions, int maxPositions);
-
-// Returns the vertical metrics based on the current text style.
-// Measured values are returned in local coordinate space.
-void nvgTextMetrics(NVGcontext* ctx, float* ascender, float* descender, float* lineh);
-
-// Breaks the specified text into lines. If end is specified only the sub-string will be used.
-// White space is stripped at the beginning of the rows, the text is split at word boundaries or when new-line characters are encountered.
-// Words longer than the max width are slit at nearest character (i.e. no hyphenation).
-int nvgTextBreakLines(NVGcontext* ctx, const char* string, const char* end, float breakRowWidth, NVGtextRow* rows, int maxRows);
-
-//
-// Internal Render API
-//
-enum NVGtexture {
-	NVG_TEXTURE_ALPHA = 0x01,
-	NVG_TEXTURE_RGBA = 0x02,
-};
-
-struct NVGscissor {
-	float xform[6];
-	float extent[2];
-};
-typedef struct NVGscissor NVGscissor;
-
-struct NVGvertex {
-	float x,y,u,v;
-};
-typedef struct NVGvertex NVGvertex;
-
-struct NVGpath {
-	int first;
-	int count;
-	unsigned char closed;
-	int nbevel;
-	NVGvertex* fill;
-	int nfill;
-	NVGvertex* stroke;
-	int nstroke;
-	int winding;
-	int convex;
-};
-typedef struct NVGpath NVGpath;
-
-struct NVGparams {
-	void* userPtr;
-	int edgeAntiAlias;
-	int (*renderCreate)(void* uptr);
-	int (*renderCreateTexture)(void* uptr, int type, int w, int h, int imageFlags, const unsigned char* data);
-	int (*renderDeleteTexture)(void* uptr, int image);
-	int (*renderUpdateTexture)(void* uptr, int image, int x, int y, int w, int h, const unsigned char* data);
-	int (*renderGetTextureSize)(void* uptr, int image, int* w, int* h);
-	void (*renderViewport)(void* uptr, float width, float height, float devicePixelRatio);
-	void (*renderCancel)(void* uptr);
-	void (*renderFlush)(void* uptr);
-	void (*renderFill)(void* uptr, NVGpaint* paint, NVGcompositeOperationState compositeOperation, NVGscissor* scissor, float fringe, const float* bounds, const NVGpath* paths, int npaths);
-	void (*renderStroke)(void* uptr, NVGpaint* paint, NVGcompositeOperationState compositeOperation, NVGscissor* scissor, float fringe, float strokeWidth, const NVGpath* paths, int npaths);
-	void (*renderTriangles)(void* uptr, NVGpaint* paint, NVGcompositeOperationState compositeOperation, NVGscissor* scissor, const NVGvertex* verts, int nverts);
-	void (*renderDelete)(void* uptr);
-};
-typedef struct NVGparams NVGparams;
-
-// Constructor and destructor, called by the render back-end.
-NVGcontext* nvgCreateInternal(NVGparams* params);
-void nvgDeleteInternal(NVGcontext* ctx);
-
-NVGparams* nvgInternalParams(NVGcontext* ctx);
-
-// Debug function to dump cached path data.
-void nvgDebugDumpPathCache(NVGcontext* ctx);
-
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-
-#define NVG_NOTUSED(v) for (;;) { (void)(1 ? (void)0 : ( (void)(v) ) ); break; }
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // NANOVG_H
diff --git a/Source/sys-clk/manager/lib/borealis/library/include/borealis/extern/nanovg/nanovg_gl.h b/Source/sys-clk/manager/lib/borealis/library/include/borealis/extern/nanovg/nanovg_gl.h
deleted file mode 100644
index 42ff6969..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/include/borealis/extern/nanovg/nanovg_gl.h
+++ /dev/null
@@ -1,1649 +0,0 @@
-//
-// Copyright (c) 2009-2013 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-#ifndef NANOVG_GL_H
-#define NANOVG_GL_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// Create flags
-
-enum NVGcreateFlags {
-	// Flag indicating if geometry based anti-aliasing is used (may not be needed when using MSAA).
-	NVG_ANTIALIAS 		= 1<<0,
-	// Flag indicating if strokes should be drawn using stencil buffer. The rendering will be a little
-	// slower, but path overlaps (i.e. self-intersecting or sharp turns) will be drawn just once.
-	NVG_STENCIL_STROKES	= 1<<1,
-	// Flag indicating that additional debug checks are done.
-	NVG_DEBUG 			= 1<<2,
-};
-
-#if defined NANOVG_GL2_IMPLEMENTATION
-#  define NANOVG_GL2 1
-#  define NANOVG_GL_IMPLEMENTATION 1
-#elif defined NANOVG_GL3_IMPLEMENTATION
-#  define NANOVG_GL3 1
-#  define NANOVG_GL_IMPLEMENTATION 1
-#  define NANOVG_GL_USE_UNIFORMBUFFER 1
-#elif defined NANOVG_GLES2_IMPLEMENTATION
-#  define NANOVG_GLES2 1
-#  define NANOVG_GL_IMPLEMENTATION 1
-#elif defined NANOVG_GLES3_IMPLEMENTATION
-#  define NANOVG_GLES3 1
-#  define NANOVG_GL_IMPLEMENTATION 1
-#endif
-
-#define NANOVG_GL_USE_STATE_FILTER (1)
-
-// Creates NanoVG contexts for different OpenGL (ES) versions.
-// Flags should be combination of the create flags above.
-
-#if defined NANOVG_GL2
-
-NVGcontext* nvgCreateGL2(int flags);
-void nvgDeleteGL2(NVGcontext* ctx);
-
-int nvglCreateImageFromHandleGL2(NVGcontext* ctx, GLuint textureId, int w, int h, int flags);
-GLuint nvglImageHandleGL2(NVGcontext* ctx, int image);
-
-#endif
-
-#if defined NANOVG_GL3
-
-NVGcontext* nvgCreateGL3(int flags);
-void nvgDeleteGL3(NVGcontext* ctx);
-
-int nvglCreateImageFromHandleGL3(NVGcontext* ctx, GLuint textureId, int w, int h, int flags);
-GLuint nvglImageHandleGL3(NVGcontext* ctx, int image);
-
-#endif
-
-#if defined NANOVG_GLES2
-
-NVGcontext* nvgCreateGLES2(int flags);
-void nvgDeleteGLES2(NVGcontext* ctx);
-
-int nvglCreateImageFromHandleGLES2(NVGcontext* ctx, GLuint textureId, int w, int h, int flags);
-GLuint nvglImageHandleGLES2(NVGcontext* ctx, int image);
-
-#endif
-
-#if defined NANOVG_GLES3
-
-NVGcontext* nvgCreateGLES3(int flags);
-void nvgDeleteGLES3(NVGcontext* ctx);
-
-int nvglCreateImageFromHandleGLES3(NVGcontext* ctx, GLuint textureId, int w, int h, int flags);
-GLuint nvglImageHandleGLES3(NVGcontext* ctx, int image);
-
-#endif
-
-// These are additional flags on top of NVGimageFlags.
-enum NVGimageFlagsGL {
-	NVG_IMAGE_NODELETE			= 1<<16,	// Do not delete GL texture handle.
-};
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* NANOVG_GL_H */
-
-#ifdef NANOVG_GL_IMPLEMENTATION
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <math.h>
-#include "nanovg.h"
-
-enum GLNVGuniformLoc {
-	GLNVG_LOC_VIEWSIZE,
-	GLNVG_LOC_TEX,
-	GLNVG_LOC_FRAG,
-	GLNVG_MAX_LOCS
-};
-
-enum GLNVGshaderType {
-	NSVG_SHADER_FILLGRAD,
-	NSVG_SHADER_FILLIMG,
-	NSVG_SHADER_SIMPLE,
-	NSVG_SHADER_IMG
-};
-
-#if NANOVG_GL_USE_UNIFORMBUFFER
-enum GLNVGuniformBindings {
-	GLNVG_FRAG_BINDING = 0,
-};
-#endif
-
-struct GLNVGshader {
-	GLuint prog;
-	GLuint frag;
-	GLuint vert;
-	GLint loc[GLNVG_MAX_LOCS];
-};
-typedef struct GLNVGshader GLNVGshader;
-
-struct GLNVGtexture {
-	int id;
-	GLuint tex;
-	int width, height;
-	int type;
-	int flags;
-};
-typedef struct GLNVGtexture GLNVGtexture;
-
-struct GLNVGblend
-{
-	GLenum srcRGB;
-	GLenum dstRGB;
-	GLenum srcAlpha;
-	GLenum dstAlpha;
-};
-typedef struct GLNVGblend GLNVGblend;
-
-enum GLNVGcallType {
-	GLNVG_NONE = 0,
-	GLNVG_FILL,
-	GLNVG_CONVEXFILL,
-	GLNVG_STROKE,
-	GLNVG_TRIANGLES,
-};
-
-struct GLNVGcall {
-	int type;
-	int image;
-	int pathOffset;
-	int pathCount;
-	int triangleOffset;
-	int triangleCount;
-	int uniformOffset;
-	GLNVGblend blendFunc;
-};
-typedef struct GLNVGcall GLNVGcall;
-
-struct GLNVGpath {
-	int fillOffset;
-	int fillCount;
-	int strokeOffset;
-	int strokeCount;
-};
-typedef struct GLNVGpath GLNVGpath;
-
-struct GLNVGfragUniforms {
-	#if NANOVG_GL_USE_UNIFORMBUFFER
-		float scissorMat[12]; // matrices are actually 3 vec4s
-		float paintMat[12];
-		struct NVGcolor innerCol;
-		struct NVGcolor outerCol;
-		float scissorExt[2];
-		float scissorScale[2];
-		float extent[2];
-		float radius;
-		float feather;
-		float strokeMult;
-		float strokeThr;
-		int texType;
-		int type;
-	#else
-		// note: after modifying layout or size of uniform array,
-		// don't forget to also update the fragment shader source!
-		#define NANOVG_GL_UNIFORMARRAY_SIZE 11
-		union {
-			struct {
-				float scissorMat[12]; // matrices are actually 3 vec4s
-				float paintMat[12];
-				struct NVGcolor innerCol;
-				struct NVGcolor outerCol;
-				float scissorExt[2];
-				float scissorScale[2];
-				float extent[2];
-				float radius;
-				float feather;
-				float strokeMult;
-				float strokeThr;
-				float texType;
-				float type;
-			};
-			float uniformArray[NANOVG_GL_UNIFORMARRAY_SIZE][4];
-		};
-	#endif
-};
-typedef struct GLNVGfragUniforms GLNVGfragUniforms;
-
-struct GLNVGcontext {
-	GLNVGshader shader;
-	GLNVGtexture* textures;
-	float view[2];
-	int ntextures;
-	int ctextures;
-	int textureId;
-	GLuint vertBuf;
-#if defined NANOVG_GL3
-	GLuint vertArr;
-#endif
-#if NANOVG_GL_USE_UNIFORMBUFFER
-	GLuint fragBuf;
-#endif
-	int fragSize;
-	int flags;
-
-	// Per frame buffers
-	GLNVGcall* calls;
-	int ccalls;
-	int ncalls;
-	GLNVGpath* paths;
-	int cpaths;
-	int npaths;
-	struct NVGvertex* verts;
-	int cverts;
-	int nverts;
-	unsigned char* uniforms;
-	int cuniforms;
-	int nuniforms;
-
-	// cached state
-	#if NANOVG_GL_USE_STATE_FILTER
-	GLuint boundTexture;
-	GLuint stencilMask;
-	GLenum stencilFunc;
-	GLint stencilFuncRef;
-	GLuint stencilFuncMask;
-	GLNVGblend blendFunc;
-	#endif
-};
-typedef struct GLNVGcontext GLNVGcontext;
-
-static int glnvg__maxi(int a, int b) { return a > b ? a : b; }
-
-#ifdef NANOVG_GLES2
-static unsigned int glnvg__nearestPow2(unsigned int num)
-{
-	unsigned n = num > 0 ? num - 1 : 0;
-	n |= n >> 1;
-	n |= n >> 2;
-	n |= n >> 4;
-	n |= n >> 8;
-	n |= n >> 16;
-	n++;
-	return n;
-}
-#endif
-
-static void glnvg__bindTexture(GLNVGcontext* gl, GLuint tex)
-{
-#if NANOVG_GL_USE_STATE_FILTER
-	if (gl->boundTexture != tex) {
-		gl->boundTexture = tex;
-		glBindTexture(GL_TEXTURE_2D, tex);
-	}
-#else
-	glBindTexture(GL_TEXTURE_2D, tex);
-#endif
-}
-
-static void glnvg__stencilMask(GLNVGcontext* gl, GLuint mask)
-{
-#if NANOVG_GL_USE_STATE_FILTER
-	if (gl->stencilMask != mask) {
-		gl->stencilMask = mask;
-		glStencilMask(mask);
-	}
-#else
-	glStencilMask(mask);
-#endif
-}
-
-static void glnvg__stencilFunc(GLNVGcontext* gl, GLenum func, GLint ref, GLuint mask)
-{
-#if NANOVG_GL_USE_STATE_FILTER
-	if ((gl->stencilFunc != func) ||
-		(gl->stencilFuncRef != ref) ||
-		(gl->stencilFuncMask != mask)) {
-
-		gl->stencilFunc = func;
-		gl->stencilFuncRef = ref;
-		gl->stencilFuncMask = mask;
-		glStencilFunc(func, ref, mask);
-	}
-#else
-	glStencilFunc(func, ref, mask);
-#endif
-}
-static void glnvg__blendFuncSeparate(GLNVGcontext* gl, const GLNVGblend* blend)
-{
-#if NANOVG_GL_USE_STATE_FILTER
-	if ((gl->blendFunc.srcRGB != blend->srcRGB) ||
-		(gl->blendFunc.dstRGB != blend->dstRGB) ||
-		(gl->blendFunc.srcAlpha != blend->srcAlpha) ||
-		(gl->blendFunc.dstAlpha != blend->dstAlpha)) {
-
-		gl->blendFunc = *blend;
-		glBlendFuncSeparate(blend->srcRGB, blend->dstRGB, blend->srcAlpha,blend->dstAlpha);
-	}
-#else
-	glBlendFuncSeparate(blend->srcRGB, blend->dstRGB, blend->srcAlpha,blend->dstAlpha);
-#endif
-}
-
-static GLNVGtexture* glnvg__allocTexture(GLNVGcontext* gl)
-{
-	GLNVGtexture* tex = NULL;
-	int i;
-
-	for (i = 0; i < gl->ntextures; i++) {
-		if (gl->textures[i].id == 0) {
-			tex = &gl->textures[i];
-			break;
-		}
-	}
-	if (tex == NULL) {
-		if (gl->ntextures+1 > gl->ctextures) {
-			GLNVGtexture* textures;
-			int ctextures = glnvg__maxi(gl->ntextures+1, 4) +  gl->ctextures/2; // 1.5x Overallocate
-			textures = (GLNVGtexture*)realloc(gl->textures, sizeof(GLNVGtexture)*ctextures);
-			if (textures == NULL) return NULL;
-			gl->textures = textures;
-			gl->ctextures = ctextures;
-		}
-		tex = &gl->textures[gl->ntextures++];
-	}
-
-	memset(tex, 0, sizeof(*tex));
-	tex->id = ++gl->textureId;
-
-	return tex;
-}
-
-static GLNVGtexture* glnvg__findTexture(GLNVGcontext* gl, int id)
-{
-	int i;
-	for (i = 0; i < gl->ntextures; i++)
-		if (gl->textures[i].id == id)
-			return &gl->textures[i];
-	return NULL;
-}
-
-static int glnvg__deleteTexture(GLNVGcontext* gl, int id)
-{
-	int i;
-	for (i = 0; i < gl->ntextures; i++) {
-		if (gl->textures[i].id == id) {
-			if (gl->textures[i].tex != 0 && (gl->textures[i].flags & NVG_IMAGE_NODELETE) == 0)
-				glDeleteTextures(1, &gl->textures[i].tex);
-			memset(&gl->textures[i], 0, sizeof(gl->textures[i]));
-			return 1;
-		}
-	}
-	return 0;
-}
-
-static void glnvg__dumpShaderError(GLuint shader, const char* name, const char* type)
-{
-	GLchar str[512+1];
-	GLsizei len = 0;
-	glGetShaderInfoLog(shader, 512, &len, str);
-	if (len > 512) len = 512;
-	str[len] = '\0';
-	printf("Shader %s/%s error:\n%s\n", name, type, str);
-}
-
-static void glnvg__dumpProgramError(GLuint prog, const char* name)
-{
-	GLchar str[512+1];
-	GLsizei len = 0;
-	glGetProgramInfoLog(prog, 512, &len, str);
-	if (len > 512) len = 512;
-	str[len] = '\0';
-	printf("Program %s error:\n%s\n", name, str);
-}
-
-static void glnvg__checkError(GLNVGcontext* gl, const char* str)
-{
-	GLenum err;
-	if ((gl->flags & NVG_DEBUG) == 0) return;
-	err = glGetError();
-	if (err != GL_NO_ERROR) {
-		printf("Error %08x after %s\n", err, str);
-		return;
-	}
-}
-
-static int glnvg__createShader(GLNVGshader* shader, const char* name, const char* header, const char* opts, const char* vshader, const char* fshader)
-{
-	GLint status;
-	GLuint prog, vert, frag;
-	const char* str[3];
-	str[0] = header;
-	str[1] = opts != NULL ? opts : "";
-
-	memset(shader, 0, sizeof(*shader));
-
-	prog = glCreateProgram();
-	vert = glCreateShader(GL_VERTEX_SHADER);
-	frag = glCreateShader(GL_FRAGMENT_SHADER);
-	str[2] = vshader;
-	glShaderSource(vert, 3, str, 0);
-	str[2] = fshader;
-	glShaderSource(frag, 3, str, 0);
-
-	glCompileShader(vert);
-	glGetShaderiv(vert, GL_COMPILE_STATUS, &status);
-	if (status != GL_TRUE) {
-		glnvg__dumpShaderError(vert, name, "vert");
-		return 0;
-	}
-
-	glCompileShader(frag);
-	glGetShaderiv(frag, GL_COMPILE_STATUS, &status);
-	if (status != GL_TRUE) {
-		glnvg__dumpShaderError(frag, name, "frag");
-		return 0;
-	}
-
-	glAttachShader(prog, vert);
-	glAttachShader(prog, frag);
-
-	glBindAttribLocation(prog, 0, "vertex");
-	glBindAttribLocation(prog, 1, "tcoord");
-
-	glLinkProgram(prog);
-	glGetProgramiv(prog, GL_LINK_STATUS, &status);
-	if (status != GL_TRUE) {
-		glnvg__dumpProgramError(prog, name);
-		return 0;
-	}
-
-	shader->prog = prog;
-	shader->vert = vert;
-	shader->frag = frag;
-
-	return 1;
-}
-
-static void glnvg__deleteShader(GLNVGshader* shader)
-{
-	if (shader->prog != 0)
-		glDeleteProgram(shader->prog);
-	if (shader->vert != 0)
-		glDeleteShader(shader->vert);
-	if (shader->frag != 0)
-		glDeleteShader(shader->frag);
-}
-
-static void glnvg__getUniforms(GLNVGshader* shader)
-{
-	shader->loc[GLNVG_LOC_VIEWSIZE] = glGetUniformLocation(shader->prog, "viewSize");
-	shader->loc[GLNVG_LOC_TEX] = glGetUniformLocation(shader->prog, "tex");
-
-#if NANOVG_GL_USE_UNIFORMBUFFER
-	shader->loc[GLNVG_LOC_FRAG] = glGetUniformBlockIndex(shader->prog, "frag");
-#else
-	shader->loc[GLNVG_LOC_FRAG] = glGetUniformLocation(shader->prog, "frag");
-#endif
-}
-
-static int glnvg__renderCreate(void* uptr)
-{
-	GLNVGcontext* gl = (GLNVGcontext*)uptr;
-	int align = 4;
-
-	// TODO: mediump float may not be enough for GLES2 in iOS.
-	// see the following discussion: https://github.com/memononen/nanovg/issues/46
-	static const char* shaderHeader =
-#if defined NANOVG_GL2
-		"#define NANOVG_GL2 1\n"
-#elif defined NANOVG_GL3
-		"#version 150 core\n"
-		"#define NANOVG_GL3 1\n"
-#elif defined NANOVG_GLES2
-		"#version 100\n"
-		"#define NANOVG_GL2 1\n"
-#elif defined NANOVG_GLES3
-		"#version 300 es\n"
-		"#define NANOVG_GL3 1\n"
-#endif
-
-#if NANOVG_GL_USE_UNIFORMBUFFER
-	"#define USE_UNIFORMBUFFER 1\n"
-#else
-	"#define UNIFORMARRAY_SIZE 11\n"
-#endif
-	"\n";
-
-	static const char* fillVertShader =
-		"#ifdef NANOVG_GL3\n"
-		"	uniform vec2 viewSize;\n"
-		"	in vec2 vertex;\n"
-		"	in vec2 tcoord;\n"
-		"	out vec2 ftcoord;\n"
-		"	out vec2 fpos;\n"
-		"#else\n"
-		"	uniform vec2 viewSize;\n"
-		"	attribute vec2 vertex;\n"
-		"	attribute vec2 tcoord;\n"
-		"	varying vec2 ftcoord;\n"
-		"	varying vec2 fpos;\n"
-		"#endif\n"
-		"void main(void) {\n"
-		"	ftcoord = tcoord;\n"
-		"	fpos = vertex;\n"
-		"	gl_Position = vec4(2.0*vertex.x/viewSize.x - 1.0, 1.0 - 2.0*vertex.y/viewSize.y, 0, 1);\n"
-		"}\n";
-
-	static const char* fillFragShader =
-		"#ifdef GL_ES\n"
-		"#if defined(GL_FRAGMENT_PRECISION_HIGH) || defined(NANOVG_GL3)\n"
-		" precision highp float;\n"
-		"#else\n"
-		" precision mediump float;\n"
-		"#endif\n"
-		"#endif\n"
-		"#ifdef NANOVG_GL3\n"
-		"#ifdef USE_UNIFORMBUFFER\n"
-		"	layout(std140) uniform frag {\n"
-		"		mat3 scissorMat;\n"
-		"		mat3 paintMat;\n"
-		"		vec4 innerCol;\n"
-		"		vec4 outerCol;\n"
-		"		vec2 scissorExt;\n"
-		"		vec2 scissorScale;\n"
-		"		vec2 extent;\n"
-		"		float radius;\n"
-		"		float feather;\n"
-		"		float strokeMult;\n"
-		"		float strokeThr;\n"
-		"		int texType;\n"
-		"		int type;\n"
-		"	};\n"
-		"#else\n" // NANOVG_GL3 && !USE_UNIFORMBUFFER
-		"	uniform vec4 frag[UNIFORMARRAY_SIZE];\n"
-		"#endif\n"
-		"	uniform sampler2D tex;\n"
-		"	in vec2 ftcoord;\n"
-		"	in vec2 fpos;\n"
-		"	out vec4 outColor;\n"
-		"#else\n" // !NANOVG_GL3
-		"	uniform vec4 frag[UNIFORMARRAY_SIZE];\n"
-		"	uniform sampler2D tex;\n"
-		"	varying vec2 ftcoord;\n"
-		"	varying vec2 fpos;\n"
-		"#endif\n"
-		"#ifndef USE_UNIFORMBUFFER\n"
-		"	#define scissorMat mat3(frag[0].xyz, frag[1].xyz, frag[2].xyz)\n"
-		"	#define paintMat mat3(frag[3].xyz, frag[4].xyz, frag[5].xyz)\n"
-		"	#define innerCol frag[6]\n"
-		"	#define outerCol frag[7]\n"
-		"	#define scissorExt frag[8].xy\n"
-		"	#define scissorScale frag[8].zw\n"
-		"	#define extent frag[9].xy\n"
-		"	#define radius frag[9].z\n"
-		"	#define feather frag[9].w\n"
-		"	#define strokeMult frag[10].x\n"
-		"	#define strokeThr frag[10].y\n"
-		"	#define texType int(frag[10].z)\n"
-		"	#define type int(frag[10].w)\n"
-		"#endif\n"
-		"\n"
-		"float sdroundrect(vec2 pt, vec2 ext, float rad) {\n"
-		"	vec2 ext2 = ext - vec2(rad,rad);\n"
-		"	vec2 d = abs(pt) - ext2;\n"
-		"	return min(max(d.x,d.y),0.0) + length(max(d,0.0)) - rad;\n"
-		"}\n"
-		"\n"
-		"// Scissoring\n"
-		"float scissorMask(vec2 p) {\n"
-		"	vec2 sc = (abs((scissorMat * vec3(p,1.0)).xy) - scissorExt);\n"
-		"	sc = vec2(0.5,0.5) - sc * scissorScale;\n"
-		"	return clamp(sc.x,0.0,1.0) * clamp(sc.y,0.0,1.0);\n"
-		"}\n"
-		"#ifdef EDGE_AA\n"
-		"// Stroke - from [0..1] to clipped pyramid, where the slope is 1px.\n"
-		"float strokeMask() {\n"
-		"	return min(1.0, (1.0-abs(ftcoord.x*2.0-1.0))*strokeMult) * min(1.0, ftcoord.y);\n"
-		"}\n"
-		"#endif\n"
-		"\n"
-		"void main(void) {\n"
-		"   vec4 result;\n"
-		"	float scissor = scissorMask(fpos);\n"
-		"#ifdef EDGE_AA\n"
-		"	float strokeAlpha = strokeMask();\n"
-		"	if (strokeAlpha < strokeThr) discard;\n"
-		"#else\n"
-		"	float strokeAlpha = 1.0;\n"
-		"#endif\n"
-		"	if (type == 0) {			// Gradient\n"
-		"		// Calculate gradient color using box gradient\n"
-		"		vec2 pt = (paintMat * vec3(fpos,1.0)).xy;\n"
-		"		float d = clamp((sdroundrect(pt, extent, radius) + feather*0.5) / feather, 0.0, 1.0);\n"
-		"		vec4 color = mix(innerCol,outerCol,d);\n"
-		"		// Combine alpha\n"
-		"		color *= strokeAlpha * scissor;\n"
-		"		result = color;\n"
-		"	} else if (type == 1) {		// Image\n"
-		"		// Calculate color fron texture\n"
-		"		vec2 pt = (paintMat * vec3(fpos,1.0)).xy / extent;\n"
-		"#ifdef NANOVG_GL3\n"
-		"		vec4 color = texture(tex, pt);\n"
-		"#else\n"
-		"		vec4 color = texture2D(tex, pt);\n"
-		"#endif\n"
-		"		if (texType == 1) color = vec4(color.xyz*color.w,color.w);"
-		"		if (texType == 2) color = vec4(color.x);"
-		"		// Apply color tint and alpha.\n"
-		"		color *= innerCol;\n"
-		"		// Combine alpha\n"
-		"		color *= strokeAlpha * scissor;\n"
-		"		result = color;\n"
-		"	} else if (type == 2) {		// Stencil fill\n"
-		"		result = vec4(1,1,1,1);\n"
-		"	} else if (type == 3) {		// Textured tris\n"
-		"#ifdef NANOVG_GL3\n"
-		"		vec4 color = texture(tex, ftcoord);\n"
-		"#else\n"
-		"		vec4 color = texture2D(tex, ftcoord);\n"
-		"#endif\n"
-		"		if (texType == 1) color = vec4(color.xyz*color.w,color.w);"
-		"		if (texType == 2) color = vec4(color.x);"
-		"		color *= scissor;\n"
-		"		result = color * innerCol;\n"
-		"	}\n"
-		"#ifdef NANOVG_GL3\n"
-		"	outColor = result;\n"
-		"#else\n"
-		"	gl_FragColor = result;\n"
-		"#endif\n"
-		"}\n";
-
-	glnvg__checkError(gl, "init");
-
-	if (gl->flags & NVG_ANTIALIAS) {
-		if (glnvg__createShader(&gl->shader, "shader", shaderHeader, "#define EDGE_AA 1\n", fillVertShader, fillFragShader) == 0)
-			return 0;
-	} else {
-		if (glnvg__createShader(&gl->shader, "shader", shaderHeader, NULL, fillVertShader, fillFragShader) == 0)
-			return 0;
-	}
-
-	glnvg__checkError(gl, "uniform locations");
-	glnvg__getUniforms(&gl->shader);
-
-	// Create dynamic vertex array
-#if defined NANOVG_GL3
-	glGenVertexArrays(1, &gl->vertArr);
-#endif
-	glGenBuffers(1, &gl->vertBuf);
-
-#if NANOVG_GL_USE_UNIFORMBUFFER
-	// Create UBOs
-	glUniformBlockBinding(gl->shader.prog, gl->shader.loc[GLNVG_LOC_FRAG], GLNVG_FRAG_BINDING);
-	glGenBuffers(1, &gl->fragBuf);
-	glGetIntegerv(GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT, &align);
-#endif
-	gl->fragSize = sizeof(GLNVGfragUniforms) + align - sizeof(GLNVGfragUniforms) % align;
-
-	glnvg__checkError(gl, "create done");
-
-	glFinish();
-
-	return 1;
-}
-
-static int glnvg__renderCreateTexture(void* uptr, int type, int w, int h, int imageFlags, const unsigned char* data)
-{
-	GLNVGcontext* gl = (GLNVGcontext*)uptr;
-	GLNVGtexture* tex = glnvg__allocTexture(gl);
-
-	if (tex == NULL) return 0;
-
-#ifdef NANOVG_GLES2
-	// Check for non-power of 2.
-	if (glnvg__nearestPow2(w) != (unsigned int)w || glnvg__nearestPow2(h) != (unsigned int)h) {
-		// No repeat
-		if ((imageFlags & NVG_IMAGE_REPEATX) != 0 || (imageFlags & NVG_IMAGE_REPEATY) != 0) {
-			printf("Repeat X/Y is not supported for non power-of-two textures (%d x %d)\n", w, h);
-			imageFlags &= ~(NVG_IMAGE_REPEATX | NVG_IMAGE_REPEATY);
-		}
-		// No mips.
-		if (imageFlags & NVG_IMAGE_GENERATE_MIPMAPS) {
-			printf("Mip-maps is not support for non power-of-two textures (%d x %d)\n", w, h);
-			imageFlags &= ~NVG_IMAGE_GENERATE_MIPMAPS;
-		}
-	}
-#endif
-
-	glGenTextures(1, &tex->tex);
-	tex->width = w;
-	tex->height = h;
-	tex->type = type;
-	tex->flags = imageFlags;
-	glnvg__bindTexture(gl, tex->tex);
-
-	glPixelStorei(GL_UNPACK_ALIGNMENT,1);
-#ifndef NANOVG_GLES2
-	glPixelStorei(GL_UNPACK_ROW_LENGTH, tex->width);
-	glPixelStorei(GL_UNPACK_SKIP_PIXELS, 0);
-	glPixelStorei(GL_UNPACK_SKIP_ROWS, 0);
-#endif
-
-#if defined (NANOVG_GL2)
-	// GL 1.4 and later has support for generating mipmaps using a tex parameter.
-	if (imageFlags & NVG_IMAGE_GENERATE_MIPMAPS) {
-		glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE);
-	}
-#endif
-
-	if (type == NVG_TEXTURE_RGBA)
-		glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, w, h, 0, GL_RGBA, GL_UNSIGNED_BYTE, data);
-	else
-#if defined(NANOVG_GLES2) || defined (NANOVG_GL2)
-		glTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE, w, h, 0, GL_LUMINANCE, GL_UNSIGNED_BYTE, data);
-#elif defined(NANOVG_GLES3)
-		glTexImage2D(GL_TEXTURE_2D, 0, GL_R8, w, h, 0, GL_RED, GL_UNSIGNED_BYTE, data);
-#else
-		glTexImage2D(GL_TEXTURE_2D, 0, GL_RED, w, h, 0, GL_RED, GL_UNSIGNED_BYTE, data);
-#endif
-
-	if (imageFlags & NVG_IMAGE_GENERATE_MIPMAPS) {
-		if (imageFlags & NVG_IMAGE_NEAREST) {
-			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST_MIPMAP_NEAREST);
-		} else {
-			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
-		}
-	} else {
-		if (imageFlags & NVG_IMAGE_NEAREST) {
-			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-		} else {
-			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-		}
-	}
-
-	if (imageFlags & NVG_IMAGE_NEAREST) {
-		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-	} else {
-		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-	}
-
-	if (imageFlags & NVG_IMAGE_REPEATX)
-		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
-	else
-		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-
-	if (imageFlags & NVG_IMAGE_REPEATY)
-		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
-	else
-		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-
-	glPixelStorei(GL_UNPACK_ALIGNMENT, 4);
-#ifndef NANOVG_GLES2
-	glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
-	glPixelStorei(GL_UNPACK_SKIP_PIXELS, 0);
-	glPixelStorei(GL_UNPACK_SKIP_ROWS, 0);
-#endif
-
-	// The new way to build mipmaps on GLES and GL3
-#if !defined(NANOVG_GL2)
-	if (imageFlags & NVG_IMAGE_GENERATE_MIPMAPS) {
-		glGenerateMipmap(GL_TEXTURE_2D);
-	}
-#endif
-
-	glnvg__checkError(gl, "create tex");
-	glnvg__bindTexture(gl, 0);
-
-	return tex->id;
-}
-
-
-static int glnvg__renderDeleteTexture(void* uptr, int image)
-{
-	GLNVGcontext* gl = (GLNVGcontext*)uptr;
-	return glnvg__deleteTexture(gl, image);
-}
-
-static int glnvg__renderUpdateTexture(void* uptr, int image, int x, int y, int w, int h, const unsigned char* data)
-{
-	GLNVGcontext* gl = (GLNVGcontext*)uptr;
-	GLNVGtexture* tex = glnvg__findTexture(gl, image);
-
-	if (tex == NULL) return 0;
-	glnvg__bindTexture(gl, tex->tex);
-
-	glPixelStorei(GL_UNPACK_ALIGNMENT,1);
-
-#ifndef NANOVG_GLES2
-	glPixelStorei(GL_UNPACK_ROW_LENGTH, tex->width);
-	glPixelStorei(GL_UNPACK_SKIP_PIXELS, x);
-	glPixelStorei(GL_UNPACK_SKIP_ROWS, y);
-#else
-	// No support for all of skip, need to update a whole row at a time.
-	if (tex->type == NVG_TEXTURE_RGBA)
-		data += y*tex->width*4;
-	else
-		data += y*tex->width;
-	x = 0;
-	w = tex->width;
-#endif
-
-	if (tex->type == NVG_TEXTURE_RGBA)
-		glTexSubImage2D(GL_TEXTURE_2D, 0, x,y, w,h, GL_RGBA, GL_UNSIGNED_BYTE, data);
-	else
-#if defined(NANOVG_GLES2) || defined(NANOVG_GL2)
-		glTexSubImage2D(GL_TEXTURE_2D, 0, x,y, w,h, GL_LUMINANCE, GL_UNSIGNED_BYTE, data);
-#else
-		glTexSubImage2D(GL_TEXTURE_2D, 0, x,y, w,h, GL_RED, GL_UNSIGNED_BYTE, data);
-#endif
-
-	glPixelStorei(GL_UNPACK_ALIGNMENT, 4);
-#ifndef NANOVG_GLES2
-	glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
-	glPixelStorei(GL_UNPACK_SKIP_PIXELS, 0);
-	glPixelStorei(GL_UNPACK_SKIP_ROWS, 0);
-#endif
-
-	glnvg__bindTexture(gl, 0);
-
-	return 1;
-}
-
-static int glnvg__renderGetTextureSize(void* uptr, int image, int* w, int* h)
-{
-	GLNVGcontext* gl = (GLNVGcontext*)uptr;
-	GLNVGtexture* tex = glnvg__findTexture(gl, image);
-	if (tex == NULL) return 0;
-	*w = tex->width;
-	*h = tex->height;
-	return 1;
-}
-
-static void glnvg__xformToMat3x4(float* m3, float* t)
-{
-	m3[0] = t[0];
-	m3[1] = t[1];
-	m3[2] = 0.0f;
-	m3[3] = 0.0f;
-	m3[4] = t[2];
-	m3[5] = t[3];
-	m3[6] = 0.0f;
-	m3[7] = 0.0f;
-	m3[8] = t[4];
-	m3[9] = t[5];
-	m3[10] = 1.0f;
-	m3[11] = 0.0f;
-}
-
-static NVGcolor glnvg__premulColor(NVGcolor c)
-{
-	c.r *= c.a;
-	c.g *= c.a;
-	c.b *= c.a;
-	return c;
-}
-
-static int glnvg__convertPaint(GLNVGcontext* gl, GLNVGfragUniforms* frag, NVGpaint* paint,
-							   NVGscissor* scissor, float width, float fringe, float strokeThr)
-{
-	GLNVGtexture* tex = NULL;
-	float invxform[6];
-
-	memset(frag, 0, sizeof(*frag));
-
-	frag->innerCol = glnvg__premulColor(paint->innerColor);
-	frag->outerCol = glnvg__premulColor(paint->outerColor);
-
-	if (scissor->extent[0] < -0.5f || scissor->extent[1] < -0.5f) {
-		memset(frag->scissorMat, 0, sizeof(frag->scissorMat));
-		frag->scissorExt[0] = 1.0f;
-		frag->scissorExt[1] = 1.0f;
-		frag->scissorScale[0] = 1.0f;
-		frag->scissorScale[1] = 1.0f;
-	} else {
-		nvgTransformInverse(invxform, scissor->xform);
-		glnvg__xformToMat3x4(frag->scissorMat, invxform);
-		frag->scissorExt[0] = scissor->extent[0];
-		frag->scissorExt[1] = scissor->extent[1];
-		frag->scissorScale[0] = sqrtf(scissor->xform[0]*scissor->xform[0] + scissor->xform[2]*scissor->xform[2]) / fringe;
-		frag->scissorScale[1] = sqrtf(scissor->xform[1]*scissor->xform[1] + scissor->xform[3]*scissor->xform[3]) / fringe;
-	}
-
-	memcpy(frag->extent, paint->extent, sizeof(frag->extent));
-	frag->strokeMult = (width*0.5f + fringe*0.5f) / fringe;
-	frag->strokeThr = strokeThr;
-
-	if (paint->image != 0) {
-		tex = glnvg__findTexture(gl, paint->image);
-		if (tex == NULL) return 0;
-		if ((tex->flags & NVG_IMAGE_FLIPY) != 0) {
-			float m1[6], m2[6];
-			nvgTransformTranslate(m1, 0.0f, frag->extent[1] * 0.5f);
-			nvgTransformMultiply(m1, paint->xform);
-			nvgTransformScale(m2, 1.0f, -1.0f);
-			nvgTransformMultiply(m2, m1);
-			nvgTransformTranslate(m1, 0.0f, -frag->extent[1] * 0.5f);
-			nvgTransformMultiply(m1, m2);
-			nvgTransformInverse(invxform, m1);
-		} else {
-			nvgTransformInverse(invxform, paint->xform);
-		}
-		frag->type = NSVG_SHADER_FILLIMG;
-
-		#if NANOVG_GL_USE_UNIFORMBUFFER
-		if (tex->type == NVG_TEXTURE_RGBA)
-			frag->texType = (tex->flags & NVG_IMAGE_PREMULTIPLIED) ? 0 : 1;
-		else
-			frag->texType = 2;
-		#else
-		if (tex->type == NVG_TEXTURE_RGBA)
-			frag->texType = (tex->flags & NVG_IMAGE_PREMULTIPLIED) ? 0.0f : 1.0f;
-		else
-			frag->texType = 2.0f;
-		#endif
-//		printf("frag->texType = %d\n", frag->texType);
-	} else {
-		frag->type = NSVG_SHADER_FILLGRAD;
-		frag->radius = paint->radius;
-		frag->feather = paint->feather;
-		nvgTransformInverse(invxform, paint->xform);
-	}
-
-	glnvg__xformToMat3x4(frag->paintMat, invxform);
-
-	return 1;
-}
-
-static GLNVGfragUniforms* nvg__fragUniformPtr(GLNVGcontext* gl, int i);
-
-static void glnvg__setUniforms(GLNVGcontext* gl, int uniformOffset, int image)
-{
-#if NANOVG_GL_USE_UNIFORMBUFFER
-	glBindBufferRange(GL_UNIFORM_BUFFER, GLNVG_FRAG_BINDING, gl->fragBuf, uniformOffset, sizeof(GLNVGfragUniforms));
-#else
-	GLNVGfragUniforms* frag = nvg__fragUniformPtr(gl, uniformOffset);
-	glUniform4fv(gl->shader.loc[GLNVG_LOC_FRAG], NANOVG_GL_UNIFORMARRAY_SIZE, &(frag->uniformArray[0][0]));
-#endif
-
-	if (image != 0) {
-		GLNVGtexture* tex = glnvg__findTexture(gl, image);
-		glnvg__bindTexture(gl, tex != NULL ? tex->tex : 0);
-		glnvg__checkError(gl, "tex paint tex");
-	} else {
-		glnvg__bindTexture(gl, 0);
-	}
-}
-
-static void glnvg__renderViewport(void* uptr, float width, float height, float devicePixelRatio)
-{
-	NVG_NOTUSED(devicePixelRatio);
-	GLNVGcontext* gl = (GLNVGcontext*)uptr;
-	gl->view[0] = width;
-	gl->view[1] = height;
-}
-
-static void glnvg__fill(GLNVGcontext* gl, GLNVGcall* call)
-{
-	GLNVGpath* paths = &gl->paths[call->pathOffset];
-	int i, npaths = call->pathCount;
-
-	// Draw shapes
-	glEnable(GL_STENCIL_TEST);
-	glnvg__stencilMask(gl, 0xff);
-	glnvg__stencilFunc(gl, GL_ALWAYS, 0, 0xff);
-	glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);
-
-	// set bindpoint for solid loc
-	glnvg__setUniforms(gl, call->uniformOffset, 0);
-	glnvg__checkError(gl, "fill simple");
-
-	glStencilOpSeparate(GL_FRONT, GL_KEEP, GL_KEEP, GL_INCR_WRAP);
-	glStencilOpSeparate(GL_BACK, GL_KEEP, GL_KEEP, GL_DECR_WRAP);
-	glDisable(GL_CULL_FACE);
-	for (i = 0; i < npaths; i++)
-		glDrawArrays(GL_TRIANGLE_FAN, paths[i].fillOffset, paths[i].fillCount);
-	glEnable(GL_CULL_FACE);
-
-	// Draw anti-aliased pixels
-	glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
-
-	glnvg__setUniforms(gl, call->uniformOffset + gl->fragSize, call->image);
-	glnvg__checkError(gl, "fill fill");
-
-	if (gl->flags & NVG_ANTIALIAS) {
-		glnvg__stencilFunc(gl, GL_EQUAL, 0x00, 0xff);
-		glStencilOp(GL_KEEP, GL_KEEP, GL_KEEP);
-		// Draw fringes
-		for (i = 0; i < npaths; i++)
-			glDrawArrays(GL_TRIANGLE_STRIP, paths[i].strokeOffset, paths[i].strokeCount);
-	}
-
-	// Draw fill
-	glnvg__stencilFunc(gl, GL_NOTEQUAL, 0x0, 0xff);
-	glStencilOp(GL_ZERO, GL_ZERO, GL_ZERO);
-	glDrawArrays(GL_TRIANGLE_STRIP, call->triangleOffset, call->triangleCount);
-
-	glDisable(GL_STENCIL_TEST);
-}
-
-static void glnvg__convexFill(GLNVGcontext* gl, GLNVGcall* call)
-{
-	GLNVGpath* paths = &gl->paths[call->pathOffset];
-	int i, npaths = call->pathCount;
-
-	glnvg__setUniforms(gl, call->uniformOffset, call->image);
-	glnvg__checkError(gl, "convex fill");
-
-	for (i = 0; i < npaths; i++) {
-		glDrawArrays(GL_TRIANGLE_FAN, paths[i].fillOffset, paths[i].fillCount);
-		// Draw fringes
-		if (paths[i].strokeCount > 0) {
-			glDrawArrays(GL_TRIANGLE_STRIP, paths[i].strokeOffset, paths[i].strokeCount);
-		}
-	}
-}
-
-static void glnvg__stroke(GLNVGcontext* gl, GLNVGcall* call)
-{
-	GLNVGpath* paths = &gl->paths[call->pathOffset];
-	int npaths = call->pathCount, i;
-
-	if (gl->flags & NVG_STENCIL_STROKES) {
-
-		glEnable(GL_STENCIL_TEST);
-		glnvg__stencilMask(gl, 0xff);
-
-		// Fill the stroke base without overlap
-		glnvg__stencilFunc(gl, GL_EQUAL, 0x0, 0xff);
-		glStencilOp(GL_KEEP, GL_KEEP, GL_INCR);
-		glnvg__setUniforms(gl, call->uniformOffset + gl->fragSize, call->image);
-		glnvg__checkError(gl, "stroke fill 0");
-		for (i = 0; i < npaths; i++)
-			glDrawArrays(GL_TRIANGLE_STRIP, paths[i].strokeOffset, paths[i].strokeCount);
-
-		// Draw anti-aliased pixels.
-		glnvg__setUniforms(gl, call->uniformOffset, call->image);
-		glnvg__stencilFunc(gl, GL_EQUAL, 0x00, 0xff);
-		glStencilOp(GL_KEEP, GL_KEEP, GL_KEEP);
-		for (i = 0; i < npaths; i++)
-			glDrawArrays(GL_TRIANGLE_STRIP, paths[i].strokeOffset, paths[i].strokeCount);
-
-		// Clear stencil buffer.
-		glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);
-		glnvg__stencilFunc(gl, GL_ALWAYS, 0x0, 0xff);
-		glStencilOp(GL_ZERO, GL_ZERO, GL_ZERO);
-		glnvg__checkError(gl, "stroke fill 1");
-		for (i = 0; i < npaths; i++)
-			glDrawArrays(GL_TRIANGLE_STRIP, paths[i].strokeOffset, paths[i].strokeCount);
-		glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
-
-		glDisable(GL_STENCIL_TEST);
-
-//		glnvg__convertPaint(gl, nvg__fragUniformPtr(gl, call->uniformOffset + gl->fragSize), paint, scissor, strokeWidth, fringe, 1.0f - 0.5f/255.0f);
-
-	} else {
-		glnvg__setUniforms(gl, call->uniformOffset, call->image);
-		glnvg__checkError(gl, "stroke fill");
-		// Draw Strokes
-		for (i = 0; i < npaths; i++)
-			glDrawArrays(GL_TRIANGLE_STRIP, paths[i].strokeOffset, paths[i].strokeCount);
-	}
-}
-
-static void glnvg__triangles(GLNVGcontext* gl, GLNVGcall* call)
-{
-	glnvg__setUniforms(gl, call->uniformOffset, call->image);
-	glnvg__checkError(gl, "triangles fill");
-
-	glDrawArrays(GL_TRIANGLES, call->triangleOffset, call->triangleCount);
-}
-
-static void glnvg__renderCancel(void* uptr) {
-	GLNVGcontext* gl = (GLNVGcontext*)uptr;
-	gl->nverts = 0;
-	gl->npaths = 0;
-	gl->ncalls = 0;
-	gl->nuniforms = 0;
-}
-
-static GLenum glnvg_convertBlendFuncFactor(int factor)
-{
-	if (factor == NVG_ZERO)
-		return GL_ZERO;
-	if (factor == NVG_ONE)
-		return GL_ONE;
-	if (factor == NVG_SRC_COLOR)
-		return GL_SRC_COLOR;
-	if (factor == NVG_ONE_MINUS_SRC_COLOR)
-		return GL_ONE_MINUS_SRC_COLOR;
-	if (factor == NVG_DST_COLOR)
-		return GL_DST_COLOR;
-	if (factor == NVG_ONE_MINUS_DST_COLOR)
-		return GL_ONE_MINUS_DST_COLOR;
-	if (factor == NVG_SRC_ALPHA)
-		return GL_SRC_ALPHA;
-	if (factor == NVG_ONE_MINUS_SRC_ALPHA)
-		return GL_ONE_MINUS_SRC_ALPHA;
-	if (factor == NVG_DST_ALPHA)
-		return GL_DST_ALPHA;
-	if (factor == NVG_ONE_MINUS_DST_ALPHA)
-		return GL_ONE_MINUS_DST_ALPHA;
-	if (factor == NVG_SRC_ALPHA_SATURATE)
-		return GL_SRC_ALPHA_SATURATE;
-	return GL_INVALID_ENUM;
-}
-
-static GLNVGblend glnvg__blendCompositeOperation(NVGcompositeOperationState op)
-{
-	GLNVGblend blend;
-	blend.srcRGB = glnvg_convertBlendFuncFactor(op.srcRGB);
-	blend.dstRGB = glnvg_convertBlendFuncFactor(op.dstRGB);
-	blend.srcAlpha = glnvg_convertBlendFuncFactor(op.srcAlpha);
-	blend.dstAlpha = glnvg_convertBlendFuncFactor(op.dstAlpha);
-	if (blend.srcRGB == GL_INVALID_ENUM || blend.dstRGB == GL_INVALID_ENUM || blend.srcAlpha == GL_INVALID_ENUM || blend.dstAlpha == GL_INVALID_ENUM)
-	{
-		blend.srcRGB = GL_ONE;
-		blend.dstRGB = GL_ONE_MINUS_SRC_ALPHA;
-		blend.srcAlpha = GL_ONE;
-		blend.dstAlpha = GL_ONE_MINUS_SRC_ALPHA;
-	}
-	return blend;
-}
-
-static void glnvg__renderFlush(void* uptr)
-{
-	GLNVGcontext* gl = (GLNVGcontext*)uptr;
-	int i;
-
-	if (gl->ncalls > 0) {
-
-		// Setup require GL state.
-		glUseProgram(gl->shader.prog);
-
-		glEnable(GL_CULL_FACE);
-		glCullFace(GL_BACK);
-		glFrontFace(GL_CCW);
-		glEnable(GL_BLEND);
-		glDisable(GL_DEPTH_TEST);
-		glDisable(GL_SCISSOR_TEST);
-		glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
-		glStencilMask(0xffffffff);
-		glStencilOp(GL_KEEP, GL_KEEP, GL_KEEP);
-		glStencilFunc(GL_ALWAYS, 0, 0xffffffff);
-		glActiveTexture(GL_TEXTURE0);
-		glBindTexture(GL_TEXTURE_2D, 0);
-		#if NANOVG_GL_USE_STATE_FILTER
-		gl->boundTexture = 0;
-		gl->stencilMask = 0xffffffff;
-		gl->stencilFunc = GL_ALWAYS;
-		gl->stencilFuncRef = 0;
-		gl->stencilFuncMask = 0xffffffff;
-		gl->blendFunc.srcRGB = GL_INVALID_ENUM;
-		gl->blendFunc.srcAlpha = GL_INVALID_ENUM;
-		gl->blendFunc.dstRGB = GL_INVALID_ENUM;
-		gl->blendFunc.dstAlpha = GL_INVALID_ENUM;
-		#endif
-
-#if NANOVG_GL_USE_UNIFORMBUFFER
-		// Upload ubo for frag shaders
-		glBindBuffer(GL_UNIFORM_BUFFER, gl->fragBuf);
-		glBufferData(GL_UNIFORM_BUFFER, gl->nuniforms * gl->fragSize, gl->uniforms, GL_STREAM_DRAW);
-#endif
-
-		// Upload vertex data
-#if defined NANOVG_GL3
-		glBindVertexArray(gl->vertArr);
-#endif
-		glBindBuffer(GL_ARRAY_BUFFER, gl->vertBuf);
-		glBufferData(GL_ARRAY_BUFFER, gl->nverts * sizeof(NVGvertex), gl->verts, GL_STREAM_DRAW);
-		glEnableVertexAttribArray(0);
-		glEnableVertexAttribArray(1);
-		glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, sizeof(NVGvertex), (const GLvoid*)(size_t)0);
-		glVertexAttribPointer(1, 2, GL_FLOAT, GL_FALSE, sizeof(NVGvertex), (const GLvoid*)(0 + 2*sizeof(float)));
-
-		// Set view and texture just once per frame.
-		glUniform1i(gl->shader.loc[GLNVG_LOC_TEX], 0);
-		glUniform2fv(gl->shader.loc[GLNVG_LOC_VIEWSIZE], 1, gl->view);
-
-#if NANOVG_GL_USE_UNIFORMBUFFER
-		glBindBuffer(GL_UNIFORM_BUFFER, gl->fragBuf);
-#endif
-
-		for (i = 0; i < gl->ncalls; i++) {
-			GLNVGcall* call = &gl->calls[i];
-			glnvg__blendFuncSeparate(gl,&call->blendFunc);
-			if (call->type == GLNVG_FILL)
-				glnvg__fill(gl, call);
-			else if (call->type == GLNVG_CONVEXFILL)
-				glnvg__convexFill(gl, call);
-			else if (call->type == GLNVG_STROKE)
-				glnvg__stroke(gl, call);
-			else if (call->type == GLNVG_TRIANGLES)
-				glnvg__triangles(gl, call);
-		}
-
-		glDisableVertexAttribArray(0);
-		glDisableVertexAttribArray(1);
-#if defined NANOVG_GL3
-		glBindVertexArray(0);
-#endif
-		glDisable(GL_CULL_FACE);
-			glBindBuffer(GL_ARRAY_BUFFER, 0);
-		glUseProgram(0);
-		glnvg__bindTexture(gl, 0);
-	}
-
-	// Reset calls
-	gl->nverts = 0;
-	gl->npaths = 0;
-	gl->ncalls = 0;
-	gl->nuniforms = 0;
-}
-
-static int glnvg__maxVertCount(const NVGpath* paths, int npaths)
-{
-	int i, count = 0;
-	for (i = 0; i < npaths; i++) {
-		count += paths[i].nfill;
-		count += paths[i].nstroke;
-	}
-	return count;
-}
-
-static GLNVGcall* glnvg__allocCall(GLNVGcontext* gl)
-{
-	GLNVGcall* ret = NULL;
-	if (gl->ncalls+1 > gl->ccalls) {
-		GLNVGcall* calls;
-		int ccalls = glnvg__maxi(gl->ncalls+1, 128) + gl->ccalls/2; // 1.5x Overallocate
-		calls = (GLNVGcall*)realloc(gl->calls, sizeof(GLNVGcall) * ccalls);
-		if (calls == NULL) return NULL;
-		gl->calls = calls;
-		gl->ccalls = ccalls;
-	}
-	ret = &gl->calls[gl->ncalls++];
-	memset(ret, 0, sizeof(GLNVGcall));
-	return ret;
-}
-
-static int glnvg__allocPaths(GLNVGcontext* gl, int n)
-{
-	int ret = 0;
-	if (gl->npaths+n > gl->cpaths) {
-		GLNVGpath* paths;
-		int cpaths = glnvg__maxi(gl->npaths + n, 128) + gl->cpaths/2; // 1.5x Overallocate
-		paths = (GLNVGpath*)realloc(gl->paths, sizeof(GLNVGpath) * cpaths);
-		if (paths == NULL) return -1;
-		gl->paths = paths;
-		gl->cpaths = cpaths;
-	}
-	ret = gl->npaths;
-	gl->npaths += n;
-	return ret;
-}
-
-static int glnvg__allocVerts(GLNVGcontext* gl, int n)
-{
-	int ret = 0;
-	if (gl->nverts+n > gl->cverts) {
-		NVGvertex* verts;
-		int cverts = glnvg__maxi(gl->nverts + n, 4096) + gl->cverts/2; // 1.5x Overallocate
-		verts = (NVGvertex*)realloc(gl->verts, sizeof(NVGvertex) * cverts);
-		if (verts == NULL) return -1;
-		gl->verts = verts;
-		gl->cverts = cverts;
-	}
-	ret = gl->nverts;
-	gl->nverts += n;
-	return ret;
-}
-
-static int glnvg__allocFragUniforms(GLNVGcontext* gl, int n)
-{
-	int ret = 0, structSize = gl->fragSize;
-	if (gl->nuniforms+n > gl->cuniforms) {
-		unsigned char* uniforms;
-		int cuniforms = glnvg__maxi(gl->nuniforms+n, 128) + gl->cuniforms/2; // 1.5x Overallocate
-		uniforms = (unsigned char*)realloc(gl->uniforms, structSize * cuniforms);
-		if (uniforms == NULL) return -1;
-		gl->uniforms = uniforms;
-		gl->cuniforms = cuniforms;
-	}
-	ret = gl->nuniforms * structSize;
-	gl->nuniforms += n;
-	return ret;
-}
-
-static GLNVGfragUniforms* nvg__fragUniformPtr(GLNVGcontext* gl, int i)
-{
-	return (GLNVGfragUniforms*)&gl->uniforms[i];
-}
-
-static void glnvg__vset(NVGvertex* vtx, float x, float y, float u, float v)
-{
-	vtx->x = x;
-	vtx->y = y;
-	vtx->u = u;
-	vtx->v = v;
-}
-
-static void glnvg__renderFill(void* uptr, NVGpaint* paint, NVGcompositeOperationState compositeOperation, NVGscissor* scissor, float fringe,
-							  const float* bounds, const NVGpath* paths, int npaths)
-{
-	GLNVGcontext* gl = (GLNVGcontext*)uptr;
-	GLNVGcall* call = glnvg__allocCall(gl);
-	NVGvertex* quad;
-	GLNVGfragUniforms* frag;
-	int i, maxverts, offset;
-
-	if (call == NULL) return;
-
-	call->type = GLNVG_FILL;
-	call->triangleCount = 4;
-	call->pathOffset = glnvg__allocPaths(gl, npaths);
-	if (call->pathOffset == -1) goto error;
-	call->pathCount = npaths;
-	call->image = paint->image;
-	call->blendFunc = glnvg__blendCompositeOperation(compositeOperation);
-
-	if (npaths == 1 && paths[0].convex)
-	{
-		call->type = GLNVG_CONVEXFILL;
-		call->triangleCount = 0;	// Bounding box fill quad not needed for convex fill
-	}
-
-	// Allocate vertices for all the paths.
-	maxverts = glnvg__maxVertCount(paths, npaths) + call->triangleCount;
-	offset = glnvg__allocVerts(gl, maxverts);
-	if (offset == -1) goto error;
-
-	for (i = 0; i < npaths; i++) {
-		GLNVGpath* copy = &gl->paths[call->pathOffset + i];
-		const NVGpath* path = &paths[i];
-		memset(copy, 0, sizeof(GLNVGpath));
-		if (path->nfill > 0) {
-			copy->fillOffset = offset;
-			copy->fillCount = path->nfill;
-			memcpy(&gl->verts[offset], path->fill, sizeof(NVGvertex) * path->nfill);
-			offset += path->nfill;
-		}
-		if (path->nstroke > 0) {
-			copy->strokeOffset = offset;
-			copy->strokeCount = path->nstroke;
-			memcpy(&gl->verts[offset], path->stroke, sizeof(NVGvertex) * path->nstroke);
-			offset += path->nstroke;
-		}
-	}
-
-	// Setup uniforms for draw calls
-	if (call->type == GLNVG_FILL) {
-		// Quad
-		call->triangleOffset = offset;
-		quad = &gl->verts[call->triangleOffset];
-		glnvg__vset(&quad[0], bounds[2], bounds[3], 0.5f, 1.0f);
-		glnvg__vset(&quad[1], bounds[2], bounds[1], 0.5f, 1.0f);
-		glnvg__vset(&quad[2], bounds[0], bounds[3], 0.5f, 1.0f);
-		glnvg__vset(&quad[3], bounds[0], bounds[1], 0.5f, 1.0f);
-
-		call->uniformOffset = glnvg__allocFragUniforms(gl, 2);
-		if (call->uniformOffset == -1) goto error;
-		// Simple shader for stencil
-		frag = nvg__fragUniformPtr(gl, call->uniformOffset);
-		memset(frag, 0, sizeof(*frag));
-		frag->strokeThr = -1.0f;
-		frag->type = NSVG_SHADER_SIMPLE;
-		// Fill shader
-		glnvg__convertPaint(gl, nvg__fragUniformPtr(gl, call->uniformOffset + gl->fragSize), paint, scissor, fringe, fringe, -1.0f);
-	} else {
-		call->uniformOffset = glnvg__allocFragUniforms(gl, 1);
-		if (call->uniformOffset == -1) goto error;
-		// Fill shader
-		glnvg__convertPaint(gl, nvg__fragUniformPtr(gl, call->uniformOffset), paint, scissor, fringe, fringe, -1.0f);
-	}
-
-	return;
-
-error:
-	// We get here if call alloc was ok, but something else is not.
-	// Roll back the last call to prevent drawing it.
-	if (gl->ncalls > 0) gl->ncalls--;
-}
-
-static void glnvg__renderStroke(void* uptr, NVGpaint* paint, NVGcompositeOperationState compositeOperation, NVGscissor* scissor, float fringe,
-								float strokeWidth, const NVGpath* paths, int npaths)
-{
-	GLNVGcontext* gl = (GLNVGcontext*)uptr;
-	GLNVGcall* call = glnvg__allocCall(gl);
-	int i, maxverts, offset;
-
-	if (call == NULL) return;
-
-	call->type = GLNVG_STROKE;
-	call->pathOffset = glnvg__allocPaths(gl, npaths);
-	if (call->pathOffset == -1) goto error;
-	call->pathCount = npaths;
-	call->image = paint->image;
-	call->blendFunc = glnvg__blendCompositeOperation(compositeOperation);
-
-	// Allocate vertices for all the paths.
-	maxverts = glnvg__maxVertCount(paths, npaths);
-	offset = glnvg__allocVerts(gl, maxverts);
-	if (offset == -1) goto error;
-
-	for (i = 0; i < npaths; i++) {
-		GLNVGpath* copy = &gl->paths[call->pathOffset + i];
-		const NVGpath* path = &paths[i];
-		memset(copy, 0, sizeof(GLNVGpath));
-		if (path->nstroke) {
-			copy->strokeOffset = offset;
-			copy->strokeCount = path->nstroke;
-			memcpy(&gl->verts[offset], path->stroke, sizeof(NVGvertex) * path->nstroke);
-			offset += path->nstroke;
-		}
-	}
-
-	if (gl->flags & NVG_STENCIL_STROKES) {
-		// Fill shader
-		call->uniformOffset = glnvg__allocFragUniforms(gl, 2);
-		if (call->uniformOffset == -1) goto error;
-
-		glnvg__convertPaint(gl, nvg__fragUniformPtr(gl, call->uniformOffset), paint, scissor, strokeWidth, fringe, -1.0f);
-		glnvg__convertPaint(gl, nvg__fragUniformPtr(gl, call->uniformOffset + gl->fragSize), paint, scissor, strokeWidth, fringe, 1.0f - 0.5f/255.0f);
-
-	} else {
-		// Fill shader
-		call->uniformOffset = glnvg__allocFragUniforms(gl, 1);
-		if (call->uniformOffset == -1) goto error;
-		glnvg__convertPaint(gl, nvg__fragUniformPtr(gl, call->uniformOffset), paint, scissor, strokeWidth, fringe, -1.0f);
-	}
-
-	return;
-
-error:
-	// We get here if call alloc was ok, but something else is not.
-	// Roll back the last call to prevent drawing it.
-	if (gl->ncalls > 0) gl->ncalls--;
-}
-
-static void glnvg__renderTriangles(void* uptr, NVGpaint* paint, NVGcompositeOperationState compositeOperation, NVGscissor* scissor,
-								   const NVGvertex* verts, int nverts)
-{
-	GLNVGcontext* gl = (GLNVGcontext*)uptr;
-	GLNVGcall* call = glnvg__allocCall(gl);
-	GLNVGfragUniforms* frag;
-
-	if (call == NULL) return;
-
-	call->type = GLNVG_TRIANGLES;
-	call->image = paint->image;
-	call->blendFunc = glnvg__blendCompositeOperation(compositeOperation);
-
-	// Allocate vertices for all the paths.
-	call->triangleOffset = glnvg__allocVerts(gl, nverts);
-	if (call->triangleOffset == -1) goto error;
-	call->triangleCount = nverts;
-
-	memcpy(&gl->verts[call->triangleOffset], verts, sizeof(NVGvertex) * nverts);
-
-	// Fill shader
-	call->uniformOffset = glnvg__allocFragUniforms(gl, 1);
-	if (call->uniformOffset == -1) goto error;
-	frag = nvg__fragUniformPtr(gl, call->uniformOffset);
-	glnvg__convertPaint(gl, frag, paint, scissor, 1.0f, 1.0f, -1.0f);
-	frag->type = NSVG_SHADER_IMG;
-
-	return;
-
-error:
-	// We get here if call alloc was ok, but something else is not.
-	// Roll back the last call to prevent drawing it.
-	if (gl->ncalls > 0) gl->ncalls--;
-}
-
-static void glnvg__renderDelete(void* uptr)
-{
-	GLNVGcontext* gl = (GLNVGcontext*)uptr;
-	int i;
-	if (gl == NULL) return;
-
-	glnvg__deleteShader(&gl->shader);
-
-#if NANOVG_GL3
-#if NANOVG_GL_USE_UNIFORMBUFFER
-	if (gl->fragBuf != 0)
-		glDeleteBuffers(1, &gl->fragBuf);
-#endif
-	if (gl->vertArr != 0)
-		glDeleteVertexArrays(1, &gl->vertArr);
-#endif
-	if (gl->vertBuf != 0)
-		glDeleteBuffers(1, &gl->vertBuf);
-
-	for (i = 0; i < gl->ntextures; i++) {
-		if (gl->textures[i].tex != 0 && (gl->textures[i].flags & NVG_IMAGE_NODELETE) == 0)
-			glDeleteTextures(1, &gl->textures[i].tex);
-	}
-	free(gl->textures);
-
-	free(gl->paths);
-	free(gl->verts);
-	free(gl->uniforms);
-	free(gl->calls);
-
-	free(gl);
-}
-
-
-#if defined NANOVG_GL2
-NVGcontext* nvgCreateGL2(int flags)
-#elif defined NANOVG_GL3
-NVGcontext* nvgCreateGL3(int flags)
-#elif defined NANOVG_GLES2
-NVGcontext* nvgCreateGLES2(int flags)
-#elif defined NANOVG_GLES3
-NVGcontext* nvgCreateGLES3(int flags)
-#endif
-{
-	NVGparams params;
-	NVGcontext* ctx = NULL;
-	GLNVGcontext* gl = (GLNVGcontext*)malloc(sizeof(GLNVGcontext));
-	if (gl == NULL) goto error;
-	memset(gl, 0, sizeof(GLNVGcontext));
-
-	memset(&params, 0, sizeof(params));
-	params.renderCreate = glnvg__renderCreate;
-	params.renderCreateTexture = glnvg__renderCreateTexture;
-	params.renderDeleteTexture = glnvg__renderDeleteTexture;
-	params.renderUpdateTexture = glnvg__renderUpdateTexture;
-	params.renderGetTextureSize = glnvg__renderGetTextureSize;
-	params.renderViewport = glnvg__renderViewport;
-	params.renderCancel = glnvg__renderCancel;
-	params.renderFlush = glnvg__renderFlush;
-	params.renderFill = glnvg__renderFill;
-	params.renderStroke = glnvg__renderStroke;
-	params.renderTriangles = glnvg__renderTriangles;
-	params.renderDelete = glnvg__renderDelete;
-	params.userPtr = gl;
-	params.edgeAntiAlias = flags & NVG_ANTIALIAS ? 1 : 0;
-
-	gl->flags = flags;
-
-	ctx = nvgCreateInternal(&params);
-	if (ctx == NULL) goto error;
-
-	return ctx;
-
-error:
-	// 'gl' is freed by nvgDeleteInternal.
-	if (ctx != NULL) nvgDeleteInternal(ctx);
-	return NULL;
-}
-
-#if defined NANOVG_GL2
-void nvgDeleteGL2(NVGcontext* ctx)
-#elif defined NANOVG_GL3
-void nvgDeleteGL3(NVGcontext* ctx)
-#elif defined NANOVG_GLES2
-void nvgDeleteGLES2(NVGcontext* ctx)
-#elif defined NANOVG_GLES3
-void nvgDeleteGLES3(NVGcontext* ctx)
-#endif
-{
-	nvgDeleteInternal(ctx);
-}
-
-#if defined NANOVG_GL2
-int nvglCreateImageFromHandleGL2(NVGcontext* ctx, GLuint textureId, int w, int h, int imageFlags)
-#elif defined NANOVG_GL3
-int nvglCreateImageFromHandleGL3(NVGcontext* ctx, GLuint textureId, int w, int h, int imageFlags)
-#elif defined NANOVG_GLES2
-int nvglCreateImageFromHandleGLES2(NVGcontext* ctx, GLuint textureId, int w, int h, int imageFlags)
-#elif defined NANOVG_GLES3
-int nvglCreateImageFromHandleGLES3(NVGcontext* ctx, GLuint textureId, int w, int h, int imageFlags)
-#endif
-{
-	GLNVGcontext* gl = (GLNVGcontext*)nvgInternalParams(ctx)->userPtr;
-	GLNVGtexture* tex = glnvg__allocTexture(gl);
-
-	if (tex == NULL) return 0;
-
-	tex->type = NVG_TEXTURE_RGBA;
-	tex->tex = textureId;
-	tex->flags = imageFlags;
-	tex->width = w;
-	tex->height = h;
-
-	return tex->id;
-}
-
-#if defined NANOVG_GL2
-GLuint nvglImageHandleGL2(NVGcontext* ctx, int image)
-#elif defined NANOVG_GL3
-GLuint nvglImageHandleGL3(NVGcontext* ctx, int image)
-#elif defined NANOVG_GLES2
-GLuint nvglImageHandleGLES2(NVGcontext* ctx, int image)
-#elif defined NANOVG_GLES3
-GLuint nvglImageHandleGLES3(NVGcontext* ctx, int image)
-#endif
-{
-	GLNVGcontext* gl = (GLNVGcontext*)nvgInternalParams(ctx)->userPtr;
-	GLNVGtexture* tex = glnvg__findTexture(gl, image);
-	return tex->tex;
-}
-
-#endif /* NANOVG_GL_IMPLEMENTATION */
diff --git a/Source/sys-clk/manager/lib/borealis/library/include/borealis/extern/nanovg/nanovg_gl_utils.h b/Source/sys-clk/manager/lib/borealis/library/include/borealis/extern/nanovg/nanovg_gl_utils.h
deleted file mode 100644
index f7384d80..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/include/borealis/extern/nanovg/nanovg_gl_utils.h
+++ /dev/null
@@ -1,154 +0,0 @@
-//
-// Copyright (c) 2009-2013 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-#ifndef NANOVG_GL_UTILS_H
-#define NANOVG_GL_UTILS_H
-
-struct NVGLUframebuffer {
-	NVGcontext* ctx;
-	GLuint fbo;
-	GLuint rbo;
-	GLuint texture;
-	int image;
-};
-typedef struct NVGLUframebuffer NVGLUframebuffer;
-
-// Helper function to create GL frame buffer to render to.
-void nvgluBindFramebuffer(NVGLUframebuffer* fb);
-NVGLUframebuffer* nvgluCreateFramebuffer(NVGcontext* ctx, int w, int h, int imageFlags);
-void nvgluDeleteFramebuffer(NVGLUframebuffer* fb);
-
-#endif // NANOVG_GL_UTILS_H
-
-#ifdef NANOVG_GL_IMPLEMENTATION
-
-#if defined(NANOVG_GL3) || defined(NANOVG_GLES2) || defined(NANOVG_GLES3)
-// FBO is core in OpenGL 3>.
-#	define NANOVG_FBO_VALID 1
-#elif defined(NANOVG_GL2)
-// On OS X including glext defines FBO on GL2 too.
-#	ifdef __APPLE__
-#		include <OpenGL/glext.h>
-#		define NANOVG_FBO_VALID 1
-#	endif
-#endif
-
-static GLint defaultFBO = -1;
-
-NVGLUframebuffer* nvgluCreateFramebuffer(NVGcontext* ctx, int w, int h, int imageFlags)
-{
-#ifdef NANOVG_FBO_VALID
-	GLint defaultFBO;
-	GLint defaultRBO;
-	NVGLUframebuffer* fb = NULL;
-
-	glGetIntegerv(GL_FRAMEBUFFER_BINDING, &defaultFBO);
-	glGetIntegerv(GL_RENDERBUFFER_BINDING, &defaultRBO);
-
-	fb = (NVGLUframebuffer*)malloc(sizeof(NVGLUframebuffer));
-	if (fb == NULL) goto error;
-	memset(fb, 0, sizeof(NVGLUframebuffer));
-
-	fb->image = nvgCreateImageRGBA(ctx, w, h, imageFlags | NVG_IMAGE_FLIPY | NVG_IMAGE_PREMULTIPLIED, NULL);
-
-#if defined NANOVG_GL2
-	fb->texture = nvglImageHandleGL2(ctx, fb->image);
-#elif defined NANOVG_GL3
-	fb->texture = nvglImageHandleGL3(ctx, fb->image);
-#elif defined NANOVG_GLES2
-	fb->texture = nvglImageHandleGLES2(ctx, fb->image);
-#elif defined NANOVG_GLES3
-	fb->texture = nvglImageHandleGLES3(ctx, fb->image);
-#endif
-
-	fb->ctx = ctx;
-
-	// frame buffer object
-	glGenFramebuffers(1, &fb->fbo);
-	glBindFramebuffer(GL_FRAMEBUFFER, fb->fbo);
-
-	// render buffer object
-	glGenRenderbuffers(1, &fb->rbo);
-	glBindRenderbuffer(GL_RENDERBUFFER, fb->rbo);
-	glRenderbufferStorage(GL_RENDERBUFFER, GL_STENCIL_INDEX8, w, h);
-
-	// combine all
-	glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, fb->texture, 0);
-	glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER, fb->rbo);
-
-	if (glCheckFramebufferStatus(GL_FRAMEBUFFER) != GL_FRAMEBUFFER_COMPLETE) {
-#ifdef GL_DEPTH24_STENCIL8
-		// If GL_STENCIL_INDEX8 is not supported, try GL_DEPTH24_STENCIL8 as a fallback.
-		// Some graphics cards require a depth buffer along with a stencil.
-		glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH24_STENCIL8, w, h);
-		glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, fb->texture, 0);
-		glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER, fb->rbo);
-
-		if (glCheckFramebufferStatus(GL_FRAMEBUFFER) != GL_FRAMEBUFFER_COMPLETE)
-#endif // GL_DEPTH24_STENCIL8
-			goto error;
-	}
-
-	glBindFramebuffer(GL_FRAMEBUFFER, defaultFBO);
-	glBindRenderbuffer(GL_RENDERBUFFER, defaultRBO);
-	return fb;
-error:
-	glBindFramebuffer(GL_FRAMEBUFFER, defaultFBO);
-	glBindRenderbuffer(GL_RENDERBUFFER, defaultRBO);
-	nvgluDeleteFramebuffer(fb);
-	return NULL;
-#else
-	NVG_NOTUSED(ctx);
-	NVG_NOTUSED(w);
-	NVG_NOTUSED(h);
-	NVG_NOTUSED(imageFlags);
-	return NULL;
-#endif
-}
-
-void nvgluBindFramebuffer(NVGLUframebuffer* fb)
-{
-#ifdef NANOVG_FBO_VALID
-	if (defaultFBO == -1) glGetIntegerv(GL_FRAMEBUFFER_BINDING, &defaultFBO);
-	glBindFramebuffer(GL_FRAMEBUFFER, fb != NULL ? fb->fbo : defaultFBO);
-#else
-	NVG_NOTUSED(fb);
-#endif
-}
-
-void nvgluDeleteFramebuffer(NVGLUframebuffer* fb)
-{
-#ifdef NANOVG_FBO_VALID
-	if (fb == NULL) return;
-	if (fb->fbo != 0)
-		glDeleteFramebuffers(1, &fb->fbo);
-	if (fb->rbo != 0)
-		glDeleteRenderbuffers(1, &fb->rbo);
-	if (fb->image >= 0)
-		nvgDeleteImage(fb->ctx, fb->image);
-	fb->ctx = NULL;
-	fb->fbo = 0;
-	fb->rbo = 0;
-	fb->texture = 0;
-	fb->image = -1;
-	free(fb);
-#else
-	NVG_NOTUSED(fb);
-#endif
-}
-
-#endif // NANOVG_GL_IMPLEMENTATION
diff --git a/Source/sys-clk/manager/lib/borealis/library/include/borealis/extern/nanovg/stb_image.h b/Source/sys-clk/manager/lib/borealis/library/include/borealis/extern/nanovg/stb_image.h
deleted file mode 100644
index ffe3c157..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/include/borealis/extern/nanovg/stb_image.h
+++ /dev/null
@@ -1,7547 +0,0 @@
-/* stb_image - v2.22 - public domain image loader - http://nothings.org/stb
-                                  no warranty implied; use at your own risk
-
-   Do this:
-      #define STB_IMAGE_IMPLEMENTATION
-   before you include this file in *one* C or C++ file to create the implementation.
-
-   // i.e. it should look like this:
-   #include ...
-   #include ...
-   #include ...
-   #define STB_IMAGE_IMPLEMENTATION
-   #include "stb_image.h"
-
-   You can #define STBI_ASSERT(x) before the #include to avoid using assert.h.
-   And #define STBI_MALLOC, STBI_REALLOC, and STBI_FREE to avoid using malloc,realloc,free
-
-
-   QUICK NOTES:
-      Primarily of interest to game developers and other people who can
-          avoid problematic images and only need the trivial interface
-
-      JPEG baseline & progressive (12 bpc/arithmetic not supported, same as stock IJG lib)
-      PNG 1/2/4/8/16-bit-per-channel
-
-      TGA (not sure what subset, if a subset)
-      BMP non-1bpp, non-RLE
-      PSD (composited view only, no extra channels, 8/16 bit-per-channel)
-
-      GIF (*comp always reports as 4-channel)
-      HDR (radiance rgbE format)
-      PIC (Softimage PIC)
-      PNM (PPM and PGM binary only)
-
-      Animated GIF still needs a proper API, but here's one way to do it:
-          http://gist.github.com/urraka/685d9a6340b26b830d49
-
-      - decode from memory or through FILE (define STBI_NO_STDIO to remove code)
-      - decode from arbitrary I/O callbacks
-      - SIMD acceleration on x86/x64 (SSE2) and ARM (NEON)
-
-   Full documentation under "DOCUMENTATION" below.
-
-
-LICENSE
-
-  See end of file for license information.
-
-RECENT REVISION HISTORY:
-
-      2.22  (2019-03-04) gif fixes, fix warnings
-      2.21  (2019-02-25) fix typo in comment
-      2.20  (2019-02-07) support utf8 filenames in Windows; fix warnings and platform ifdefs 
-      2.19  (2018-02-11) fix warning
-      2.18  (2018-01-30) fix warnings
-      2.17  (2018-01-29) bugfix, 1-bit BMP, 16-bitness query, fix warnings
-      2.16  (2017-07-23) all functions have 16-bit variants; optimizations; bugfixes
-      2.15  (2017-03-18) fix png-1,2,4; all Imagenet JPGs; no runtime SSE detection on GCC
-      2.14  (2017-03-03) remove deprecated STBI_JPEG_OLD; fixes for Imagenet JPGs
-      2.13  (2016-12-04) experimental 16-bit API, only for PNG so far; fixes
-      2.12  (2016-04-02) fix typo in 2.11 PSD fix that caused crashes
-      2.11  (2016-04-02) 16-bit PNGS; enable SSE2 in non-gcc x64
-                         RGB-format JPEG; remove white matting in PSD;
-                         allocate large structures on the stack;
-                         correct channel count for PNG & BMP
-      2.10  (2016-01-22) avoid warning introduced in 2.09
-      2.09  (2016-01-16) 16-bit TGA; comments in PNM files; STBI_REALLOC_SIZED
-
-   See end of file for full revision history.
-
-
- ============================    Contributors    =========================
-
- Image formats                          Extensions, features
-    Sean Barrett (jpeg, png, bmp)          Jetro Lauha (stbi_info)
-    Nicolas Schulz (hdr, psd)              Martin "SpartanJ" Golini (stbi_info)
-    Jonathan Dummer (tga)                  James "moose2000" Brown (iPhone PNG)
-    Jean-Marc Lienher (gif)                Ben "Disch" Wenger (io callbacks)
-    Tom Seddon (pic)                       Omar Cornut (1/2/4-bit PNG)
-    Thatcher Ulrich (psd)                  Nicolas Guillemot (vertical flip)
-    Ken Miller (pgm, ppm)                  Richard Mitton (16-bit PSD)
-    github:urraka (animated gif)           Junggon Kim (PNM comments)
-    Christopher Forseth (animated gif)     Daniel Gibson (16-bit TGA)
-                                           socks-the-fox (16-bit PNG)
-                                           Jeremy Sawicki (handle all ImageNet JPGs)
- Optimizations & bugfixes                  Mikhail Morozov (1-bit BMP)
-    Fabian "ryg" Giesen                    Anael Seghezzi (is-16-bit query)
-    Arseny Kapoulkine
-    John-Mark Allen
-    Carmelo J Fdez-Aguera
-
- Bug & warning fixes
-    Marc LeBlanc            David Woo          Guillaume George   Martins Mozeiko
-    Christpher Lloyd        Jerry Jansson      Joseph Thomson     Phil Jordan
-    Dave Moore              Roy Eltham         Hayaki Saito       Nathan Reed
-    Won Chun                Luke Graham        Johan Duparc       Nick Verigakis
-    the Horde3D community   Thomas Ruf         Ronny Chevalier    github:rlyeh
-    Janez Zemva             John Bartholomew   Michal Cichon      github:romigrou
-    Jonathan Blow           Ken Hamada         Tero Hanninen      github:svdijk
-    Laurent Gomila          Cort Stratton      Sergio Gonzalez    github:snagar
-    Aruelien Pocheville     Thibault Reuille   Cass Everitt       github:Zelex
-    Ryamond Barbiero        Paul Du Bois       Engin Manap        github:grim210
-    Aldo Culquicondor       Philipp Wiesemann  Dale Weiler        github:sammyhw
-    Oriol Ferrer Mesia      Josh Tobin         Matthew Gregan     github:phprus
-    Julian Raschke          Gregory Mullen     Baldur Karlsson    github:poppolopoppo
-    Christian Floisand      Kevin Schmidt      JR Smith           github:darealshinji
-    Blazej Dariusz Roszkowski                                     github:Michaelangel007
-*/
-
-#ifndef STBI_INCLUDE_STB_IMAGE_H
-#define STBI_INCLUDE_STB_IMAGE_H
-
-// DOCUMENTATION
-//
-// Limitations:
-//    - no 12-bit-per-channel JPEG
-//    - no JPEGs with arithmetic coding
-//    - GIF always returns *comp=4
-//
-// Basic usage (see HDR discussion below for HDR usage):
-//    int x,y,n;
-//    unsigned char *data = stbi_load(filename, &x, &y, &n, 0);
-//    // ... process data if not NULL ...
-//    // ... x = width, y = height, n = # 8-bit components per pixel ...
-//    // ... replace '0' with '1'..'4' to force that many components per pixel
-//    // ... but 'n' will always be the number that it would have been if you said 0
-//    stbi_image_free(data)
-//
-// Standard parameters:
-//    int *x                 -- outputs image width in pixels
-//    int *y                 -- outputs image height in pixels
-//    int *channels_in_file  -- outputs # of image components in image file
-//    int desired_channels   -- if non-zero, # of image components requested in result
-//
-// The return value from an image loader is an 'unsigned char *' which points
-// to the pixel data, or NULL on an allocation failure or if the image is
-// corrupt or invalid. The pixel data consists of *y scanlines of *x pixels,
-// with each pixel consisting of N interleaved 8-bit components; the first
-// pixel pointed to is top-left-most in the image. There is no padding between
-// image scanlines or between pixels, regardless of format. The number of
-// components N is 'desired_channels' if desired_channels is non-zero, or
-// *channels_in_file otherwise. If desired_channels is non-zero,
-// *channels_in_file has the number of components that _would_ have been
-// output otherwise. E.g. if you set desired_channels to 4, you will always
-// get RGBA output, but you can check *channels_in_file to see if it's trivially
-// opaque because e.g. there were only 3 channels in the source image.
-//
-// An output image with N components has the following components interleaved
-// in this order in each pixel:
-//
-//     N=#comp     components
-//       1           grey
-//       2           grey, alpha
-//       3           red, green, blue
-//       4           red, green, blue, alpha
-//
-// If image loading fails for any reason, the return value will be NULL,
-// and *x, *y, *channels_in_file will be unchanged. The function
-// stbi_failure_reason() can be queried for an extremely brief, end-user
-// unfriendly explanation of why the load failed. Define STBI_NO_FAILURE_STRINGS
-// to avoid compiling these strings at all, and STBI_FAILURE_USERMSG to get slightly
-// more user-friendly ones.
-//
-// Paletted PNG, BMP, GIF, and PIC images are automatically depalettized.
-//
-// ===========================================================================
-//
-// UNICODE:
-//
-//   If compiling for Windows and you wish to use Unicode filenames, compile
-//   with
-//       #define STBI_WINDOWS_UTF8
-//   and pass utf8-encoded filenames. Call stbi_convert_wchar_to_utf8 to convert
-//   Windows wchar_t filenames to utf8.
-//
-// ===========================================================================
-//
-// Philosophy
-//
-// stb libraries are designed with the following priorities:
-//
-//    1. easy to use
-//    2. easy to maintain
-//    3. good performance
-//
-// Sometimes I let "good performance" creep up in priority over "easy to maintain",
-// and for best performance I may provide less-easy-to-use APIs that give higher
-// performance, in addition to the easy-to-use ones. Nevertheless, it's important
-// to keep in mind that from the standpoint of you, a client of this library,
-// all you care about is #1 and #3, and stb libraries DO NOT emphasize #3 above all.
-//
-// Some secondary priorities arise directly from the first two, some of which
-// provide more explicit reasons why performance can't be emphasized.
-//
-//    - Portable ("ease of use")
-//    - Small source code footprint ("easy to maintain")
-//    - No dependencies ("ease of use")
-//
-// ===========================================================================
-//
-// I/O callbacks
-//
-// I/O callbacks allow you to read from arbitrary sources, like packaged
-// files or some other source. Data read from callbacks are processed
-// through a small internal buffer (currently 128 bytes) to try to reduce
-// overhead.
-//
-// The three functions you must define are "read" (reads some bytes of data),
-// "skip" (skips some bytes of data), "eof" (reports if the stream is at the end).
-//
-// ===========================================================================
-//
-// SIMD support
-//
-// The JPEG decoder will try to automatically use SIMD kernels on x86 when
-// supported by the compiler. For ARM Neon support, you must explicitly
-// request it.
-//
-// (The old do-it-yourself SIMD API is no longer supported in the current
-// code.)
-//
-// On x86, SSE2 will automatically be used when available based on a run-time
-// test; if not, the generic C versions are used as a fall-back. On ARM targets,
-// the typical path is to have separate builds for NEON and non-NEON devices
-// (at least this is true for iOS and Android). Therefore, the NEON support is
-// toggled by a build flag: define STBI_NEON to get NEON loops.
-//
-// If for some reason you do not want to use any of SIMD code, or if
-// you have issues compiling it, you can disable it entirely by
-// defining STBI_NO_SIMD.
-//
-// ===========================================================================
-//
-// HDR image support   (disable by defining STBI_NO_HDR)
-//
-// stb_image supports loading HDR images in general, and currently the Radiance
-// .HDR file format specifically. You can still load any file through the existing
-// interface; if you attempt to load an HDR file, it will be automatically remapped
-// to LDR, assuming gamma 2.2 and an arbitrary scale factor defaulting to 1;
-// both of these constants can be reconfigured through this interface:
-//
-//     stbi_hdr_to_ldr_gamma(2.2f);
-//     stbi_hdr_to_ldr_scale(1.0f);
-//
-// (note, do not use _inverse_ constants; stbi_image will invert them
-// appropriately).
-//
-// Additionally, there is a new, parallel interface for loading files as
-// (linear) floats to preserve the full dynamic range:
-//
-//    float *data = stbi_loadf(filename, &x, &y, &n, 0);
-//
-// If you load LDR images through this interface, those images will
-// be promoted to floating point values, run through the inverse of
-// constants corresponding to the above:
-//
-//     stbi_ldr_to_hdr_scale(1.0f);
-//     stbi_ldr_to_hdr_gamma(2.2f);
-//
-// Finally, given a filename (or an open file or memory block--see header
-// file for details) containing image data, you can query for the "most
-// appropriate" interface to use (that is, whether the image is HDR or
-// not), using:
-//
-//     stbi_is_hdr(char *filename);
-//
-// ===========================================================================
-//
-// iPhone PNG support:
-//
-// By default we convert iphone-formatted PNGs back to RGB, even though
-// they are internally encoded differently. You can disable this conversion
-// by calling stbi_convert_iphone_png_to_rgb(0), in which case
-// you will always just get the native iphone "format" through (which
-// is BGR stored in RGB).
-//
-// Call stbi_set_unpremultiply_on_load(1) as well to force a divide per
-// pixel to remove any premultiplied alpha *only* if the image file explicitly
-// says there's premultiplied data (currently only happens in iPhone images,
-// and only if iPhone convert-to-rgb processing is on).
-//
-// ===========================================================================
-//
-// ADDITIONAL CONFIGURATION
-//
-//  - You can suppress implementation of any of the decoders to reduce
-//    your code footprint by #defining one or more of the following
-//    symbols before creating the implementation.
-//
-//        STBI_NO_JPEG
-//        STBI_NO_PNG
-//        STBI_NO_BMP
-//        STBI_NO_PSD
-//        STBI_NO_TGA
-//        STBI_NO_GIF
-//        STBI_NO_HDR
-//        STBI_NO_PIC
-//        STBI_NO_PNM   (.ppm and .pgm)
-//
-//  - You can request *only* certain decoders and suppress all other ones
-//    (this will be more forward-compatible, as addition of new decoders
-//    doesn't require you to disable them explicitly):
-//
-//        STBI_ONLY_JPEG
-//        STBI_ONLY_PNG
-//        STBI_ONLY_BMP
-//        STBI_ONLY_PSD
-//        STBI_ONLY_TGA
-//        STBI_ONLY_GIF
-//        STBI_ONLY_HDR
-//        STBI_ONLY_PIC
-//        STBI_ONLY_PNM   (.ppm and .pgm)
-//
-//   - If you use STBI_NO_PNG (or _ONLY_ without PNG), and you still
-//     want the zlib decoder to be available, #define STBI_SUPPORT_ZLIB
-//
-
-
-#ifndef STBI_NO_STDIO
-#include <stdio.h>
-#endif // STBI_NO_STDIO
-
-#define STBI_VERSION 1
-
-enum
-{
-   STBI_default = 0, // only used for desired_channels
-
-   STBI_grey       = 1,
-   STBI_grey_alpha = 2,
-   STBI_rgb        = 3,
-   STBI_rgb_alpha  = 4
-};
-
-#include <stdlib.h>
-typedef unsigned char stbi_uc;
-typedef unsigned short stbi_us;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef STBIDEF
-#ifdef STB_IMAGE_STATIC
-#define STBIDEF static
-#else
-#define STBIDEF extern
-#endif
-#endif
-
-//////////////////////////////////////////////////////////////////////////////
-//
-// PRIMARY API - works on images of any type
-//
-
-//
-// load image by filename, open file, or memory buffer
-//
-
-typedef struct
-{
-   int      (*read)  (void *user,char *data,int size);   // fill 'data' with 'size' bytes.  return number of bytes actually read
-   void     (*skip)  (void *user,int n);                 // skip the next 'n' bytes, or 'unget' the last -n bytes if negative
-   int      (*eof)   (void *user);                       // returns nonzero if we are at end of file/data
-} stbi_io_callbacks;
-
-////////////////////////////////////
-//
-// 8-bits-per-channel interface
-//
-
-STBIDEF stbi_uc *stbi_load_from_memory   (stbi_uc           const *buffer, int len   , int *x, int *y, int *channels_in_file, int desired_channels);
-STBIDEF stbi_uc *stbi_load_from_callbacks(stbi_io_callbacks const *clbk  , void *user, int *x, int *y, int *channels_in_file, int desired_channels);
-
-#ifndef STBI_NO_STDIO
-STBIDEF stbi_uc *stbi_load            (char const *filename, int *x, int *y, int *channels_in_file, int desired_channels);
-STBIDEF stbi_uc *stbi_load_from_file  (FILE *f, int *x, int *y, int *channels_in_file, int desired_channels);
-// for stbi_load_from_file, file pointer is left pointing immediately after image
-#endif
-
-#ifndef STBI_NO_GIF
-STBIDEF stbi_uc *stbi_load_gif_from_memory(stbi_uc const *buffer, int len, int **delays, int *x, int *y, int *z, int *comp, int req_comp);
-#endif
-
-#ifdef STBI_WINDOWS_UTF8
-STBIDEF int stbi_convert_wchar_to_utf8(char *buffer, size_t bufferlen, const wchar_t* input);
-#endif
-
-////////////////////////////////////
-//
-// 16-bits-per-channel interface
-//
-
-STBIDEF stbi_us *stbi_load_16_from_memory   (stbi_uc const *buffer, int len, int *x, int *y, int *channels_in_file, int desired_channels);
-STBIDEF stbi_us *stbi_load_16_from_callbacks(stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *channels_in_file, int desired_channels);
-
-#ifndef STBI_NO_STDIO
-STBIDEF stbi_us *stbi_load_16          (char const *filename, int *x, int *y, int *channels_in_file, int desired_channels);
-STBIDEF stbi_us *stbi_load_from_file_16(FILE *f, int *x, int *y, int *channels_in_file, int desired_channels);
-#endif
-
-////////////////////////////////////
-//
-// float-per-channel interface
-//
-#ifndef STBI_NO_LINEAR
-   STBIDEF float *stbi_loadf_from_memory     (stbi_uc const *buffer, int len, int *x, int *y, int *channels_in_file, int desired_channels);
-   STBIDEF float *stbi_loadf_from_callbacks  (stbi_io_callbacks const *clbk, void *user, int *x, int *y,  int *channels_in_file, int desired_channels);
-
-   #ifndef STBI_NO_STDIO
-   STBIDEF float *stbi_loadf            (char const *filename, int *x, int *y, int *channels_in_file, int desired_channels);
-   STBIDEF float *stbi_loadf_from_file  (FILE *f, int *x, int *y, int *channels_in_file, int desired_channels);
-   #endif
-#endif
-
-#ifndef STBI_NO_HDR
-   STBIDEF void   stbi_hdr_to_ldr_gamma(float gamma);
-   STBIDEF void   stbi_hdr_to_ldr_scale(float scale);
-#endif // STBI_NO_HDR
-
-#ifndef STBI_NO_LINEAR
-   STBIDEF void   stbi_ldr_to_hdr_gamma(float gamma);
-   STBIDEF void   stbi_ldr_to_hdr_scale(float scale);
-#endif // STBI_NO_LINEAR
-
-// stbi_is_hdr is always defined, but always returns false if STBI_NO_HDR
-STBIDEF int    stbi_is_hdr_from_callbacks(stbi_io_callbacks const *clbk, void *user);
-STBIDEF int    stbi_is_hdr_from_memory(stbi_uc const *buffer, int len);
-#ifndef STBI_NO_STDIO
-STBIDEF int      stbi_is_hdr          (char const *filename);
-STBIDEF int      stbi_is_hdr_from_file(FILE *f);
-#endif // STBI_NO_STDIO
-
-
-// get a VERY brief reason for failure
-// NOT THREADSAFE
-STBIDEF const char *stbi_failure_reason  (void);
-
-// free the loaded image -- this is just free()
-STBIDEF void     stbi_image_free      (void *retval_from_stbi_load);
-
-// get image dimensions & components without fully decoding
-STBIDEF int      stbi_info_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *comp);
-STBIDEF int      stbi_info_from_callbacks(stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *comp);
-STBIDEF int      stbi_is_16_bit_from_memory(stbi_uc const *buffer, int len);
-STBIDEF int      stbi_is_16_bit_from_callbacks(stbi_io_callbacks const *clbk, void *user);
-
-#ifndef STBI_NO_STDIO
-STBIDEF int      stbi_info               (char const *filename,     int *x, int *y, int *comp);
-STBIDEF int      stbi_info_from_file     (FILE *f,                  int *x, int *y, int *comp);
-STBIDEF int      stbi_is_16_bit          (char const *filename);
-STBIDEF int      stbi_is_16_bit_from_file(FILE *f);
-#endif
-
-
-
-// for image formats that explicitly notate that they have premultiplied alpha,
-// we just return the colors as stored in the file. set this flag to force
-// unpremultiplication. results are undefined if the unpremultiply overflow.
-STBIDEF void stbi_set_unpremultiply_on_load(int flag_true_if_should_unpremultiply);
-
-// indicate whether we should process iphone images back to canonical format,
-// or just pass them through "as-is"
-STBIDEF void stbi_convert_iphone_png_to_rgb(int flag_true_if_should_convert);
-
-// flip the image vertically, so the first pixel in the output array is the bottom left
-STBIDEF void stbi_set_flip_vertically_on_load(int flag_true_if_should_flip);
-
-// ZLIB client - used by PNG, available for other purposes
-
-STBIDEF char *stbi_zlib_decode_malloc_guesssize(const char *buffer, int len, int initial_size, int *outlen);
-STBIDEF char *stbi_zlib_decode_malloc_guesssize_headerflag(const char *buffer, int len, int initial_size, int *outlen, int parse_header);
-STBIDEF char *stbi_zlib_decode_malloc(const char *buffer, int len, int *outlen);
-STBIDEF int   stbi_zlib_decode_buffer(char *obuffer, int olen, const char *ibuffer, int ilen);
-
-STBIDEF char *stbi_zlib_decode_noheader_malloc(const char *buffer, int len, int *outlen);
-STBIDEF int   stbi_zlib_decode_noheader_buffer(char *obuffer, int olen, const char *ibuffer, int ilen);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-//
-//
-////   end header file   /////////////////////////////////////////////////////
-#endif // STBI_INCLUDE_STB_IMAGE_H
-
-#ifdef STB_IMAGE_IMPLEMENTATION
-
-#if defined(STBI_ONLY_JPEG) || defined(STBI_ONLY_PNG) || defined(STBI_ONLY_BMP) \
-  || defined(STBI_ONLY_TGA) || defined(STBI_ONLY_GIF) || defined(STBI_ONLY_PSD) \
-  || defined(STBI_ONLY_HDR) || defined(STBI_ONLY_PIC) || defined(STBI_ONLY_PNM) \
-  || defined(STBI_ONLY_ZLIB)
-   #ifndef STBI_ONLY_JPEG
-   #define STBI_NO_JPEG
-   #endif
-   #ifndef STBI_ONLY_PNG
-   #define STBI_NO_PNG
-   #endif
-   #ifndef STBI_ONLY_BMP
-   #define STBI_NO_BMP
-   #endif
-   #ifndef STBI_ONLY_PSD
-   #define STBI_NO_PSD
-   #endif
-   #ifndef STBI_ONLY_TGA
-   #define STBI_NO_TGA
-   #endif
-   #ifndef STBI_ONLY_GIF
-   #define STBI_NO_GIF
-   #endif
-   #ifndef STBI_ONLY_HDR
-   #define STBI_NO_HDR
-   #endif
-   #ifndef STBI_ONLY_PIC
-   #define STBI_NO_PIC
-   #endif
-   #ifndef STBI_ONLY_PNM
-   #define STBI_NO_PNM
-   #endif
-#endif
-
-#if defined(STBI_NO_PNG) && !defined(STBI_SUPPORT_ZLIB) && !defined(STBI_NO_ZLIB)
-#define STBI_NO_ZLIB
-#endif
-
-
-#include <stdarg.h>
-#include <stddef.h> // ptrdiff_t on osx
-#include <stdlib.h>
-#include <string.h>
-#include <limits.h>
-
-#if !defined(STBI_NO_LINEAR) || !defined(STBI_NO_HDR)
-#include <math.h>  // ldexp, pow
-#endif
-
-#ifndef STBI_NO_STDIO
-#include <stdio.h>
-#endif
-
-#ifndef STBI_ASSERT
-#include <assert.h>
-#define STBI_ASSERT(x) assert(x)
-#endif
-
-#ifdef __cplusplus
-#define STBI_EXTERN extern "C"
-#else
-#define STBI_EXTERN extern
-#endif
-
-
-#ifndef _MSC_VER
-   #ifdef __cplusplus
-   #define stbi_inline inline
-   #else
-   #define stbi_inline
-   #endif
-#else
-   #define stbi_inline __forceinline
-#endif
-
-
-#ifdef _MSC_VER
-typedef unsigned short stbi__uint16;
-typedef   signed short stbi__int16;
-typedef unsigned int   stbi__uint32;
-typedef   signed int   stbi__int32;
-#else
-#include <stdint.h>
-typedef uint16_t stbi__uint16;
-typedef int16_t  stbi__int16;
-typedef uint32_t stbi__uint32;
-typedef int32_t  stbi__int32;
-#endif
-
-// should produce compiler error if size is wrong
-typedef unsigned char validate_uint32[sizeof(stbi__uint32)==4 ? 1 : -1];
-
-#ifdef _MSC_VER
-#define STBI_NOTUSED(v)  (void)(v)
-#else
-#define STBI_NOTUSED(v)  (void)sizeof(v)
-#endif
-
-#ifdef _MSC_VER
-#define STBI_HAS_LROTL
-#endif
-
-#ifdef STBI_HAS_LROTL
-   #define stbi_lrot(x,y)  _lrotl(x,y)
-#else
-   #define stbi_lrot(x,y)  (((x) << (y)) | ((x) >> (32 - (y))))
-#endif
-
-#if defined(STBI_MALLOC) && defined(STBI_FREE) && (defined(STBI_REALLOC) || defined(STBI_REALLOC_SIZED))
-// ok
-#elif !defined(STBI_MALLOC) && !defined(STBI_FREE) && !defined(STBI_REALLOC) && !defined(STBI_REALLOC_SIZED)
-// ok
-#else
-#error "Must define all or none of STBI_MALLOC, STBI_FREE, and STBI_REALLOC (or STBI_REALLOC_SIZED)."
-#endif
-
-#ifndef STBI_MALLOC
-#define STBI_MALLOC(sz)           malloc(sz)
-#define STBI_REALLOC(p,newsz)     realloc(p,newsz)
-#define STBI_FREE(p)              free(p)
-#endif
-
-#ifndef STBI_REALLOC_SIZED
-#define STBI_REALLOC_SIZED(p,oldsz,newsz) STBI_REALLOC(p,newsz)
-#endif
-
-// x86/x64 detection
-#if defined(__x86_64__) || defined(_M_X64)
-#define STBI__X64_TARGET
-#elif defined(__i386) || defined(_M_IX86)
-#define STBI__X86_TARGET
-#endif
-
-#if defined(__GNUC__) && defined(STBI__X86_TARGET) && !defined(__SSE2__) && !defined(STBI_NO_SIMD)
-// gcc doesn't support sse2 intrinsics unless you compile with -msse2,
-// which in turn means it gets to use SSE2 everywhere. This is unfortunate,
-// but previous attempts to provide the SSE2 functions with runtime
-// detection caused numerous issues. The way architecture extensions are
-// exposed in GCC/Clang is, sadly, not really suited for one-file libs.
-// New behavior: if compiled with -msse2, we use SSE2 without any
-// detection; if not, we don't use it at all.
-#define STBI_NO_SIMD
-#endif
-
-#if defined(__MINGW32__) && defined(STBI__X86_TARGET) && !defined(STBI_MINGW_ENABLE_SSE2) && !defined(STBI_NO_SIMD)
-// Note that __MINGW32__ doesn't actually mean 32-bit, so we have to avoid STBI__X64_TARGET
-//
-// 32-bit MinGW wants ESP to be 16-byte aligned, but this is not in the
-// Windows ABI and VC++ as well as Windows DLLs don't maintain that invariant.
-// As a result, enabling SSE2 on 32-bit MinGW is dangerous when not
-// simultaneously enabling "-mstackrealign".
-//
-// See https://github.com/nothings/stb/issues/81 for more information.
-//
-// So default to no SSE2 on 32-bit MinGW. If you've read this far and added
-// -mstackrealign to your build settings, feel free to #define STBI_MINGW_ENABLE_SSE2.
-#define STBI_NO_SIMD
-#endif
-
-#if !defined(STBI_NO_SIMD) && (defined(STBI__X86_TARGET) || defined(STBI__X64_TARGET))
-#define STBI_SSE2
-#include <emmintrin.h>
-
-#ifdef _MSC_VER
-
-#if _MSC_VER >= 1400  // not VC6
-#include <intrin.h> // __cpuid
-static int stbi__cpuid3(void)
-{
-   int info[4];
-   __cpuid(info,1);
-   return info[3];
-}
-#else
-static int stbi__cpuid3(void)
-{
-   int res;
-   __asm {
-      mov  eax,1
-      cpuid
-      mov  res,edx
-   }
-   return res;
-}
-#endif
-
-#define STBI_SIMD_ALIGN(type, name) __declspec(align(16)) type name
-
-#if !defined(STBI_NO_JPEG) && defined(STBI_SSE2)
-static int stbi__sse2_available(void)
-{
-   int info3 = stbi__cpuid3();
-   return ((info3 >> 26) & 1) != 0;
-}
-#endif
-
-#else // assume GCC-style if not VC++
-#define STBI_SIMD_ALIGN(type, name) type name __attribute__((aligned(16)))
-
-#if !defined(STBI_NO_JPEG) && defined(STBI_SSE2)
-static int stbi__sse2_available(void)
-{
-   // If we're even attempting to compile this on GCC/Clang, that means
-   // -msse2 is on, which means the compiler is allowed to use SSE2
-   // instructions at will, and so are we.
-   return 1;
-}
-#endif
-
-#endif
-#endif
-
-// ARM NEON
-#if defined(STBI_NO_SIMD) && defined(STBI_NEON)
-#undef STBI_NEON
-#endif
-
-#ifdef STBI_NEON
-#include <arm_neon.h>
-// assume GCC or Clang on ARM targets
-#define STBI_SIMD_ALIGN(type, name) type name __attribute__((aligned(16)))
-#endif
-
-#ifndef STBI_SIMD_ALIGN
-#define STBI_SIMD_ALIGN(type, name) type name
-#endif
-
-///////////////////////////////////////////////
-//
-//  stbi__context struct and start_xxx functions
-
-// stbi__context structure is our basic context used by all images, so it
-// contains all the IO context, plus some basic image information
-typedef struct
-{
-   stbi__uint32 img_x, img_y;
-   int img_n, img_out_n;
-
-   stbi_io_callbacks io;
-   void *io_user_data;
-
-   int read_from_callbacks;
-   int buflen;
-   stbi_uc buffer_start[128];
-
-   stbi_uc *img_buffer, *img_buffer_end;
-   stbi_uc *img_buffer_original, *img_buffer_original_end;
-} stbi__context;
-
-
-static void stbi__refill_buffer(stbi__context *s);
-
-// initialize a memory-decode context
-static void stbi__start_mem(stbi__context *s, stbi_uc const *buffer, int len)
-{
-   s->io.read = NULL;
-   s->read_from_callbacks = 0;
-   s->img_buffer = s->img_buffer_original = (stbi_uc *) buffer;
-   s->img_buffer_end = s->img_buffer_original_end = (stbi_uc *) buffer+len;
-}
-
-// initialize a callback-based context
-static void stbi__start_callbacks(stbi__context *s, stbi_io_callbacks *c, void *user)
-{
-   s->io = *c;
-   s->io_user_data = user;
-   s->buflen = sizeof(s->buffer_start);
-   s->read_from_callbacks = 1;
-   s->img_buffer_original = s->buffer_start;
-   stbi__refill_buffer(s);
-   s->img_buffer_original_end = s->img_buffer_end;
-}
-
-#ifndef STBI_NO_STDIO
-
-static int stbi__stdio_read(void *user, char *data, int size)
-{
-   return (int) fread(data,1,size,(FILE*) user);
-}
-
-static void stbi__stdio_skip(void *user, int n)
-{
-   fseek((FILE*) user, n, SEEK_CUR);
-}
-
-static int stbi__stdio_eof(void *user)
-{
-   return feof((FILE*) user);
-}
-
-static stbi_io_callbacks stbi__stdio_callbacks =
-{
-   stbi__stdio_read,
-   stbi__stdio_skip,
-   stbi__stdio_eof,
-};
-
-static void stbi__start_file(stbi__context *s, FILE *f)
-{
-   stbi__start_callbacks(s, &stbi__stdio_callbacks, (void *) f);
-}
-
-//static void stop_file(stbi__context *s) { }
-
-#endif // !STBI_NO_STDIO
-
-static void stbi__rewind(stbi__context *s)
-{
-   // conceptually rewind SHOULD rewind to the beginning of the stream,
-   // but we just rewind to the beginning of the initial buffer, because
-   // we only use it after doing 'test', which only ever looks at at most 92 bytes
-   s->img_buffer = s->img_buffer_original;
-   s->img_buffer_end = s->img_buffer_original_end;
-}
-
-enum
-{
-   STBI_ORDER_RGB,
-   STBI_ORDER_BGR
-};
-
-typedef struct
-{
-   int bits_per_channel;
-   int num_channels;
-   int channel_order;
-} stbi__result_info;
-
-#ifndef STBI_NO_JPEG
-static int      stbi__jpeg_test(stbi__context *s);
-static void    *stbi__jpeg_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri);
-static int      stbi__jpeg_info(stbi__context *s, int *x, int *y, int *comp);
-#endif
-
-#ifndef STBI_NO_PNG
-static int      stbi__png_test(stbi__context *s);
-static void    *stbi__png_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri);
-static int      stbi__png_info(stbi__context *s, int *x, int *y, int *comp);
-static int      stbi__png_is16(stbi__context *s);
-#endif
-
-#ifndef STBI_NO_BMP
-static int      stbi__bmp_test(stbi__context *s);
-static void    *stbi__bmp_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri);
-static int      stbi__bmp_info(stbi__context *s, int *x, int *y, int *comp);
-#endif
-
-#ifndef STBI_NO_TGA
-static int      stbi__tga_test(stbi__context *s);
-static void    *stbi__tga_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri);
-static int      stbi__tga_info(stbi__context *s, int *x, int *y, int *comp);
-#endif
-
-#ifndef STBI_NO_PSD
-static int      stbi__psd_test(stbi__context *s);
-static void    *stbi__psd_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri, int bpc);
-static int      stbi__psd_info(stbi__context *s, int *x, int *y, int *comp);
-static int      stbi__psd_is16(stbi__context *s);
-#endif
-
-#ifndef STBI_NO_HDR
-static int      stbi__hdr_test(stbi__context *s);
-static float   *stbi__hdr_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri);
-static int      stbi__hdr_info(stbi__context *s, int *x, int *y, int *comp);
-#endif
-
-#ifndef STBI_NO_PIC
-static int      stbi__pic_test(stbi__context *s);
-static void    *stbi__pic_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri);
-static int      stbi__pic_info(stbi__context *s, int *x, int *y, int *comp);
-#endif
-
-#ifndef STBI_NO_GIF
-static int      stbi__gif_test(stbi__context *s);
-static void    *stbi__gif_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri);
-static void    *stbi__load_gif_main(stbi__context *s, int **delays, int *x, int *y, int *z, int *comp, int req_comp);
-static int      stbi__gif_info(stbi__context *s, int *x, int *y, int *comp);
-#endif
-
-#ifndef STBI_NO_PNM
-static int      stbi__pnm_test(stbi__context *s);
-static void    *stbi__pnm_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri);
-static int      stbi__pnm_info(stbi__context *s, int *x, int *y, int *comp);
-#endif
-
-// this is not threadsafe
-static const char *stbi__g_failure_reason;
-
-STBIDEF const char *stbi_failure_reason(void)
-{
-   return stbi__g_failure_reason;
-}
-
-static int stbi__err(const char *str)
-{
-   stbi__g_failure_reason = str;
-   return 0;
-}
-
-static void *stbi__malloc(size_t size)
-{
-    return STBI_MALLOC(size);
-}
-
-// stb_image uses ints pervasively, including for offset calculations.
-// therefore the largest decoded image size we can support with the
-// current code, even on 64-bit targets, is INT_MAX. this is not a
-// significant limitation for the intended use case.
-//
-// we do, however, need to make sure our size calculations don't
-// overflow. hence a few helper functions for size calculations that
-// multiply integers together, making sure that they're non-negative
-// and no overflow occurs.
-
-// return 1 if the sum is valid, 0 on overflow.
-// negative terms are considered invalid.
-static int stbi__addsizes_valid(int a, int b)
-{
-   if (b < 0) return 0;
-   // now 0 <= b <= INT_MAX, hence also
-   // 0 <= INT_MAX - b <= INTMAX.
-   // And "a + b <= INT_MAX" (which might overflow) is the
-   // same as a <= INT_MAX - b (no overflow)
-   return a <= INT_MAX - b;
-}
-
-// returns 1 if the product is valid, 0 on overflow.
-// negative factors are considered invalid.
-static int stbi__mul2sizes_valid(int a, int b)
-{
-   if (a < 0 || b < 0) return 0;
-   if (b == 0) return 1; // mul-by-0 is always safe
-   // portable way to check for no overflows in a*b
-   return a <= INT_MAX/b;
-}
-
-// returns 1 if "a*b + add" has no negative terms/factors and doesn't overflow
-static int stbi__mad2sizes_valid(int a, int b, int add)
-{
-   return stbi__mul2sizes_valid(a, b) && stbi__addsizes_valid(a*b, add);
-}
-
-// returns 1 if "a*b*c + add" has no negative terms/factors and doesn't overflow
-static int stbi__mad3sizes_valid(int a, int b, int c, int add)
-{
-   return stbi__mul2sizes_valid(a, b) && stbi__mul2sizes_valid(a*b, c) &&
-      stbi__addsizes_valid(a*b*c, add);
-}
-
-// returns 1 if "a*b*c*d + add" has no negative terms/factors and doesn't overflow
-#if !defined(STBI_NO_LINEAR) || !defined(STBI_NO_HDR)
-static int stbi__mad4sizes_valid(int a, int b, int c, int d, int add)
-{
-   return stbi__mul2sizes_valid(a, b) && stbi__mul2sizes_valid(a*b, c) &&
-      stbi__mul2sizes_valid(a*b*c, d) && stbi__addsizes_valid(a*b*c*d, add);
-}
-#endif
-
-// mallocs with size overflow checking
-static void *stbi__malloc_mad2(int a, int b, int add)
-{
-   if (!stbi__mad2sizes_valid(a, b, add)) return NULL;
-   return stbi__malloc(a*b + add);
-}
-
-static void *stbi__malloc_mad3(int a, int b, int c, int add)
-{
-   if (!stbi__mad3sizes_valid(a, b, c, add)) return NULL;
-   return stbi__malloc(a*b*c + add);
-}
-
-#if !defined(STBI_NO_LINEAR) || !defined(STBI_NO_HDR)
-static void *stbi__malloc_mad4(int a, int b, int c, int d, int add)
-{
-   if (!stbi__mad4sizes_valid(a, b, c, d, add)) return NULL;
-   return stbi__malloc(a*b*c*d + add);
-}
-#endif
-
-// stbi__err - error
-// stbi__errpf - error returning pointer to float
-// stbi__errpuc - error returning pointer to unsigned char
-
-#ifdef STBI_NO_FAILURE_STRINGS
-   #define stbi__err(x,y)  0
-#elif defined(STBI_FAILURE_USERMSG)
-   #define stbi__err(x,y)  stbi__err(y)
-#else
-   #define stbi__err(x,y)  stbi__err(x)
-#endif
-
-#define stbi__errpf(x,y)   ((float *)(size_t) (stbi__err(x,y)?NULL:NULL))
-#define stbi__errpuc(x,y)  ((unsigned char *)(size_t) (stbi__err(x,y)?NULL:NULL))
-
-STBIDEF void stbi_image_free(void *retval_from_stbi_load)
-{
-   STBI_FREE(retval_from_stbi_load);
-}
-
-#ifndef STBI_NO_LINEAR
-static float   *stbi__ldr_to_hdr(stbi_uc *data, int x, int y, int comp);
-#endif
-
-#ifndef STBI_NO_HDR
-static stbi_uc *stbi__hdr_to_ldr(float   *data, int x, int y, int comp);
-#endif
-
-static int stbi__vertically_flip_on_load = 0;
-
-STBIDEF void stbi_set_flip_vertically_on_load(int flag_true_if_should_flip)
-{
-    stbi__vertically_flip_on_load = flag_true_if_should_flip;
-}
-
-static void *stbi__load_main(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri, int bpc)
-{
-   memset(ri, 0, sizeof(*ri)); // make sure it's initialized if we add new fields
-   ri->bits_per_channel = 8; // default is 8 so most paths don't have to be changed
-   ri->channel_order = STBI_ORDER_RGB; // all current input & output are this, but this is here so we can add BGR order
-   ri->num_channels = 0;
-
-   #ifndef STBI_NO_JPEG
-   if (stbi__jpeg_test(s)) return stbi__jpeg_load(s,x,y,comp,req_comp, ri);
-   #endif
-   #ifndef STBI_NO_PNG
-   if (stbi__png_test(s))  return stbi__png_load(s,x,y,comp,req_comp, ri);
-   #endif
-   #ifndef STBI_NO_BMP
-   if (stbi__bmp_test(s))  return stbi__bmp_load(s,x,y,comp,req_comp, ri);
-   #endif
-   #ifndef STBI_NO_GIF
-   if (stbi__gif_test(s))  return stbi__gif_load(s,x,y,comp,req_comp, ri);
-   #endif
-   #ifndef STBI_NO_PSD
-   if (stbi__psd_test(s))  return stbi__psd_load(s,x,y,comp,req_comp, ri, bpc);
-   #endif
-   #ifndef STBI_NO_PIC
-   if (stbi__pic_test(s))  return stbi__pic_load(s,x,y,comp,req_comp, ri);
-   #endif
-   #ifndef STBI_NO_PNM
-   if (stbi__pnm_test(s))  return stbi__pnm_load(s,x,y,comp,req_comp, ri);
-   #endif
-
-   #ifndef STBI_NO_HDR
-   if (stbi__hdr_test(s)) {
-      float *hdr = stbi__hdr_load(s, x,y,comp,req_comp, ri);
-      return stbi__hdr_to_ldr(hdr, *x, *y, req_comp ? req_comp : *comp);
-   }
-   #endif
-
-   #ifndef STBI_NO_TGA
-   // test tga last because it's a crappy test!
-   if (stbi__tga_test(s))
-      return stbi__tga_load(s,x,y,comp,req_comp, ri);
-   #endif
-
-   return stbi__errpuc("unknown image type", "Image not of any known type, or corrupt");
-}
-
-static stbi_uc *stbi__convert_16_to_8(stbi__uint16 *orig, int w, int h, int channels)
-{
-   int i;
-   int img_len = w * h * channels;
-   stbi_uc *reduced;
-
-   reduced = (stbi_uc *) stbi__malloc(img_len);
-   if (reduced == NULL) return stbi__errpuc("outofmem", "Out of memory");
-
-   for (i = 0; i < img_len; ++i)
-      reduced[i] = (stbi_uc)((orig[i] >> 8) & 0xFF); // top half of each byte is sufficient approx of 16->8 bit scaling
-
-   STBI_FREE(orig);
-   return reduced;
-}
-
-static stbi__uint16 *stbi__convert_8_to_16(stbi_uc *orig, int w, int h, int channels)
-{
-   int i;
-   int img_len = w * h * channels;
-   stbi__uint16 *enlarged;
-
-   enlarged = (stbi__uint16 *) stbi__malloc(img_len*2);
-   if (enlarged == NULL) return (stbi__uint16 *) stbi__errpuc("outofmem", "Out of memory");
-
-   for (i = 0; i < img_len; ++i)
-      enlarged[i] = (stbi__uint16)((orig[i] << 8) + orig[i]); // replicate to high and low byte, maps 0->0, 255->0xffff
-
-   STBI_FREE(orig);
-   return enlarged;
-}
-
-static void stbi__vertical_flip(void *image, int w, int h, int bytes_per_pixel)
-{
-   int row;
-   size_t bytes_per_row = (size_t)w * bytes_per_pixel;
-   stbi_uc temp[2048];
-   stbi_uc *bytes = (stbi_uc *)image;
-
-   for (row = 0; row < (h>>1); row++) {
-      stbi_uc *row0 = bytes + row*bytes_per_row;
-      stbi_uc *row1 = bytes + (h - row - 1)*bytes_per_row;
-      // swap row0 with row1
-      size_t bytes_left = bytes_per_row;
-      while (bytes_left) {
-         size_t bytes_copy = (bytes_left < sizeof(temp)) ? bytes_left : sizeof(temp);
-         memcpy(temp, row0, bytes_copy);
-         memcpy(row0, row1, bytes_copy);
-         memcpy(row1, temp, bytes_copy);
-         row0 += bytes_copy;
-         row1 += bytes_copy;
-         bytes_left -= bytes_copy;
-      }
-   }
-}
-
-#ifndef STBI_NO_GIF
-static void stbi__vertical_flip_slices(void *image, int w, int h, int z, int bytes_per_pixel)
-{
-   int slice;
-   int slice_size = w * h * bytes_per_pixel;
-
-   stbi_uc *bytes = (stbi_uc *)image;
-   for (slice = 0; slice < z; ++slice) {
-      stbi__vertical_flip(bytes, w, h, bytes_per_pixel); 
-      bytes += slice_size; 
-   }
-}
-#endif
-
-static unsigned char *stbi__load_and_postprocess_8bit(stbi__context *s, int *x, int *y, int *comp, int req_comp)
-{
-   stbi__result_info ri;
-   void *result = stbi__load_main(s, x, y, comp, req_comp, &ri, 8);
-
-   if (result == NULL)
-      return NULL;
-
-   if (ri.bits_per_channel != 8) {
-      STBI_ASSERT(ri.bits_per_channel == 16);
-      result = stbi__convert_16_to_8((stbi__uint16 *) result, *x, *y, req_comp == 0 ? *comp : req_comp);
-      ri.bits_per_channel = 8;
-   }
-
-   // @TODO: move stbi__convert_format to here
-
-   if (stbi__vertically_flip_on_load) {
-      int channels = req_comp ? req_comp : *comp;
-      stbi__vertical_flip(result, *x, *y, channels * sizeof(stbi_uc));
-   }
-
-   return (unsigned char *) result;
-}
-
-static stbi__uint16 *stbi__load_and_postprocess_16bit(stbi__context *s, int *x, int *y, int *comp, int req_comp)
-{
-   stbi__result_info ri;
-   void *result = stbi__load_main(s, x, y, comp, req_comp, &ri, 16);
-
-   if (result == NULL)
-      return NULL;
-
-   if (ri.bits_per_channel != 16) {
-      STBI_ASSERT(ri.bits_per_channel == 8);
-      result = stbi__convert_8_to_16((stbi_uc *) result, *x, *y, req_comp == 0 ? *comp : req_comp);
-      ri.bits_per_channel = 16;
-   }
-
-   // @TODO: move stbi__convert_format16 to here
-   // @TODO: special case RGB-to-Y (and RGBA-to-YA) for 8-bit-to-16-bit case to keep more precision
-
-   if (stbi__vertically_flip_on_load) {
-      int channels = req_comp ? req_comp : *comp;
-      stbi__vertical_flip(result, *x, *y, channels * sizeof(stbi__uint16));
-   }
-
-   return (stbi__uint16 *) result;
-}
-
-#if !defined(STBI_NO_HDR) && !defined(STBI_NO_LINEAR)
-static void stbi__float_postprocess(float *result, int *x, int *y, int *comp, int req_comp)
-{
-   if (stbi__vertically_flip_on_load && result != NULL) {
-      int channels = req_comp ? req_comp : *comp;
-      stbi__vertical_flip(result, *x, *y, channels * sizeof(float));
-   }
-}
-#endif
-
-#ifndef STBI_NO_STDIO
-
-#if defined(_MSC_VER) && defined(STBI_WINDOWS_UTF8)
-STBI_EXTERN __declspec(dllimport) int __stdcall MultiByteToWideChar(unsigned int cp, unsigned long flags, const char *str, int cbmb, wchar_t *widestr, int cchwide);
-STBI_EXTERN __declspec(dllimport) int __stdcall WideCharToMultiByte(unsigned int cp, unsigned long flags, const wchar_t *widestr, int cchwide, char *str, int cbmb, const char *defchar, int *used_default);
-#endif
-
-#if defined(_MSC_VER) && defined(STBI_WINDOWS_UTF8)
-STBIDEF int stbi_convert_wchar_to_utf8(char *buffer, size_t bufferlen, const wchar_t* input)
-{
-	return WideCharToMultiByte(65001 /* UTF8 */, 0, input, -1, buffer, (int) bufferlen, NULL, NULL);
-}
-#endif
-
-static FILE *stbi__fopen(char const *filename, char const *mode)
-{
-   FILE *f;
-#if defined(_MSC_VER) && defined(STBI_WINDOWS_UTF8)
-   wchar_t wMode[64];
-   wchar_t wFilename[1024];
-	if (0 == MultiByteToWideChar(65001 /* UTF8 */, 0, filename, -1, wFilename, sizeof(wFilename)))
-      return 0;
-	
-	if (0 == MultiByteToWideChar(65001 /* UTF8 */, 0, mode, -1, wMode, sizeof(wMode)))
-      return 0;
-
-#if _MSC_VER >= 1400
-	if (0 != _wfopen_s(&f, wFilename, wMode))
-		f = 0;
-#else
-   f = _wfopen(wFilename, wMode);
-#endif
-
-#elif defined(_MSC_VER) && _MSC_VER >= 1400
-   if (0 != fopen_s(&f, filename, mode))
-      f=0;
-#else
-   f = fopen(filename, mode);
-#endif
-   return f;
-}
-
-
-STBIDEF stbi_uc *stbi_load(char const *filename, int *x, int *y, int *comp, int req_comp)
-{
-   FILE *f = stbi__fopen(filename, "rb");
-   unsigned char *result;
-   if (!f) return stbi__errpuc("can't fopen", "Unable to open file");
-   result = stbi_load_from_file(f,x,y,comp,req_comp);
-   fclose(f);
-   return result;
-}
-
-STBIDEF stbi_uc *stbi_load_from_file(FILE *f, int *x, int *y, int *comp, int req_comp)
-{
-   unsigned char *result;
-   stbi__context s;
-   stbi__start_file(&s,f);
-   result = stbi__load_and_postprocess_8bit(&s,x,y,comp,req_comp);
-   if (result) {
-      // need to 'unget' all the characters in the IO buffer
-      fseek(f, - (int) (s.img_buffer_end - s.img_buffer), SEEK_CUR);
-   }
-   return result;
-}
-
-STBIDEF stbi__uint16 *stbi_load_from_file_16(FILE *f, int *x, int *y, int *comp, int req_comp)
-{
-   stbi__uint16 *result;
-   stbi__context s;
-   stbi__start_file(&s,f);
-   result = stbi__load_and_postprocess_16bit(&s,x,y,comp,req_comp);
-   if (result) {
-      // need to 'unget' all the characters in the IO buffer
-      fseek(f, - (int) (s.img_buffer_end - s.img_buffer), SEEK_CUR);
-   }
-   return result;
-}
-
-STBIDEF stbi_us *stbi_load_16(char const *filename, int *x, int *y, int *comp, int req_comp)
-{
-   FILE *f = stbi__fopen(filename, "rb");
-   stbi__uint16 *result;
-   if (!f) return (stbi_us *) stbi__errpuc("can't fopen", "Unable to open file");
-   result = stbi_load_from_file_16(f,x,y,comp,req_comp);
-   fclose(f);
-   return result;
-}
-
-
-#endif //!STBI_NO_STDIO
-
-STBIDEF stbi_us *stbi_load_16_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *channels_in_file, int desired_channels)
-{
-   stbi__context s;
-   stbi__start_mem(&s,buffer,len);
-   return stbi__load_and_postprocess_16bit(&s,x,y,channels_in_file,desired_channels);
-}
-
-STBIDEF stbi_us *stbi_load_16_from_callbacks(stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *channels_in_file, int desired_channels)
-{
-   stbi__context s;
-   stbi__start_callbacks(&s, (stbi_io_callbacks *)clbk, user);
-   return stbi__load_and_postprocess_16bit(&s,x,y,channels_in_file,desired_channels);
-}
-
-STBIDEF stbi_uc *stbi_load_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *comp, int req_comp)
-{
-   stbi__context s;
-   stbi__start_mem(&s,buffer,len);
-   return stbi__load_and_postprocess_8bit(&s,x,y,comp,req_comp);
-}
-
-STBIDEF stbi_uc *stbi_load_from_callbacks(stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *comp, int req_comp)
-{
-   stbi__context s;
-   stbi__start_callbacks(&s, (stbi_io_callbacks *) clbk, user);
-   return stbi__load_and_postprocess_8bit(&s,x,y,comp,req_comp);
-}
-
-#ifndef STBI_NO_GIF
-STBIDEF stbi_uc *stbi_load_gif_from_memory(stbi_uc const *buffer, int len, int **delays, int *x, int *y, int *z, int *comp, int req_comp)
-{
-   unsigned char *result;
-   stbi__context s; 
-   stbi__start_mem(&s,buffer,len); 
-   
-   result = (unsigned char*) stbi__load_gif_main(&s, delays, x, y, z, comp, req_comp);
-   if (stbi__vertically_flip_on_load) {
-      stbi__vertical_flip_slices( result, *x, *y, *z, *comp ); 
-   }
-
-   return result; 
-}
-#endif
-
-#ifndef STBI_NO_LINEAR
-static float *stbi__loadf_main(stbi__context *s, int *x, int *y, int *comp, int req_comp)
-{
-   unsigned char *data;
-   #ifndef STBI_NO_HDR
-   if (stbi__hdr_test(s)) {
-      stbi__result_info ri;
-      float *hdr_data = stbi__hdr_load(s,x,y,comp,req_comp, &ri);
-      if (hdr_data)
-         stbi__float_postprocess(hdr_data,x,y,comp,req_comp);
-      return hdr_data;
-   }
-   #endif
-   data = stbi__load_and_postprocess_8bit(s, x, y, comp, req_comp);
-   if (data)
-      return stbi__ldr_to_hdr(data, *x, *y, req_comp ? req_comp : *comp);
-   return stbi__errpf("unknown image type", "Image not of any known type, or corrupt");
-}
-
-STBIDEF float *stbi_loadf_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *comp, int req_comp)
-{
-   stbi__context s;
-   stbi__start_mem(&s,buffer,len);
-   return stbi__loadf_main(&s,x,y,comp,req_comp);
-}
-
-STBIDEF float *stbi_loadf_from_callbacks(stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *comp, int req_comp)
-{
-   stbi__context s;
-   stbi__start_callbacks(&s, (stbi_io_callbacks *) clbk, user);
-   return stbi__loadf_main(&s,x,y,comp,req_comp);
-}
-
-#ifndef STBI_NO_STDIO
-STBIDEF float *stbi_loadf(char const *filename, int *x, int *y, int *comp, int req_comp)
-{
-   float *result;
-   FILE *f = stbi__fopen(filename, "rb");
-   if (!f) return stbi__errpf("can't fopen", "Unable to open file");
-   result = stbi_loadf_from_file(f,x,y,comp,req_comp);
-   fclose(f);
-   return result;
-}
-
-STBIDEF float *stbi_loadf_from_file(FILE *f, int *x, int *y, int *comp, int req_comp)
-{
-   stbi__context s;
-   stbi__start_file(&s,f);
-   return stbi__loadf_main(&s,x,y,comp,req_comp);
-}
-#endif // !STBI_NO_STDIO
-
-#endif // !STBI_NO_LINEAR
-
-// these is-hdr-or-not is defined independent of whether STBI_NO_LINEAR is
-// defined, for API simplicity; if STBI_NO_LINEAR is defined, it always
-// reports false!
-
-STBIDEF int stbi_is_hdr_from_memory(stbi_uc const *buffer, int len)
-{
-   #ifndef STBI_NO_HDR
-   stbi__context s;
-   stbi__start_mem(&s,buffer,len);
-   return stbi__hdr_test(&s);
-   #else
-   STBI_NOTUSED(buffer);
-   STBI_NOTUSED(len);
-   return 0;
-   #endif
-}
-
-#ifndef STBI_NO_STDIO
-STBIDEF int      stbi_is_hdr          (char const *filename)
-{
-   FILE *f = stbi__fopen(filename, "rb");
-   int result=0;
-   if (f) {
-      result = stbi_is_hdr_from_file(f);
-      fclose(f);
-   }
-   return result;
-}
-
-STBIDEF int stbi_is_hdr_from_file(FILE *f)
-{
-   #ifndef STBI_NO_HDR
-   long pos = ftell(f);
-   int res;
-   stbi__context s;
-   stbi__start_file(&s,f);
-   res = stbi__hdr_test(&s);
-   fseek(f, pos, SEEK_SET);
-   return res;
-   #else
-   STBI_NOTUSED(f);
-   return 0;
-   #endif
-}
-#endif // !STBI_NO_STDIO
-
-STBIDEF int      stbi_is_hdr_from_callbacks(stbi_io_callbacks const *clbk, void *user)
-{
-   #ifndef STBI_NO_HDR
-   stbi__context s;
-   stbi__start_callbacks(&s, (stbi_io_callbacks *) clbk, user);
-   return stbi__hdr_test(&s);
-   #else
-   STBI_NOTUSED(clbk);
-   STBI_NOTUSED(user);
-   return 0;
-   #endif
-}
-
-#ifndef STBI_NO_LINEAR
-static float stbi__l2h_gamma=2.2f, stbi__l2h_scale=1.0f;
-
-STBIDEF void   stbi_ldr_to_hdr_gamma(float gamma) { stbi__l2h_gamma = gamma; }
-STBIDEF void   stbi_ldr_to_hdr_scale(float scale) { stbi__l2h_scale = scale; }
-#endif
-
-static float stbi__h2l_gamma_i=1.0f/2.2f, stbi__h2l_scale_i=1.0f;
-
-STBIDEF void   stbi_hdr_to_ldr_gamma(float gamma) { stbi__h2l_gamma_i = 1/gamma; }
-STBIDEF void   stbi_hdr_to_ldr_scale(float scale) { stbi__h2l_scale_i = 1/scale; }
-
-
-//////////////////////////////////////////////////////////////////////////////
-//
-// Common code used by all image loaders
-//
-
-enum
-{
-   STBI__SCAN_load=0,
-   STBI__SCAN_type,
-   STBI__SCAN_header
-};
-
-static void stbi__refill_buffer(stbi__context *s)
-{
-   int n = (s->io.read)(s->io_user_data,(char*)s->buffer_start,s->buflen);
-   if (n == 0) {
-      // at end of file, treat same as if from memory, but need to handle case
-      // where s->img_buffer isn't pointing to safe memory, e.g. 0-byte file
-      s->read_from_callbacks = 0;
-      s->img_buffer = s->buffer_start;
-      s->img_buffer_end = s->buffer_start+1;
-      *s->img_buffer = 0;
-   } else {
-      s->img_buffer = s->buffer_start;
-      s->img_buffer_end = s->buffer_start + n;
-   }
-}
-
-stbi_inline static stbi_uc stbi__get8(stbi__context *s)
-{
-   if (s->img_buffer < s->img_buffer_end)
-      return *s->img_buffer++;
-   if (s->read_from_callbacks) {
-      stbi__refill_buffer(s);
-      return *s->img_buffer++;
-   }
-   return 0;
-}
-
-stbi_inline static int stbi__at_eof(stbi__context *s)
-{
-   if (s->io.read) {
-      if (!(s->io.eof)(s->io_user_data)) return 0;
-      // if feof() is true, check if buffer = end
-      // special case: we've only got the special 0 character at the end
-      if (s->read_from_callbacks == 0) return 1;
-   }
-
-   return s->img_buffer >= s->img_buffer_end;
-}
-
-static void stbi__skip(stbi__context *s, int n)
-{
-   if (n < 0) {
-      s->img_buffer = s->img_buffer_end;
-      return;
-   }
-   if (s->io.read) {
-      int blen = (int) (s->img_buffer_end - s->img_buffer);
-      if (blen < n) {
-         s->img_buffer = s->img_buffer_end;
-         (s->io.skip)(s->io_user_data, n - blen);
-         return;
-      }
-   }
-   s->img_buffer += n;
-}
-
-static int stbi__getn(stbi__context *s, stbi_uc *buffer, int n)
-{
-   if (s->io.read) {
-      int blen = (int) (s->img_buffer_end - s->img_buffer);
-      if (blen < n) {
-         int res, count;
-
-         memcpy(buffer, s->img_buffer, blen);
-
-         count = (s->io.read)(s->io_user_data, (char*) buffer + blen, n - blen);
-         res = (count == (n-blen));
-         s->img_buffer = s->img_buffer_end;
-         return res;
-      }
-   }
-
-   if (s->img_buffer+n <= s->img_buffer_end) {
-      memcpy(buffer, s->img_buffer, n);
-      s->img_buffer += n;
-      return 1;
-   } else
-      return 0;
-}
-
-static int stbi__get16be(stbi__context *s)
-{
-   int z = stbi__get8(s);
-   return (z << 8) + stbi__get8(s);
-}
-
-static stbi__uint32 stbi__get32be(stbi__context *s)
-{
-   stbi__uint32 z = stbi__get16be(s);
-   return (z << 16) + stbi__get16be(s);
-}
-
-#if defined(STBI_NO_BMP) && defined(STBI_NO_TGA) && defined(STBI_NO_GIF)
-// nothing
-#else
-static int stbi__get16le(stbi__context *s)
-{
-   int z = stbi__get8(s);
-   return z + (stbi__get8(s) << 8);
-}
-#endif
-
-#ifndef STBI_NO_BMP
-static stbi__uint32 stbi__get32le(stbi__context *s)
-{
-   stbi__uint32 z = stbi__get16le(s);
-   return z + (stbi__get16le(s) << 16);
-}
-#endif
-
-#define STBI__BYTECAST(x)  ((stbi_uc) ((x) & 255))  // truncate int to byte without warnings
-
-
-//////////////////////////////////////////////////////////////////////////////
-//
-//  generic converter from built-in img_n to req_comp
-//    individual types do this automatically as much as possible (e.g. jpeg
-//    does all cases internally since it needs to colorspace convert anyway,
-//    and it never has alpha, so very few cases ). png can automatically
-//    interleave an alpha=255 channel, but falls back to this for other cases
-//
-//  assume data buffer is malloced, so malloc a new one and free that one
-//  only failure mode is malloc failing
-
-static stbi_uc stbi__compute_y(int r, int g, int b)
-{
-   return (stbi_uc) (((r*77) + (g*150) +  (29*b)) >> 8);
-}
-
-static unsigned char *stbi__convert_format(unsigned char *data, int img_n, int req_comp, unsigned int x, unsigned int y)
-{
-   int i,j;
-   unsigned char *good;
-
-   if (req_comp == img_n) return data;
-   STBI_ASSERT(req_comp >= 1 && req_comp <= 4);
-
-   good = (unsigned char *) stbi__malloc_mad3(req_comp, x, y, 0);
-   if (good == NULL) {
-      STBI_FREE(data);
-      return stbi__errpuc("outofmem", "Out of memory");
-   }
-
-   for (j=0; j < (int) y; ++j) {
-      unsigned char *src  = data + j * x * img_n   ;
-      unsigned char *dest = good + j * x * req_comp;
-
-      #define STBI__COMBO(a,b)  ((a)*8+(b))
-      #define STBI__CASE(a,b)   case STBI__COMBO(a,b): for(i=x-1; i >= 0; --i, src += a, dest += b)
-      // convert source image with img_n components to one with req_comp components;
-      // avoid switch per pixel, so use switch per scanline and massive macros
-      switch (STBI__COMBO(img_n, req_comp)) {
-         STBI__CASE(1,2) { dest[0]=src[0]; dest[1]=255;                                     } break;
-         STBI__CASE(1,3) { dest[0]=dest[1]=dest[2]=src[0];                                  } break;
-         STBI__CASE(1,4) { dest[0]=dest[1]=dest[2]=src[0]; dest[3]=255;                     } break;
-         STBI__CASE(2,1) { dest[0]=src[0];                                                  } break;
-         STBI__CASE(2,3) { dest[0]=dest[1]=dest[2]=src[0];                                  } break;
-         STBI__CASE(2,4) { dest[0]=dest[1]=dest[2]=src[0]; dest[3]=src[1];                  } break;
-         STBI__CASE(3,4) { dest[0]=src[0];dest[1]=src[1];dest[2]=src[2];dest[3]=255;        } break;
-         STBI__CASE(3,1) { dest[0]=stbi__compute_y(src[0],src[1],src[2]);                   } break;
-         STBI__CASE(3,2) { dest[0]=stbi__compute_y(src[0],src[1],src[2]); dest[1] = 255;    } break;
-         STBI__CASE(4,1) { dest[0]=stbi__compute_y(src[0],src[1],src[2]);                   } break;
-         STBI__CASE(4,2) { dest[0]=stbi__compute_y(src[0],src[1],src[2]); dest[1] = src[3]; } break;
-         STBI__CASE(4,3) { dest[0]=src[0];dest[1]=src[1];dest[2]=src[2];                    } break;
-         default: STBI_ASSERT(0);
-      }
-      #undef STBI__CASE
-   }
-
-   STBI_FREE(data);
-   return good;
-}
-
-static stbi__uint16 stbi__compute_y_16(int r, int g, int b)
-{
-   return (stbi__uint16) (((r*77) + (g*150) +  (29*b)) >> 8);
-}
-
-static stbi__uint16 *stbi__convert_format16(stbi__uint16 *data, int img_n, int req_comp, unsigned int x, unsigned int y)
-{
-   int i,j;
-   stbi__uint16 *good;
-
-   if (req_comp == img_n) return data;
-   STBI_ASSERT(req_comp >= 1 && req_comp <= 4);
-
-   good = (stbi__uint16 *) stbi__malloc(req_comp * x * y * 2);
-   if (good == NULL) {
-      STBI_FREE(data);
-      return (stbi__uint16 *) stbi__errpuc("outofmem", "Out of memory");
-   }
-
-   for (j=0; j < (int) y; ++j) {
-      stbi__uint16 *src  = data + j * x * img_n   ;
-      stbi__uint16 *dest = good + j * x * req_comp;
-
-      #define STBI__COMBO(a,b)  ((a)*8+(b))
-      #define STBI__CASE(a,b)   case STBI__COMBO(a,b): for(i=x-1; i >= 0; --i, src += a, dest += b)
-      // convert source image with img_n components to one with req_comp components;
-      // avoid switch per pixel, so use switch per scanline and massive macros
-      switch (STBI__COMBO(img_n, req_comp)) {
-         STBI__CASE(1,2) { dest[0]=src[0]; dest[1]=0xffff;                                     } break;
-         STBI__CASE(1,3) { dest[0]=dest[1]=dest[2]=src[0];                                     } break;
-         STBI__CASE(1,4) { dest[0]=dest[1]=dest[2]=src[0]; dest[3]=0xffff;                     } break;
-         STBI__CASE(2,1) { dest[0]=src[0];                                                     } break;
-         STBI__CASE(2,3) { dest[0]=dest[1]=dest[2]=src[0];                                     } break;
-         STBI__CASE(2,4) { dest[0]=dest[1]=dest[2]=src[0]; dest[3]=src[1];                     } break;
-         STBI__CASE(3,4) { dest[0]=src[0];dest[1]=src[1];dest[2]=src[2];dest[3]=0xffff;        } break;
-         STBI__CASE(3,1) { dest[0]=stbi__compute_y_16(src[0],src[1],src[2]);                   } break;
-         STBI__CASE(3,2) { dest[0]=stbi__compute_y_16(src[0],src[1],src[2]); dest[1] = 0xffff; } break;
-         STBI__CASE(4,1) { dest[0]=stbi__compute_y_16(src[0],src[1],src[2]);                   } break;
-         STBI__CASE(4,2) { dest[0]=stbi__compute_y_16(src[0],src[1],src[2]); dest[1] = src[3]; } break;
-         STBI__CASE(4,3) { dest[0]=src[0];dest[1]=src[1];dest[2]=src[2];                       } break;
-         default: STBI_ASSERT(0);
-      }
-      #undef STBI__CASE
-   }
-
-   STBI_FREE(data);
-   return good;
-}
-
-#ifndef STBI_NO_LINEAR
-static float   *stbi__ldr_to_hdr(stbi_uc *data, int x, int y, int comp)
-{
-   int i,k,n;
-   float *output;
-   if (!data) return NULL;
-   output = (float *) stbi__malloc_mad4(x, y, comp, sizeof(float), 0);
-   if (output == NULL) { STBI_FREE(data); return stbi__errpf("outofmem", "Out of memory"); }
-   // compute number of non-alpha components
-   if (comp & 1) n = comp; else n = comp-1;
-   for (i=0; i < x*y; ++i) {
-      for (k=0; k < n; ++k) {
-         output[i*comp + k] = (float) (pow(data[i*comp+k]/255.0f, stbi__l2h_gamma) * stbi__l2h_scale);
-      }
-   }
-   if (n < comp) {
-      for (i=0; i < x*y; ++i) {
-         output[i*comp + n] = data[i*comp + n]/255.0f;
-      }
-   }
-   STBI_FREE(data);
-   return output;
-}
-#endif
-
-#ifndef STBI_NO_HDR
-#define stbi__float2int(x)   ((int) (x))
-static stbi_uc *stbi__hdr_to_ldr(float   *data, int x, int y, int comp)
-{
-   int i,k,n;
-   stbi_uc *output;
-   if (!data) return NULL;
-   output = (stbi_uc *) stbi__malloc_mad3(x, y, comp, 0);
-   if (output == NULL) { STBI_FREE(data); return stbi__errpuc("outofmem", "Out of memory"); }
-   // compute number of non-alpha components
-   if (comp & 1) n = comp; else n = comp-1;
-   for (i=0; i < x*y; ++i) {
-      for (k=0; k < n; ++k) {
-         float z = (float) pow(data[i*comp+k]*stbi__h2l_scale_i, stbi__h2l_gamma_i) * 255 + 0.5f;
-         if (z < 0) z = 0;
-         if (z > 255) z = 255;
-         output[i*comp + k] = (stbi_uc) stbi__float2int(z);
-      }
-      if (k < comp) {
-         float z = data[i*comp+k] * 255 + 0.5f;
-         if (z < 0) z = 0;
-         if (z > 255) z = 255;
-         output[i*comp + k] = (stbi_uc) stbi__float2int(z);
-      }
-   }
-   STBI_FREE(data);
-   return output;
-}
-#endif
-
-//////////////////////////////////////////////////////////////////////////////
-//
-//  "baseline" JPEG/JFIF decoder
-//
-//    simple implementation
-//      - doesn't support delayed output of y-dimension
-//      - simple interface (only one output format: 8-bit interleaved RGB)
-//      - doesn't try to recover corrupt jpegs
-//      - doesn't allow partial loading, loading multiple at once
-//      - still fast on x86 (copying globals into locals doesn't help x86)
-//      - allocates lots of intermediate memory (full size of all components)
-//        - non-interleaved case requires this anyway
-//        - allows good upsampling (see next)
-//    high-quality
-//      - upsampled channels are bilinearly interpolated, even across blocks
-//      - quality integer IDCT derived from IJG's 'slow'
-//    performance
-//      - fast huffman; reasonable integer IDCT
-//      - some SIMD kernels for common paths on targets with SSE2/NEON
-//      - uses a lot of intermediate memory, could cache poorly
-
-#ifndef STBI_NO_JPEG
-
-// huffman decoding acceleration
-#define FAST_BITS   9  // larger handles more cases; smaller stomps less cache
-
-typedef struct
-{
-   stbi_uc  fast[1 << FAST_BITS];
-   // weirdly, repacking this into AoS is a 10% speed loss, instead of a win
-   stbi__uint16 code[256];
-   stbi_uc  values[256];
-   stbi_uc  size[257];
-   unsigned int maxcode[18];
-   int    delta[17];   // old 'firstsymbol' - old 'firstcode'
-} stbi__huffman;
-
-typedef struct
-{
-   stbi__context *s;
-   stbi__huffman huff_dc[4];
-   stbi__huffman huff_ac[4];
-   stbi__uint16 dequant[4][64];
-   stbi__int16 fast_ac[4][1 << FAST_BITS];
-
-// sizes for components, interleaved MCUs
-   int img_h_max, img_v_max;
-   int img_mcu_x, img_mcu_y;
-   int img_mcu_w, img_mcu_h;
-
-// definition of jpeg image component
-   struct
-   {
-      int id;
-      int h,v;
-      int tq;
-      int hd,ha;
-      int dc_pred;
-
-      int x,y,w2,h2;
-      stbi_uc *data;
-      void *raw_data, *raw_coeff;
-      stbi_uc *linebuf;
-      short   *coeff;   // progressive only
-      int      coeff_w, coeff_h; // number of 8x8 coefficient blocks
-   } img_comp[4];
-
-   stbi__uint32   code_buffer; // jpeg entropy-coded buffer
-   int            code_bits;   // number of valid bits
-   unsigned char  marker;      // marker seen while filling entropy buffer
-   int            nomore;      // flag if we saw a marker so must stop
-
-   int            progressive;
-   int            spec_start;
-   int            spec_end;
-   int            succ_high;
-   int            succ_low;
-   int            eob_run;
-   int            jfif;
-   int            app14_color_transform; // Adobe APP14 tag
-   int            rgb;
-
-   int scan_n, order[4];
-   int restart_interval, todo;
-
-// kernels
-   void (*idct_block_kernel)(stbi_uc *out, int out_stride, short data[64]);
-   void (*YCbCr_to_RGB_kernel)(stbi_uc *out, const stbi_uc *y, const stbi_uc *pcb, const stbi_uc *pcr, int count, int step);
-   stbi_uc *(*resample_row_hv_2_kernel)(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs);
-} stbi__jpeg;
-
-static int stbi__build_huffman(stbi__huffman *h, int *count)
-{
-   int i,j,k=0;
-   unsigned int code;
-   // build size list for each symbol (from JPEG spec)
-   for (i=0; i < 16; ++i)
-      for (j=0; j < count[i]; ++j)
-         h->size[k++] = (stbi_uc) (i+1);
-   h->size[k] = 0;
-
-   // compute actual symbols (from jpeg spec)
-   code = 0;
-   k = 0;
-   for(j=1; j <= 16; ++j) {
-      // compute delta to add to code to compute symbol id
-      h->delta[j] = k - code;
-      if (h->size[k] == j) {
-         while (h->size[k] == j)
-            h->code[k++] = (stbi__uint16) (code++);
-         if (code-1 >= (1u << j)) return stbi__err("bad code lengths","Corrupt JPEG");
-      }
-      // compute largest code + 1 for this size, preshifted as needed later
-      h->maxcode[j] = code << (16-j);
-      code <<= 1;
-   }
-   h->maxcode[j] = 0xffffffff;
-
-   // build non-spec acceleration table; 255 is flag for not-accelerated
-   memset(h->fast, 255, 1 << FAST_BITS);
-   for (i=0; i < k; ++i) {
-      int s = h->size[i];
-      if (s <= FAST_BITS) {
-         int c = h->code[i] << (FAST_BITS-s);
-         int m = 1 << (FAST_BITS-s);
-         for (j=0; j < m; ++j) {
-            h->fast[c+j] = (stbi_uc) i;
-         }
-      }
-   }
-   return 1;
-}
-
-// build a table that decodes both magnitude and value of small ACs in
-// one go.
-static void stbi__build_fast_ac(stbi__int16 *fast_ac, stbi__huffman *h)
-{
-   int i;
-   for (i=0; i < (1 << FAST_BITS); ++i) {
-      stbi_uc fast = h->fast[i];
-      fast_ac[i] = 0;
-      if (fast < 255) {
-         int rs = h->values[fast];
-         int run = (rs >> 4) & 15;
-         int magbits = rs & 15;
-         int len = h->size[fast];
-
-         if (magbits && len + magbits <= FAST_BITS) {
-            // magnitude code followed by receive_extend code
-            int k = ((i << len) & ((1 << FAST_BITS) - 1)) >> (FAST_BITS - magbits);
-            int m = 1 << (magbits - 1);
-            if (k < m) k += (~0U << magbits) + 1;
-            // if the result is small enough, we can fit it in fast_ac table
-            if (k >= -128 && k <= 127)
-               fast_ac[i] = (stbi__int16) ((k * 256) + (run * 16) + (len + magbits));
-         }
-      }
-   }
-}
-
-static void stbi__grow_buffer_unsafe(stbi__jpeg *j)
-{
-   do {
-      unsigned int b = j->nomore ? 0 : stbi__get8(j->s);
-      if (b == 0xff) {
-         int c = stbi__get8(j->s);
-         while (c == 0xff) c = stbi__get8(j->s); // consume fill bytes
-         if (c != 0) {
-            j->marker = (unsigned char) c;
-            j->nomore = 1;
-            return;
-         }
-      }
-      j->code_buffer |= b << (24 - j->code_bits);
-      j->code_bits += 8;
-   } while (j->code_bits <= 24);
-}
-
-// (1 << n) - 1
-static const stbi__uint32 stbi__bmask[17]={0,1,3,7,15,31,63,127,255,511,1023,2047,4095,8191,16383,32767,65535};
-
-// decode a jpeg huffman value from the bitstream
-stbi_inline static int stbi__jpeg_huff_decode(stbi__jpeg *j, stbi__huffman *h)
-{
-   unsigned int temp;
-   int c,k;
-
-   if (j->code_bits < 16) stbi__grow_buffer_unsafe(j);
-
-   // look at the top FAST_BITS and determine what symbol ID it is,
-   // if the code is <= FAST_BITS
-   c = (j->code_buffer >> (32 - FAST_BITS)) & ((1 << FAST_BITS)-1);
-   k = h->fast[c];
-   if (k < 255) {
-      int s = h->size[k];
-      if (s > j->code_bits)
-         return -1;
-      j->code_buffer <<= s;
-      j->code_bits -= s;
-      return h->values[k];
-   }
-
-   // naive test is to shift the code_buffer down so k bits are
-   // valid, then test against maxcode. To speed this up, we've
-   // preshifted maxcode left so that it has (16-k) 0s at the
-   // end; in other words, regardless of the number of bits, it
-   // wants to be compared against something shifted to have 16;
-   // that way we don't need to shift inside the loop.
-   temp = j->code_buffer >> 16;
-   for (k=FAST_BITS+1 ; ; ++k)
-      if (temp < h->maxcode[k])
-         break;
-   if (k == 17) {
-      // error! code not found
-      j->code_bits -= 16;
-      return -1;
-   }
-
-   if (k > j->code_bits)
-      return -1;
-
-   // convert the huffman code to the symbol id
-   c = ((j->code_buffer >> (32 - k)) & stbi__bmask[k]) + h->delta[k];
-   STBI_ASSERT((((j->code_buffer) >> (32 - h->size[c])) & stbi__bmask[h->size[c]]) == h->code[c]);
-
-   // convert the id to a symbol
-   j->code_bits -= k;
-   j->code_buffer <<= k;
-   return h->values[c];
-}
-
-// bias[n] = (-1<<n) + 1
-static const int stbi__jbias[16] = {0,-1,-3,-7,-15,-31,-63,-127,-255,-511,-1023,-2047,-4095,-8191,-16383,-32767};
-
-// combined JPEG 'receive' and JPEG 'extend', since baseline
-// always extends everything it receives.
-stbi_inline static int stbi__extend_receive(stbi__jpeg *j, int n)
-{
-   unsigned int k;
-   int sgn;
-   if (j->code_bits < n) stbi__grow_buffer_unsafe(j);
-
-   sgn = (stbi__int32)j->code_buffer >> 31; // sign bit is always in MSB
-   k = stbi_lrot(j->code_buffer, n);
-   STBI_ASSERT(n >= 0 && n < (int) (sizeof(stbi__bmask)/sizeof(*stbi__bmask)));
-   j->code_buffer = k & ~stbi__bmask[n];
-   k &= stbi__bmask[n];
-   j->code_bits -= n;
-   return k + (stbi__jbias[n] & ~sgn);
-}
-
-// get some unsigned bits
-stbi_inline static int stbi__jpeg_get_bits(stbi__jpeg *j, int n)
-{
-   unsigned int k;
-   if (j->code_bits < n) stbi__grow_buffer_unsafe(j);
-   k = stbi_lrot(j->code_buffer, n);
-   j->code_buffer = k & ~stbi__bmask[n];
-   k &= stbi__bmask[n];
-   j->code_bits -= n;
-   return k;
-}
-
-stbi_inline static int stbi__jpeg_get_bit(stbi__jpeg *j)
-{
-   unsigned int k;
-   if (j->code_bits < 1) stbi__grow_buffer_unsafe(j);
-   k = j->code_buffer;
-   j->code_buffer <<= 1;
-   --j->code_bits;
-   return k & 0x80000000;
-}
-
-// given a value that's at position X in the zigzag stream,
-// where does it appear in the 8x8 matrix coded as row-major?
-static const stbi_uc stbi__jpeg_dezigzag[64+15] =
-{
-    0,  1,  8, 16,  9,  2,  3, 10,
-   17, 24, 32, 25, 18, 11,  4,  5,
-   12, 19, 26, 33, 40, 48, 41, 34,
-   27, 20, 13,  6,  7, 14, 21, 28,
-   35, 42, 49, 56, 57, 50, 43, 36,
-   29, 22, 15, 23, 30, 37, 44, 51,
-   58, 59, 52, 45, 38, 31, 39, 46,
-   53, 60, 61, 54, 47, 55, 62, 63,
-   // let corrupt input sample past end
-   63, 63, 63, 63, 63, 63, 63, 63,
-   63, 63, 63, 63, 63, 63, 63
-};
-
-// decode one 64-entry block--
-static int stbi__jpeg_decode_block(stbi__jpeg *j, short data[64], stbi__huffman *hdc, stbi__huffman *hac, stbi__int16 *fac, int b, stbi__uint16 *dequant)
-{
-   int diff,dc,k;
-   int t;
-
-   if (j->code_bits < 16) stbi__grow_buffer_unsafe(j);
-   t = stbi__jpeg_huff_decode(j, hdc);
-   if (t < 0) return stbi__err("bad huffman code","Corrupt JPEG");
-
-   // 0 all the ac values now so we can do it 32-bits at a time
-   memset(data,0,64*sizeof(data[0]));
-
-   diff = t ? stbi__extend_receive(j, t) : 0;
-   dc = j->img_comp[b].dc_pred + diff;
-   j->img_comp[b].dc_pred = dc;
-   data[0] = (short) (dc * dequant[0]);
-
-   // decode AC components, see JPEG spec
-   k = 1;
-   do {
-      unsigned int zig;
-      int c,r,s;
-      if (j->code_bits < 16) stbi__grow_buffer_unsafe(j);
-      c = (j->code_buffer >> (32 - FAST_BITS)) & ((1 << FAST_BITS)-1);
-      r = fac[c];
-      if (r) { // fast-AC path
-         k += (r >> 4) & 15; // run
-         s = r & 15; // combined length
-         j->code_buffer <<= s;
-         j->code_bits -= s;
-         // decode into unzigzag'd location
-         zig = stbi__jpeg_dezigzag[k++];
-         data[zig] = (short) ((r >> 8) * dequant[zig]);
-      } else {
-         int rs = stbi__jpeg_huff_decode(j, hac);
-         if (rs < 0) return stbi__err("bad huffman code","Corrupt JPEG");
-         s = rs & 15;
-         r = rs >> 4;
-         if (s == 0) {
-            if (rs != 0xf0) break; // end block
-            k += 16;
-         } else {
-            k += r;
-            // decode into unzigzag'd location
-            zig = stbi__jpeg_dezigzag[k++];
-            data[zig] = (short) (stbi__extend_receive(j,s) * dequant[zig]);
-         }
-      }
-   } while (k < 64);
-   return 1;
-}
-
-static int stbi__jpeg_decode_block_prog_dc(stbi__jpeg *j, short data[64], stbi__huffman *hdc, int b)
-{
-   int diff,dc;
-   int t;
-   if (j->spec_end != 0) return stbi__err("can't merge dc and ac", "Corrupt JPEG");
-
-   if (j->code_bits < 16) stbi__grow_buffer_unsafe(j);
-
-   if (j->succ_high == 0) {
-      // first scan for DC coefficient, must be first
-      memset(data,0,64*sizeof(data[0])); // 0 all the ac values now
-      t = stbi__jpeg_huff_decode(j, hdc);
-      diff = t ? stbi__extend_receive(j, t) : 0;
-
-      dc = j->img_comp[b].dc_pred + diff;
-      j->img_comp[b].dc_pred = dc;
-      data[0] = (short) (dc << j->succ_low);
-   } else {
-      // refinement scan for DC coefficient
-      if (stbi__jpeg_get_bit(j))
-         data[0] += (short) (1 << j->succ_low);
-   }
-   return 1;
-}
-
-// @OPTIMIZE: store non-zigzagged during the decode passes,
-// and only de-zigzag when dequantizing
-static int stbi__jpeg_decode_block_prog_ac(stbi__jpeg *j, short data[64], stbi__huffman *hac, stbi__int16 *fac)
-{
-   int k;
-   if (j->spec_start == 0) return stbi__err("can't merge dc and ac", "Corrupt JPEG");
-
-   if (j->succ_high == 0) {
-      int shift = j->succ_low;
-
-      if (j->eob_run) {
-         --j->eob_run;
-         return 1;
-      }
-
-      k = j->spec_start;
-      do {
-         unsigned int zig;
-         int c,r,s;
-         if (j->code_bits < 16) stbi__grow_buffer_unsafe(j);
-         c = (j->code_buffer >> (32 - FAST_BITS)) & ((1 << FAST_BITS)-1);
-         r = fac[c];
-         if (r) { // fast-AC path
-            k += (r >> 4) & 15; // run
-            s = r & 15; // combined length
-            j->code_buffer <<= s;
-            j->code_bits -= s;
-            zig = stbi__jpeg_dezigzag[k++];
-            data[zig] = (short) ((r >> 8) << shift);
-         } else {
-            int rs = stbi__jpeg_huff_decode(j, hac);
-            if (rs < 0) return stbi__err("bad huffman code","Corrupt JPEG");
-            s = rs & 15;
-            r = rs >> 4;
-            if (s == 0) {
-               if (r < 15) {
-                  j->eob_run = (1 << r);
-                  if (r)
-                     j->eob_run += stbi__jpeg_get_bits(j, r);
-                  --j->eob_run;
-                  break;
-               }
-               k += 16;
-            } else {
-               k += r;
-               zig = stbi__jpeg_dezigzag[k++];
-               data[zig] = (short) (stbi__extend_receive(j,s) << shift);
-            }
-         }
-      } while (k <= j->spec_end);
-   } else {
-      // refinement scan for these AC coefficients
-
-      short bit = (short) (1 << j->succ_low);
-
-      if (j->eob_run) {
-         --j->eob_run;
-         for (k = j->spec_start; k <= j->spec_end; ++k) {
-            short *p = &data[stbi__jpeg_dezigzag[k]];
-            if (*p != 0)
-               if (stbi__jpeg_get_bit(j))
-                  if ((*p & bit)==0) {
-                     if (*p > 0)
-                        *p += bit;
-                     else
-                        *p -= bit;
-                  }
-         }
-      } else {
-         k = j->spec_start;
-         do {
-            int r,s;
-            int rs = stbi__jpeg_huff_decode(j, hac); // @OPTIMIZE see if we can use the fast path here, advance-by-r is so slow, eh
-            if (rs < 0) return stbi__err("bad huffman code","Corrupt JPEG");
-            s = rs & 15;
-            r = rs >> 4;
-            if (s == 0) {
-               if (r < 15) {
-                  j->eob_run = (1 << r) - 1;
-                  if (r)
-                     j->eob_run += stbi__jpeg_get_bits(j, r);
-                  r = 64; // force end of block
-               } else {
-                  // r=15 s=0 should write 16 0s, so we just do
-                  // a run of 15 0s and then write s (which is 0),
-                  // so we don't have to do anything special here
-               }
-            } else {
-               if (s != 1) return stbi__err("bad huffman code", "Corrupt JPEG");
-               // sign bit
-               if (stbi__jpeg_get_bit(j))
-                  s = bit;
-               else
-                  s = -bit;
-            }
-
-            // advance by r
-            while (k <= j->spec_end) {
-               short *p = &data[stbi__jpeg_dezigzag[k++]];
-               if (*p != 0) {
-                  if (stbi__jpeg_get_bit(j))
-                     if ((*p & bit)==0) {
-                        if (*p > 0)
-                           *p += bit;
-                        else
-                           *p -= bit;
-                     }
-               } else {
-                  if (r == 0) {
-                     *p = (short) s;
-                     break;
-                  }
-                  --r;
-               }
-            }
-         } while (k <= j->spec_end);
-      }
-   }
-   return 1;
-}
-
-// take a -128..127 value and stbi__clamp it and convert to 0..255
-stbi_inline static stbi_uc stbi__clamp(int x)
-{
-   // trick to use a single test to catch both cases
-   if ((unsigned int) x > 255) {
-      if (x < 0) return 0;
-      if (x > 255) return 255;
-   }
-   return (stbi_uc) x;
-}
-
-#define stbi__f2f(x)  ((int) (((x) * 4096 + 0.5)))
-#define stbi__fsh(x)  ((x) * 4096)
-
-// derived from jidctint -- DCT_ISLOW
-#define STBI__IDCT_1D(s0,s1,s2,s3,s4,s5,s6,s7) \
-   int t0,t1,t2,t3,p1,p2,p3,p4,p5,x0,x1,x2,x3; \
-   p2 = s2;                                    \
-   p3 = s6;                                    \
-   p1 = (p2+p3) * stbi__f2f(0.5411961f);       \
-   t2 = p1 + p3*stbi__f2f(-1.847759065f);      \
-   t3 = p1 + p2*stbi__f2f( 0.765366865f);      \
-   p2 = s0;                                    \
-   p3 = s4;                                    \
-   t0 = stbi__fsh(p2+p3);                      \
-   t1 = stbi__fsh(p2-p3);                      \
-   x0 = t0+t3;                                 \
-   x3 = t0-t3;                                 \
-   x1 = t1+t2;                                 \
-   x2 = t1-t2;                                 \
-   t0 = s7;                                    \
-   t1 = s5;                                    \
-   t2 = s3;                                    \
-   t3 = s1;                                    \
-   p3 = t0+t2;                                 \
-   p4 = t1+t3;                                 \
-   p1 = t0+t3;                                 \
-   p2 = t1+t2;                                 \
-   p5 = (p3+p4)*stbi__f2f( 1.175875602f);      \
-   t0 = t0*stbi__f2f( 0.298631336f);           \
-   t1 = t1*stbi__f2f( 2.053119869f);           \
-   t2 = t2*stbi__f2f( 3.072711026f);           \
-   t3 = t3*stbi__f2f( 1.501321110f);           \
-   p1 = p5 + p1*stbi__f2f(-0.899976223f);      \
-   p2 = p5 + p2*stbi__f2f(-2.562915447f);      \
-   p3 = p3*stbi__f2f(-1.961570560f);           \
-   p4 = p4*stbi__f2f(-0.390180644f);           \
-   t3 += p1+p4;                                \
-   t2 += p2+p3;                                \
-   t1 += p2+p4;                                \
-   t0 += p1+p3;
-
-static void stbi__idct_block(stbi_uc *out, int out_stride, short data[64])
-{
-   int i,val[64],*v=val;
-   stbi_uc *o;
-   short *d = data;
-
-   // columns
-   for (i=0; i < 8; ++i,++d, ++v) {
-      // if all zeroes, shortcut -- this avoids dequantizing 0s and IDCTing
-      if (d[ 8]==0 && d[16]==0 && d[24]==0 && d[32]==0
-           && d[40]==0 && d[48]==0 && d[56]==0) {
-         //    no shortcut                 0     seconds
-         //    (1|2|3|4|5|6|7)==0          0     seconds
-         //    all separate               -0.047 seconds
-         //    1 && 2|3 && 4|5 && 6|7:    -0.047 seconds
-         int dcterm = d[0]*4;
-         v[0] = v[8] = v[16] = v[24] = v[32] = v[40] = v[48] = v[56] = dcterm;
-      } else {
-         STBI__IDCT_1D(d[ 0],d[ 8],d[16],d[24],d[32],d[40],d[48],d[56])
-         // constants scaled things up by 1<<12; let's bring them back
-         // down, but keep 2 extra bits of precision
-         x0 += 512; x1 += 512; x2 += 512; x3 += 512;
-         v[ 0] = (x0+t3) >> 10;
-         v[56] = (x0-t3) >> 10;
-         v[ 8] = (x1+t2) >> 10;
-         v[48] = (x1-t2) >> 10;
-         v[16] = (x2+t1) >> 10;
-         v[40] = (x2-t1) >> 10;
-         v[24] = (x3+t0) >> 10;
-         v[32] = (x3-t0) >> 10;
-      }
-   }
-
-   for (i=0, v=val, o=out; i < 8; ++i,v+=8,o+=out_stride) {
-      // no fast case since the first 1D IDCT spread components out
-      STBI__IDCT_1D(v[0],v[1],v[2],v[3],v[4],v[5],v[6],v[7])
-      // constants scaled things up by 1<<12, plus we had 1<<2 from first
-      // loop, plus horizontal and vertical each scale by sqrt(8) so together
-      // we've got an extra 1<<3, so 1<<17 total we need to remove.
-      // so we want to round that, which means adding 0.5 * 1<<17,
-      // aka 65536. Also, we'll end up with -128 to 127 that we want
-      // to encode as 0..255 by adding 128, so we'll add that before the shift
-      x0 += 65536 + (128<<17);
-      x1 += 65536 + (128<<17);
-      x2 += 65536 + (128<<17);
-      x3 += 65536 + (128<<17);
-      // tried computing the shifts into temps, or'ing the temps to see
-      // if any were out of range, but that was slower
-      o[0] = stbi__clamp((x0+t3) >> 17);
-      o[7] = stbi__clamp((x0-t3) >> 17);
-      o[1] = stbi__clamp((x1+t2) >> 17);
-      o[6] = stbi__clamp((x1-t2) >> 17);
-      o[2] = stbi__clamp((x2+t1) >> 17);
-      o[5] = stbi__clamp((x2-t1) >> 17);
-      o[3] = stbi__clamp((x3+t0) >> 17);
-      o[4] = stbi__clamp((x3-t0) >> 17);
-   }
-}
-
-#ifdef STBI_SSE2
-// sse2 integer IDCT. not the fastest possible implementation but it
-// produces bit-identical results to the generic C version so it's
-// fully "transparent".
-static void stbi__idct_simd(stbi_uc *out, int out_stride, short data[64])
-{
-   // This is constructed to match our regular (generic) integer IDCT exactly.
-   __m128i row0, row1, row2, row3, row4, row5, row6, row7;
-   __m128i tmp;
-
-   // dot product constant: even elems=x, odd elems=y
-   #define dct_const(x,y)  _mm_setr_epi16((x),(y),(x),(y),(x),(y),(x),(y))
-
-   // out(0) = c0[even]*x + c0[odd]*y   (c0, x, y 16-bit, out 32-bit)
-   // out(1) = c1[even]*x + c1[odd]*y
-   #define dct_rot(out0,out1, x,y,c0,c1) \
-      __m128i c0##lo = _mm_unpacklo_epi16((x),(y)); \
-      __m128i c0##hi = _mm_unpackhi_epi16((x),(y)); \
-      __m128i out0##_l = _mm_madd_epi16(c0##lo, c0); \
-      __m128i out0##_h = _mm_madd_epi16(c0##hi, c0); \
-      __m128i out1##_l = _mm_madd_epi16(c0##lo, c1); \
-      __m128i out1##_h = _mm_madd_epi16(c0##hi, c1)
-
-   // out = in << 12  (in 16-bit, out 32-bit)
-   #define dct_widen(out, in) \
-      __m128i out##_l = _mm_srai_epi32(_mm_unpacklo_epi16(_mm_setzero_si128(), (in)), 4); \
-      __m128i out##_h = _mm_srai_epi32(_mm_unpackhi_epi16(_mm_setzero_si128(), (in)), 4)
-
-   // wide add
-   #define dct_wadd(out, a, b) \
-      __m128i out##_l = _mm_add_epi32(a##_l, b##_l); \
-      __m128i out##_h = _mm_add_epi32(a##_h, b##_h)
-
-   // wide sub
-   #define dct_wsub(out, a, b) \
-      __m128i out##_l = _mm_sub_epi32(a##_l, b##_l); \
-      __m128i out##_h = _mm_sub_epi32(a##_h, b##_h)
-
-   // butterfly a/b, add bias, then shift by "s" and pack
-   #define dct_bfly32o(out0, out1, a,b,bias,s) \
-      { \
-         __m128i abiased_l = _mm_add_epi32(a##_l, bias); \
-         __m128i abiased_h = _mm_add_epi32(a##_h, bias); \
-         dct_wadd(sum, abiased, b); \
-         dct_wsub(dif, abiased, b); \
-         out0 = _mm_packs_epi32(_mm_srai_epi32(sum_l, s), _mm_srai_epi32(sum_h, s)); \
-         out1 = _mm_packs_epi32(_mm_srai_epi32(dif_l, s), _mm_srai_epi32(dif_h, s)); \
-      }
-
-   // 8-bit interleave step (for transposes)
-   #define dct_interleave8(a, b) \
-      tmp = a; \
-      a = _mm_unpacklo_epi8(a, b); \
-      b = _mm_unpackhi_epi8(tmp, b)
-
-   // 16-bit interleave step (for transposes)
-   #define dct_interleave16(a, b) \
-      tmp = a; \
-      a = _mm_unpacklo_epi16(a, b); \
-      b = _mm_unpackhi_epi16(tmp, b)
-
-   #define dct_pass(bias,shift) \
-      { \
-         /* even part */ \
-         dct_rot(t2e,t3e, row2,row6, rot0_0,rot0_1); \
-         __m128i sum04 = _mm_add_epi16(row0, row4); \
-         __m128i dif04 = _mm_sub_epi16(row0, row4); \
-         dct_widen(t0e, sum04); \
-         dct_widen(t1e, dif04); \
-         dct_wadd(x0, t0e, t3e); \
-         dct_wsub(x3, t0e, t3e); \
-         dct_wadd(x1, t1e, t2e); \
-         dct_wsub(x2, t1e, t2e); \
-         /* odd part */ \
-         dct_rot(y0o,y2o, row7,row3, rot2_0,rot2_1); \
-         dct_rot(y1o,y3o, row5,row1, rot3_0,rot3_1); \
-         __m128i sum17 = _mm_add_epi16(row1, row7); \
-         __m128i sum35 = _mm_add_epi16(row3, row5); \
-         dct_rot(y4o,y5o, sum17,sum35, rot1_0,rot1_1); \
-         dct_wadd(x4, y0o, y4o); \
-         dct_wadd(x5, y1o, y5o); \
-         dct_wadd(x6, y2o, y5o); \
-         dct_wadd(x7, y3o, y4o); \
-         dct_bfly32o(row0,row7, x0,x7,bias,shift); \
-         dct_bfly32o(row1,row6, x1,x6,bias,shift); \
-         dct_bfly32o(row2,row5, x2,x5,bias,shift); \
-         dct_bfly32o(row3,row4, x3,x4,bias,shift); \
-      }
-
-   __m128i rot0_0 = dct_const(stbi__f2f(0.5411961f), stbi__f2f(0.5411961f) + stbi__f2f(-1.847759065f));
-   __m128i rot0_1 = dct_const(stbi__f2f(0.5411961f) + stbi__f2f( 0.765366865f), stbi__f2f(0.5411961f));
-   __m128i rot1_0 = dct_const(stbi__f2f(1.175875602f) + stbi__f2f(-0.899976223f), stbi__f2f(1.175875602f));
-   __m128i rot1_1 = dct_const(stbi__f2f(1.175875602f), stbi__f2f(1.175875602f) + stbi__f2f(-2.562915447f));
-   __m128i rot2_0 = dct_const(stbi__f2f(-1.961570560f) + stbi__f2f( 0.298631336f), stbi__f2f(-1.961570560f));
-   __m128i rot2_1 = dct_const(stbi__f2f(-1.961570560f), stbi__f2f(-1.961570560f) + stbi__f2f( 3.072711026f));
-   __m128i rot3_0 = dct_const(stbi__f2f(-0.390180644f) + stbi__f2f( 2.053119869f), stbi__f2f(-0.390180644f));
-   __m128i rot3_1 = dct_const(stbi__f2f(-0.390180644f), stbi__f2f(-0.390180644f) + stbi__f2f( 1.501321110f));
-
-   // rounding biases in column/row passes, see stbi__idct_block for explanation.
-   __m128i bias_0 = _mm_set1_epi32(512);
-   __m128i bias_1 = _mm_set1_epi32(65536 + (128<<17));
-
-   // load
-   row0 = _mm_load_si128((const __m128i *) (data + 0*8));
-   row1 = _mm_load_si128((const __m128i *) (data + 1*8));
-   row2 = _mm_load_si128((const __m128i *) (data + 2*8));
-   row3 = _mm_load_si128((const __m128i *) (data + 3*8));
-   row4 = _mm_load_si128((const __m128i *) (data + 4*8));
-   row5 = _mm_load_si128((const __m128i *) (data + 5*8));
-   row6 = _mm_load_si128((const __m128i *) (data + 6*8));
-   row7 = _mm_load_si128((const __m128i *) (data + 7*8));
-
-   // column pass
-   dct_pass(bias_0, 10);
-
-   {
-      // 16bit 8x8 transpose pass 1
-      dct_interleave16(row0, row4);
-      dct_interleave16(row1, row5);
-      dct_interleave16(row2, row6);
-      dct_interleave16(row3, row7);
-
-      // transpose pass 2
-      dct_interleave16(row0, row2);
-      dct_interleave16(row1, row3);
-      dct_interleave16(row4, row6);
-      dct_interleave16(row5, row7);
-
-      // transpose pass 3
-      dct_interleave16(row0, row1);
-      dct_interleave16(row2, row3);
-      dct_interleave16(row4, row5);
-      dct_interleave16(row6, row7);
-   }
-
-   // row pass
-   dct_pass(bias_1, 17);
-
-   {
-      // pack
-      __m128i p0 = _mm_packus_epi16(row0, row1); // a0a1a2a3...a7b0b1b2b3...b7
-      __m128i p1 = _mm_packus_epi16(row2, row3);
-      __m128i p2 = _mm_packus_epi16(row4, row5);
-      __m128i p3 = _mm_packus_epi16(row6, row7);
-
-      // 8bit 8x8 transpose pass 1
-      dct_interleave8(p0, p2); // a0e0a1e1...
-      dct_interleave8(p1, p3); // c0g0c1g1...
-
-      // transpose pass 2
-      dct_interleave8(p0, p1); // a0c0e0g0...
-      dct_interleave8(p2, p3); // b0d0f0h0...
-
-      // transpose pass 3
-      dct_interleave8(p0, p2); // a0b0c0d0...
-      dct_interleave8(p1, p3); // a4b4c4d4...
-
-      // store
-      _mm_storel_epi64((__m128i *) out, p0); out += out_stride;
-      _mm_storel_epi64((__m128i *) out, _mm_shuffle_epi32(p0, 0x4e)); out += out_stride;
-      _mm_storel_epi64((__m128i *) out, p2); out += out_stride;
-      _mm_storel_epi64((__m128i *) out, _mm_shuffle_epi32(p2, 0x4e)); out += out_stride;
-      _mm_storel_epi64((__m128i *) out, p1); out += out_stride;
-      _mm_storel_epi64((__m128i *) out, _mm_shuffle_epi32(p1, 0x4e)); out += out_stride;
-      _mm_storel_epi64((__m128i *) out, p3); out += out_stride;
-      _mm_storel_epi64((__m128i *) out, _mm_shuffle_epi32(p3, 0x4e));
-   }
-
-#undef dct_const
-#undef dct_rot
-#undef dct_widen
-#undef dct_wadd
-#undef dct_wsub
-#undef dct_bfly32o
-#undef dct_interleave8
-#undef dct_interleave16
-#undef dct_pass
-}
-
-#endif // STBI_SSE2
-
-#ifdef STBI_NEON
-
-// NEON integer IDCT. should produce bit-identical
-// results to the generic C version.
-static void stbi__idct_simd(stbi_uc *out, int out_stride, short data[64])
-{
-   int16x8_t row0, row1, row2, row3, row4, row5, row6, row7;
-
-   int16x4_t rot0_0 = vdup_n_s16(stbi__f2f(0.5411961f));
-   int16x4_t rot0_1 = vdup_n_s16(stbi__f2f(-1.847759065f));
-   int16x4_t rot0_2 = vdup_n_s16(stbi__f2f( 0.765366865f));
-   int16x4_t rot1_0 = vdup_n_s16(stbi__f2f( 1.175875602f));
-   int16x4_t rot1_1 = vdup_n_s16(stbi__f2f(-0.899976223f));
-   int16x4_t rot1_2 = vdup_n_s16(stbi__f2f(-2.562915447f));
-   int16x4_t rot2_0 = vdup_n_s16(stbi__f2f(-1.961570560f));
-   int16x4_t rot2_1 = vdup_n_s16(stbi__f2f(-0.390180644f));
-   int16x4_t rot3_0 = vdup_n_s16(stbi__f2f( 0.298631336f));
-   int16x4_t rot3_1 = vdup_n_s16(stbi__f2f( 2.053119869f));
-   int16x4_t rot3_2 = vdup_n_s16(stbi__f2f( 3.072711026f));
-   int16x4_t rot3_3 = vdup_n_s16(stbi__f2f( 1.501321110f));
-
-#define dct_long_mul(out, inq, coeff) \
-   int32x4_t out##_l = vmull_s16(vget_low_s16(inq), coeff); \
-   int32x4_t out##_h = vmull_s16(vget_high_s16(inq), coeff)
-
-#define dct_long_mac(out, acc, inq, coeff) \
-   int32x4_t out##_l = vmlal_s16(acc##_l, vget_low_s16(inq), coeff); \
-   int32x4_t out##_h = vmlal_s16(acc##_h, vget_high_s16(inq), coeff)
-
-#define dct_widen(out, inq) \
-   int32x4_t out##_l = vshll_n_s16(vget_low_s16(inq), 12); \
-   int32x4_t out##_h = vshll_n_s16(vget_high_s16(inq), 12)
-
-// wide add
-#define dct_wadd(out, a, b) \
-   int32x4_t out##_l = vaddq_s32(a##_l, b##_l); \
-   int32x4_t out##_h = vaddq_s32(a##_h, b##_h)
-
-// wide sub
-#define dct_wsub(out, a, b) \
-   int32x4_t out##_l = vsubq_s32(a##_l, b##_l); \
-   int32x4_t out##_h = vsubq_s32(a##_h, b##_h)
-
-// butterfly a/b, then shift using "shiftop" by "s" and pack
-#define dct_bfly32o(out0,out1, a,b,shiftop,s) \
-   { \
-      dct_wadd(sum, a, b); \
-      dct_wsub(dif, a, b); \
-      out0 = vcombine_s16(shiftop(sum_l, s), shiftop(sum_h, s)); \
-      out1 = vcombine_s16(shiftop(dif_l, s), shiftop(dif_h, s)); \
-   }
-
-#define dct_pass(shiftop, shift) \
-   { \
-      /* even part */ \
-      int16x8_t sum26 = vaddq_s16(row2, row6); \
-      dct_long_mul(p1e, sum26, rot0_0); \
-      dct_long_mac(t2e, p1e, row6, rot0_1); \
-      dct_long_mac(t3e, p1e, row2, rot0_2); \
-      int16x8_t sum04 = vaddq_s16(row0, row4); \
-      int16x8_t dif04 = vsubq_s16(row0, row4); \
-      dct_widen(t0e, sum04); \
-      dct_widen(t1e, dif04); \
-      dct_wadd(x0, t0e, t3e); \
-      dct_wsub(x3, t0e, t3e); \
-      dct_wadd(x1, t1e, t2e); \
-      dct_wsub(x2, t1e, t2e); \
-      /* odd part */ \
-      int16x8_t sum15 = vaddq_s16(row1, row5); \
-      int16x8_t sum17 = vaddq_s16(row1, row7); \
-      int16x8_t sum35 = vaddq_s16(row3, row5); \
-      int16x8_t sum37 = vaddq_s16(row3, row7); \
-      int16x8_t sumodd = vaddq_s16(sum17, sum35); \
-      dct_long_mul(p5o, sumodd, rot1_0); \
-      dct_long_mac(p1o, p5o, sum17, rot1_1); \
-      dct_long_mac(p2o, p5o, sum35, rot1_2); \
-      dct_long_mul(p3o, sum37, rot2_0); \
-      dct_long_mul(p4o, sum15, rot2_1); \
-      dct_wadd(sump13o, p1o, p3o); \
-      dct_wadd(sump24o, p2o, p4o); \
-      dct_wadd(sump23o, p2o, p3o); \
-      dct_wadd(sump14o, p1o, p4o); \
-      dct_long_mac(x4, sump13o, row7, rot3_0); \
-      dct_long_mac(x5, sump24o, row5, rot3_1); \
-      dct_long_mac(x6, sump23o, row3, rot3_2); \
-      dct_long_mac(x7, sump14o, row1, rot3_3); \
-      dct_bfly32o(row0,row7, x0,x7,shiftop,shift); \
-      dct_bfly32o(row1,row6, x1,x6,shiftop,shift); \
-      dct_bfly32o(row2,row5, x2,x5,shiftop,shift); \
-      dct_bfly32o(row3,row4, x3,x4,shiftop,shift); \
-   }
-
-   // load
-   row0 = vld1q_s16(data + 0*8);
-   row1 = vld1q_s16(data + 1*8);
-   row2 = vld1q_s16(data + 2*8);
-   row3 = vld1q_s16(data + 3*8);
-   row4 = vld1q_s16(data + 4*8);
-   row5 = vld1q_s16(data + 5*8);
-   row6 = vld1q_s16(data + 6*8);
-   row7 = vld1q_s16(data + 7*8);
-
-   // add DC bias
-   row0 = vaddq_s16(row0, vsetq_lane_s16(1024, vdupq_n_s16(0), 0));
-
-   // column pass
-   dct_pass(vrshrn_n_s32, 10);
-
-   // 16bit 8x8 transpose
-   {
-// these three map to a single VTRN.16, VTRN.32, and VSWP, respectively.
-// whether compilers actually get this is another story, sadly.
-#define dct_trn16(x, y) { int16x8x2_t t = vtrnq_s16(x, y); x = t.val[0]; y = t.val[1]; }
-#define dct_trn32(x, y) { int32x4x2_t t = vtrnq_s32(vreinterpretq_s32_s16(x), vreinterpretq_s32_s16(y)); x = vreinterpretq_s16_s32(t.val[0]); y = vreinterpretq_s16_s32(t.val[1]); }
-#define dct_trn64(x, y) { int16x8_t x0 = x; int16x8_t y0 = y; x = vcombine_s16(vget_low_s16(x0), vget_low_s16(y0)); y = vcombine_s16(vget_high_s16(x0), vget_high_s16(y0)); }
-
-      // pass 1
-      dct_trn16(row0, row1); // a0b0a2b2a4b4a6b6
-      dct_trn16(row2, row3);
-      dct_trn16(row4, row5);
-      dct_trn16(row6, row7);
-
-      // pass 2
-      dct_trn32(row0, row2); // a0b0c0d0a4b4c4d4
-      dct_trn32(row1, row3);
-      dct_trn32(row4, row6);
-      dct_trn32(row5, row7);
-
-      // pass 3
-      dct_trn64(row0, row4); // a0b0c0d0e0f0g0h0
-      dct_trn64(row1, row5);
-      dct_trn64(row2, row6);
-      dct_trn64(row3, row7);
-
-#undef dct_trn16
-#undef dct_trn32
-#undef dct_trn64
-   }
-
-   // row pass
-   // vrshrn_n_s32 only supports shifts up to 16, we need
-   // 17. so do a non-rounding shift of 16 first then follow
-   // up with a rounding shift by 1.
-   dct_pass(vshrn_n_s32, 16);
-
-   {
-      // pack and round
-      uint8x8_t p0 = vqrshrun_n_s16(row0, 1);
-      uint8x8_t p1 = vqrshrun_n_s16(row1, 1);
-      uint8x8_t p2 = vqrshrun_n_s16(row2, 1);
-      uint8x8_t p3 = vqrshrun_n_s16(row3, 1);
-      uint8x8_t p4 = vqrshrun_n_s16(row4, 1);
-      uint8x8_t p5 = vqrshrun_n_s16(row5, 1);
-      uint8x8_t p6 = vqrshrun_n_s16(row6, 1);
-      uint8x8_t p7 = vqrshrun_n_s16(row7, 1);
-
-      // again, these can translate into one instruction, but often don't.
-#define dct_trn8_8(x, y) { uint8x8x2_t t = vtrn_u8(x, y); x = t.val[0]; y = t.val[1]; }
-#define dct_trn8_16(x, y) { uint16x4x2_t t = vtrn_u16(vreinterpret_u16_u8(x), vreinterpret_u16_u8(y)); x = vreinterpret_u8_u16(t.val[0]); y = vreinterpret_u8_u16(t.val[1]); }
-#define dct_trn8_32(x, y) { uint32x2x2_t t = vtrn_u32(vreinterpret_u32_u8(x), vreinterpret_u32_u8(y)); x = vreinterpret_u8_u32(t.val[0]); y = vreinterpret_u8_u32(t.val[1]); }
-
-      // sadly can't use interleaved stores here since we only write
-      // 8 bytes to each scan line!
-
-      // 8x8 8-bit transpose pass 1
-      dct_trn8_8(p0, p1);
-      dct_trn8_8(p2, p3);
-      dct_trn8_8(p4, p5);
-      dct_trn8_8(p6, p7);
-
-      // pass 2
-      dct_trn8_16(p0, p2);
-      dct_trn8_16(p1, p3);
-      dct_trn8_16(p4, p6);
-      dct_trn8_16(p5, p7);
-
-      // pass 3
-      dct_trn8_32(p0, p4);
-      dct_trn8_32(p1, p5);
-      dct_trn8_32(p2, p6);
-      dct_trn8_32(p3, p7);
-
-      // store
-      vst1_u8(out, p0); out += out_stride;
-      vst1_u8(out, p1); out += out_stride;
-      vst1_u8(out, p2); out += out_stride;
-      vst1_u8(out, p3); out += out_stride;
-      vst1_u8(out, p4); out += out_stride;
-      vst1_u8(out, p5); out += out_stride;
-      vst1_u8(out, p6); out += out_stride;
-      vst1_u8(out, p7);
-
-#undef dct_trn8_8
-#undef dct_trn8_16
-#undef dct_trn8_32
-   }
-
-#undef dct_long_mul
-#undef dct_long_mac
-#undef dct_widen
-#undef dct_wadd
-#undef dct_wsub
-#undef dct_bfly32o
-#undef dct_pass
-}
-
-#endif // STBI_NEON
-
-#define STBI__MARKER_none  0xff
-// if there's a pending marker from the entropy stream, return that
-// otherwise, fetch from the stream and get a marker. if there's no
-// marker, return 0xff, which is never a valid marker value
-static stbi_uc stbi__get_marker(stbi__jpeg *j)
-{
-   stbi_uc x;
-   if (j->marker != STBI__MARKER_none) { x = j->marker; j->marker = STBI__MARKER_none; return x; }
-   x = stbi__get8(j->s);
-   if (x != 0xff) return STBI__MARKER_none;
-   while (x == 0xff)
-      x = stbi__get8(j->s); // consume repeated 0xff fill bytes
-   return x;
-}
-
-// in each scan, we'll have scan_n components, and the order
-// of the components is specified by order[]
-#define STBI__RESTART(x)     ((x) >= 0xd0 && (x) <= 0xd7)
-
-// after a restart interval, stbi__jpeg_reset the entropy decoder and
-// the dc prediction
-static void stbi__jpeg_reset(stbi__jpeg *j)
-{
-   j->code_bits = 0;
-   j->code_buffer = 0;
-   j->nomore = 0;
-   j->img_comp[0].dc_pred = j->img_comp[1].dc_pred = j->img_comp[2].dc_pred = j->img_comp[3].dc_pred = 0;
-   j->marker = STBI__MARKER_none;
-   j->todo = j->restart_interval ? j->restart_interval : 0x7fffffff;
-   j->eob_run = 0;
-   // no more than 1<<31 MCUs if no restart_interal? that's plenty safe,
-   // since we don't even allow 1<<30 pixels
-}
-
-static int stbi__parse_entropy_coded_data(stbi__jpeg *z)
-{
-   stbi__jpeg_reset(z);
-   if (!z->progressive) {
-      if (z->scan_n == 1) {
-         int i,j;
-         STBI_SIMD_ALIGN(short, data[64]);
-         int n = z->order[0];
-         // non-interleaved data, we just need to process one block at a time,
-         // in trivial scanline order
-         // number of blocks to do just depends on how many actual "pixels" this
-         // component has, independent of interleaved MCU blocking and such
-         int w = (z->img_comp[n].x+7) >> 3;
-         int h = (z->img_comp[n].y+7) >> 3;
-         for (j=0; j < h; ++j) {
-            for (i=0; i < w; ++i) {
-               int ha = z->img_comp[n].ha;
-               if (!stbi__jpeg_decode_block(z, data, z->huff_dc+z->img_comp[n].hd, z->huff_ac+ha, z->fast_ac[ha], n, z->dequant[z->img_comp[n].tq])) return 0;
-               z->idct_block_kernel(z->img_comp[n].data+z->img_comp[n].w2*j*8+i*8, z->img_comp[n].w2, data);
-               // every data block is an MCU, so countdown the restart interval
-               if (--z->todo <= 0) {
-                  if (z->code_bits < 24) stbi__grow_buffer_unsafe(z);
-                  // if it's NOT a restart, then just bail, so we get corrupt data
-                  // rather than no data
-                  if (!STBI__RESTART(z->marker)) return 1;
-                  stbi__jpeg_reset(z);
-               }
-            }
-         }
-         return 1;
-      } else { // interleaved
-         int i,j,k,x,y;
-         STBI_SIMD_ALIGN(short, data[64]);
-         for (j=0; j < z->img_mcu_y; ++j) {
-            for (i=0; i < z->img_mcu_x; ++i) {
-               // scan an interleaved mcu... process scan_n components in order
-               for (k=0; k < z->scan_n; ++k) {
-                  int n = z->order[k];
-                  // scan out an mcu's worth of this component; that's just determined
-                  // by the basic H and V specified for the component
-                  for (y=0; y < z->img_comp[n].v; ++y) {
-                     for (x=0; x < z->img_comp[n].h; ++x) {
-                        int x2 = (i*z->img_comp[n].h + x)*8;
-                        int y2 = (j*z->img_comp[n].v + y)*8;
-                        int ha = z->img_comp[n].ha;
-                        if (!stbi__jpeg_decode_block(z, data, z->huff_dc+z->img_comp[n].hd, z->huff_ac+ha, z->fast_ac[ha], n, z->dequant[z->img_comp[n].tq])) return 0;
-                        z->idct_block_kernel(z->img_comp[n].data+z->img_comp[n].w2*y2+x2, z->img_comp[n].w2, data);
-                     }
-                  }
-               }
-               // after all interleaved components, that's an interleaved MCU,
-               // so now count down the restart interval
-               if (--z->todo <= 0) {
-                  if (z->code_bits < 24) stbi__grow_buffer_unsafe(z);
-                  if (!STBI__RESTART(z->marker)) return 1;
-                  stbi__jpeg_reset(z);
-               }
-            }
-         }
-         return 1;
-      }
-   } else {
-      if (z->scan_n == 1) {
-         int i,j;
-         int n = z->order[0];
-         // non-interleaved data, we just need to process one block at a time,
-         // in trivial scanline order
-         // number of blocks to do just depends on how many actual "pixels" this
-         // component has, independent of interleaved MCU blocking and such
-         int w = (z->img_comp[n].x+7) >> 3;
-         int h = (z->img_comp[n].y+7) >> 3;
-         for (j=0; j < h; ++j) {
-            for (i=0; i < w; ++i) {
-               short *data = z->img_comp[n].coeff + 64 * (i + j * z->img_comp[n].coeff_w);
-               if (z->spec_start == 0) {
-                  if (!stbi__jpeg_decode_block_prog_dc(z, data, &z->huff_dc[z->img_comp[n].hd], n))
-                     return 0;
-               } else {
-                  int ha = z->img_comp[n].ha;
-                  if (!stbi__jpeg_decode_block_prog_ac(z, data, &z->huff_ac[ha], z->fast_ac[ha]))
-                     return 0;
-               }
-               // every data block is an MCU, so countdown the restart interval
-               if (--z->todo <= 0) {
-                  if (z->code_bits < 24) stbi__grow_buffer_unsafe(z);
-                  if (!STBI__RESTART(z->marker)) return 1;
-                  stbi__jpeg_reset(z);
-               }
-            }
-         }
-         return 1;
-      } else { // interleaved
-         int i,j,k,x,y;
-         for (j=0; j < z->img_mcu_y; ++j) {
-            for (i=0; i < z->img_mcu_x; ++i) {
-               // scan an interleaved mcu... process scan_n components in order
-               for (k=0; k < z->scan_n; ++k) {
-                  int n = z->order[k];
-                  // scan out an mcu's worth of this component; that's just determined
-                  // by the basic H and V specified for the component
-                  for (y=0; y < z->img_comp[n].v; ++y) {
-                     for (x=0; x < z->img_comp[n].h; ++x) {
-                        int x2 = (i*z->img_comp[n].h + x);
-                        int y2 = (j*z->img_comp[n].v + y);
-                        short *data = z->img_comp[n].coeff + 64 * (x2 + y2 * z->img_comp[n].coeff_w);
-                        if (!stbi__jpeg_decode_block_prog_dc(z, data, &z->huff_dc[z->img_comp[n].hd], n))
-                           return 0;
-                     }
-                  }
-               }
-               // after all interleaved components, that's an interleaved MCU,
-               // so now count down the restart interval
-               if (--z->todo <= 0) {
-                  if (z->code_bits < 24) stbi__grow_buffer_unsafe(z);
-                  if (!STBI__RESTART(z->marker)) return 1;
-                  stbi__jpeg_reset(z);
-               }
-            }
-         }
-         return 1;
-      }
-   }
-}
-
-static void stbi__jpeg_dequantize(short *data, stbi__uint16 *dequant)
-{
-   int i;
-   for (i=0; i < 64; ++i)
-      data[i] *= dequant[i];
-}
-
-static void stbi__jpeg_finish(stbi__jpeg *z)
-{
-   if (z->progressive) {
-      // dequantize and idct the data
-      int i,j,n;
-      for (n=0; n < z->s->img_n; ++n) {
-         int w = (z->img_comp[n].x+7) >> 3;
-         int h = (z->img_comp[n].y+7) >> 3;
-         for (j=0; j < h; ++j) {
-            for (i=0; i < w; ++i) {
-               short *data = z->img_comp[n].coeff + 64 * (i + j * z->img_comp[n].coeff_w);
-               stbi__jpeg_dequantize(data, z->dequant[z->img_comp[n].tq]);
-               z->idct_block_kernel(z->img_comp[n].data+z->img_comp[n].w2*j*8+i*8, z->img_comp[n].w2, data);
-            }
-         }
-      }
-   }
-}
-
-static int stbi__process_marker(stbi__jpeg *z, int m)
-{
-   int L;
-   switch (m) {
-      case STBI__MARKER_none: // no marker found
-         return stbi__err("expected marker","Corrupt JPEG");
-
-      case 0xDD: // DRI - specify restart interval
-         if (stbi__get16be(z->s) != 4) return stbi__err("bad DRI len","Corrupt JPEG");
-         z->restart_interval = stbi__get16be(z->s);
-         return 1;
-
-      case 0xDB: // DQT - define quantization table
-         L = stbi__get16be(z->s)-2;
-         while (L > 0) {
-            int q = stbi__get8(z->s);
-            int p = q >> 4, sixteen = (p != 0);
-            int t = q & 15,i;
-            if (p != 0 && p != 1) return stbi__err("bad DQT type","Corrupt JPEG");
-            if (t > 3) return stbi__err("bad DQT table","Corrupt JPEG");
-
-            for (i=0; i < 64; ++i)
-               z->dequant[t][stbi__jpeg_dezigzag[i]] = (stbi__uint16)(sixteen ? stbi__get16be(z->s) : stbi__get8(z->s));
-            L -= (sixteen ? 129 : 65);
-         }
-         return L==0;
-
-      case 0xC4: // DHT - define huffman table
-         L = stbi__get16be(z->s)-2;
-         while (L > 0) {
-            stbi_uc *v;
-            int sizes[16],i,n=0;
-            int q = stbi__get8(z->s);
-            int tc = q >> 4;
-            int th = q & 15;
-            if (tc > 1 || th > 3) return stbi__err("bad DHT header","Corrupt JPEG");
-            for (i=0; i < 16; ++i) {
-               sizes[i] = stbi__get8(z->s);
-               n += sizes[i];
-            }
-            L -= 17;
-            if (tc == 0) {
-               if (!stbi__build_huffman(z->huff_dc+th, sizes)) return 0;
-               v = z->huff_dc[th].values;
-            } else {
-               if (!stbi__build_huffman(z->huff_ac+th, sizes)) return 0;
-               v = z->huff_ac[th].values;
-            }
-            for (i=0; i < n; ++i)
-               v[i] = stbi__get8(z->s);
-            if (tc != 0)
-               stbi__build_fast_ac(z->fast_ac[th], z->huff_ac + th);
-            L -= n;
-         }
-         return L==0;
-   }
-
-   // check for comment block or APP blocks
-   if ((m >= 0xE0 && m <= 0xEF) || m == 0xFE) {
-      L = stbi__get16be(z->s);
-      if (L < 2) {
-         if (m == 0xFE)
-            return stbi__err("bad COM len","Corrupt JPEG");
-         else
-            return stbi__err("bad APP len","Corrupt JPEG");
-      }
-      L -= 2;
-
-      if (m == 0xE0 && L >= 5) { // JFIF APP0 segment
-         static const unsigned char tag[5] = {'J','F','I','F','\0'};
-         int ok = 1;
-         int i;
-         for (i=0; i < 5; ++i)
-            if (stbi__get8(z->s) != tag[i])
-               ok = 0;
-         L -= 5;
-         if (ok)
-            z->jfif = 1;
-      } else if (m == 0xEE && L >= 12) { // Adobe APP14 segment
-         static const unsigned char tag[6] = {'A','d','o','b','e','\0'};
-         int ok = 1;
-         int i;
-         for (i=0; i < 6; ++i)
-            if (stbi__get8(z->s) != tag[i])
-               ok = 0;
-         L -= 6;
-         if (ok) {
-            stbi__get8(z->s); // version
-            stbi__get16be(z->s); // flags0
-            stbi__get16be(z->s); // flags1
-            z->app14_color_transform = stbi__get8(z->s); // color transform
-            L -= 6;
-         }
-      }
-
-      stbi__skip(z->s, L);
-      return 1;
-   }
-
-   return stbi__err("unknown marker","Corrupt JPEG");
-}
-
-// after we see SOS
-static int stbi__process_scan_header(stbi__jpeg *z)
-{
-   int i;
-   int Ls = stbi__get16be(z->s);
-   z->scan_n = stbi__get8(z->s);
-   if (z->scan_n < 1 || z->scan_n > 4 || z->scan_n > (int) z->s->img_n) return stbi__err("bad SOS component count","Corrupt JPEG");
-   if (Ls != 6+2*z->scan_n) return stbi__err("bad SOS len","Corrupt JPEG");
-   for (i=0; i < z->scan_n; ++i) {
-      int id = stbi__get8(z->s), which;
-      int q = stbi__get8(z->s);
-      for (which = 0; which < z->s->img_n; ++which)
-         if (z->img_comp[which].id == id)
-            break;
-      if (which == z->s->img_n) return 0; // no match
-      z->img_comp[which].hd = q >> 4;   if (z->img_comp[which].hd > 3) return stbi__err("bad DC huff","Corrupt JPEG");
-      z->img_comp[which].ha = q & 15;   if (z->img_comp[which].ha > 3) return stbi__err("bad AC huff","Corrupt JPEG");
-      z->order[i] = which;
-   }
-
-   {
-      int aa;
-      z->spec_start = stbi__get8(z->s);
-      z->spec_end   = stbi__get8(z->s); // should be 63, but might be 0
-      aa = stbi__get8(z->s);
-      z->succ_high = (aa >> 4);
-      z->succ_low  = (aa & 15);
-      if (z->progressive) {
-         if (z->spec_start > 63 || z->spec_end > 63  || z->spec_start > z->spec_end || z->succ_high > 13 || z->succ_low > 13)
-            return stbi__err("bad SOS", "Corrupt JPEG");
-      } else {
-         if (z->spec_start != 0) return stbi__err("bad SOS","Corrupt JPEG");
-         if (z->succ_high != 0 || z->succ_low != 0) return stbi__err("bad SOS","Corrupt JPEG");
-         z->spec_end = 63;
-      }
-   }
-
-   return 1;
-}
-
-static int stbi__free_jpeg_components(stbi__jpeg *z, int ncomp, int why)
-{
-   int i;
-   for (i=0; i < ncomp; ++i) {
-      if (z->img_comp[i].raw_data) {
-         STBI_FREE(z->img_comp[i].raw_data);
-         z->img_comp[i].raw_data = NULL;
-         z->img_comp[i].data = NULL;
-      }
-      if (z->img_comp[i].raw_coeff) {
-         STBI_FREE(z->img_comp[i].raw_coeff);
-         z->img_comp[i].raw_coeff = 0;
-         z->img_comp[i].coeff = 0;
-      }
-      if (z->img_comp[i].linebuf) {
-         STBI_FREE(z->img_comp[i].linebuf);
-         z->img_comp[i].linebuf = NULL;
-      }
-   }
-   return why;
-}
-
-static int stbi__process_frame_header(stbi__jpeg *z, int scan)
-{
-   stbi__context *s = z->s;
-   int Lf,p,i,q, h_max=1,v_max=1,c;
-   Lf = stbi__get16be(s);         if (Lf < 11) return stbi__err("bad SOF len","Corrupt JPEG"); // JPEG
-   p  = stbi__get8(s);            if (p != 8) return stbi__err("only 8-bit","JPEG format not supported: 8-bit only"); // JPEG baseline
-   s->img_y = stbi__get16be(s);   if (s->img_y == 0) return stbi__err("no header height", "JPEG format not supported: delayed height"); // Legal, but we don't handle it--but neither does IJG
-   s->img_x = stbi__get16be(s);   if (s->img_x == 0) return stbi__err("0 width","Corrupt JPEG"); // JPEG requires
-   c = stbi__get8(s);
-   if (c != 3 && c != 1 && c != 4) return stbi__err("bad component count","Corrupt JPEG");
-   s->img_n = c;
-   for (i=0; i < c; ++i) {
-      z->img_comp[i].data = NULL;
-      z->img_comp[i].linebuf = NULL;
-   }
-
-   if (Lf != 8+3*s->img_n) return stbi__err("bad SOF len","Corrupt JPEG");
-
-   z->rgb = 0;
-   for (i=0; i < s->img_n; ++i) {
-      static const unsigned char rgb[3] = { 'R', 'G', 'B' };
-      z->img_comp[i].id = stbi__get8(s);
-      if (s->img_n == 3 && z->img_comp[i].id == rgb[i])
-         ++z->rgb;
-      q = stbi__get8(s);
-      z->img_comp[i].h = (q >> 4);  if (!z->img_comp[i].h || z->img_comp[i].h > 4) return stbi__err("bad H","Corrupt JPEG");
-      z->img_comp[i].v = q & 15;    if (!z->img_comp[i].v || z->img_comp[i].v > 4) return stbi__err("bad V","Corrupt JPEG");
-      z->img_comp[i].tq = stbi__get8(s);  if (z->img_comp[i].tq > 3) return stbi__err("bad TQ","Corrupt JPEG");
-   }
-
-   if (scan != STBI__SCAN_load) return 1;
-
-   if (!stbi__mad3sizes_valid(s->img_x, s->img_y, s->img_n, 0)) return stbi__err("too large", "Image too large to decode");
-
-   for (i=0; i < s->img_n; ++i) {
-      if (z->img_comp[i].h > h_max) h_max = z->img_comp[i].h;
-      if (z->img_comp[i].v > v_max) v_max = z->img_comp[i].v;
-   }
-
-   // compute interleaved mcu info
-   z->img_h_max = h_max;
-   z->img_v_max = v_max;
-   z->img_mcu_w = h_max * 8;
-   z->img_mcu_h = v_max * 8;
-   // these sizes can't be more than 17 bits
-   z->img_mcu_x = (s->img_x + z->img_mcu_w-1) / z->img_mcu_w;
-   z->img_mcu_y = (s->img_y + z->img_mcu_h-1) / z->img_mcu_h;
-
-   for (i=0; i < s->img_n; ++i) {
-      // number of effective pixels (e.g. for non-interleaved MCU)
-      z->img_comp[i].x = (s->img_x * z->img_comp[i].h + h_max-1) / h_max;
-      z->img_comp[i].y = (s->img_y * z->img_comp[i].v + v_max-1) / v_max;
-      // to simplify generation, we'll allocate enough memory to decode
-      // the bogus oversized data from using interleaved MCUs and their
-      // big blocks (e.g. a 16x16 iMCU on an image of width 33); we won't
-      // discard the extra data until colorspace conversion
-      //
-      // img_mcu_x, img_mcu_y: <=17 bits; comp[i].h and .v are <=4 (checked earlier)
-      // so these muls can't overflow with 32-bit ints (which we require)
-      z->img_comp[i].w2 = z->img_mcu_x * z->img_comp[i].h * 8;
-      z->img_comp[i].h2 = z->img_mcu_y * z->img_comp[i].v * 8;
-      z->img_comp[i].coeff = 0;
-      z->img_comp[i].raw_coeff = 0;
-      z->img_comp[i].linebuf = NULL;
-      z->img_comp[i].raw_data = stbi__malloc_mad2(z->img_comp[i].w2, z->img_comp[i].h2, 15);
-      if (z->img_comp[i].raw_data == NULL)
-         return stbi__free_jpeg_components(z, i+1, stbi__err("outofmem", "Out of memory"));
-      // align blocks for idct using mmx/sse
-      z->img_comp[i].data = (stbi_uc*) (((size_t) z->img_comp[i].raw_data + 15) & ~15);
-      if (z->progressive) {
-         // w2, h2 are multiples of 8 (see above)
-         z->img_comp[i].coeff_w = z->img_comp[i].w2 / 8;
-         z->img_comp[i].coeff_h = z->img_comp[i].h2 / 8;
-         z->img_comp[i].raw_coeff = stbi__malloc_mad3(z->img_comp[i].w2, z->img_comp[i].h2, sizeof(short), 15);
-         if (z->img_comp[i].raw_coeff == NULL)
-            return stbi__free_jpeg_components(z, i+1, stbi__err("outofmem", "Out of memory"));
-         z->img_comp[i].coeff = (short*) (((size_t) z->img_comp[i].raw_coeff + 15) & ~15);
-      }
-   }
-
-   return 1;
-}
-
-// use comparisons since in some cases we handle more than one case (e.g. SOF)
-#define stbi__DNL(x)         ((x) == 0xdc)
-#define stbi__SOI(x)         ((x) == 0xd8)
-#define stbi__EOI(x)         ((x) == 0xd9)
-#define stbi__SOF(x)         ((x) == 0xc0 || (x) == 0xc1 || (x) == 0xc2)
-#define stbi__SOS(x)         ((x) == 0xda)
-
-#define stbi__SOF_progressive(x)   ((x) == 0xc2)
-
-static int stbi__decode_jpeg_header(stbi__jpeg *z, int scan)
-{
-   int m;
-   z->jfif = 0;
-   z->app14_color_transform = -1; // valid values are 0,1,2
-   z->marker = STBI__MARKER_none; // initialize cached marker to empty
-   m = stbi__get_marker(z);
-   if (!stbi__SOI(m)) return stbi__err("no SOI","Corrupt JPEG");
-   if (scan == STBI__SCAN_type) return 1;
-   m = stbi__get_marker(z);
-   while (!stbi__SOF(m)) {
-      if (!stbi__process_marker(z,m)) return 0;
-      m = stbi__get_marker(z);
-      while (m == STBI__MARKER_none) {
-         // some files have extra padding after their blocks, so ok, we'll scan
-         if (stbi__at_eof(z->s)) return stbi__err("no SOF", "Corrupt JPEG");
-         m = stbi__get_marker(z);
-      }
-   }
-   z->progressive = stbi__SOF_progressive(m);
-   if (!stbi__process_frame_header(z, scan)) return 0;
-   return 1;
-}
-
-// decode image to YCbCr format
-static int stbi__decode_jpeg_image(stbi__jpeg *j)
-{
-   int m;
-   for (m = 0; m < 4; m++) {
-      j->img_comp[m].raw_data = NULL;
-      j->img_comp[m].raw_coeff = NULL;
-   }
-   j->restart_interval = 0;
-   if (!stbi__decode_jpeg_header(j, STBI__SCAN_load)) return 0;
-   m = stbi__get_marker(j);
-   while (!stbi__EOI(m)) {
-      if (stbi__SOS(m)) {
-         if (!stbi__process_scan_header(j)) return 0;
-         if (!stbi__parse_entropy_coded_data(j)) return 0;
-         if (j->marker == STBI__MARKER_none ) {
-            // handle 0s at the end of image data from IP Kamera 9060
-            while (!stbi__at_eof(j->s)) {
-               int x = stbi__get8(j->s);
-               if (x == 255) {
-                  j->marker = stbi__get8(j->s);
-                  break;
-               }
-            }
-            // if we reach eof without hitting a marker, stbi__get_marker() below will fail and we'll eventually return 0
-         }
-      } else if (stbi__DNL(m)) {
-         int Ld = stbi__get16be(j->s);
-         stbi__uint32 NL = stbi__get16be(j->s);
-         if (Ld != 4) return stbi__err("bad DNL len", "Corrupt JPEG");
-         if (NL != j->s->img_y) return stbi__err("bad DNL height", "Corrupt JPEG");
-      } else {
-         if (!stbi__process_marker(j, m)) return 0;
-      }
-      m = stbi__get_marker(j);
-   }
-   if (j->progressive)
-      stbi__jpeg_finish(j);
-   return 1;
-}
-
-// static jfif-centered resampling (across block boundaries)
-
-typedef stbi_uc *(*resample_row_func)(stbi_uc *out, stbi_uc *in0, stbi_uc *in1,
-                                    int w, int hs);
-
-#define stbi__div4(x) ((stbi_uc) ((x) >> 2))
-
-static stbi_uc *resample_row_1(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs)
-{
-   STBI_NOTUSED(out);
-   STBI_NOTUSED(in_far);
-   STBI_NOTUSED(w);
-   STBI_NOTUSED(hs);
-   return in_near;
-}
-
-static stbi_uc* stbi__resample_row_v_2(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs)
-{
-   // need to generate two samples vertically for every one in input
-   int i;
-   STBI_NOTUSED(hs);
-   for (i=0; i < w; ++i)
-      out[i] = stbi__div4(3*in_near[i] + in_far[i] + 2);
-   return out;
-}
-
-static stbi_uc*  stbi__resample_row_h_2(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs)
-{
-   // need to generate two samples horizontally for every one in input
-   int i;
-   stbi_uc *input = in_near;
-
-   if (w == 1) {
-      // if only one sample, can't do any interpolation
-      out[0] = out[1] = input[0];
-      return out;
-   }
-
-   out[0] = input[0];
-   out[1] = stbi__div4(input[0]*3 + input[1] + 2);
-   for (i=1; i < w-1; ++i) {
-      int n = 3*input[i]+2;
-      out[i*2+0] = stbi__div4(n+input[i-1]);
-      out[i*2+1] = stbi__div4(n+input[i+1]);
-   }
-   out[i*2+0] = stbi__div4(input[w-2]*3 + input[w-1] + 2);
-   out[i*2+1] = input[w-1];
-
-   STBI_NOTUSED(in_far);
-   STBI_NOTUSED(hs);
-
-   return out;
-}
-
-#define stbi__div16(x) ((stbi_uc) ((x) >> 4))
-
-static stbi_uc *stbi__resample_row_hv_2(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs)
-{
-   // need to generate 2x2 samples for every one in input
-   int i,t0,t1;
-   if (w == 1) {
-      out[0] = out[1] = stbi__div4(3*in_near[0] + in_far[0] + 2);
-      return out;
-   }
-
-   t1 = 3*in_near[0] + in_far[0];
-   out[0] = stbi__div4(t1+2);
-   for (i=1; i < w; ++i) {
-      t0 = t1;
-      t1 = 3*in_near[i]+in_far[i];
-      out[i*2-1] = stbi__div16(3*t0 + t1 + 8);
-      out[i*2  ] = stbi__div16(3*t1 + t0 + 8);
-   }
-   out[w*2-1] = stbi__div4(t1+2);
-
-   STBI_NOTUSED(hs);
-
-   return out;
-}
-
-#if defined(STBI_SSE2) || defined(STBI_NEON)
-static stbi_uc *stbi__resample_row_hv_2_simd(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs)
-{
-   // need to generate 2x2 samples for every one in input
-   int i=0,t0,t1;
-
-   if (w == 1) {
-      out[0] = out[1] = stbi__div4(3*in_near[0] + in_far[0] + 2);
-      return out;
-   }
-
-   t1 = 3*in_near[0] + in_far[0];
-   // process groups of 8 pixels for as long as we can.
-   // note we can't handle the last pixel in a row in this loop
-   // because we need to handle the filter boundary conditions.
-   for (; i < ((w-1) & ~7); i += 8) {
-#if defined(STBI_SSE2)
-      // load and perform the vertical filtering pass
-      // this uses 3*x + y = 4*x + (y - x)
-      __m128i zero  = _mm_setzero_si128();
-      __m128i farb  = _mm_loadl_epi64((__m128i *) (in_far + i));
-      __m128i nearb = _mm_loadl_epi64((__m128i *) (in_near + i));
-      __m128i farw  = _mm_unpacklo_epi8(farb, zero);
-      __m128i nearw = _mm_unpacklo_epi8(nearb, zero);
-      __m128i diff  = _mm_sub_epi16(farw, nearw);
-      __m128i nears = _mm_slli_epi16(nearw, 2);
-      __m128i curr  = _mm_add_epi16(nears, diff); // current row
-
-      // horizontal filter works the same based on shifted vers of current
-      // row. "prev" is current row shifted right by 1 pixel; we need to
-      // insert the previous pixel value (from t1).
-      // "next" is current row shifted left by 1 pixel, with first pixel
-      // of next block of 8 pixels added in.
-      __m128i prv0 = _mm_slli_si128(curr, 2);
-      __m128i nxt0 = _mm_srli_si128(curr, 2);
-      __m128i prev = _mm_insert_epi16(prv0, t1, 0);
-      __m128i next = _mm_insert_epi16(nxt0, 3*in_near[i+8] + in_far[i+8], 7);
-
-      // horizontal filter, polyphase implementation since it's convenient:
-      // even pixels = 3*cur + prev = cur*4 + (prev - cur)
-      // odd  pixels = 3*cur + next = cur*4 + (next - cur)
-      // note the shared term.
-      __m128i bias  = _mm_set1_epi16(8);
-      __m128i curs = _mm_slli_epi16(curr, 2);
-      __m128i prvd = _mm_sub_epi16(prev, curr);
-      __m128i nxtd = _mm_sub_epi16(next, curr);
-      __m128i curb = _mm_add_epi16(curs, bias);
-      __m128i even = _mm_add_epi16(prvd, curb);
-      __m128i odd  = _mm_add_epi16(nxtd, curb);
-
-      // interleave even and odd pixels, then undo scaling.
-      __m128i int0 = _mm_unpacklo_epi16(even, odd);
-      __m128i int1 = _mm_unpackhi_epi16(even, odd);
-      __m128i de0  = _mm_srli_epi16(int0, 4);
-      __m128i de1  = _mm_srli_epi16(int1, 4);
-
-      // pack and write output
-      __m128i outv = _mm_packus_epi16(de0, de1);
-      _mm_storeu_si128((__m128i *) (out + i*2), outv);
-#elif defined(STBI_NEON)
-      // load and perform the vertical filtering pass
-      // this uses 3*x + y = 4*x + (y - x)
-      uint8x8_t farb  = vld1_u8(in_far + i);
-      uint8x8_t nearb = vld1_u8(in_near + i);
-      int16x8_t diff  = vreinterpretq_s16_u16(vsubl_u8(farb, nearb));
-      int16x8_t nears = vreinterpretq_s16_u16(vshll_n_u8(nearb, 2));
-      int16x8_t curr  = vaddq_s16(nears, diff); // current row
-
-      // horizontal filter works the same based on shifted vers of current
-      // row. "prev" is current row shifted right by 1 pixel; we need to
-      // insert the previous pixel value (from t1).
-      // "next" is current row shifted left by 1 pixel, with first pixel
-      // of next block of 8 pixels added in.
-      int16x8_t prv0 = vextq_s16(curr, curr, 7);
-      int16x8_t nxt0 = vextq_s16(curr, curr, 1);
-      int16x8_t prev = vsetq_lane_s16(t1, prv0, 0);
-      int16x8_t next = vsetq_lane_s16(3*in_near[i+8] + in_far[i+8], nxt0, 7);
-
-      // horizontal filter, polyphase implementation since it's convenient:
-      // even pixels = 3*cur + prev = cur*4 + (prev - cur)
-      // odd  pixels = 3*cur + next = cur*4 + (next - cur)
-      // note the shared term.
-      int16x8_t curs = vshlq_n_s16(curr, 2);
-      int16x8_t prvd = vsubq_s16(prev, curr);
-      int16x8_t nxtd = vsubq_s16(next, curr);
-      int16x8_t even = vaddq_s16(curs, prvd);
-      int16x8_t odd  = vaddq_s16(curs, nxtd);
-
-      // undo scaling and round, then store with even/odd phases interleaved
-      uint8x8x2_t o;
-      o.val[0] = vqrshrun_n_s16(even, 4);
-      o.val[1] = vqrshrun_n_s16(odd,  4);
-      vst2_u8(out + i*2, o);
-#endif
-
-      // "previous" value for next iter
-      t1 = 3*in_near[i+7] + in_far[i+7];
-   }
-
-   t0 = t1;
-   t1 = 3*in_near[i] + in_far[i];
-   out[i*2] = stbi__div16(3*t1 + t0 + 8);
-
-   for (++i; i < w; ++i) {
-      t0 = t1;
-      t1 = 3*in_near[i]+in_far[i];
-      out[i*2-1] = stbi__div16(3*t0 + t1 + 8);
-      out[i*2  ] = stbi__div16(3*t1 + t0 + 8);
-   }
-   out[w*2-1] = stbi__div4(t1+2);
-
-   STBI_NOTUSED(hs);
-
-   return out;
-}
-#endif
-
-static stbi_uc *stbi__resample_row_generic(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs)
-{
-   // resample with nearest-neighbor
-   int i,j;
-   STBI_NOTUSED(in_far);
-   for (i=0; i < w; ++i)
-      for (j=0; j < hs; ++j)
-         out[i*hs+j] = in_near[i];
-   return out;
-}
-
-// this is a reduced-precision calculation of YCbCr-to-RGB introduced
-// to make sure the code produces the same results in both SIMD and scalar
-#define stbi__float2fixed(x)  (((int) ((x) * 4096.0f + 0.5f)) << 8)
-static void stbi__YCbCr_to_RGB_row(stbi_uc *out, const stbi_uc *y, const stbi_uc *pcb, const stbi_uc *pcr, int count, int step)
-{
-   int i;
-   for (i=0; i < count; ++i) {
-      int y_fixed = (y[i] << 20) + (1<<19); // rounding
-      int r,g,b;
-      int cr = pcr[i] - 128;
-      int cb = pcb[i] - 128;
-      r = y_fixed +  cr* stbi__float2fixed(1.40200f);
-      g = y_fixed + (cr*-stbi__float2fixed(0.71414f)) + ((cb*-stbi__float2fixed(0.34414f)) & 0xffff0000);
-      b = y_fixed                                     +   cb* stbi__float2fixed(1.77200f);
-      r >>= 20;
-      g >>= 20;
-      b >>= 20;
-      if ((unsigned) r > 255) { if (r < 0) r = 0; else r = 255; }
-      if ((unsigned) g > 255) { if (g < 0) g = 0; else g = 255; }
-      if ((unsigned) b > 255) { if (b < 0) b = 0; else b = 255; }
-      out[0] = (stbi_uc)r;
-      out[1] = (stbi_uc)g;
-      out[2] = (stbi_uc)b;
-      out[3] = 255;
-      out += step;
-   }
-}
-
-#if defined(STBI_SSE2) || defined(STBI_NEON)
-static void stbi__YCbCr_to_RGB_simd(stbi_uc *out, stbi_uc const *y, stbi_uc const *pcb, stbi_uc const *pcr, int count, int step)
-{
-   int i = 0;
-
-#ifdef STBI_SSE2
-   // step == 3 is pretty ugly on the final interleave, and i'm not convinced
-   // it's useful in practice (you wouldn't use it for textures, for example).
-   // so just accelerate step == 4 case.
-   if (step == 4) {
-      // this is a fairly straightforward implementation and not super-optimized.
-      __m128i signflip  = _mm_set1_epi8(-0x80);
-      __m128i cr_const0 = _mm_set1_epi16(   (short) ( 1.40200f*4096.0f+0.5f));
-      __m128i cr_const1 = _mm_set1_epi16( - (short) ( 0.71414f*4096.0f+0.5f));
-      __m128i cb_const0 = _mm_set1_epi16( - (short) ( 0.34414f*4096.0f+0.5f));
-      __m128i cb_const1 = _mm_set1_epi16(   (short) ( 1.77200f*4096.0f+0.5f));
-      __m128i y_bias = _mm_set1_epi8((char) (unsigned char) 128);
-      __m128i xw = _mm_set1_epi16(255); // alpha channel
-
-      for (; i+7 < count; i += 8) {
-         // load
-         __m128i y_bytes = _mm_loadl_epi64((__m128i *) (y+i));
-         __m128i cr_bytes = _mm_loadl_epi64((__m128i *) (pcr+i));
-         __m128i cb_bytes = _mm_loadl_epi64((__m128i *) (pcb+i));
-         __m128i cr_biased = _mm_xor_si128(cr_bytes, signflip); // -128
-         __m128i cb_biased = _mm_xor_si128(cb_bytes, signflip); // -128
-
-         // unpack to short (and left-shift cr, cb by 8)
-         __m128i yw  = _mm_unpacklo_epi8(y_bias, y_bytes);
-         __m128i crw = _mm_unpacklo_epi8(_mm_setzero_si128(), cr_biased);
-         __m128i cbw = _mm_unpacklo_epi8(_mm_setzero_si128(), cb_biased);
-
-         // color transform
-         __m128i yws = _mm_srli_epi16(yw, 4);
-         __m128i cr0 = _mm_mulhi_epi16(cr_const0, crw);
-         __m128i cb0 = _mm_mulhi_epi16(cb_const0, cbw);
-         __m128i cb1 = _mm_mulhi_epi16(cbw, cb_const1);
-         __m128i cr1 = _mm_mulhi_epi16(crw, cr_const1);
-         __m128i rws = _mm_add_epi16(cr0, yws);
-         __m128i gwt = _mm_add_epi16(cb0, yws);
-         __m128i bws = _mm_add_epi16(yws, cb1);
-         __m128i gws = _mm_add_epi16(gwt, cr1);
-
-         // descale
-         __m128i rw = _mm_srai_epi16(rws, 4);
-         __m128i bw = _mm_srai_epi16(bws, 4);
-         __m128i gw = _mm_srai_epi16(gws, 4);
-
-         // back to byte, set up for transpose
-         __m128i brb = _mm_packus_epi16(rw, bw);
-         __m128i gxb = _mm_packus_epi16(gw, xw);
-
-         // transpose to interleave channels
-         __m128i t0 = _mm_unpacklo_epi8(brb, gxb);
-         __m128i t1 = _mm_unpackhi_epi8(brb, gxb);
-         __m128i o0 = _mm_unpacklo_epi16(t0, t1);
-         __m128i o1 = _mm_unpackhi_epi16(t0, t1);
-
-         // store
-         _mm_storeu_si128((__m128i *) (out + 0), o0);
-         _mm_storeu_si128((__m128i *) (out + 16), o1);
-         out += 32;
-      }
-   }
-#endif
-
-#ifdef STBI_NEON
-   // in this version, step=3 support would be easy to add. but is there demand?
-   if (step == 4) {
-      // this is a fairly straightforward implementation and not super-optimized.
-      uint8x8_t signflip = vdup_n_u8(0x80);
-      int16x8_t cr_const0 = vdupq_n_s16(   (short) ( 1.40200f*4096.0f+0.5f));
-      int16x8_t cr_const1 = vdupq_n_s16( - (short) ( 0.71414f*4096.0f+0.5f));
-      int16x8_t cb_const0 = vdupq_n_s16( - (short) ( 0.34414f*4096.0f+0.5f));
-      int16x8_t cb_const1 = vdupq_n_s16(   (short) ( 1.77200f*4096.0f+0.5f));
-
-      for (; i+7 < count; i += 8) {
-         // load
-         uint8x8_t y_bytes  = vld1_u8(y + i);
-         uint8x8_t cr_bytes = vld1_u8(pcr + i);
-         uint8x8_t cb_bytes = vld1_u8(pcb + i);
-         int8x8_t cr_biased = vreinterpret_s8_u8(vsub_u8(cr_bytes, signflip));
-         int8x8_t cb_biased = vreinterpret_s8_u8(vsub_u8(cb_bytes, signflip));
-
-         // expand to s16
-         int16x8_t yws = vreinterpretq_s16_u16(vshll_n_u8(y_bytes, 4));
-         int16x8_t crw = vshll_n_s8(cr_biased, 7);
-         int16x8_t cbw = vshll_n_s8(cb_biased, 7);
-
-         // color transform
-         int16x8_t cr0 = vqdmulhq_s16(crw, cr_const0);
-         int16x8_t cb0 = vqdmulhq_s16(cbw, cb_const0);
-         int16x8_t cr1 = vqdmulhq_s16(crw, cr_const1);
-         int16x8_t cb1 = vqdmulhq_s16(cbw, cb_const1);
-         int16x8_t rws = vaddq_s16(yws, cr0);
-         int16x8_t gws = vaddq_s16(vaddq_s16(yws, cb0), cr1);
-         int16x8_t bws = vaddq_s16(yws, cb1);
-
-         // undo scaling, round, convert to byte
-         uint8x8x4_t o;
-         o.val[0] = vqrshrun_n_s16(rws, 4);
-         o.val[1] = vqrshrun_n_s16(gws, 4);
-         o.val[2] = vqrshrun_n_s16(bws, 4);
-         o.val[3] = vdup_n_u8(255);
-
-         // store, interleaving r/g/b/a
-         vst4_u8(out, o);
-         out += 8*4;
-      }
-   }
-#endif
-
-   for (; i < count; ++i) {
-      int y_fixed = (y[i] << 20) + (1<<19); // rounding
-      int r,g,b;
-      int cr = pcr[i] - 128;
-      int cb = pcb[i] - 128;
-      r = y_fixed + cr* stbi__float2fixed(1.40200f);
-      g = y_fixed + cr*-stbi__float2fixed(0.71414f) + ((cb*-stbi__float2fixed(0.34414f)) & 0xffff0000);
-      b = y_fixed                                   +   cb* stbi__float2fixed(1.77200f);
-      r >>= 20;
-      g >>= 20;
-      b >>= 20;
-      if ((unsigned) r > 255) { if (r < 0) r = 0; else r = 255; }
-      if ((unsigned) g > 255) { if (g < 0) g = 0; else g = 255; }
-      if ((unsigned) b > 255) { if (b < 0) b = 0; else b = 255; }
-      out[0] = (stbi_uc)r;
-      out[1] = (stbi_uc)g;
-      out[2] = (stbi_uc)b;
-      out[3] = 255;
-      out += step;
-   }
-}
-#endif
-
-// set up the kernels
-static void stbi__setup_jpeg(stbi__jpeg *j)
-{
-   j->idct_block_kernel = stbi__idct_block;
-   j->YCbCr_to_RGB_kernel = stbi__YCbCr_to_RGB_row;
-   j->resample_row_hv_2_kernel = stbi__resample_row_hv_2;
-
-#ifdef STBI_SSE2
-   if (stbi__sse2_available()) {
-      j->idct_block_kernel = stbi__idct_simd;
-      j->YCbCr_to_RGB_kernel = stbi__YCbCr_to_RGB_simd;
-      j->resample_row_hv_2_kernel = stbi__resample_row_hv_2_simd;
-   }
-#endif
-
-#ifdef STBI_NEON
-   j->idct_block_kernel = stbi__idct_simd;
-   j->YCbCr_to_RGB_kernel = stbi__YCbCr_to_RGB_simd;
-   j->resample_row_hv_2_kernel = stbi__resample_row_hv_2_simd;
-#endif
-}
-
-// clean up the temporary component buffers
-static void stbi__cleanup_jpeg(stbi__jpeg *j)
-{
-   stbi__free_jpeg_components(j, j->s->img_n, 0);
-}
-
-typedef struct
-{
-   resample_row_func resample;
-   stbi_uc *line0,*line1;
-   int hs,vs;   // expansion factor in each axis
-   int w_lores; // horizontal pixels pre-expansion
-   int ystep;   // how far through vertical expansion we are
-   int ypos;    // which pre-expansion row we're on
-} stbi__resample;
-
-// fast 0..255 * 0..255 => 0..255 rounded multiplication
-static stbi_uc stbi__blinn_8x8(stbi_uc x, stbi_uc y)
-{
-   unsigned int t = x*y + 128;
-   return (stbi_uc) ((t + (t >>8)) >> 8);
-}
-
-static stbi_uc *load_jpeg_image(stbi__jpeg *z, int *out_x, int *out_y, int *comp, int req_comp)
-{
-   int n, decode_n, is_rgb;
-   z->s->img_n = 0; // make stbi__cleanup_jpeg safe
-
-   // validate req_comp
-   if (req_comp < 0 || req_comp > 4) return stbi__errpuc("bad req_comp", "Internal error");
-
-   // load a jpeg image from whichever source, but leave in YCbCr format
-   if (!stbi__decode_jpeg_image(z)) { stbi__cleanup_jpeg(z); return NULL; }
-
-   // determine actual number of components to generate
-   n = req_comp ? req_comp : z->s->img_n >= 3 ? 3 : 1;
-
-   is_rgb = z->s->img_n == 3 && (z->rgb == 3 || (z->app14_color_transform == 0 && !z->jfif));
-
-   if (z->s->img_n == 3 && n < 3 && !is_rgb)
-      decode_n = 1;
-   else
-      decode_n = z->s->img_n;
-
-   // resample and color-convert
-   {
-      int k;
-      unsigned int i,j;
-      stbi_uc *output;
-      stbi_uc *coutput[4] = { NULL, NULL, NULL, NULL };
-
-      stbi__resample res_comp[4];
-
-      for (k=0; k < decode_n; ++k) {
-         stbi__resample *r = &res_comp[k];
-
-         // allocate line buffer big enough for upsampling off the edges
-         // with upsample factor of 4
-         z->img_comp[k].linebuf = (stbi_uc *) stbi__malloc(z->s->img_x + 3);
-         if (!z->img_comp[k].linebuf) { stbi__cleanup_jpeg(z); return stbi__errpuc("outofmem", "Out of memory"); }
-
-         r->hs      = z->img_h_max / z->img_comp[k].h;
-         r->vs      = z->img_v_max / z->img_comp[k].v;
-         r->ystep   = r->vs >> 1;
-         r->w_lores = (z->s->img_x + r->hs-1) / r->hs;
-         r->ypos    = 0;
-         r->line0   = r->line1 = z->img_comp[k].data;
-
-         if      (r->hs == 1 && r->vs == 1) r->resample = resample_row_1;
-         else if (r->hs == 1 && r->vs == 2) r->resample = stbi__resample_row_v_2;
-         else if (r->hs == 2 && r->vs == 1) r->resample = stbi__resample_row_h_2;
-         else if (r->hs == 2 && r->vs == 2) r->resample = z->resample_row_hv_2_kernel;
-         else                               r->resample = stbi__resample_row_generic;
-      }
-
-      // can't error after this so, this is safe
-      output = (stbi_uc *) stbi__malloc_mad3(n, z->s->img_x, z->s->img_y, 1);
-      if (!output) { stbi__cleanup_jpeg(z); return stbi__errpuc("outofmem", "Out of memory"); }
-
-      // now go ahead and resample
-      for (j=0; j < z->s->img_y; ++j) {
-         stbi_uc *out = output + n * z->s->img_x * j;
-         for (k=0; k < decode_n; ++k) {
-            stbi__resample *r = &res_comp[k];
-            int y_bot = r->ystep >= (r->vs >> 1);
-            coutput[k] = r->resample(z->img_comp[k].linebuf,
-                                     y_bot ? r->line1 : r->line0,
-                                     y_bot ? r->line0 : r->line1,
-                                     r->w_lores, r->hs);
-            if (++r->ystep >= r->vs) {
-               r->ystep = 0;
-               r->line0 = r->line1;
-               if (++r->ypos < z->img_comp[k].y)
-                  r->line1 += z->img_comp[k].w2;
-            }
-         }
-         if (n >= 3) {
-            stbi_uc *y = coutput[0];
-            if (z->s->img_n == 3) {
-               if (is_rgb) {
-                  for (i=0; i < z->s->img_x; ++i) {
-                     out[0] = y[i];
-                     out[1] = coutput[1][i];
-                     out[2] = coutput[2][i];
-                     out[3] = 255;
-                     out += n;
-                  }
-               } else {
-                  z->YCbCr_to_RGB_kernel(out, y, coutput[1], coutput[2], z->s->img_x, n);
-               }
-            } else if (z->s->img_n == 4) {
-               if (z->app14_color_transform == 0) { // CMYK
-                  for (i=0; i < z->s->img_x; ++i) {
-                     stbi_uc m = coutput[3][i];
-                     out[0] = stbi__blinn_8x8(coutput[0][i], m);
-                     out[1] = stbi__blinn_8x8(coutput[1][i], m);
-                     out[2] = stbi__blinn_8x8(coutput[2][i], m);
-                     out[3] = 255;
-                     out += n;
-                  }
-               } else if (z->app14_color_transform == 2) { // YCCK
-                  z->YCbCr_to_RGB_kernel(out, y, coutput[1], coutput[2], z->s->img_x, n);
-                  for (i=0; i < z->s->img_x; ++i) {
-                     stbi_uc m = coutput[3][i];
-                     out[0] = stbi__blinn_8x8(255 - out[0], m);
-                     out[1] = stbi__blinn_8x8(255 - out[1], m);
-                     out[2] = stbi__blinn_8x8(255 - out[2], m);
-                     out += n;
-                  }
-               } else { // YCbCr + alpha?  Ignore the fourth channel for now
-                  z->YCbCr_to_RGB_kernel(out, y, coutput[1], coutput[2], z->s->img_x, n);
-               }
-            } else
-               for (i=0; i < z->s->img_x; ++i) {
-                  out[0] = out[1] = out[2] = y[i];
-                  out[3] = 255; // not used if n==3
-                  out += n;
-               }
-         } else {
-            if (is_rgb) {
-               if (n == 1)
-                  for (i=0; i < z->s->img_x; ++i)
-                     *out++ = stbi__compute_y(coutput[0][i], coutput[1][i], coutput[2][i]);
-               else {
-                  for (i=0; i < z->s->img_x; ++i, out += 2) {
-                     out[0] = stbi__compute_y(coutput[0][i], coutput[1][i], coutput[2][i]);
-                     out[1] = 255;
-                  }
-               }
-            } else if (z->s->img_n == 4 && z->app14_color_transform == 0) {
-               for (i=0; i < z->s->img_x; ++i) {
-                  stbi_uc m = coutput[3][i];
-                  stbi_uc r = stbi__blinn_8x8(coutput[0][i], m);
-                  stbi_uc g = stbi__blinn_8x8(coutput[1][i], m);
-                  stbi_uc b = stbi__blinn_8x8(coutput[2][i], m);
-                  out[0] = stbi__compute_y(r, g, b);
-                  out[1] = 255;
-                  out += n;
-               }
-            } else if (z->s->img_n == 4 && z->app14_color_transform == 2) {
-               for (i=0; i < z->s->img_x; ++i) {
-                  out[0] = stbi__blinn_8x8(255 - coutput[0][i], coutput[3][i]);
-                  out[1] = 255;
-                  out += n;
-               }
-            } else {
-               stbi_uc *y = coutput[0];
-               if (n == 1)
-                  for (i=0; i < z->s->img_x; ++i) out[i] = y[i];
-               else
-                  for (i=0; i < z->s->img_x; ++i) { *out++ = y[i]; *out++ = 255; }
-            }
-         }
-      }
-      stbi__cleanup_jpeg(z);
-      *out_x = z->s->img_x;
-      *out_y = z->s->img_y;
-      if (comp) *comp = z->s->img_n >= 3 ? 3 : 1; // report original components, not output
-      return output;
-   }
-}
-
-static void *stbi__jpeg_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri)
-{
-   unsigned char* result;
-   stbi__jpeg* j = (stbi__jpeg*) stbi__malloc(sizeof(stbi__jpeg));
-   STBI_NOTUSED(ri);
-   j->s = s;
-   stbi__setup_jpeg(j);
-   result = load_jpeg_image(j, x,y,comp,req_comp);
-   STBI_FREE(j);
-   return result;
-}
-
-static int stbi__jpeg_test(stbi__context *s)
-{
-   int r;
-   stbi__jpeg* j = (stbi__jpeg*)stbi__malloc(sizeof(stbi__jpeg));
-   j->s = s;
-   stbi__setup_jpeg(j);
-   r = stbi__decode_jpeg_header(j, STBI__SCAN_type);
-   stbi__rewind(s);
-   STBI_FREE(j);
-   return r;
-}
-
-static int stbi__jpeg_info_raw(stbi__jpeg *j, int *x, int *y, int *comp)
-{
-   if (!stbi__decode_jpeg_header(j, STBI__SCAN_header)) {
-      stbi__rewind( j->s );
-      return 0;
-   }
-   if (x) *x = j->s->img_x;
-   if (y) *y = j->s->img_y;
-   if (comp) *comp = j->s->img_n >= 3 ? 3 : 1;
-   return 1;
-}
-
-static int stbi__jpeg_info(stbi__context *s, int *x, int *y, int *comp)
-{
-   int result;
-   stbi__jpeg* j = (stbi__jpeg*) (stbi__malloc(sizeof(stbi__jpeg)));
-   j->s = s;
-   result = stbi__jpeg_info_raw(j, x, y, comp);
-   STBI_FREE(j);
-   return result;
-}
-#endif
-
-// public domain zlib decode    v0.2  Sean Barrett 2006-11-18
-//    simple implementation
-//      - all input must be provided in an upfront buffer
-//      - all output is written to a single output buffer (can malloc/realloc)
-//    performance
-//      - fast huffman
-
-#ifndef STBI_NO_ZLIB
-
-// fast-way is faster to check than jpeg huffman, but slow way is slower
-#define STBI__ZFAST_BITS  9 // accelerate all cases in default tables
-#define STBI__ZFAST_MASK  ((1 << STBI__ZFAST_BITS) - 1)
-
-// zlib-style huffman encoding
-// (jpegs packs from left, zlib from right, so can't share code)
-typedef struct
-{
-   stbi__uint16 fast[1 << STBI__ZFAST_BITS];
-   stbi__uint16 firstcode[16];
-   int maxcode[17];
-   stbi__uint16 firstsymbol[16];
-   stbi_uc  size[288];
-   stbi__uint16 value[288];
-} stbi__zhuffman;
-
-stbi_inline static int stbi__bitreverse16(int n)
-{
-  n = ((n & 0xAAAA) >>  1) | ((n & 0x5555) << 1);
-  n = ((n & 0xCCCC) >>  2) | ((n & 0x3333) << 2);
-  n = ((n & 0xF0F0) >>  4) | ((n & 0x0F0F) << 4);
-  n = ((n & 0xFF00) >>  8) | ((n & 0x00FF) << 8);
-  return n;
-}
-
-stbi_inline static int stbi__bit_reverse(int v, int bits)
-{
-   STBI_ASSERT(bits <= 16);
-   // to bit reverse n bits, reverse 16 and shift
-   // e.g. 11 bits, bit reverse and shift away 5
-   return stbi__bitreverse16(v) >> (16-bits);
-}
-
-static int stbi__zbuild_huffman(stbi__zhuffman *z, const stbi_uc *sizelist, int num)
-{
-   int i,k=0;
-   int code, next_code[16], sizes[17];
-
-   // DEFLATE spec for generating codes
-   memset(sizes, 0, sizeof(sizes));
-   memset(z->fast, 0, sizeof(z->fast));
-   for (i=0; i < num; ++i)
-      ++sizes[sizelist[i]];
-   sizes[0] = 0;
-   for (i=1; i < 16; ++i)
-      if (sizes[i] > (1 << i))
-         return stbi__err("bad sizes", "Corrupt PNG");
-   code = 0;
-   for (i=1; i < 16; ++i) {
-      next_code[i] = code;
-      z->firstcode[i] = (stbi__uint16) code;
-      z->firstsymbol[i] = (stbi__uint16) k;
-      code = (code + sizes[i]);
-      if (sizes[i])
-         if (code-1 >= (1 << i)) return stbi__err("bad codelengths","Corrupt PNG");
-      z->maxcode[i] = code << (16-i); // preshift for inner loop
-      code <<= 1;
-      k += sizes[i];
-   }
-   z->maxcode[16] = 0x10000; // sentinel
-   for (i=0; i < num; ++i) {
-      int s = sizelist[i];
-      if (s) {
-         int c = next_code[s] - z->firstcode[s] + z->firstsymbol[s];
-         stbi__uint16 fastv = (stbi__uint16) ((s << 9) | i);
-         z->size [c] = (stbi_uc     ) s;
-         z->value[c] = (stbi__uint16) i;
-         if (s <= STBI__ZFAST_BITS) {
-            int j = stbi__bit_reverse(next_code[s],s);
-            while (j < (1 << STBI__ZFAST_BITS)) {
-               z->fast[j] = fastv;
-               j += (1 << s);
-            }
-         }
-         ++next_code[s];
-      }
-   }
-   return 1;
-}
-
-// zlib-from-memory implementation for PNG reading
-//    because PNG allows splitting the zlib stream arbitrarily,
-//    and it's annoying structurally to have PNG call ZLIB call PNG,
-//    we require PNG read all the IDATs and combine them into a single
-//    memory buffer
-
-typedef struct
-{
-   stbi_uc *zbuffer, *zbuffer_end;
-   int num_bits;
-   stbi__uint32 code_buffer;
-
-   char *zout;
-   char *zout_start;
-   char *zout_end;
-   int   z_expandable;
-
-   stbi__zhuffman z_length, z_distance;
-} stbi__zbuf;
-
-stbi_inline static stbi_uc stbi__zget8(stbi__zbuf *z)
-{
-   if (z->zbuffer >= z->zbuffer_end) return 0;
-   return *z->zbuffer++;
-}
-
-static void stbi__fill_bits(stbi__zbuf *z)
-{
-   do {
-      STBI_ASSERT(z->code_buffer < (1U << z->num_bits));
-      z->code_buffer |= (unsigned int) stbi__zget8(z) << z->num_bits;
-      z->num_bits += 8;
-   } while (z->num_bits <= 24);
-}
-
-stbi_inline static unsigned int stbi__zreceive(stbi__zbuf *z, int n)
-{
-   unsigned int k;
-   if (z->num_bits < n) stbi__fill_bits(z);
-   k = z->code_buffer & ((1 << n) - 1);
-   z->code_buffer >>= n;
-   z->num_bits -= n;
-   return k;
-}
-
-static int stbi__zhuffman_decode_slowpath(stbi__zbuf *a, stbi__zhuffman *z)
-{
-   int b,s,k;
-   // not resolved by fast table, so compute it the slow way
-   // use jpeg approach, which requires MSbits at top
-   k = stbi__bit_reverse(a->code_buffer, 16);
-   for (s=STBI__ZFAST_BITS+1; ; ++s)
-      if (k < z->maxcode[s])
-         break;
-   if (s == 16) return -1; // invalid code!
-   // code size is s, so:
-   b = (k >> (16-s)) - z->firstcode[s] + z->firstsymbol[s];
-   STBI_ASSERT(z->size[b] == s);
-   a->code_buffer >>= s;
-   a->num_bits -= s;
-   return z->value[b];
-}
-
-stbi_inline static int stbi__zhuffman_decode(stbi__zbuf *a, stbi__zhuffman *z)
-{
-   int b,s;
-   if (a->num_bits < 16) stbi__fill_bits(a);
-   b = z->fast[a->code_buffer & STBI__ZFAST_MASK];
-   if (b) {
-      s = b >> 9;
-      a->code_buffer >>= s;
-      a->num_bits -= s;
-      return b & 511;
-   }
-   return stbi__zhuffman_decode_slowpath(a, z);
-}
-
-static int stbi__zexpand(stbi__zbuf *z, char *zout, int n)  // need to make room for n bytes
-{
-   char *q;
-   int cur, limit, old_limit;
-   z->zout = zout;
-   if (!z->z_expandable) return stbi__err("output buffer limit","Corrupt PNG");
-   cur   = (int) (z->zout     - z->zout_start);
-   limit = old_limit = (int) (z->zout_end - z->zout_start);
-   while (cur + n > limit)
-      limit *= 2;
-   q = (char *) STBI_REALLOC_SIZED(z->zout_start, old_limit, limit);
-   STBI_NOTUSED(old_limit);
-   if (q == NULL) return stbi__err("outofmem", "Out of memory");
-   z->zout_start = q;
-   z->zout       = q + cur;
-   z->zout_end   = q + limit;
-   return 1;
-}
-
-static const int stbi__zlength_base[31] = {
-   3,4,5,6,7,8,9,10,11,13,
-   15,17,19,23,27,31,35,43,51,59,
-   67,83,99,115,131,163,195,227,258,0,0 };
-
-static const int stbi__zlength_extra[31]=
-{ 0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0,0,0 };
-
-static const int stbi__zdist_base[32] = { 1,2,3,4,5,7,9,13,17,25,33,49,65,97,129,193,
-257,385,513,769,1025,1537,2049,3073,4097,6145,8193,12289,16385,24577,0,0};
-
-static const int stbi__zdist_extra[32] =
-{ 0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13};
-
-static int stbi__parse_huffman_block(stbi__zbuf *a)
-{
-   char *zout = a->zout;
-   for(;;) {
-      int z = stbi__zhuffman_decode(a, &a->z_length);
-      if (z < 256) {
-         if (z < 0) return stbi__err("bad huffman code","Corrupt PNG"); // error in huffman codes
-         if (zout >= a->zout_end) {
-            if (!stbi__zexpand(a, zout, 1)) return 0;
-            zout = a->zout;
-         }
-         *zout++ = (char) z;
-      } else {
-         stbi_uc *p;
-         int len,dist;
-         if (z == 256) {
-            a->zout = zout;
-            return 1;
-         }
-         z -= 257;
-         len = stbi__zlength_base[z];
-         if (stbi__zlength_extra[z]) len += stbi__zreceive(a, stbi__zlength_extra[z]);
-         z = stbi__zhuffman_decode(a, &a->z_distance);
-         if (z < 0) return stbi__err("bad huffman code","Corrupt PNG");
-         dist = stbi__zdist_base[z];
-         if (stbi__zdist_extra[z]) dist += stbi__zreceive(a, stbi__zdist_extra[z]);
-         if (zout - a->zout_start < dist) return stbi__err("bad dist","Corrupt PNG");
-         if (zout + len > a->zout_end) {
-            if (!stbi__zexpand(a, zout, len)) return 0;
-            zout = a->zout;
-         }
-         p = (stbi_uc *) (zout - dist);
-         if (dist == 1) { // run of one byte; common in images.
-            stbi_uc v = *p;
-            if (len) { do *zout++ = v; while (--len); }
-         } else {
-            if (len) { do *zout++ = *p++; while (--len); }
-         }
-      }
-   }
-}
-
-static int stbi__compute_huffman_codes(stbi__zbuf *a)
-{
-   static const stbi_uc length_dezigzag[19] = { 16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15 };
-   stbi__zhuffman z_codelength;
-   stbi_uc lencodes[286+32+137];//padding for maximum single op
-   stbi_uc codelength_sizes[19];
-   int i,n;
-
-   int hlit  = stbi__zreceive(a,5) + 257;
-   int hdist = stbi__zreceive(a,5) + 1;
-   int hclen = stbi__zreceive(a,4) + 4;
-   int ntot  = hlit + hdist;
-
-   memset(codelength_sizes, 0, sizeof(codelength_sizes));
-   for (i=0; i < hclen; ++i) {
-      int s = stbi__zreceive(a,3);
-      codelength_sizes[length_dezigzag[i]] = (stbi_uc) s;
-   }
-   if (!stbi__zbuild_huffman(&z_codelength, codelength_sizes, 19)) return 0;
-
-   n = 0;
-   while (n < ntot) {
-      int c = stbi__zhuffman_decode(a, &z_codelength);
-      if (c < 0 || c >= 19) return stbi__err("bad codelengths", "Corrupt PNG");
-      if (c < 16)
-         lencodes[n++] = (stbi_uc) c;
-      else {
-         stbi_uc fill = 0;
-         if (c == 16) {
-            c = stbi__zreceive(a,2)+3;
-            if (n == 0) return stbi__err("bad codelengths", "Corrupt PNG");
-            fill = lencodes[n-1];
-         } else if (c == 17)
-            c = stbi__zreceive(a,3)+3;
-         else {
-            STBI_ASSERT(c == 18);
-            c = stbi__zreceive(a,7)+11;
-         }
-         if (ntot - n < c) return stbi__err("bad codelengths", "Corrupt PNG");
-         memset(lencodes+n, fill, c);
-         n += c;
-      }
-   }
-   if (n != ntot) return stbi__err("bad codelengths","Corrupt PNG");
-   if (!stbi__zbuild_huffman(&a->z_length, lencodes, hlit)) return 0;
-   if (!stbi__zbuild_huffman(&a->z_distance, lencodes+hlit, hdist)) return 0;
-   return 1;
-}
-
-static int stbi__parse_uncompressed_block(stbi__zbuf *a)
-{
-   stbi_uc header[4];
-   int len,nlen,k;
-   if (a->num_bits & 7)
-      stbi__zreceive(a, a->num_bits & 7); // discard
-   // drain the bit-packed data into header
-   k = 0;
-   while (a->num_bits > 0) {
-      header[k++] = (stbi_uc) (a->code_buffer & 255); // suppress MSVC run-time check
-      a->code_buffer >>= 8;
-      a->num_bits -= 8;
-   }
-   STBI_ASSERT(a->num_bits == 0);
-   // now fill header the normal way
-   while (k < 4)
-      header[k++] = stbi__zget8(a);
-   len  = header[1] * 256 + header[0];
-   nlen = header[3] * 256 + header[2];
-   if (nlen != (len ^ 0xffff)) return stbi__err("zlib corrupt","Corrupt PNG");
-   if (a->zbuffer + len > a->zbuffer_end) return stbi__err("read past buffer","Corrupt PNG");
-   if (a->zout + len > a->zout_end)
-      if (!stbi__zexpand(a, a->zout, len)) return 0;
-   memcpy(a->zout, a->zbuffer, len);
-   a->zbuffer += len;
-   a->zout += len;
-   return 1;
-}
-
-static int stbi__parse_zlib_header(stbi__zbuf *a)
-{
-   int cmf   = stbi__zget8(a);
-   int cm    = cmf & 15;
-   /* int cinfo = cmf >> 4; */
-   int flg   = stbi__zget8(a);
-   if ((cmf*256+flg) % 31 != 0) return stbi__err("bad zlib header","Corrupt PNG"); // zlib spec
-   if (flg & 32) return stbi__err("no preset dict","Corrupt PNG"); // preset dictionary not allowed in png
-   if (cm != 8) return stbi__err("bad compression","Corrupt PNG"); // DEFLATE required for png
-   // window = 1 << (8 + cinfo)... but who cares, we fully buffer output
-   return 1;
-}
-
-static const stbi_uc stbi__zdefault_length[288] =
-{
-   8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
-   8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
-   8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
-   8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
-   8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, 9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
-   9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, 9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
-   9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, 9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
-   9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, 9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
-   7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, 7,7,7,7,7,7,7,7,8,8,8,8,8,8,8,8
-};
-static const stbi_uc stbi__zdefault_distance[32] =
-{
-   5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
-};
-/*
-Init algorithm:
-{
-   int i;   // use <= to match clearly with spec
-   for (i=0; i <= 143; ++i)     stbi__zdefault_length[i]   = 8;
-   for (   ; i <= 255; ++i)     stbi__zdefault_length[i]   = 9;
-   for (   ; i <= 279; ++i)     stbi__zdefault_length[i]   = 7;
-   for (   ; i <= 287; ++i)     stbi__zdefault_length[i]   = 8;
-
-   for (i=0; i <=  31; ++i)     stbi__zdefault_distance[i] = 5;
-}
-*/
-
-static int stbi__parse_zlib(stbi__zbuf *a, int parse_header)
-{
-   int final, type;
-   if (parse_header)
-      if (!stbi__parse_zlib_header(a)) return 0;
-   a->num_bits = 0;
-   a->code_buffer = 0;
-   do {
-      final = stbi__zreceive(a,1);
-      type = stbi__zreceive(a,2);
-      if (type == 0) {
-         if (!stbi__parse_uncompressed_block(a)) return 0;
-      } else if (type == 3) {
-         return 0;
-      } else {
-         if (type == 1) {
-            // use fixed code lengths
-            if (!stbi__zbuild_huffman(&a->z_length  , stbi__zdefault_length  , 288)) return 0;
-            if (!stbi__zbuild_huffman(&a->z_distance, stbi__zdefault_distance,  32)) return 0;
-         } else {
-            if (!stbi__compute_huffman_codes(a)) return 0;
-         }
-         if (!stbi__parse_huffman_block(a)) return 0;
-      }
-   } while (!final);
-   return 1;
-}
-
-static int stbi__do_zlib(stbi__zbuf *a, char *obuf, int olen, int exp, int parse_header)
-{
-   a->zout_start = obuf;
-   a->zout       = obuf;
-   a->zout_end   = obuf + olen;
-   a->z_expandable = exp;
-
-   return stbi__parse_zlib(a, parse_header);
-}
-
-STBIDEF char *stbi_zlib_decode_malloc_guesssize(const char *buffer, int len, int initial_size, int *outlen)
-{
-   stbi__zbuf a;
-   char *p = (char *) stbi__malloc(initial_size);
-   if (p == NULL) return NULL;
-   a.zbuffer = (stbi_uc *) buffer;
-   a.zbuffer_end = (stbi_uc *) buffer + len;
-   if (stbi__do_zlib(&a, p, initial_size, 1, 1)) {
-      if (outlen) *outlen = (int) (a.zout - a.zout_start);
-      return a.zout_start;
-   } else {
-      STBI_FREE(a.zout_start);
-      return NULL;
-   }
-}
-
-STBIDEF char *stbi_zlib_decode_malloc(char const *buffer, int len, int *outlen)
-{
-   return stbi_zlib_decode_malloc_guesssize(buffer, len, 16384, outlen);
-}
-
-STBIDEF char *stbi_zlib_decode_malloc_guesssize_headerflag(const char *buffer, int len, int initial_size, int *outlen, int parse_header)
-{
-   stbi__zbuf a;
-   char *p = (char *) stbi__malloc(initial_size);
-   if (p == NULL) return NULL;
-   a.zbuffer = (stbi_uc *) buffer;
-   a.zbuffer_end = (stbi_uc *) buffer + len;
-   if (stbi__do_zlib(&a, p, initial_size, 1, parse_header)) {
-      if (outlen) *outlen = (int) (a.zout - a.zout_start);
-      return a.zout_start;
-   } else {
-      STBI_FREE(a.zout_start);
-      return NULL;
-   }
-}
-
-STBIDEF int stbi_zlib_decode_buffer(char *obuffer, int olen, char const *ibuffer, int ilen)
-{
-   stbi__zbuf a;
-   a.zbuffer = (stbi_uc *) ibuffer;
-   a.zbuffer_end = (stbi_uc *) ibuffer + ilen;
-   if (stbi__do_zlib(&a, obuffer, olen, 0, 1))
-      return (int) (a.zout - a.zout_start);
-   else
-      return -1;
-}
-
-STBIDEF char *stbi_zlib_decode_noheader_malloc(char const *buffer, int len, int *outlen)
-{
-   stbi__zbuf a;
-   char *p = (char *) stbi__malloc(16384);
-   if (p == NULL) return NULL;
-   a.zbuffer = (stbi_uc *) buffer;
-   a.zbuffer_end = (stbi_uc *) buffer+len;
-   if (stbi__do_zlib(&a, p, 16384, 1, 0)) {
-      if (outlen) *outlen = (int) (a.zout - a.zout_start);
-      return a.zout_start;
-   } else {
-      STBI_FREE(a.zout_start);
-      return NULL;
-   }
-}
-
-STBIDEF int stbi_zlib_decode_noheader_buffer(char *obuffer, int olen, const char *ibuffer, int ilen)
-{
-   stbi__zbuf a;
-   a.zbuffer = (stbi_uc *) ibuffer;
-   a.zbuffer_end = (stbi_uc *) ibuffer + ilen;
-   if (stbi__do_zlib(&a, obuffer, olen, 0, 0))
-      return (int) (a.zout - a.zout_start);
-   else
-      return -1;
-}
-#endif
-
-// public domain "baseline" PNG decoder   v0.10  Sean Barrett 2006-11-18
-//    simple implementation
-//      - only 8-bit samples
-//      - no CRC checking
-//      - allocates lots of intermediate memory
-//        - avoids problem of streaming data between subsystems
-//        - avoids explicit window management
-//    performance
-//      - uses stb_zlib, a PD zlib implementation with fast huffman decoding
-
-#ifndef STBI_NO_PNG
-typedef struct
-{
-   stbi__uint32 length;
-   stbi__uint32 type;
-} stbi__pngchunk;
-
-static stbi__pngchunk stbi__get_chunk_header(stbi__context *s)
-{
-   stbi__pngchunk c;
-   c.length = stbi__get32be(s);
-   c.type   = stbi__get32be(s);
-   return c;
-}
-
-static int stbi__check_png_header(stbi__context *s)
-{
-   static const stbi_uc png_sig[8] = { 137,80,78,71,13,10,26,10 };
-   int i;
-   for (i=0; i < 8; ++i)
-      if (stbi__get8(s) != png_sig[i]) return stbi__err("bad png sig","Not a PNG");
-   return 1;
-}
-
-typedef struct
-{
-   stbi__context *s;
-   stbi_uc *idata, *expanded, *out;
-   int depth;
-} stbi__png;
-
-
-enum {
-   STBI__F_none=0,
-   STBI__F_sub=1,
-   STBI__F_up=2,
-   STBI__F_avg=3,
-   STBI__F_paeth=4,
-   // synthetic filters used for first scanline to avoid needing a dummy row of 0s
-   STBI__F_avg_first,
-   STBI__F_paeth_first
-};
-
-static stbi_uc first_row_filter[5] =
-{
-   STBI__F_none,
-   STBI__F_sub,
-   STBI__F_none,
-   STBI__F_avg_first,
-   STBI__F_paeth_first
-};
-
-static int stbi__paeth(int a, int b, int c)
-{
-   int p = a + b - c;
-   int pa = abs(p-a);
-   int pb = abs(p-b);
-   int pc = abs(p-c);
-   if (pa <= pb && pa <= pc) return a;
-   if (pb <= pc) return b;
-   return c;
-}
-
-static const stbi_uc stbi__depth_scale_table[9] = { 0, 0xff, 0x55, 0, 0x11, 0,0,0, 0x01 };
-
-// create the png data from post-deflated data
-static int stbi__create_png_image_raw(stbi__png *a, stbi_uc *raw, stbi__uint32 raw_len, int out_n, stbi__uint32 x, stbi__uint32 y, int depth, int color)
-{
-   int bytes = (depth == 16? 2 : 1);
-   stbi__context *s = a->s;
-   stbi__uint32 i,j,stride = x*out_n*bytes;
-   stbi__uint32 img_len, img_width_bytes;
-   int k;
-   int img_n = s->img_n; // copy it into a local for later
-
-   int output_bytes = out_n*bytes;
-   int filter_bytes = img_n*bytes;
-   int width = x;
-
-   STBI_ASSERT(out_n == s->img_n || out_n == s->img_n+1);
-   a->out = (stbi_uc *) stbi__malloc_mad3(x, y, output_bytes, 0); // extra bytes to write off the end into
-   if (!a->out) return stbi__err("outofmem", "Out of memory");
-
-   if (!stbi__mad3sizes_valid(img_n, x, depth, 7)) return stbi__err("too large", "Corrupt PNG");
-   img_width_bytes = (((img_n * x * depth) + 7) >> 3);
-   img_len = (img_width_bytes + 1) * y;
-
-   // we used to check for exact match between raw_len and img_len on non-interlaced PNGs,
-   // but issue #276 reported a PNG in the wild that had extra data at the end (all zeros),
-   // so just check for raw_len < img_len always.
-   if (raw_len < img_len) return stbi__err("not enough pixels","Corrupt PNG");
-
-   for (j=0; j < y; ++j) {
-      stbi_uc *cur = a->out + stride*j;
-      stbi_uc *prior;
-      int filter = *raw++;
-
-      if (filter > 4)
-         return stbi__err("invalid filter","Corrupt PNG");
-
-      if (depth < 8) {
-         STBI_ASSERT(img_width_bytes <= x);
-         cur += x*out_n - img_width_bytes; // store output to the rightmost img_len bytes, so we can decode in place
-         filter_bytes = 1;
-         width = img_width_bytes;
-      }
-      prior = cur - stride; // bugfix: need to compute this after 'cur +=' computation above
-
-      // if first row, use special filter that doesn't sample previous row
-      if (j == 0) filter = first_row_filter[filter];
-
-      // handle first byte explicitly
-      for (k=0; k < filter_bytes; ++k) {
-         switch (filter) {
-            case STBI__F_none       : cur[k] = raw[k]; break;
-            case STBI__F_sub        : cur[k] = raw[k]; break;
-            case STBI__F_up         : cur[k] = STBI__BYTECAST(raw[k] + prior[k]); break;
-            case STBI__F_avg        : cur[k] = STBI__BYTECAST(raw[k] + (prior[k]>>1)); break;
-            case STBI__F_paeth      : cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(0,prior[k],0)); break;
-            case STBI__F_avg_first  : cur[k] = raw[k]; break;
-            case STBI__F_paeth_first: cur[k] = raw[k]; break;
-         }
-      }
-
-      if (depth == 8) {
-         if (img_n != out_n)
-            cur[img_n] = 255; // first pixel
-         raw += img_n;
-         cur += out_n;
-         prior += out_n;
-      } else if (depth == 16) {
-         if (img_n != out_n) {
-            cur[filter_bytes]   = 255; // first pixel top byte
-            cur[filter_bytes+1] = 255; // first pixel bottom byte
-         }
-         raw += filter_bytes;
-         cur += output_bytes;
-         prior += output_bytes;
-      } else {
-         raw += 1;
-         cur += 1;
-         prior += 1;
-      }
-
-      // this is a little gross, so that we don't switch per-pixel or per-component
-      if (depth < 8 || img_n == out_n) {
-         int nk = (width - 1)*filter_bytes;
-         #define STBI__CASE(f) \
-             case f:     \
-                for (k=0; k < nk; ++k)
-         switch (filter) {
-            // "none" filter turns into a memcpy here; make that explicit.
-            case STBI__F_none:         memcpy(cur, raw, nk); break;
-            STBI__CASE(STBI__F_sub)          { cur[k] = STBI__BYTECAST(raw[k] + cur[k-filter_bytes]); } break;
-            STBI__CASE(STBI__F_up)           { cur[k] = STBI__BYTECAST(raw[k] + prior[k]); } break;
-            STBI__CASE(STBI__F_avg)          { cur[k] = STBI__BYTECAST(raw[k] + ((prior[k] + cur[k-filter_bytes])>>1)); } break;
-            STBI__CASE(STBI__F_paeth)        { cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(cur[k-filter_bytes],prior[k],prior[k-filter_bytes])); } break;
-            STBI__CASE(STBI__F_avg_first)    { cur[k] = STBI__BYTECAST(raw[k] + (cur[k-filter_bytes] >> 1)); } break;
-            STBI__CASE(STBI__F_paeth_first)  { cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(cur[k-filter_bytes],0,0)); } break;
-         }
-         #undef STBI__CASE
-         raw += nk;
-      } else {
-         STBI_ASSERT(img_n+1 == out_n);
-         #define STBI__CASE(f) \
-             case f:     \
-                for (i=x-1; i >= 1; --i, cur[filter_bytes]=255,raw+=filter_bytes,cur+=output_bytes,prior+=output_bytes) \
-                   for (k=0; k < filter_bytes; ++k)
-         switch (filter) {
-            STBI__CASE(STBI__F_none)         { cur[k] = raw[k]; } break;
-            STBI__CASE(STBI__F_sub)          { cur[k] = STBI__BYTECAST(raw[k] + cur[k- output_bytes]); } break;
-            STBI__CASE(STBI__F_up)           { cur[k] = STBI__BYTECAST(raw[k] + prior[k]); } break;
-            STBI__CASE(STBI__F_avg)          { cur[k] = STBI__BYTECAST(raw[k] + ((prior[k] + cur[k- output_bytes])>>1)); } break;
-            STBI__CASE(STBI__F_paeth)        { cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(cur[k- output_bytes],prior[k],prior[k- output_bytes])); } break;
-            STBI__CASE(STBI__F_avg_first)    { cur[k] = STBI__BYTECAST(raw[k] + (cur[k- output_bytes] >> 1)); } break;
-            STBI__CASE(STBI__F_paeth_first)  { cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(cur[k- output_bytes],0,0)); } break;
-         }
-         #undef STBI__CASE
-
-         // the loop above sets the high byte of the pixels' alpha, but for
-         // 16 bit png files we also need the low byte set. we'll do that here.
-         if (depth == 16) {
-            cur = a->out + stride*j; // start at the beginning of the row again
-            for (i=0; i < x; ++i,cur+=output_bytes) {
-               cur[filter_bytes+1] = 255;
-            }
-         }
-      }
-   }
-
-   // we make a separate pass to expand bits to pixels; for performance,
-   // this could run two scanlines behind the above code, so it won't
-   // intefere with filtering but will still be in the cache.
-   if (depth < 8) {
-      for (j=0; j < y; ++j) {
-         stbi_uc *cur = a->out + stride*j;
-         stbi_uc *in  = a->out + stride*j + x*out_n - img_width_bytes;
-         // unpack 1/2/4-bit into a 8-bit buffer. allows us to keep the common 8-bit path optimal at minimal cost for 1/2/4-bit
-         // png guarante byte alignment, if width is not multiple of 8/4/2 we'll decode dummy trailing data that will be skipped in the later loop
-         stbi_uc scale = (color == 0) ? stbi__depth_scale_table[depth] : 1; // scale grayscale values to 0..255 range
-
-         // note that the final byte might overshoot and write more data than desired.
-         // we can allocate enough data that this never writes out of memory, but it
-         // could also overwrite the next scanline. can it overwrite non-empty data
-         // on the next scanline? yes, consider 1-pixel-wide scanlines with 1-bit-per-pixel.
-         // so we need to explicitly clamp the final ones
-
-         if (depth == 4) {
-            for (k=x*img_n; k >= 2; k-=2, ++in) {
-               *cur++ = scale * ((*in >> 4)       );
-               *cur++ = scale * ((*in     ) & 0x0f);
-            }
-            if (k > 0) *cur++ = scale * ((*in >> 4)       );
-         } else if (depth == 2) {
-            for (k=x*img_n; k >= 4; k-=4, ++in) {
-               *cur++ = scale * ((*in >> 6)       );
-               *cur++ = scale * ((*in >> 4) & 0x03);
-               *cur++ = scale * ((*in >> 2) & 0x03);
-               *cur++ = scale * ((*in     ) & 0x03);
-            }
-            if (k > 0) *cur++ = scale * ((*in >> 6)       );
-            if (k > 1) *cur++ = scale * ((*in >> 4) & 0x03);
-            if (k > 2) *cur++ = scale * ((*in >> 2) & 0x03);
-         } else if (depth == 1) {
-            for (k=x*img_n; k >= 8; k-=8, ++in) {
-               *cur++ = scale * ((*in >> 7)       );
-               *cur++ = scale * ((*in >> 6) & 0x01);
-               *cur++ = scale * ((*in >> 5) & 0x01);
-               *cur++ = scale * ((*in >> 4) & 0x01);
-               *cur++ = scale * ((*in >> 3) & 0x01);
-               *cur++ = scale * ((*in >> 2) & 0x01);
-               *cur++ = scale * ((*in >> 1) & 0x01);
-               *cur++ = scale * ((*in     ) & 0x01);
-            }
-            if (k > 0) *cur++ = scale * ((*in >> 7)       );
-            if (k > 1) *cur++ = scale * ((*in >> 6) & 0x01);
-            if (k > 2) *cur++ = scale * ((*in >> 5) & 0x01);
-            if (k > 3) *cur++ = scale * ((*in >> 4) & 0x01);
-            if (k > 4) *cur++ = scale * ((*in >> 3) & 0x01);
-            if (k > 5) *cur++ = scale * ((*in >> 2) & 0x01);
-            if (k > 6) *cur++ = scale * ((*in >> 1) & 0x01);
-         }
-         if (img_n != out_n) {
-            int q;
-            // insert alpha = 255
-            cur = a->out + stride*j;
-            if (img_n == 1) {
-               for (q=x-1; q >= 0; --q) {
-                  cur[q*2+1] = 255;
-                  cur[q*2+0] = cur[q];
-               }
-            } else {
-               STBI_ASSERT(img_n == 3);
-               for (q=x-1; q >= 0; --q) {
-                  cur[q*4+3] = 255;
-                  cur[q*4+2] = cur[q*3+2];
-                  cur[q*4+1] = cur[q*3+1];
-                  cur[q*4+0] = cur[q*3+0];
-               }
-            }
-         }
-      }
-   } else if (depth == 16) {
-      // force the image data from big-endian to platform-native.
-      // this is done in a separate pass due to the decoding relying
-      // on the data being untouched, but could probably be done
-      // per-line during decode if care is taken.
-      stbi_uc *cur = a->out;
-      stbi__uint16 *cur16 = (stbi__uint16*)cur;
-
-      for(i=0; i < x*y*out_n; ++i,cur16++,cur+=2) {
-         *cur16 = (cur[0] << 8) | cur[1];
-      }
-   }
-
-   return 1;
-}
-
-static int stbi__create_png_image(stbi__png *a, stbi_uc *image_data, stbi__uint32 image_data_len, int out_n, int depth, int color, int interlaced)
-{
-   int bytes = (depth == 16 ? 2 : 1);
-   int out_bytes = out_n * bytes;
-   stbi_uc *final;
-   int p;
-   if (!interlaced)
-      return stbi__create_png_image_raw(a, image_data, image_data_len, out_n, a->s->img_x, a->s->img_y, depth, color);
-
-   // de-interlacing
-   final = (stbi_uc *) stbi__malloc_mad3(a->s->img_x, a->s->img_y, out_bytes, 0);
-   for (p=0; p < 7; ++p) {
-      int xorig[] = { 0,4,0,2,0,1,0 };
-      int yorig[] = { 0,0,4,0,2,0,1 };
-      int xspc[]  = { 8,8,4,4,2,2,1 };
-      int yspc[]  = { 8,8,8,4,4,2,2 };
-      int i,j,x,y;
-      // pass1_x[4] = 0, pass1_x[5] = 1, pass1_x[12] = 1
-      x = (a->s->img_x - xorig[p] + xspc[p]-1) / xspc[p];
-      y = (a->s->img_y - yorig[p] + yspc[p]-1) / yspc[p];
-      if (x && y) {
-         stbi__uint32 img_len = ((((a->s->img_n * x * depth) + 7) >> 3) + 1) * y;
-         if (!stbi__create_png_image_raw(a, image_data, image_data_len, out_n, x, y, depth, color)) {
-            STBI_FREE(final);
-            return 0;
-         }
-         for (j=0; j < y; ++j) {
-            for (i=0; i < x; ++i) {
-               int out_y = j*yspc[p]+yorig[p];
-               int out_x = i*xspc[p]+xorig[p];
-               memcpy(final + out_y*a->s->img_x*out_bytes + out_x*out_bytes,
-                      a->out + (j*x+i)*out_bytes, out_bytes);
-            }
-         }
-         STBI_FREE(a->out);
-         image_data += img_len;
-         image_data_len -= img_len;
-      }
-   }
-   a->out = final;
-
-   return 1;
-}
-
-static int stbi__compute_transparency(stbi__png *z, stbi_uc tc[3], int out_n)
-{
-   stbi__context *s = z->s;
-   stbi__uint32 i, pixel_count = s->img_x * s->img_y;
-   stbi_uc *p = z->out;
-
-   // compute color-based transparency, assuming we've
-   // already got 255 as the alpha value in the output
-   STBI_ASSERT(out_n == 2 || out_n == 4);
-
-   if (out_n == 2) {
-      for (i=0; i < pixel_count; ++i) {
-         p[1] = (p[0] == tc[0] ? 0 : 255);
-         p += 2;
-      }
-   } else {
-      for (i=0; i < pixel_count; ++i) {
-         if (p[0] == tc[0] && p[1] == tc[1] && p[2] == tc[2])
-            p[3] = 0;
-         p += 4;
-      }
-   }
-   return 1;
-}
-
-static int stbi__compute_transparency16(stbi__png *z, stbi__uint16 tc[3], int out_n)
-{
-   stbi__context *s = z->s;
-   stbi__uint32 i, pixel_count = s->img_x * s->img_y;
-   stbi__uint16 *p = (stbi__uint16*) z->out;
-
-   // compute color-based transparency, assuming we've
-   // already got 65535 as the alpha value in the output
-   STBI_ASSERT(out_n == 2 || out_n == 4);
-
-   if (out_n == 2) {
-      for (i = 0; i < pixel_count; ++i) {
-         p[1] = (p[0] == tc[0] ? 0 : 65535);
-         p += 2;
-      }
-   } else {
-      for (i = 0; i < pixel_count; ++i) {
-         if (p[0] == tc[0] && p[1] == tc[1] && p[2] == tc[2])
-            p[3] = 0;
-         p += 4;
-      }
-   }
-   return 1;
-}
-
-static int stbi__expand_png_palette(stbi__png *a, stbi_uc *palette, int len, int pal_img_n)
-{
-   stbi__uint32 i, pixel_count = a->s->img_x * a->s->img_y;
-   stbi_uc *p, *temp_out, *orig = a->out;
-
-   p = (stbi_uc *) stbi__malloc_mad2(pixel_count, pal_img_n, 0);
-   if (p == NULL) return stbi__err("outofmem", "Out of memory");
-
-   // between here and free(out) below, exitting would leak
-   temp_out = p;
-
-   if (pal_img_n == 3) {
-      for (i=0; i < pixel_count; ++i) {
-         int n = orig[i]*4;
-         p[0] = palette[n  ];
-         p[1] = palette[n+1];
-         p[2] = palette[n+2];
-         p += 3;
-      }
-   } else {
-      for (i=0; i < pixel_count; ++i) {
-         int n = orig[i]*4;
-         p[0] = palette[n  ];
-         p[1] = palette[n+1];
-         p[2] = palette[n+2];
-         p[3] = palette[n+3];
-         p += 4;
-      }
-   }
-   STBI_FREE(a->out);
-   a->out = temp_out;
-
-   STBI_NOTUSED(len);
-
-   return 1;
-}
-
-static int stbi__unpremultiply_on_load = 0;
-static int stbi__de_iphone_flag = 0;
-
-STBIDEF void stbi_set_unpremultiply_on_load(int flag_true_if_should_unpremultiply)
-{
-   stbi__unpremultiply_on_load = flag_true_if_should_unpremultiply;
-}
-
-STBIDEF void stbi_convert_iphone_png_to_rgb(int flag_true_if_should_convert)
-{
-   stbi__de_iphone_flag = flag_true_if_should_convert;
-}
-
-static void stbi__de_iphone(stbi__png *z)
-{
-   stbi__context *s = z->s;
-   stbi__uint32 i, pixel_count = s->img_x * s->img_y;
-   stbi_uc *p = z->out;
-
-   if (s->img_out_n == 3) {  // convert bgr to rgb
-      for (i=0; i < pixel_count; ++i) {
-         stbi_uc t = p[0];
-         p[0] = p[2];
-         p[2] = t;
-         p += 3;
-      }
-   } else {
-      STBI_ASSERT(s->img_out_n == 4);
-      if (stbi__unpremultiply_on_load) {
-         // convert bgr to rgb and unpremultiply
-         for (i=0; i < pixel_count; ++i) {
-            stbi_uc a = p[3];
-            stbi_uc t = p[0];
-            if (a) {
-               stbi_uc half = a / 2;
-               p[0] = (p[2] * 255 + half) / a;
-               p[1] = (p[1] * 255 + half) / a;
-               p[2] = ( t   * 255 + half) / a;
-            } else {
-               p[0] = p[2];
-               p[2] = t;
-            }
-            p += 4;
-         }
-      } else {
-         // convert bgr to rgb
-         for (i=0; i < pixel_count; ++i) {
-            stbi_uc t = p[0];
-            p[0] = p[2];
-            p[2] = t;
-            p += 4;
-         }
-      }
-   }
-}
-
-#define STBI__PNG_TYPE(a,b,c,d)  (((unsigned) (a) << 24) + ((unsigned) (b) << 16) + ((unsigned) (c) << 8) + (unsigned) (d))
-
-static int stbi__parse_png_file(stbi__png *z, int scan, int req_comp)
-{
-   stbi_uc palette[1024], pal_img_n=0;
-   stbi_uc has_trans=0, tc[3]={0};
-   stbi__uint16 tc16[3];
-   stbi__uint32 ioff=0, idata_limit=0, i, pal_len=0;
-   int first=1,k,interlace=0, color=0, is_iphone=0;
-   stbi__context *s = z->s;
-
-   z->expanded = NULL;
-   z->idata = NULL;
-   z->out = NULL;
-
-   if (!stbi__check_png_header(s)) return 0;
-
-   if (scan == STBI__SCAN_type) return 1;
-
-   for (;;) {
-      stbi__pngchunk c = stbi__get_chunk_header(s);
-      switch (c.type) {
-         case STBI__PNG_TYPE('C','g','B','I'):
-            is_iphone = 1;
-            stbi__skip(s, c.length);
-            break;
-         case STBI__PNG_TYPE('I','H','D','R'): {
-            int comp,filter;
-            if (!first) return stbi__err("multiple IHDR","Corrupt PNG");
-            first = 0;
-            if (c.length != 13) return stbi__err("bad IHDR len","Corrupt PNG");
-            s->img_x = stbi__get32be(s); if (s->img_x > (1 << 24)) return stbi__err("too large","Very large image (corrupt?)");
-            s->img_y = stbi__get32be(s); if (s->img_y > (1 << 24)) return stbi__err("too large","Very large image (corrupt?)");
-            z->depth = stbi__get8(s);  if (z->depth != 1 && z->depth != 2 && z->depth != 4 && z->depth != 8 && z->depth != 16)  return stbi__err("1/2/4/8/16-bit only","PNG not supported: 1/2/4/8/16-bit only");
-            color = stbi__get8(s);  if (color > 6)         return stbi__err("bad ctype","Corrupt PNG");
-            if (color == 3 && z->depth == 16)                  return stbi__err("bad ctype","Corrupt PNG");
-            if (color == 3) pal_img_n = 3; else if (color & 1) return stbi__err("bad ctype","Corrupt PNG");
-            comp  = stbi__get8(s);  if (comp) return stbi__err("bad comp method","Corrupt PNG");
-            filter= stbi__get8(s);  if (filter) return stbi__err("bad filter method","Corrupt PNG");
-            interlace = stbi__get8(s); if (interlace>1) return stbi__err("bad interlace method","Corrupt PNG");
-            if (!s->img_x || !s->img_y) return stbi__err("0-pixel image","Corrupt PNG");
-            if (!pal_img_n) {
-               s->img_n = (color & 2 ? 3 : 1) + (color & 4 ? 1 : 0);
-               if ((1 << 30) / s->img_x / s->img_n < s->img_y) return stbi__err("too large", "Image too large to decode");
-               if (scan == STBI__SCAN_header) return 1;
-            } else {
-               // if paletted, then pal_n is our final components, and
-               // img_n is # components to decompress/filter.
-               s->img_n = 1;
-               if ((1 << 30) / s->img_x / 4 < s->img_y) return stbi__err("too large","Corrupt PNG");
-               // if SCAN_header, have to scan to see if we have a tRNS
-            }
-            break;
-         }
-
-         case STBI__PNG_TYPE('P','L','T','E'):  {
-            if (first) return stbi__err("first not IHDR", "Corrupt PNG");
-            if (c.length > 256*3) return stbi__err("invalid PLTE","Corrupt PNG");
-            pal_len = c.length / 3;
-            if (pal_len * 3 != c.length) return stbi__err("invalid PLTE","Corrupt PNG");
-            for (i=0; i < pal_len; ++i) {
-               palette[i*4+0] = stbi__get8(s);
-               palette[i*4+1] = stbi__get8(s);
-               palette[i*4+2] = stbi__get8(s);
-               palette[i*4+3] = 255;
-            }
-            break;
-         }
-
-         case STBI__PNG_TYPE('t','R','N','S'): {
-            if (first) return stbi__err("first not IHDR", "Corrupt PNG");
-            if (z->idata) return stbi__err("tRNS after IDAT","Corrupt PNG");
-            if (pal_img_n) {
-               if (scan == STBI__SCAN_header) { s->img_n = 4; return 1; }
-               if (pal_len == 0) return stbi__err("tRNS before PLTE","Corrupt PNG");
-               if (c.length > pal_len) return stbi__err("bad tRNS len","Corrupt PNG");
-               pal_img_n = 4;
-               for (i=0; i < c.length; ++i)
-                  palette[i*4+3] = stbi__get8(s);
-            } else {
-               if (!(s->img_n & 1)) return stbi__err("tRNS with alpha","Corrupt PNG");
-               if (c.length != (stbi__uint32) s->img_n*2) return stbi__err("bad tRNS len","Corrupt PNG");
-               has_trans = 1;
-               if (z->depth == 16) {
-                  for (k = 0; k < s->img_n; ++k) tc16[k] = (stbi__uint16)stbi__get16be(s); // copy the values as-is
-               } else {
-                  for (k = 0; k < s->img_n; ++k) tc[k] = (stbi_uc)(stbi__get16be(s) & 255) * stbi__depth_scale_table[z->depth]; // non 8-bit images will be larger
-               }
-            }
-            break;
-         }
-
-         case STBI__PNG_TYPE('I','D','A','T'): {
-            if (first) return stbi__err("first not IHDR", "Corrupt PNG");
-            if (pal_img_n && !pal_len) return stbi__err("no PLTE","Corrupt PNG");
-            if (scan == STBI__SCAN_header) { s->img_n = pal_img_n; return 1; }
-            if ((int)(ioff + c.length) < (int)ioff) return 0;
-            if (ioff + c.length > idata_limit) {
-               stbi__uint32 idata_limit_old = idata_limit;
-               stbi_uc *p;
-               if (idata_limit == 0) idata_limit = c.length > 4096 ? c.length : 4096;
-               while (ioff + c.length > idata_limit)
-                  idata_limit *= 2;
-               STBI_NOTUSED(idata_limit_old);
-               p = (stbi_uc *) STBI_REALLOC_SIZED(z->idata, idata_limit_old, idata_limit); if (p == NULL) return stbi__err("outofmem", "Out of memory");
-               z->idata = p;
-            }
-            if (!stbi__getn(s, z->idata+ioff,c.length)) return stbi__err("outofdata","Corrupt PNG");
-            ioff += c.length;
-            break;
-         }
-
-         case STBI__PNG_TYPE('I','E','N','D'): {
-            stbi__uint32 raw_len, bpl;
-            if (first) return stbi__err("first not IHDR", "Corrupt PNG");
-            if (scan != STBI__SCAN_load) return 1;
-            if (z->idata == NULL) return stbi__err("no IDAT","Corrupt PNG");
-            // initial guess for decoded data size to avoid unnecessary reallocs
-            bpl = (s->img_x * z->depth + 7) / 8; // bytes per line, per component
-            raw_len = bpl * s->img_y * s->img_n /* pixels */ + s->img_y /* filter mode per row */;
-            z->expanded = (stbi_uc *) stbi_zlib_decode_malloc_guesssize_headerflag((char *) z->idata, ioff, raw_len, (int *) &raw_len, !is_iphone);
-            if (z->expanded == NULL) return 0; // zlib should set error
-            STBI_FREE(z->idata); z->idata = NULL;
-            if ((req_comp == s->img_n+1 && req_comp != 3 && !pal_img_n) || has_trans)
-               s->img_out_n = s->img_n+1;
-            else
-               s->img_out_n = s->img_n;
-            if (!stbi__create_png_image(z, z->expanded, raw_len, s->img_out_n, z->depth, color, interlace)) return 0;
-            if (has_trans) {
-               if (z->depth == 16) {
-                  if (!stbi__compute_transparency16(z, tc16, s->img_out_n)) return 0;
-               } else {
-                  if (!stbi__compute_transparency(z, tc, s->img_out_n)) return 0;
-               }
-            }
-            if (is_iphone && stbi__de_iphone_flag && s->img_out_n > 2)
-               stbi__de_iphone(z);
-            if (pal_img_n) {
-               // pal_img_n == 3 or 4
-               s->img_n = pal_img_n; // record the actual colors we had
-               s->img_out_n = pal_img_n;
-               if (req_comp >= 3) s->img_out_n = req_comp;
-               if (!stbi__expand_png_palette(z, palette, pal_len, s->img_out_n))
-                  return 0;
-            } else if (has_trans) {
-               // non-paletted image with tRNS -> source image has (constant) alpha
-               ++s->img_n;
-            }
-            STBI_FREE(z->expanded); z->expanded = NULL;
-            return 1;
-         }
-
-         default:
-            // if critical, fail
-            if (first) return stbi__err("first not IHDR", "Corrupt PNG");
-            if ((c.type & (1 << 29)) == 0) {
-               #ifndef STBI_NO_FAILURE_STRINGS
-               // not threadsafe
-               static char invalid_chunk[] = "XXXX PNG chunk not known";
-               invalid_chunk[0] = STBI__BYTECAST(c.type >> 24);
-               invalid_chunk[1] = STBI__BYTECAST(c.type >> 16);
-               invalid_chunk[2] = STBI__BYTECAST(c.type >>  8);
-               invalid_chunk[3] = STBI__BYTECAST(c.type >>  0);
-               #endif
-               return stbi__err(invalid_chunk, "PNG not supported: unknown PNG chunk type");
-            }
-            stbi__skip(s, c.length);
-            break;
-      }
-      // end of PNG chunk, read and skip CRC
-      stbi__get32be(s);
-   }
-}
-
-static void *stbi__do_png(stbi__png *p, int *x, int *y, int *n, int req_comp, stbi__result_info *ri)
-{
-   void *result=NULL;
-   if (req_comp < 0 || req_comp > 4) return stbi__errpuc("bad req_comp", "Internal error");
-   if (stbi__parse_png_file(p, STBI__SCAN_load, req_comp)) {
-      if (p->depth < 8)
-         ri->bits_per_channel = 8;
-      else
-         ri->bits_per_channel = p->depth;
-      result = p->out;
-      p->out = NULL;
-      if (req_comp && req_comp != p->s->img_out_n) {
-         if (ri->bits_per_channel == 8)
-            result = stbi__convert_format((unsigned char *) result, p->s->img_out_n, req_comp, p->s->img_x, p->s->img_y);
-         else
-            result = stbi__convert_format16((stbi__uint16 *) result, p->s->img_out_n, req_comp, p->s->img_x, p->s->img_y);
-         p->s->img_out_n = req_comp;
-         if (result == NULL) return result;
-      }
-      *x = p->s->img_x;
-      *y = p->s->img_y;
-      if (n) *n = p->s->img_n;
-   }
-   STBI_FREE(p->out);      p->out      = NULL;
-   STBI_FREE(p->expanded); p->expanded = NULL;
-   STBI_FREE(p->idata);    p->idata    = NULL;
-
-   return result;
-}
-
-static void *stbi__png_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri)
-{
-   stbi__png p;
-   p.s = s;
-   return stbi__do_png(&p, x,y,comp,req_comp, ri);
-}
-
-static int stbi__png_test(stbi__context *s)
-{
-   int r;
-   r = stbi__check_png_header(s);
-   stbi__rewind(s);
-   return r;
-}
-
-static int stbi__png_info_raw(stbi__png *p, int *x, int *y, int *comp)
-{
-   if (!stbi__parse_png_file(p, STBI__SCAN_header, 0)) {
-      stbi__rewind( p->s );
-      return 0;
-   }
-   if (x) *x = p->s->img_x;
-   if (y) *y = p->s->img_y;
-   if (comp) *comp = p->s->img_n;
-   return 1;
-}
-
-static int stbi__png_info(stbi__context *s, int *x, int *y, int *comp)
-{
-   stbi__png p;
-   p.s = s;
-   return stbi__png_info_raw(&p, x, y, comp);
-}
-
-static int stbi__png_is16(stbi__context *s)
-{
-   stbi__png p;
-   p.s = s;
-   if (!stbi__png_info_raw(&p, NULL, NULL, NULL))
-	   return 0;
-   if (p.depth != 16) {
-      stbi__rewind(p.s);
-      return 0;
-   }
-   return 1;
-}
-#endif
-
-// Microsoft/Windows BMP image
-
-#ifndef STBI_NO_BMP
-static int stbi__bmp_test_raw(stbi__context *s)
-{
-   int r;
-   int sz;
-   if (stbi__get8(s) != 'B') return 0;
-   if (stbi__get8(s) != 'M') return 0;
-   stbi__get32le(s); // discard filesize
-   stbi__get16le(s); // discard reserved
-   stbi__get16le(s); // discard reserved
-   stbi__get32le(s); // discard data offset
-   sz = stbi__get32le(s);
-   r = (sz == 12 || sz == 40 || sz == 56 || sz == 108 || sz == 124);
-   return r;
-}
-
-static int stbi__bmp_test(stbi__context *s)
-{
-   int r = stbi__bmp_test_raw(s);
-   stbi__rewind(s);
-   return r;
-}
-
-
-// returns 0..31 for the highest set bit
-static int stbi__high_bit(unsigned int z)
-{
-   int n=0;
-   if (z == 0) return -1;
-   if (z >= 0x10000) { n += 16; z >>= 16; }
-   if (z >= 0x00100) { n +=  8; z >>=  8; }
-   if (z >= 0x00010) { n +=  4; z >>=  4; }
-   if (z >= 0x00004) { n +=  2; z >>=  2; }
-   if (z >= 0x00002) { n +=  1; z >>=  1; }
-   return n;
-}
-
-static int stbi__bitcount(unsigned int a)
-{
-   a = (a & 0x55555555) + ((a >>  1) & 0x55555555); // max 2
-   a = (a & 0x33333333) + ((a >>  2) & 0x33333333); // max 4
-   a = (a + (a >> 4)) & 0x0f0f0f0f; // max 8 per 4, now 8 bits
-   a = (a + (a >> 8)); // max 16 per 8 bits
-   a = (a + (a >> 16)); // max 32 per 8 bits
-   return a & 0xff;
-}
-
-// extract an arbitrarily-aligned N-bit value (N=bits)
-// from v, and then make it 8-bits long and fractionally
-// extend it to full full range.
-static int stbi__shiftsigned(unsigned int v, int shift, int bits)
-{
-   static unsigned int mul_table[9] = {
-      0,
-      0xff/*0b11111111*/, 0x55/*0b01010101*/, 0x49/*0b01001001*/, 0x11/*0b00010001*/,
-      0x21/*0b00100001*/, 0x41/*0b01000001*/, 0x81/*0b10000001*/, 0x01/*0b00000001*/,
-   };
-   static unsigned int shift_table[9] = {
-      0, 0,0,1,0,2,4,6,0,
-   };
-   if (shift < 0)
-      v <<= -shift;
-   else
-      v >>= shift;
-   STBI_ASSERT(v >= 0 && v < 256);
-   v >>= (8-bits);
-   STBI_ASSERT(bits >= 0 && bits <= 8);
-   return (int) ((unsigned) v * mul_table[bits]) >> shift_table[bits];
-}
-
-typedef struct
-{
-   int bpp, offset, hsz;
-   unsigned int mr,mg,mb,ma, all_a;
-} stbi__bmp_data;
-
-static void *stbi__bmp_parse_header(stbi__context *s, stbi__bmp_data *info)
-{
-   int hsz;
-   if (stbi__get8(s) != 'B' || stbi__get8(s) != 'M') return stbi__errpuc("not BMP", "Corrupt BMP");
-   stbi__get32le(s); // discard filesize
-   stbi__get16le(s); // discard reserved
-   stbi__get16le(s); // discard reserved
-   info->offset = stbi__get32le(s);
-   info->hsz = hsz = stbi__get32le(s);
-   info->mr = info->mg = info->mb = info->ma = 0;
-
-   if (hsz != 12 && hsz != 40 && hsz != 56 && hsz != 108 && hsz != 124) return stbi__errpuc("unknown BMP", "BMP type not supported: unknown");
-   if (hsz == 12) {
-      s->img_x = stbi__get16le(s);
-      s->img_y = stbi__get16le(s);
-   } else {
-      s->img_x = stbi__get32le(s);
-      s->img_y = stbi__get32le(s);
-   }
-   if (stbi__get16le(s) != 1) return stbi__errpuc("bad BMP", "bad BMP");
-   info->bpp = stbi__get16le(s);
-   if (hsz != 12) {
-      int compress = stbi__get32le(s);
-      if (compress == 1 || compress == 2) return stbi__errpuc("BMP RLE", "BMP type not supported: RLE");
-      stbi__get32le(s); // discard sizeof
-      stbi__get32le(s); // discard hres
-      stbi__get32le(s); // discard vres
-      stbi__get32le(s); // discard colorsused
-      stbi__get32le(s); // discard max important
-      if (hsz == 40 || hsz == 56) {
-         if (hsz == 56) {
-            stbi__get32le(s);
-            stbi__get32le(s);
-            stbi__get32le(s);
-            stbi__get32le(s);
-         }
-         if (info->bpp == 16 || info->bpp == 32) {
-            if (compress == 0) {
-               if (info->bpp == 32) {
-                  info->mr = 0xffu << 16;
-                  info->mg = 0xffu <<  8;
-                  info->mb = 0xffu <<  0;
-                  info->ma = 0xffu << 24;
-                  info->all_a = 0; // if all_a is 0 at end, then we loaded alpha channel but it was all 0
-               } else {
-                  info->mr = 31u << 10;
-                  info->mg = 31u <<  5;
-                  info->mb = 31u <<  0;
-               }
-            } else if (compress == 3) {
-               info->mr = stbi__get32le(s);
-               info->mg = stbi__get32le(s);
-               info->mb = stbi__get32le(s);
-               // not documented, but generated by photoshop and handled by mspaint
-               if (info->mr == info->mg && info->mg == info->mb) {
-                  // ?!?!?
-                  return stbi__errpuc("bad BMP", "bad BMP");
-               }
-            } else
-               return stbi__errpuc("bad BMP", "bad BMP");
-         }
-      } else {
-         int i;
-         if (hsz != 108 && hsz != 124)
-            return stbi__errpuc("bad BMP", "bad BMP");
-         info->mr = stbi__get32le(s);
-         info->mg = stbi__get32le(s);
-         info->mb = stbi__get32le(s);
-         info->ma = stbi__get32le(s);
-         stbi__get32le(s); // discard color space
-         for (i=0; i < 12; ++i)
-            stbi__get32le(s); // discard color space parameters
-         if (hsz == 124) {
-            stbi__get32le(s); // discard rendering intent
-            stbi__get32le(s); // discard offset of profile data
-            stbi__get32le(s); // discard size of profile data
-            stbi__get32le(s); // discard reserved
-         }
-      }
-   }
-   return (void *) 1;
-}
-
-
-static void *stbi__bmp_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri)
-{
-   stbi_uc *out;
-   unsigned int mr=0,mg=0,mb=0,ma=0, all_a;
-   stbi_uc pal[256][4];
-   int psize=0,i,j,width;
-   int flip_vertically, pad, target;
-   stbi__bmp_data info;
-   STBI_NOTUSED(ri);
-
-   info.all_a = 255;
-   if (stbi__bmp_parse_header(s, &info) == NULL)
-      return NULL; // error code already set
-
-   flip_vertically = ((int) s->img_y) > 0;
-   s->img_y = abs((int) s->img_y);
-
-   mr = info.mr;
-   mg = info.mg;
-   mb = info.mb;
-   ma = info.ma;
-   all_a = info.all_a;
-
-   if (info.hsz == 12) {
-      if (info.bpp < 24)
-         psize = (info.offset - 14 - 24) / 3;
-   } else {
-      if (info.bpp < 16)
-         psize = (info.offset - 14 - info.hsz) >> 2;
-   }
-
-   s->img_n = ma ? 4 : 3;
-   if (req_comp && req_comp >= 3) // we can directly decode 3 or 4
-      target = req_comp;
-   else
-      target = s->img_n; // if they want monochrome, we'll post-convert
-
-   // sanity-check size
-   if (!stbi__mad3sizes_valid(target, s->img_x, s->img_y, 0))
-      return stbi__errpuc("too large", "Corrupt BMP");
-
-   out = (stbi_uc *) stbi__malloc_mad3(target, s->img_x, s->img_y, 0);
-   if (!out) return stbi__errpuc("outofmem", "Out of memory");
-   if (info.bpp < 16) {
-      int z=0;
-      if (psize == 0 || psize > 256) { STBI_FREE(out); return stbi__errpuc("invalid", "Corrupt BMP"); }
-      for (i=0; i < psize; ++i) {
-         pal[i][2] = stbi__get8(s);
-         pal[i][1] = stbi__get8(s);
-         pal[i][0] = stbi__get8(s);
-         if (info.hsz != 12) stbi__get8(s);
-         pal[i][3] = 255;
-      }
-      stbi__skip(s, info.offset - 14 - info.hsz - psize * (info.hsz == 12 ? 3 : 4));
-      if (info.bpp == 1) width = (s->img_x + 7) >> 3;
-      else if (info.bpp == 4) width = (s->img_x + 1) >> 1;
-      else if (info.bpp == 8) width = s->img_x;
-      else { STBI_FREE(out); return stbi__errpuc("bad bpp", "Corrupt BMP"); }
-      pad = (-width)&3;
-      if (info.bpp == 1) {
-         for (j=0; j < (int) s->img_y; ++j) {
-            int bit_offset = 7, v = stbi__get8(s);
-            for (i=0; i < (int) s->img_x; ++i) {
-               int color = (v>>bit_offset)&0x1;
-               out[z++] = pal[color][0];
-               out[z++] = pal[color][1];
-               out[z++] = pal[color][2];
-               if (target == 4) out[z++] = 255;
-               if (i+1 == (int) s->img_x) break;
-               if((--bit_offset) < 0) {
-                  bit_offset = 7;
-                  v = stbi__get8(s);
-               }
-            }
-            stbi__skip(s, pad);
-         }
-      } else {
-         for (j=0; j < (int) s->img_y; ++j) {
-            for (i=0; i < (int) s->img_x; i += 2) {
-               int v=stbi__get8(s),v2=0;
-               if (info.bpp == 4) {
-                  v2 = v & 15;
-                  v >>= 4;
-               }
-               out[z++] = pal[v][0];
-               out[z++] = pal[v][1];
-               out[z++] = pal[v][2];
-               if (target == 4) out[z++] = 255;
-               if (i+1 == (int) s->img_x) break;
-               v = (info.bpp == 8) ? stbi__get8(s) : v2;
-               out[z++] = pal[v][0];
-               out[z++] = pal[v][1];
-               out[z++] = pal[v][2];
-               if (target == 4) out[z++] = 255;
-            }
-            stbi__skip(s, pad);
-         }
-      }
-   } else {
-      int rshift=0,gshift=0,bshift=0,ashift=0,rcount=0,gcount=0,bcount=0,acount=0;
-      int z = 0;
-      int easy=0;
-      stbi__skip(s, info.offset - 14 - info.hsz);
-      if (info.bpp == 24) width = 3 * s->img_x;
-      else if (info.bpp == 16) width = 2*s->img_x;
-      else /* bpp = 32 and pad = 0 */ width=0;
-      pad = (-width) & 3;
-      if (info.bpp == 24) {
-         easy = 1;
-      } else if (info.bpp == 32) {
-         if (mb == 0xff && mg == 0xff00 && mr == 0x00ff0000 && ma == 0xff000000)
-            easy = 2;
-      }
-      if (!easy) {
-         if (!mr || !mg || !mb) { STBI_FREE(out); return stbi__errpuc("bad masks", "Corrupt BMP"); }
-         // right shift amt to put high bit in position #7
-         rshift = stbi__high_bit(mr)-7; rcount = stbi__bitcount(mr);
-         gshift = stbi__high_bit(mg)-7; gcount = stbi__bitcount(mg);
-         bshift = stbi__high_bit(mb)-7; bcount = stbi__bitcount(mb);
-         ashift = stbi__high_bit(ma)-7; acount = stbi__bitcount(ma);
-      }
-      for (j=0; j < (int) s->img_y; ++j) {
-         if (easy) {
-            for (i=0; i < (int) s->img_x; ++i) {
-               unsigned char a;
-               out[z+2] = stbi__get8(s);
-               out[z+1] = stbi__get8(s);
-               out[z+0] = stbi__get8(s);
-               z += 3;
-               a = (easy == 2 ? stbi__get8(s) : 255);
-               all_a |= a;
-               if (target == 4) out[z++] = a;
-            }
-         } else {
-            int bpp = info.bpp;
-            for (i=0; i < (int) s->img_x; ++i) {
-               stbi__uint32 v = (bpp == 16 ? (stbi__uint32) stbi__get16le(s) : stbi__get32le(s));
-               unsigned int a;
-               out[z++] = STBI__BYTECAST(stbi__shiftsigned(v & mr, rshift, rcount));
-               out[z++] = STBI__BYTECAST(stbi__shiftsigned(v & mg, gshift, gcount));
-               out[z++] = STBI__BYTECAST(stbi__shiftsigned(v & mb, bshift, bcount));
-               a = (ma ? stbi__shiftsigned(v & ma, ashift, acount) : 255);
-               all_a |= a;
-               if (target == 4) out[z++] = STBI__BYTECAST(a);
-            }
-         }
-         stbi__skip(s, pad);
-      }
-   }
-
-   // if alpha channel is all 0s, replace with all 255s
-   if (target == 4 && all_a == 0)
-      for (i=4*s->img_x*s->img_y-1; i >= 0; i -= 4)
-         out[i] = 255;
-
-   if (flip_vertically) {
-      stbi_uc t;
-      for (j=0; j < (int) s->img_y>>1; ++j) {
-         stbi_uc *p1 = out +      j     *s->img_x*target;
-         stbi_uc *p2 = out + (s->img_y-1-j)*s->img_x*target;
-         for (i=0; i < (int) s->img_x*target; ++i) {
-            t = p1[i]; p1[i] = p2[i]; p2[i] = t;
-         }
-      }
-   }
-
-   if (req_comp && req_comp != target) {
-      out = stbi__convert_format(out, target, req_comp, s->img_x, s->img_y);
-      if (out == NULL) return out; // stbi__convert_format frees input on failure
-   }
-
-   *x = s->img_x;
-   *y = s->img_y;
-   if (comp) *comp = s->img_n;
-   return out;
-}
-#endif
-
-// Targa Truevision - TGA
-// by Jonathan Dummer
-#ifndef STBI_NO_TGA
-// returns STBI_rgb or whatever, 0 on error
-static int stbi__tga_get_comp(int bits_per_pixel, int is_grey, int* is_rgb16)
-{
-   // only RGB or RGBA (incl. 16bit) or grey allowed
-   if (is_rgb16) *is_rgb16 = 0;
-   switch(bits_per_pixel) {
-      case 8:  return STBI_grey;
-      case 16: if(is_grey) return STBI_grey_alpha;
-               // fallthrough
-      case 15: if(is_rgb16) *is_rgb16 = 1;
-               return STBI_rgb;
-      case 24: // fallthrough
-      case 32: return bits_per_pixel/8;
-      default: return 0;
-   }
-}
-
-static int stbi__tga_info(stbi__context *s, int *x, int *y, int *comp)
-{
-    int tga_w, tga_h, tga_comp, tga_image_type, tga_bits_per_pixel, tga_colormap_bpp;
-    int sz, tga_colormap_type;
-    stbi__get8(s);                   // discard Offset
-    tga_colormap_type = stbi__get8(s); // colormap type
-    if( tga_colormap_type > 1 ) {
-        stbi__rewind(s);
-        return 0;      // only RGB or indexed allowed
-    }
-    tga_image_type = stbi__get8(s); // image type
-    if ( tga_colormap_type == 1 ) { // colormapped (paletted) image
-        if (tga_image_type != 1 && tga_image_type != 9) {
-            stbi__rewind(s);
-            return 0;
-        }
-        stbi__skip(s,4);       // skip index of first colormap entry and number of entries
-        sz = stbi__get8(s);    //   check bits per palette color entry
-        if ( (sz != 8) && (sz != 15) && (sz != 16) && (sz != 24) && (sz != 32) ) {
-            stbi__rewind(s);
-            return 0;
-        }
-        stbi__skip(s,4);       // skip image x and y origin
-        tga_colormap_bpp = sz;
-    } else { // "normal" image w/o colormap - only RGB or grey allowed, +/- RLE
-        if ( (tga_image_type != 2) && (tga_image_type != 3) && (tga_image_type != 10) && (tga_image_type != 11) ) {
-            stbi__rewind(s);
-            return 0; // only RGB or grey allowed, +/- RLE
-        }
-        stbi__skip(s,9); // skip colormap specification and image x/y origin
-        tga_colormap_bpp = 0;
-    }
-    tga_w = stbi__get16le(s);
-    if( tga_w < 1 ) {
-        stbi__rewind(s);
-        return 0;   // test width
-    }
-    tga_h = stbi__get16le(s);
-    if( tga_h < 1 ) {
-        stbi__rewind(s);
-        return 0;   // test height
-    }
-    tga_bits_per_pixel = stbi__get8(s); // bits per pixel
-    stbi__get8(s); // ignore alpha bits
-    if (tga_colormap_bpp != 0) {
-        if((tga_bits_per_pixel != 8) && (tga_bits_per_pixel != 16)) {
-            // when using a colormap, tga_bits_per_pixel is the size of the indexes
-            // I don't think anything but 8 or 16bit indexes makes sense
-            stbi__rewind(s);
-            return 0;
-        }
-        tga_comp = stbi__tga_get_comp(tga_colormap_bpp, 0, NULL);
-    } else {
-        tga_comp = stbi__tga_get_comp(tga_bits_per_pixel, (tga_image_type == 3) || (tga_image_type == 11), NULL);
-    }
-    if(!tga_comp) {
-      stbi__rewind(s);
-      return 0;
-    }
-    if (x) *x = tga_w;
-    if (y) *y = tga_h;
-    if (comp) *comp = tga_comp;
-    return 1;                   // seems to have passed everything
-}
-
-static int stbi__tga_test(stbi__context *s)
-{
-   int res = 0;
-   int sz, tga_color_type;
-   stbi__get8(s);      //   discard Offset
-   tga_color_type = stbi__get8(s);   //   color type
-   if ( tga_color_type > 1 ) goto errorEnd;   //   only RGB or indexed allowed
-   sz = stbi__get8(s);   //   image type
-   if ( tga_color_type == 1 ) { // colormapped (paletted) image
-      if (sz != 1 && sz != 9) goto errorEnd; // colortype 1 demands image type 1 or 9
-      stbi__skip(s,4);       // skip index of first colormap entry and number of entries
-      sz = stbi__get8(s);    //   check bits per palette color entry
-      if ( (sz != 8) && (sz != 15) && (sz != 16) && (sz != 24) && (sz != 32) ) goto errorEnd;
-      stbi__skip(s,4);       // skip image x and y origin
-   } else { // "normal" image w/o colormap
-      if ( (sz != 2) && (sz != 3) && (sz != 10) && (sz != 11) ) goto errorEnd; // only RGB or grey allowed, +/- RLE
-      stbi__skip(s,9); // skip colormap specification and image x/y origin
-   }
-   if ( stbi__get16le(s) < 1 ) goto errorEnd;      //   test width
-   if ( stbi__get16le(s) < 1 ) goto errorEnd;      //   test height
-   sz = stbi__get8(s);   //   bits per pixel
-   if ( (tga_color_type == 1) && (sz != 8) && (sz != 16) ) goto errorEnd; // for colormapped images, bpp is size of an index
-   if ( (sz != 8) && (sz != 15) && (sz != 16) && (sz != 24) && (sz != 32) ) goto errorEnd;
-
-   res = 1; // if we got this far, everything's good and we can return 1 instead of 0
-
-errorEnd:
-   stbi__rewind(s);
-   return res;
-}
-
-// read 16bit value and convert to 24bit RGB
-static void stbi__tga_read_rgb16(stbi__context *s, stbi_uc* out)
-{
-   stbi__uint16 px = (stbi__uint16)stbi__get16le(s);
-   stbi__uint16 fiveBitMask = 31;
-   // we have 3 channels with 5bits each
-   int r = (px >> 10) & fiveBitMask;
-   int g = (px >> 5) & fiveBitMask;
-   int b = px & fiveBitMask;
-   // Note that this saves the data in RGB(A) order, so it doesn't need to be swapped later
-   out[0] = (stbi_uc)((r * 255)/31);
-   out[1] = (stbi_uc)((g * 255)/31);
-   out[2] = (stbi_uc)((b * 255)/31);
-
-   // some people claim that the most significant bit might be used for alpha
-   // (possibly if an alpha-bit is set in the "image descriptor byte")
-   // but that only made 16bit test images completely translucent..
-   // so let's treat all 15 and 16bit TGAs as RGB with no alpha.
-}
-
-static void *stbi__tga_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri)
-{
-   //   read in the TGA header stuff
-   int tga_offset = stbi__get8(s);
-   int tga_indexed = stbi__get8(s);
-   int tga_image_type = stbi__get8(s);
-   int tga_is_RLE = 0;
-   int tga_palette_start = stbi__get16le(s);
-   int tga_palette_len = stbi__get16le(s);
-   int tga_palette_bits = stbi__get8(s);
-   int tga_x_origin = stbi__get16le(s);
-   int tga_y_origin = stbi__get16le(s);
-   int tga_width = stbi__get16le(s);
-   int tga_height = stbi__get16le(s);
-   int tga_bits_per_pixel = stbi__get8(s);
-   int tga_comp, tga_rgb16=0;
-   int tga_inverted = stbi__get8(s);
-   // int tga_alpha_bits = tga_inverted & 15; // the 4 lowest bits - unused (useless?)
-   //   image data
-   unsigned char *tga_data;
-   unsigned char *tga_palette = NULL;
-   int i, j;
-   unsigned char raw_data[4] = {0};
-   int RLE_count = 0;
-   int RLE_repeating = 0;
-   int read_next_pixel = 1;
-   STBI_NOTUSED(ri);
-
-   //   do a tiny bit of precessing
-   if ( tga_image_type >= 8 )
-   {
-      tga_image_type -= 8;
-      tga_is_RLE = 1;
-   }
-   tga_inverted = 1 - ((tga_inverted >> 5) & 1);
-
-   //   If I'm paletted, then I'll use the number of bits from the palette
-   if ( tga_indexed ) tga_comp = stbi__tga_get_comp(tga_palette_bits, 0, &tga_rgb16);
-   else tga_comp = stbi__tga_get_comp(tga_bits_per_pixel, (tga_image_type == 3), &tga_rgb16);
-
-   if(!tga_comp) // shouldn't really happen, stbi__tga_test() should have ensured basic consistency
-      return stbi__errpuc("bad format", "Can't find out TGA pixelformat");
-
-   //   tga info
-   *x = tga_width;
-   *y = tga_height;
-   if (comp) *comp = tga_comp;
-
-   if (!stbi__mad3sizes_valid(tga_width, tga_height, tga_comp, 0))
-      return stbi__errpuc("too large", "Corrupt TGA");
-
-   tga_data = (unsigned char*)stbi__malloc_mad3(tga_width, tga_height, tga_comp, 0);
-   if (!tga_data) return stbi__errpuc("outofmem", "Out of memory");
-
-   // skip to the data's starting position (offset usually = 0)
-   stbi__skip(s, tga_offset );
-
-   if ( !tga_indexed && !tga_is_RLE && !tga_rgb16 ) {
-      for (i=0; i < tga_height; ++i) {
-         int row = tga_inverted ? tga_height -i - 1 : i;
-         stbi_uc *tga_row = tga_data + row*tga_width*tga_comp;
-         stbi__getn(s, tga_row, tga_width * tga_comp);
-      }
-   } else  {
-      //   do I need to load a palette?
-      if ( tga_indexed)
-      {
-         //   any data to skip? (offset usually = 0)
-         stbi__skip(s, tga_palette_start );
-         //   load the palette
-         tga_palette = (unsigned char*)stbi__malloc_mad2(tga_palette_len, tga_comp, 0);
-         if (!tga_palette) {
-            STBI_FREE(tga_data);
-            return stbi__errpuc("outofmem", "Out of memory");
-         }
-         if (tga_rgb16) {
-            stbi_uc *pal_entry = tga_palette;
-            STBI_ASSERT(tga_comp == STBI_rgb);
-            for (i=0; i < tga_palette_len; ++i) {
-               stbi__tga_read_rgb16(s, pal_entry);
-               pal_entry += tga_comp;
-            }
-         } else if (!stbi__getn(s, tga_palette, tga_palette_len * tga_comp)) {
-               STBI_FREE(tga_data);
-               STBI_FREE(tga_palette);
-               return stbi__errpuc("bad palette", "Corrupt TGA");
-         }
-      }
-      //   load the data
-      for (i=0; i < tga_width * tga_height; ++i)
-      {
-         //   if I'm in RLE mode, do I need to get a RLE stbi__pngchunk?
-         if ( tga_is_RLE )
-         {
-            if ( RLE_count == 0 )
-            {
-               //   yep, get the next byte as a RLE command
-               int RLE_cmd = stbi__get8(s);
-               RLE_count = 1 + (RLE_cmd & 127);
-               RLE_repeating = RLE_cmd >> 7;
-               read_next_pixel = 1;
-            } else if ( !RLE_repeating )
-            {
-               read_next_pixel = 1;
-            }
-         } else
-         {
-            read_next_pixel = 1;
-         }
-         //   OK, if I need to read a pixel, do it now
-         if ( read_next_pixel )
-         {
-            //   load however much data we did have
-            if ( tga_indexed )
-            {
-               // read in index, then perform the lookup
-               int pal_idx = (tga_bits_per_pixel == 8) ? stbi__get8(s) : stbi__get16le(s);
-               if ( pal_idx >= tga_palette_len ) {
-                  // invalid index
-                  pal_idx = 0;
-               }
-               pal_idx *= tga_comp;
-               for (j = 0; j < tga_comp; ++j) {
-                  raw_data[j] = tga_palette[pal_idx+j];
-               }
-            } else if(tga_rgb16) {
-               STBI_ASSERT(tga_comp == STBI_rgb);
-               stbi__tga_read_rgb16(s, raw_data);
-            } else {
-               //   read in the data raw
-               for (j = 0; j < tga_comp; ++j) {
-                  raw_data[j] = stbi__get8(s);
-               }
-            }
-            //   clear the reading flag for the next pixel
-            read_next_pixel = 0;
-         } // end of reading a pixel
-
-         // copy data
-         for (j = 0; j < tga_comp; ++j)
-           tga_data[i*tga_comp+j] = raw_data[j];
-
-         //   in case we're in RLE mode, keep counting down
-         --RLE_count;
-      }
-      //   do I need to invert the image?
-      if ( tga_inverted )
-      {
-         for (j = 0; j*2 < tga_height; ++j)
-         {
-            int index1 = j * tga_width * tga_comp;
-            int index2 = (tga_height - 1 - j) * tga_width * tga_comp;
-            for (i = tga_width * tga_comp; i > 0; --i)
-            {
-               unsigned char temp = tga_data[index1];
-               tga_data[index1] = tga_data[index2];
-               tga_data[index2] = temp;
-               ++index1;
-               ++index2;
-            }
-         }
-      }
-      //   clear my palette, if I had one
-      if ( tga_palette != NULL )
-      {
-         STBI_FREE( tga_palette );
-      }
-   }
-
-   // swap RGB - if the source data was RGB16, it already is in the right order
-   if (tga_comp >= 3 && !tga_rgb16)
-   {
-      unsigned char* tga_pixel = tga_data;
-      for (i=0; i < tga_width * tga_height; ++i)
-      {
-         unsigned char temp = tga_pixel[0];
-         tga_pixel[0] = tga_pixel[2];
-         tga_pixel[2] = temp;
-         tga_pixel += tga_comp;
-      }
-   }
-
-   // convert to target component count
-   if (req_comp && req_comp != tga_comp)
-      tga_data = stbi__convert_format(tga_data, tga_comp, req_comp, tga_width, tga_height);
-
-   //   the things I do to get rid of an error message, and yet keep
-   //   Microsoft's C compilers happy... [8^(
-   tga_palette_start = tga_palette_len = tga_palette_bits =
-         tga_x_origin = tga_y_origin = 0;
-   //   OK, done
-   return tga_data;
-}
-#endif
-
-// *************************************************************************************************
-// Photoshop PSD loader -- PD by Thatcher Ulrich, integration by Nicolas Schulz, tweaked by STB
-
-#ifndef STBI_NO_PSD
-static int stbi__psd_test(stbi__context *s)
-{
-   int r = (stbi__get32be(s) == 0x38425053);
-   stbi__rewind(s);
-   return r;
-}
-
-static int stbi__psd_decode_rle(stbi__context *s, stbi_uc *p, int pixelCount)
-{
-   int count, nleft, len;
-
-   count = 0;
-   while ((nleft = pixelCount - count) > 0) {
-      len = stbi__get8(s);
-      if (len == 128) {
-         // No-op.
-      } else if (len < 128) {
-         // Copy next len+1 bytes literally.
-         len++;
-         if (len > nleft) return 0; // corrupt data
-         count += len;
-         while (len) {
-            *p = stbi__get8(s);
-            p += 4;
-            len--;
-         }
-      } else if (len > 128) {
-         stbi_uc   val;
-         // Next -len+1 bytes in the dest are replicated from next source byte.
-         // (Interpret len as a negative 8-bit int.)
-         len = 257 - len;
-         if (len > nleft) return 0; // corrupt data
-         val = stbi__get8(s);
-         count += len;
-         while (len) {
-            *p = val;
-            p += 4;
-            len--;
-         }
-      }
-   }
-
-   return 1;
-}
-
-static void *stbi__psd_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri, int bpc)
-{
-   int pixelCount;
-   int channelCount, compression;
-   int channel, i;
-   int bitdepth;
-   int w,h;
-   stbi_uc *out;
-   STBI_NOTUSED(ri);
-
-   // Check identifier
-   if (stbi__get32be(s) != 0x38425053)   // "8BPS"
-      return stbi__errpuc("not PSD", "Corrupt PSD image");
-
-   // Check file type version.
-   if (stbi__get16be(s) != 1)
-      return stbi__errpuc("wrong version", "Unsupported version of PSD image");
-
-   // Skip 6 reserved bytes.
-   stbi__skip(s, 6 );
-
-   // Read the number of channels (R, G, B, A, etc).
-   channelCount = stbi__get16be(s);
-   if (channelCount < 0 || channelCount > 16)
-      return stbi__errpuc("wrong channel count", "Unsupported number of channels in PSD image");
-
-   // Read the rows and columns of the image.
-   h = stbi__get32be(s);
-   w = stbi__get32be(s);
-
-   // Make sure the depth is 8 bits.
-   bitdepth = stbi__get16be(s);
-   if (bitdepth != 8 && bitdepth != 16)
-      return stbi__errpuc("unsupported bit depth", "PSD bit depth is not 8 or 16 bit");
-
-   // Make sure the color mode is RGB.
-   // Valid options are:
-   //   0: Bitmap
-   //   1: Grayscale
-   //   2: Indexed color
-   //   3: RGB color
-   //   4: CMYK color
-   //   7: Multichannel
-   //   8: Duotone
-   //   9: Lab color
-   if (stbi__get16be(s) != 3)
-      return stbi__errpuc("wrong color format", "PSD is not in RGB color format");
-
-   // Skip the Mode Data.  (It's the palette for indexed color; other info for other modes.)
-   stbi__skip(s,stbi__get32be(s) );
-
-   // Skip the image resources.  (resolution, pen tool paths, etc)
-   stbi__skip(s, stbi__get32be(s) );
-
-   // Skip the reserved data.
-   stbi__skip(s, stbi__get32be(s) );
-
-   // Find out if the data is compressed.
-   // Known values:
-   //   0: no compression
-   //   1: RLE compressed
-   compression = stbi__get16be(s);
-   if (compression > 1)
-      return stbi__errpuc("bad compression", "PSD has an unknown compression format");
-
-   // Check size
-   if (!stbi__mad3sizes_valid(4, w, h, 0))
-      return stbi__errpuc("too large", "Corrupt PSD");
-
-   // Create the destination image.
-
-   if (!compression && bitdepth == 16 && bpc == 16) {
-      out = (stbi_uc *) stbi__malloc_mad3(8, w, h, 0);
-      ri->bits_per_channel = 16;
-   } else
-      out = (stbi_uc *) stbi__malloc(4 * w*h);
-
-   if (!out) return stbi__errpuc("outofmem", "Out of memory");
-   pixelCount = w*h;
-
-   // Initialize the data to zero.
-   //memset( out, 0, pixelCount * 4 );
-
-   // Finally, the image data.
-   if (compression) {
-      // RLE as used by .PSD and .TIFF
-      // Loop until you get the number of unpacked bytes you are expecting:
-      //     Read the next source byte into n.
-      //     If n is between 0 and 127 inclusive, copy the next n+1 bytes literally.
-      //     Else if n is between -127 and -1 inclusive, copy the next byte -n+1 times.
-      //     Else if n is 128, noop.
-      // Endloop
-
-      // The RLE-compressed data is preceded by a 2-byte data count for each row in the data,
-      // which we're going to just skip.
-      stbi__skip(s, h * channelCount * 2 );
-
-      // Read the RLE data by channel.
-      for (channel = 0; channel < 4; channel++) {
-         stbi_uc *p;
-
-         p = out+channel;
-         if (channel >= channelCount) {
-            // Fill this channel with default data.
-            for (i = 0; i < pixelCount; i++, p += 4)
-               *p = (channel == 3 ? 255 : 0);
-         } else {
-            // Read the RLE data.
-            if (!stbi__psd_decode_rle(s, p, pixelCount)) {
-               STBI_FREE(out);
-               return stbi__errpuc("corrupt", "bad RLE data");
-            }
-         }
-      }
-
-   } else {
-      // We're at the raw image data.  It's each channel in order (Red, Green, Blue, Alpha, ...)
-      // where each channel consists of an 8-bit (or 16-bit) value for each pixel in the image.
-
-      // Read the data by channel.
-      for (channel = 0; channel < 4; channel++) {
-         if (channel >= channelCount) {
-            // Fill this channel with default data.
-            if (bitdepth == 16 && bpc == 16) {
-               stbi__uint16 *q = ((stbi__uint16 *) out) + channel;
-               stbi__uint16 val = channel == 3 ? 65535 : 0;
-               for (i = 0; i < pixelCount; i++, q += 4)
-                  *q = val;
-            } else {
-               stbi_uc *p = out+channel;
-               stbi_uc val = channel == 3 ? 255 : 0;
-               for (i = 0; i < pixelCount; i++, p += 4)
-                  *p = val;
-            }
-         } else {
-            if (ri->bits_per_channel == 16) {    // output bpc
-               stbi__uint16 *q = ((stbi__uint16 *) out) + channel;
-               for (i = 0; i < pixelCount; i++, q += 4)
-                  *q = (stbi__uint16) stbi__get16be(s);
-            } else {
-               stbi_uc *p = out+channel;
-               if (bitdepth == 16) {  // input bpc
-                  for (i = 0; i < pixelCount; i++, p += 4)
-                     *p = (stbi_uc) (stbi__get16be(s) >> 8);
-               } else {
-                  for (i = 0; i < pixelCount; i++, p += 4)
-                     *p = stbi__get8(s);
-               }
-            }
-         }
-      }
-   }
-
-   // remove weird white matte from PSD
-   if (channelCount >= 4) {
-      if (ri->bits_per_channel == 16) {
-         for (i=0; i < w*h; ++i) {
-            stbi__uint16 *pixel = (stbi__uint16 *) out + 4*i;
-            if (pixel[3] != 0 && pixel[3] != 65535) {
-               float a = pixel[3] / 65535.0f;
-               float ra = 1.0f / a;
-               float inv_a = 65535.0f * (1 - ra);
-               pixel[0] = (stbi__uint16) (pixel[0]*ra + inv_a);
-               pixel[1] = (stbi__uint16) (pixel[1]*ra + inv_a);
-               pixel[2] = (stbi__uint16) (pixel[2]*ra + inv_a);
-            }
-         }
-      } else {
-         for (i=0; i < w*h; ++i) {
-            unsigned char *pixel = out + 4*i;
-            if (pixel[3] != 0 && pixel[3] != 255) {
-               float a = pixel[3] / 255.0f;
-               float ra = 1.0f / a;
-               float inv_a = 255.0f * (1 - ra);
-               pixel[0] = (unsigned char) (pixel[0]*ra + inv_a);
-               pixel[1] = (unsigned char) (pixel[1]*ra + inv_a);
-               pixel[2] = (unsigned char) (pixel[2]*ra + inv_a);
-            }
-         }
-      }
-   }
-
-   // convert to desired output format
-   if (req_comp && req_comp != 4) {
-      if (ri->bits_per_channel == 16)
-         out = (stbi_uc *) stbi__convert_format16((stbi__uint16 *) out, 4, req_comp, w, h);
-      else
-         out = stbi__convert_format(out, 4, req_comp, w, h);
-      if (out == NULL) return out; // stbi__convert_format frees input on failure
-   }
-
-   if (comp) *comp = 4;
-   *y = h;
-   *x = w;
-
-   return out;
-}
-#endif
-
-// *************************************************************************************************
-// Softimage PIC loader
-// by Tom Seddon
-//
-// See http://softimage.wiki.softimage.com/index.php/INFO:_PIC_file_format
-// See http://ozviz.wasp.uwa.edu.au/~pbourke/dataformats/softimagepic/
-
-#ifndef STBI_NO_PIC
-static int stbi__pic_is4(stbi__context *s,const char *str)
-{
-   int i;
-   for (i=0; i<4; ++i)
-      if (stbi__get8(s) != (stbi_uc)str[i])
-         return 0;
-
-   return 1;
-}
-
-static int stbi__pic_test_core(stbi__context *s)
-{
-   int i;
-
-   if (!stbi__pic_is4(s,"\x53\x80\xF6\x34"))
-      return 0;
-
-   for(i=0;i<84;++i)
-      stbi__get8(s);
-
-   if (!stbi__pic_is4(s,"PICT"))
-      return 0;
-
-   return 1;
-}
-
-typedef struct
-{
-   stbi_uc size,type,channel;
-} stbi__pic_packet;
-
-static stbi_uc *stbi__readval(stbi__context *s, int channel, stbi_uc *dest)
-{
-   int mask=0x80, i;
-
-   for (i=0; i<4; ++i, mask>>=1) {
-      if (channel & mask) {
-         if (stbi__at_eof(s)) return stbi__errpuc("bad file","PIC file too short");
-         dest[i]=stbi__get8(s);
-      }
-   }
-
-   return dest;
-}
-
-static void stbi__copyval(int channel,stbi_uc *dest,const stbi_uc *src)
-{
-   int mask=0x80,i;
-
-   for (i=0;i<4; ++i, mask>>=1)
-      if (channel&mask)
-         dest[i]=src[i];
-}
-
-static stbi_uc *stbi__pic_load_core(stbi__context *s,int width,int height,int *comp, stbi_uc *result)
-{
-   int act_comp=0,num_packets=0,y,chained;
-   stbi__pic_packet packets[10];
-
-   // this will (should...) cater for even some bizarre stuff like having data
-    // for the same channel in multiple packets.
-   do {
-      stbi__pic_packet *packet;
-
-      if (num_packets==sizeof(packets)/sizeof(packets[0]))
-         return stbi__errpuc("bad format","too many packets");
-
-      packet = &packets[num_packets++];
-
-      chained = stbi__get8(s);
-      packet->size    = stbi__get8(s);
-      packet->type    = stbi__get8(s);
-      packet->channel = stbi__get8(s);
-
-      act_comp |= packet->channel;
-
-      if (stbi__at_eof(s))          return stbi__errpuc("bad file","file too short (reading packets)");
-      if (packet->size != 8)  return stbi__errpuc("bad format","packet isn't 8bpp");
-   } while (chained);
-
-   *comp = (act_comp & 0x10 ? 4 : 3); // has alpha channel?
-
-   for(y=0; y<height; ++y) {
-      int packet_idx;
-
-      for(packet_idx=0; packet_idx < num_packets; ++packet_idx) {
-         stbi__pic_packet *packet = &packets[packet_idx];
-         stbi_uc *dest = result+y*width*4;
-
-         switch (packet->type) {
-            default:
-               return stbi__errpuc("bad format","packet has bad compression type");
-
-            case 0: {//uncompressed
-               int x;
-
-               for(x=0;x<width;++x, dest+=4)
-                  if (!stbi__readval(s,packet->channel,dest))
-                     return 0;
-               break;
-            }
-
-            case 1://Pure RLE
-               {
-                  int left=width, i;
-
-                  while (left>0) {
-                     stbi_uc count,value[4];
-
-                     count=stbi__get8(s);
-                     if (stbi__at_eof(s))   return stbi__errpuc("bad file","file too short (pure read count)");
-
-                     if (count > left)
-                        count = (stbi_uc) left;
-
-                     if (!stbi__readval(s,packet->channel,value))  return 0;
-
-                     for(i=0; i<count; ++i,dest+=4)
-                        stbi__copyval(packet->channel,dest,value);
-                     left -= count;
-                  }
-               }
-               break;
-
-            case 2: {//Mixed RLE
-               int left=width;
-               while (left>0) {
-                  int count = stbi__get8(s), i;
-                  if (stbi__at_eof(s))  return stbi__errpuc("bad file","file too short (mixed read count)");
-
-                  if (count >= 128) { // Repeated
-                     stbi_uc value[4];
-
-                     if (count==128)
-                        count = stbi__get16be(s);
-                     else
-                        count -= 127;
-                     if (count > left)
-                        return stbi__errpuc("bad file","scanline overrun");
-
-                     if (!stbi__readval(s,packet->channel,value))
-                        return 0;
-
-                     for(i=0;i<count;++i, dest += 4)
-                        stbi__copyval(packet->channel,dest,value);
-                  } else { // Raw
-                     ++count;
-                     if (count>left) return stbi__errpuc("bad file","scanline overrun");
-
-                     for(i=0;i<count;++i, dest+=4)
-                        if (!stbi__readval(s,packet->channel,dest))
-                           return 0;
-                  }
-                  left-=count;
-               }
-               break;
-            }
-         }
-      }
-   }
-
-   return result;
-}
-
-static void *stbi__pic_load(stbi__context *s,int *px,int *py,int *comp,int req_comp, stbi__result_info *ri)
-{
-   stbi_uc *result;
-   int i, x,y, internal_comp;
-   STBI_NOTUSED(ri);
-
-   if (!comp) comp = &internal_comp;
-
-   for (i=0; i<92; ++i)
-      stbi__get8(s);
-
-   x = stbi__get16be(s);
-   y = stbi__get16be(s);
-   if (stbi__at_eof(s))  return stbi__errpuc("bad file","file too short (pic header)");
-   if (!stbi__mad3sizes_valid(x, y, 4, 0)) return stbi__errpuc("too large", "PIC image too large to decode");
-
-   stbi__get32be(s); //skip `ratio'
-   stbi__get16be(s); //skip `fields'
-   stbi__get16be(s); //skip `pad'
-
-   // intermediate buffer is RGBA
-   result = (stbi_uc *) stbi__malloc_mad3(x, y, 4, 0);
-   memset(result, 0xff, x*y*4);
-
-   if (!stbi__pic_load_core(s,x,y,comp, result)) {
-      STBI_FREE(result);
-      result=0;
-   }
-   *px = x;
-   *py = y;
-   if (req_comp == 0) req_comp = *comp;
-   result=stbi__convert_format(result,4,req_comp,x,y);
-
-   return result;
-}
-
-static int stbi__pic_test(stbi__context *s)
-{
-   int r = stbi__pic_test_core(s);
-   stbi__rewind(s);
-   return r;
-}
-#endif
-
-// *************************************************************************************************
-// GIF loader -- public domain by Jean-Marc Lienher -- simplified/shrunk by stb
-
-#ifndef STBI_NO_GIF
-typedef struct
-{
-   stbi__int16 prefix;
-   stbi_uc first;
-   stbi_uc suffix;
-} stbi__gif_lzw;
-
-typedef struct
-{
-   int w,h;
-   stbi_uc *out;                 // output buffer (always 4 components)
-   stbi_uc *background;          // The current "background" as far as a gif is concerned
-   stbi_uc *history; 
-   int flags, bgindex, ratio, transparent, eflags;
-   stbi_uc  pal[256][4];
-   stbi_uc lpal[256][4];
-   stbi__gif_lzw codes[8192];
-   stbi_uc *color_table;
-   int parse, step;
-   int lflags;
-   int start_x, start_y;
-   int max_x, max_y;
-   int cur_x, cur_y;
-   int line_size;
-   int delay;
-} stbi__gif;
-
-static int stbi__gif_test_raw(stbi__context *s)
-{
-   int sz;
-   if (stbi__get8(s) != 'G' || stbi__get8(s) != 'I' || stbi__get8(s) != 'F' || stbi__get8(s) != '8') return 0;
-   sz = stbi__get8(s);
-   if (sz != '9' && sz != '7') return 0;
-   if (stbi__get8(s) != 'a') return 0;
-   return 1;
-}
-
-static int stbi__gif_test(stbi__context *s)
-{
-   int r = stbi__gif_test_raw(s);
-   stbi__rewind(s);
-   return r;
-}
-
-static void stbi__gif_parse_colortable(stbi__context *s, stbi_uc pal[256][4], int num_entries, int transp)
-{
-   int i;
-   for (i=0; i < num_entries; ++i) {
-      pal[i][2] = stbi__get8(s);
-      pal[i][1] = stbi__get8(s);
-      pal[i][0] = stbi__get8(s);
-      pal[i][3] = transp == i ? 0 : 255;
-   }
-}
-
-static int stbi__gif_header(stbi__context *s, stbi__gif *g, int *comp, int is_info)
-{
-   stbi_uc version;
-   if (stbi__get8(s) != 'G' || stbi__get8(s) != 'I' || stbi__get8(s) != 'F' || stbi__get8(s) != '8')
-      return stbi__err("not GIF", "Corrupt GIF");
-
-   version = stbi__get8(s);
-   if (version != '7' && version != '9')    return stbi__err("not GIF", "Corrupt GIF");
-   if (stbi__get8(s) != 'a')                return stbi__err("not GIF", "Corrupt GIF");
-
-   stbi__g_failure_reason = "";
-   g->w = stbi__get16le(s);
-   g->h = stbi__get16le(s);
-   g->flags = stbi__get8(s);
-   g->bgindex = stbi__get8(s);
-   g->ratio = stbi__get8(s);
-   g->transparent = -1;
-
-   if (comp != 0) *comp = 4;  // can't actually tell whether it's 3 or 4 until we parse the comments
-
-   if (is_info) return 1;
-
-   if (g->flags & 0x80)
-      stbi__gif_parse_colortable(s,g->pal, 2 << (g->flags & 7), -1);
-
-   return 1;
-}
-
-static int stbi__gif_info_raw(stbi__context *s, int *x, int *y, int *comp)
-{
-   stbi__gif* g = (stbi__gif*) stbi__malloc(sizeof(stbi__gif));
-   if (!stbi__gif_header(s, g, comp, 1)) {
-      STBI_FREE(g);
-      stbi__rewind( s );
-      return 0;
-   }
-   if (x) *x = g->w;
-   if (y) *y = g->h;
-   STBI_FREE(g);
-   return 1;
-}
-
-static void stbi__out_gif_code(stbi__gif *g, stbi__uint16 code)
-{
-   stbi_uc *p, *c;
-   int idx; 
-
-   // recurse to decode the prefixes, since the linked-list is backwards,
-   // and working backwards through an interleaved image would be nasty
-   if (g->codes[code].prefix >= 0)
-      stbi__out_gif_code(g, g->codes[code].prefix);
-
-   if (g->cur_y >= g->max_y) return;
-
-   idx = g->cur_x + g->cur_y; 
-   p = &g->out[idx];
-   g->history[idx / 4] = 1;  
-
-   c = &g->color_table[g->codes[code].suffix * 4];
-   if (c[3] > 128) { // don't render transparent pixels; 
-      p[0] = c[2];
-      p[1] = c[1];
-      p[2] = c[0];
-      p[3] = c[3];
-   }
-   g->cur_x += 4;
-
-   if (g->cur_x >= g->max_x) {
-      g->cur_x = g->start_x;
-      g->cur_y += g->step;
-
-      while (g->cur_y >= g->max_y && g->parse > 0) {
-         g->step = (1 << g->parse) * g->line_size;
-         g->cur_y = g->start_y + (g->step >> 1);
-         --g->parse;
-      }
-   }
-}
-
-static stbi_uc *stbi__process_gif_raster(stbi__context *s, stbi__gif *g)
-{
-   stbi_uc lzw_cs;
-   stbi__int32 len, init_code;
-   stbi__uint32 first;
-   stbi__int32 codesize, codemask, avail, oldcode, bits, valid_bits, clear;
-   stbi__gif_lzw *p;
-
-   lzw_cs = stbi__get8(s);
-   if (lzw_cs > 12) return NULL;
-   clear = 1 << lzw_cs;
-   first = 1;
-   codesize = lzw_cs + 1;
-   codemask = (1 << codesize) - 1;
-   bits = 0;
-   valid_bits = 0;
-   for (init_code = 0; init_code < clear; init_code++) {
-      g->codes[init_code].prefix = -1;
-      g->codes[init_code].first = (stbi_uc) init_code;
-      g->codes[init_code].suffix = (stbi_uc) init_code;
-   }
-
-   // support no starting clear code
-   avail = clear+2;
-   oldcode = -1;
-
-   len = 0;
-   for(;;) {
-      if (valid_bits < codesize) {
-         if (len == 0) {
-            len = stbi__get8(s); // start new block
-            if (len == 0)
-               return g->out;
-         }
-         --len;
-         bits |= (stbi__int32) stbi__get8(s) << valid_bits;
-         valid_bits += 8;
-      } else {
-         stbi__int32 code = bits & codemask;
-         bits >>= codesize;
-         valid_bits -= codesize;
-         // @OPTIMIZE: is there some way we can accelerate the non-clear path?
-         if (code == clear) {  // clear code
-            codesize = lzw_cs + 1;
-            codemask = (1 << codesize) - 1;
-            avail = clear + 2;
-            oldcode = -1;
-            first = 0;
-         } else if (code == clear + 1) { // end of stream code
-            stbi__skip(s, len);
-            while ((len = stbi__get8(s)) > 0)
-               stbi__skip(s,len);
-            return g->out;
-         } else if (code <= avail) {
-            if (first) {
-               return stbi__errpuc("no clear code", "Corrupt GIF");
-            }
-
-            if (oldcode >= 0) {
-               p = &g->codes[avail++];
-               if (avail > 8192) {
-                  return stbi__errpuc("too many codes", "Corrupt GIF");
-               }
-
-               p->prefix = (stbi__int16) oldcode;
-               p->first = g->codes[oldcode].first;
-               p->suffix = (code == avail) ? p->first : g->codes[code].first;
-            } else if (code == avail)
-               return stbi__errpuc("illegal code in raster", "Corrupt GIF");
-
-            stbi__out_gif_code(g, (stbi__uint16) code);
-
-            if ((avail & codemask) == 0 && avail <= 0x0FFF) {
-               codesize++;
-               codemask = (1 << codesize) - 1;
-            }
-
-            oldcode = code;
-         } else {
-            return stbi__errpuc("illegal code in raster", "Corrupt GIF");
-         }
-      }
-   }
-}
-
-// this function is designed to support animated gifs, although stb_image doesn't support it
-// two back is the image from two frames ago, used for a very specific disposal format
-static stbi_uc *stbi__gif_load_next(stbi__context *s, stbi__gif *g, int *comp, int req_comp, stbi_uc *two_back)
-{
-   int dispose; 
-   int first_frame; 
-   int pi; 
-   int pcount; 
-   STBI_NOTUSED(req_comp);
-
-   // on first frame, any non-written pixels get the background colour (non-transparent)
-   first_frame = 0; 
-   if (g->out == 0) {
-      if (!stbi__gif_header(s, g, comp,0)) return 0; // stbi__g_failure_reason set by stbi__gif_header
-      if (!stbi__mad3sizes_valid(4, g->w, g->h, 0))
-         return stbi__errpuc("too large", "GIF image is too large");
-      pcount = g->w * g->h;
-      g->out = (stbi_uc *) stbi__malloc(4 * pcount);
-      g->background = (stbi_uc *) stbi__malloc(4 * pcount);
-      g->history = (stbi_uc *) stbi__malloc(pcount);
-      if (!g->out || !g->background || !g->history)
-         return stbi__errpuc("outofmem", "Out of memory");
-
-      // image is treated as "transparent" at the start - ie, nothing overwrites the current background; 
-      // background colour is only used for pixels that are not rendered first frame, after that "background"
-      // color refers to the color that was there the previous frame. 
-      memset(g->out, 0x00, 4 * pcount);
-      memset(g->background, 0x00, 4 * pcount); // state of the background (starts transparent)
-      memset(g->history, 0x00, pcount);        // pixels that were affected previous frame
-      first_frame = 1; 
-   } else {
-      // second frame - how do we dispoase of the previous one?
-      dispose = (g->eflags & 0x1C) >> 2; 
-      pcount = g->w * g->h; 
-
-      if ((dispose == 3) && (two_back == 0)) {
-         dispose = 2; // if I don't have an image to revert back to, default to the old background
-      }
-
-      if (dispose == 3) { // use previous graphic
-         for (pi = 0; pi < pcount; ++pi) {
-            if (g->history[pi]) {
-               memcpy( &g->out[pi * 4], &two_back[pi * 4], 4 ); 
-            }
-         }
-      } else if (dispose == 2) { 
-         // restore what was changed last frame to background before that frame; 
-         for (pi = 0; pi < pcount; ++pi) {
-            if (g->history[pi]) {
-               memcpy( &g->out[pi * 4], &g->background[pi * 4], 4 ); 
-            }
-         }
-      } else {
-         // This is a non-disposal case eithe way, so just 
-         // leave the pixels as is, and they will become the new background
-         // 1: do not dispose
-         // 0:  not specified.
-      }
-
-      // background is what out is after the undoing of the previou frame; 
-      memcpy( g->background, g->out, 4 * g->w * g->h ); 
-   }
-
-   // clear my history; 
-   memset( g->history, 0x00, g->w * g->h );        // pixels that were affected previous frame
-
-   for (;;) {
-      int tag = stbi__get8(s); 
-      switch (tag) {
-         case 0x2C: /* Image Descriptor */
-         {
-            stbi__int32 x, y, w, h;
-            stbi_uc *o;
-
-            x = stbi__get16le(s);
-            y = stbi__get16le(s);
-            w = stbi__get16le(s);
-            h = stbi__get16le(s);
-            if (((x + w) > (g->w)) || ((y + h) > (g->h)))
-               return stbi__errpuc("bad Image Descriptor", "Corrupt GIF");
-
-            g->line_size = g->w * 4;
-            g->start_x = x * 4;
-            g->start_y = y * g->line_size;
-            g->max_x   = g->start_x + w * 4;
-            g->max_y   = g->start_y + h * g->line_size;
-            g->cur_x   = g->start_x;
-            g->cur_y   = g->start_y;
-
-            // if the width of the specified rectangle is 0, that means
-            // we may not see *any* pixels or the image is malformed;
-            // to make sure this is caught, move the current y down to
-            // max_y (which is what out_gif_code checks).
-            if (w == 0)
-               g->cur_y = g->max_y;
-
-            g->lflags = stbi__get8(s);
-
-            if (g->lflags & 0x40) {
-               g->step = 8 * g->line_size; // first interlaced spacing
-               g->parse = 3;
-            } else {
-               g->step = g->line_size;
-               g->parse = 0;
-            }
-
-            if (g->lflags & 0x80) {
-               stbi__gif_parse_colortable(s,g->lpal, 2 << (g->lflags & 7), g->eflags & 0x01 ? g->transparent : -1);
-               g->color_table = (stbi_uc *) g->lpal;
-            } else if (g->flags & 0x80) {
-               g->color_table = (stbi_uc *) g->pal;
-            } else
-               return stbi__errpuc("missing color table", "Corrupt GIF");            
-            
-            o = stbi__process_gif_raster(s, g);
-            if (!o) return NULL;
-
-            // if this was the first frame, 
-            pcount = g->w * g->h; 
-            if (first_frame && (g->bgindex > 0)) {
-               // if first frame, any pixel not drawn to gets the background color
-               for (pi = 0; pi < pcount; ++pi) {
-                  if (g->history[pi] == 0) {
-                     g->pal[g->bgindex][3] = 255; // just in case it was made transparent, undo that; It will be reset next frame if need be; 
-                     memcpy( &g->out[pi * 4], &g->pal[g->bgindex], 4 ); 
-                  }
-               }
-            }
-
-            return o;
-         }
-
-         case 0x21: // Comment Extension.
-         {
-            int len;
-            int ext = stbi__get8(s); 
-            if (ext == 0xF9) { // Graphic Control Extension.
-               len = stbi__get8(s);
-               if (len == 4) {
-                  g->eflags = stbi__get8(s);
-                  g->delay = 10 * stbi__get16le(s); // delay - 1/100th of a second, saving as 1/1000ths.
-
-                  // unset old transparent
-                  if (g->transparent >= 0) {
-                     g->pal[g->transparent][3] = 255; 
-                  } 
-                  if (g->eflags & 0x01) {
-                     g->transparent = stbi__get8(s);
-                     if (g->transparent >= 0) {
-                        g->pal[g->transparent][3] = 0; 
-                     }
-                  } else {
-                     // don't need transparent
-                     stbi__skip(s, 1); 
-                     g->transparent = -1; 
-                  }
-               } else {
-                  stbi__skip(s, len);
-                  break;
-               }
-            } 
-            while ((len = stbi__get8(s)) != 0) {
-               stbi__skip(s, len);
-            }
-            break;
-         }
-
-         case 0x3B: // gif stream termination code
-            return (stbi_uc *) s; // using '1' causes warning on some compilers
-
-         default:
-            return stbi__errpuc("unknown code", "Corrupt GIF");
-      }
-   }
-}
-
-static void *stbi__load_gif_main(stbi__context *s, int **delays, int *x, int *y, int *z, int *comp, int req_comp)
-{
-   if (stbi__gif_test(s)) {
-      int layers = 0; 
-      stbi_uc *u = 0;
-      stbi_uc *out = 0;
-      stbi_uc *two_back = 0; 
-      stbi__gif g;
-      int stride; 
-      memset(&g, 0, sizeof(g));
-      if (delays) {
-         *delays = 0; 
-      }
-
-      do {
-         u = stbi__gif_load_next(s, &g, comp, req_comp, two_back);
-         if (u == (stbi_uc *) s) u = 0;  // end of animated gif marker
-
-         if (u) {
-            *x = g.w;
-            *y = g.h;
-            ++layers; 
-            stride = g.w * g.h * 4; 
-         
-            if (out) {
-               out = (stbi_uc*) STBI_REALLOC( out, layers * stride ); 
-               if (delays) {
-                  *delays = (int*) STBI_REALLOC( *delays, sizeof(int) * layers ); 
-               }
-            } else {
-               out = (stbi_uc*)stbi__malloc( layers * stride ); 
-               if (delays) {
-                  *delays = (int*) stbi__malloc( layers * sizeof(int) ); 
-               }
-            }
-            memcpy( out + ((layers - 1) * stride), u, stride ); 
-            if (layers >= 2) {
-               two_back = out - 2 * stride; 
-            }
-
-            if (delays) {
-               (*delays)[layers - 1U] = g.delay; 
-            }
-         }
-      } while (u != 0); 
-
-      // free temp buffer; 
-      STBI_FREE(g.out); 
-      STBI_FREE(g.history); 
-      STBI_FREE(g.background); 
-
-      // do the final conversion after loading everything; 
-      if (req_comp && req_comp != 4)
-         out = stbi__convert_format(out, 4, req_comp, layers * g.w, g.h);
-
-      *z = layers; 
-      return out;
-   } else {
-      return stbi__errpuc("not GIF", "Image was not as a gif type."); 
-   }
-}
-
-static void *stbi__gif_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri)
-{
-   stbi_uc *u = 0;
-   stbi__gif g;
-   memset(&g, 0, sizeof(g));
-   STBI_NOTUSED(ri);
-
-   u = stbi__gif_load_next(s, &g, comp, req_comp, 0);
-   if (u == (stbi_uc *) s) u = 0;  // end of animated gif marker
-   if (u) {
-      *x = g.w;
-      *y = g.h;
-
-      // moved conversion to after successful load so that the same
-      // can be done for multiple frames. 
-      if (req_comp && req_comp != 4)
-         u = stbi__convert_format(u, 4, req_comp, g.w, g.h);
-   } else if (g.out) {
-      // if there was an error and we allocated an image buffer, free it!
-      STBI_FREE(g.out);
-   }
-
-   // free buffers needed for multiple frame loading; 
-   STBI_FREE(g.history);
-   STBI_FREE(g.background); 
-
-   return u;
-}
-
-static int stbi__gif_info(stbi__context *s, int *x, int *y, int *comp)
-{
-   return stbi__gif_info_raw(s,x,y,comp);
-}
-#endif
-
-// *************************************************************************************************
-// Radiance RGBE HDR loader
-// originally by Nicolas Schulz
-#ifndef STBI_NO_HDR
-static int stbi__hdr_test_core(stbi__context *s, const char *signature)
-{
-   int i;
-   for (i=0; signature[i]; ++i)
-      if (stbi__get8(s) != signature[i])
-          return 0;
-   stbi__rewind(s);
-   return 1;
-}
-
-static int stbi__hdr_test(stbi__context* s)
-{
-   int r = stbi__hdr_test_core(s, "#?RADIANCE\n");
-   stbi__rewind(s);
-   if(!r) {
-       r = stbi__hdr_test_core(s, "#?RGBE\n");
-       stbi__rewind(s);
-   }
-   return r;
-}
-
-#define STBI__HDR_BUFLEN  1024
-static char *stbi__hdr_gettoken(stbi__context *z, char *buffer)
-{
-   int len=0;
-   char c = '\0';
-
-   c = (char) stbi__get8(z);
-
-   while (!stbi__at_eof(z) && c != '\n') {
-      buffer[len++] = c;
-      if (len == STBI__HDR_BUFLEN-1) {
-         // flush to end of line
-         while (!stbi__at_eof(z) && stbi__get8(z) != '\n')
-            ;
-         break;
-      }
-      c = (char) stbi__get8(z);
-   }
-
-   buffer[len] = 0;
-   return buffer;
-}
-
-static void stbi__hdr_convert(float *output, stbi_uc *input, int req_comp)
-{
-   if ( input[3] != 0 ) {
-      float f1;
-      // Exponent
-      f1 = (float) ldexp(1.0f, input[3] - (int)(128 + 8));
-      if (req_comp <= 2)
-         output[0] = (input[0] + input[1] + input[2]) * f1 / 3;
-      else {
-         output[0] = input[0] * f1;
-         output[1] = input[1] * f1;
-         output[2] = input[2] * f1;
-      }
-      if (req_comp == 2) output[1] = 1;
-      if (req_comp == 4) output[3] = 1;
-   } else {
-      switch (req_comp) {
-         case 4: output[3] = 1; /* fallthrough */
-         case 3: output[0] = output[1] = output[2] = 0;
-                 break;
-         case 2: output[1] = 1; /* fallthrough */
-         case 1: output[0] = 0;
-                 break;
-      }
-   }
-}
-
-static float *stbi__hdr_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri)
-{
-   char buffer[STBI__HDR_BUFLEN];
-   char *token;
-   int valid = 0;
-   int width, height;
-   stbi_uc *scanline;
-   float *hdr_data;
-   int len;
-   unsigned char count, value;
-   int i, j, k, c1,c2, z;
-   const char *headerToken;
-   STBI_NOTUSED(ri);
-
-   // Check identifier
-   headerToken = stbi__hdr_gettoken(s,buffer);
-   if (strcmp(headerToken, "#?RADIANCE") != 0 && strcmp(headerToken, "#?RGBE") != 0)
-      return stbi__errpf("not HDR", "Corrupt HDR image");
-
-   // Parse header
-   for(;;) {
-      token = stbi__hdr_gettoken(s,buffer);
-      if (token[0] == 0) break;
-      if (strcmp(token, "FORMAT=32-bit_rle_rgbe") == 0) valid = 1;
-   }
-
-   if (!valid)    return stbi__errpf("unsupported format", "Unsupported HDR format");
-
-   // Parse width and height
-   // can't use sscanf() if we're not using stdio!
-   token = stbi__hdr_gettoken(s,buffer);
-   if (strncmp(token, "-Y ", 3))  return stbi__errpf("unsupported data layout", "Unsupported HDR format");
-   token += 3;
-   height = (int) strtol(token, &token, 10);
-   while (*token == ' ') ++token;
-   if (strncmp(token, "+X ", 3))  return stbi__errpf("unsupported data layout", "Unsupported HDR format");
-   token += 3;
-   width = (int) strtol(token, NULL, 10);
-
-   *x = width;
-   *y = height;
-
-   if (comp) *comp = 3;
-   if (req_comp == 0) req_comp = 3;
-
-   if (!stbi__mad4sizes_valid(width, height, req_comp, sizeof(float), 0))
-      return stbi__errpf("too large", "HDR image is too large");
-
-   // Read data
-   hdr_data = (float *) stbi__malloc_mad4(width, height, req_comp, sizeof(float), 0);
-   if (!hdr_data)
-      return stbi__errpf("outofmem", "Out of memory");
-
-   // Load image data
-   // image data is stored as some number of sca
-   if ( width < 8 || width >= 32768) {
-      // Read flat data
-      for (j=0; j < height; ++j) {
-         for (i=0; i < width; ++i) {
-            stbi_uc rgbe[4];
-           main_decode_loop:
-            stbi__getn(s, rgbe, 4);
-            stbi__hdr_convert(hdr_data + j * width * req_comp + i * req_comp, rgbe, req_comp);
-         }
-      }
-   } else {
-      // Read RLE-encoded data
-      scanline = NULL;
-
-      for (j = 0; j < height; ++j) {
-         c1 = stbi__get8(s);
-         c2 = stbi__get8(s);
-         len = stbi__get8(s);
-         if (c1 != 2 || c2 != 2 || (len & 0x80)) {
-            // not run-length encoded, so we have to actually use THIS data as a decoded
-            // pixel (note this can't be a valid pixel--one of RGB must be >= 128)
-            stbi_uc rgbe[4];
-            rgbe[0] = (stbi_uc) c1;
-            rgbe[1] = (stbi_uc) c2;
-            rgbe[2] = (stbi_uc) len;
-            rgbe[3] = (stbi_uc) stbi__get8(s);
-            stbi__hdr_convert(hdr_data, rgbe, req_comp);
-            i = 1;
-            j = 0;
-            STBI_FREE(scanline);
-            goto main_decode_loop; // yes, this makes no sense
-         }
-         len <<= 8;
-         len |= stbi__get8(s);
-         if (len != width) { STBI_FREE(hdr_data); STBI_FREE(scanline); return stbi__errpf("invalid decoded scanline length", "corrupt HDR"); }
-         if (scanline == NULL) {
-            scanline = (stbi_uc *) stbi__malloc_mad2(width, 4, 0);
-            if (!scanline) {
-               STBI_FREE(hdr_data);
-               return stbi__errpf("outofmem", "Out of memory");
-            }
-         }
-
-         for (k = 0; k < 4; ++k) {
-            int nleft;
-            i = 0;
-            while ((nleft = width - i) > 0) {
-               count = stbi__get8(s);
-               if (count > 128) {
-                  // Run
-                  value = stbi__get8(s);
-                  count -= 128;
-                  if (count > nleft) { STBI_FREE(hdr_data); STBI_FREE(scanline); return stbi__errpf("corrupt", "bad RLE data in HDR"); }
-                  for (z = 0; z < count; ++z)
-                     scanline[i++ * 4 + k] = value;
-               } else {
-                  // Dump
-                  if (count > nleft) { STBI_FREE(hdr_data); STBI_FREE(scanline); return stbi__errpf("corrupt", "bad RLE data in HDR"); }
-                  for (z = 0; z < count; ++z)
-                     scanline[i++ * 4 + k] = stbi__get8(s);
-               }
-            }
-         }
-         for (i=0; i < width; ++i)
-            stbi__hdr_convert(hdr_data+(j*width + i)*req_comp, scanline + i*4, req_comp);
-      }
-      if (scanline)
-         STBI_FREE(scanline);
-   }
-
-   return hdr_data;
-}
-
-static int stbi__hdr_info(stbi__context *s, int *x, int *y, int *comp)
-{
-   char buffer[STBI__HDR_BUFLEN];
-   char *token;
-   int valid = 0;
-   int dummy;
-
-   if (!x) x = &dummy;
-   if (!y) y = &dummy;
-   if (!comp) comp = &dummy;
-
-   if (stbi__hdr_test(s) == 0) {
-       stbi__rewind( s );
-       return 0;
-   }
-
-   for(;;) {
-      token = stbi__hdr_gettoken(s,buffer);
-      if (token[0] == 0) break;
-      if (strcmp(token, "FORMAT=32-bit_rle_rgbe") == 0) valid = 1;
-   }
-
-   if (!valid) {
-       stbi__rewind( s );
-       return 0;
-   }
-   token = stbi__hdr_gettoken(s,buffer);
-   if (strncmp(token, "-Y ", 3)) {
-       stbi__rewind( s );
-       return 0;
-   }
-   token += 3;
-   *y = (int) strtol(token, &token, 10);
-   while (*token == ' ') ++token;
-   if (strncmp(token, "+X ", 3)) {
-       stbi__rewind( s );
-       return 0;
-   }
-   token += 3;
-   *x = (int) strtol(token, NULL, 10);
-   *comp = 3;
-   return 1;
-}
-#endif // STBI_NO_HDR
-
-#ifndef STBI_NO_BMP
-static int stbi__bmp_info(stbi__context *s, int *x, int *y, int *comp)
-{
-   void *p;
-   stbi__bmp_data info;
-
-   info.all_a = 255;
-   p = stbi__bmp_parse_header(s, &info);
-   stbi__rewind( s );
-   if (p == NULL)
-      return 0;
-   if (x) *x = s->img_x;
-   if (y) *y = s->img_y;
-   if (comp) *comp = info.ma ? 4 : 3;
-   return 1;
-}
-#endif
-
-#ifndef STBI_NO_PSD
-static int stbi__psd_info(stbi__context *s, int *x, int *y, int *comp)
-{
-   int channelCount, dummy, depth;
-   if (!x) x = &dummy;
-   if (!y) y = &dummy;
-   if (!comp) comp = &dummy;
-   if (stbi__get32be(s) != 0x38425053) {
-       stbi__rewind( s );
-       return 0;
-   }
-   if (stbi__get16be(s) != 1) {
-       stbi__rewind( s );
-       return 0;
-   }
-   stbi__skip(s, 6);
-   channelCount = stbi__get16be(s);
-   if (channelCount < 0 || channelCount > 16) {
-       stbi__rewind( s );
-       return 0;
-   }
-   *y = stbi__get32be(s);
-   *x = stbi__get32be(s);
-   depth = stbi__get16be(s);
-   if (depth != 8 && depth != 16) {
-       stbi__rewind( s );
-       return 0;
-   }
-   if (stbi__get16be(s) != 3) {
-       stbi__rewind( s );
-       return 0;
-   }
-   *comp = 4;
-   return 1;
-}
-
-static int stbi__psd_is16(stbi__context *s)
-{
-   int channelCount, depth;
-   if (stbi__get32be(s) != 0x38425053) {
-       stbi__rewind( s );
-       return 0;
-   }
-   if (stbi__get16be(s) != 1) {
-       stbi__rewind( s );
-       return 0;
-   }
-   stbi__skip(s, 6);
-   channelCount = stbi__get16be(s);
-   if (channelCount < 0 || channelCount > 16) {
-       stbi__rewind( s );
-       return 0;
-   }
-   (void) stbi__get32be(s);
-   (void) stbi__get32be(s);
-   depth = stbi__get16be(s);
-   if (depth != 16) {
-       stbi__rewind( s );
-       return 0;
-   }
-   return 1;
-}
-#endif
-
-#ifndef STBI_NO_PIC
-static int stbi__pic_info(stbi__context *s, int *x, int *y, int *comp)
-{
-   int act_comp=0,num_packets=0,chained,dummy;
-   stbi__pic_packet packets[10];
-
-   if (!x) x = &dummy;
-   if (!y) y = &dummy;
-   if (!comp) comp = &dummy;
-
-   if (!stbi__pic_is4(s,"\x53\x80\xF6\x34")) {
-      stbi__rewind(s);
-      return 0;
-   }
-
-   stbi__skip(s, 88);
-
-   *x = stbi__get16be(s);
-   *y = stbi__get16be(s);
-   if (stbi__at_eof(s)) {
-      stbi__rewind( s);
-      return 0;
-   }
-   if ( (*x) != 0 && (1 << 28) / (*x) < (*y)) {
-      stbi__rewind( s );
-      return 0;
-   }
-
-   stbi__skip(s, 8);
-
-   do {
-      stbi__pic_packet *packet;
-
-      if (num_packets==sizeof(packets)/sizeof(packets[0]))
-         return 0;
-
-      packet = &packets[num_packets++];
-      chained = stbi__get8(s);
-      packet->size    = stbi__get8(s);
-      packet->type    = stbi__get8(s);
-      packet->channel = stbi__get8(s);
-      act_comp |= packet->channel;
-
-      if (stbi__at_eof(s)) {
-          stbi__rewind( s );
-          return 0;
-      }
-      if (packet->size != 8) {
-          stbi__rewind( s );
-          return 0;
-      }
-   } while (chained);
-
-   *comp = (act_comp & 0x10 ? 4 : 3);
-
-   return 1;
-}
-#endif
-
-// *************************************************************************************************
-// Portable Gray Map and Portable Pixel Map loader
-// by Ken Miller
-//
-// PGM: http://netpbm.sourceforge.net/doc/pgm.html
-// PPM: http://netpbm.sourceforge.net/doc/ppm.html
-//
-// Known limitations:
-//    Does not support comments in the header section
-//    Does not support ASCII image data (formats P2 and P3)
-//    Does not support 16-bit-per-channel
-
-#ifndef STBI_NO_PNM
-
-static int      stbi__pnm_test(stbi__context *s)
-{
-   char p, t;
-   p = (char) stbi__get8(s);
-   t = (char) stbi__get8(s);
-   if (p != 'P' || (t != '5' && t != '6')) {
-       stbi__rewind( s );
-       return 0;
-   }
-   return 1;
-}
-
-static void *stbi__pnm_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri)
-{
-   stbi_uc *out;
-   STBI_NOTUSED(ri);
-
-   if (!stbi__pnm_info(s, (int *)&s->img_x, (int *)&s->img_y, (int *)&s->img_n))
-      return 0;
-
-   *x = s->img_x;
-   *y = s->img_y;
-   if (comp) *comp = s->img_n;
-
-   if (!stbi__mad3sizes_valid(s->img_n, s->img_x, s->img_y, 0))
-      return stbi__errpuc("too large", "PNM too large");
-
-   out = (stbi_uc *) stbi__malloc_mad3(s->img_n, s->img_x, s->img_y, 0);
-   if (!out) return stbi__errpuc("outofmem", "Out of memory");
-   stbi__getn(s, out, s->img_n * s->img_x * s->img_y);
-
-   if (req_comp && req_comp != s->img_n) {
-      out = stbi__convert_format(out, s->img_n, req_comp, s->img_x, s->img_y);
-      if (out == NULL) return out; // stbi__convert_format frees input on failure
-   }
-   return out;
-}
-
-static int      stbi__pnm_isspace(char c)
-{
-   return c == ' ' || c == '\t' || c == '\n' || c == '\v' || c == '\f' || c == '\r';
-}
-
-static void     stbi__pnm_skip_whitespace(stbi__context *s, char *c)
-{
-   for (;;) {
-      while (!stbi__at_eof(s) && stbi__pnm_isspace(*c))
-         *c = (char) stbi__get8(s);
-
-      if (stbi__at_eof(s) || *c != '#')
-         break;
-
-      while (!stbi__at_eof(s) && *c != '\n' && *c != '\r' )
-         *c = (char) stbi__get8(s);
-   }
-}
-
-static int      stbi__pnm_isdigit(char c)
-{
-   return c >= '0' && c <= '9';
-}
-
-static int      stbi__pnm_getinteger(stbi__context *s, char *c)
-{
-   int value = 0;
-
-   while (!stbi__at_eof(s) && stbi__pnm_isdigit(*c)) {
-      value = value*10 + (*c - '0');
-      *c = (char) stbi__get8(s);
-   }
-
-   return value;
-}
-
-static int      stbi__pnm_info(stbi__context *s, int *x, int *y, int *comp)
-{
-   int maxv, dummy;
-   char c, p, t;
-
-   if (!x) x = &dummy;
-   if (!y) y = &dummy;
-   if (!comp) comp = &dummy;
-
-   stbi__rewind(s);
-
-   // Get identifier
-   p = (char) stbi__get8(s);
-   t = (char) stbi__get8(s);
-   if (p != 'P' || (t != '5' && t != '6')) {
-       stbi__rewind(s);
-       return 0;
-   }
-
-   *comp = (t == '6') ? 3 : 1;  // '5' is 1-component .pgm; '6' is 3-component .ppm
-
-   c = (char) stbi__get8(s);
-   stbi__pnm_skip_whitespace(s, &c);
-
-   *x = stbi__pnm_getinteger(s, &c); // read width
-   stbi__pnm_skip_whitespace(s, &c);
-
-   *y = stbi__pnm_getinteger(s, &c); // read height
-   stbi__pnm_skip_whitespace(s, &c);
-
-   maxv = stbi__pnm_getinteger(s, &c);  // read max value
-
-   if (maxv > 255)
-      return stbi__err("max value > 255", "PPM image not 8-bit");
-   else
-      return 1;
-}
-#endif
-
-static int stbi__info_main(stbi__context *s, int *x, int *y, int *comp)
-{
-   #ifndef STBI_NO_JPEG
-   if (stbi__jpeg_info(s, x, y, comp)) return 1;
-   #endif
-
-   #ifndef STBI_NO_PNG
-   if (stbi__png_info(s, x, y, comp))  return 1;
-   #endif
-
-   #ifndef STBI_NO_GIF
-   if (stbi__gif_info(s, x, y, comp))  return 1;
-   #endif
-
-   #ifndef STBI_NO_BMP
-   if (stbi__bmp_info(s, x, y, comp))  return 1;
-   #endif
-
-   #ifndef STBI_NO_PSD
-   if (stbi__psd_info(s, x, y, comp))  return 1;
-   #endif
-
-   #ifndef STBI_NO_PIC
-   if (stbi__pic_info(s, x, y, comp))  return 1;
-   #endif
-
-   #ifndef STBI_NO_PNM
-   if (stbi__pnm_info(s, x, y, comp))  return 1;
-   #endif
-
-   #ifndef STBI_NO_HDR
-   if (stbi__hdr_info(s, x, y, comp))  return 1;
-   #endif
-
-   // test tga last because it's a crappy test!
-   #ifndef STBI_NO_TGA
-   if (stbi__tga_info(s, x, y, comp))
-       return 1;
-   #endif
-   return stbi__err("unknown image type", "Image not of any known type, or corrupt");
-}
-
-static int stbi__is_16_main(stbi__context *s)
-{
-   #ifndef STBI_NO_PNG
-   if (stbi__png_is16(s))  return 1;
-   #endif
-
-   #ifndef STBI_NO_PSD
-   if (stbi__psd_is16(s))  return 1;
-   #endif
-
-   return 0;
-}
-
-#ifndef STBI_NO_STDIO
-STBIDEF int stbi_info(char const *filename, int *x, int *y, int *comp)
-{
-    FILE *f = stbi__fopen(filename, "rb");
-    int result;
-    if (!f) return stbi__err("can't fopen", "Unable to open file");
-    result = stbi_info_from_file(f, x, y, comp);
-    fclose(f);
-    return result;
-}
-
-STBIDEF int stbi_info_from_file(FILE *f, int *x, int *y, int *comp)
-{
-   int r;
-   stbi__context s;
-   long pos = ftell(f);
-   stbi__start_file(&s, f);
-   r = stbi__info_main(&s,x,y,comp);
-   fseek(f,pos,SEEK_SET);
-   return r;
-}
-
-STBIDEF int stbi_is_16_bit(char const *filename)
-{
-    FILE *f = stbi__fopen(filename, "rb");
-    int result;
-    if (!f) return stbi__err("can't fopen", "Unable to open file");
-    result = stbi_is_16_bit_from_file(f);
-    fclose(f);
-    return result;
-}
-
-STBIDEF int stbi_is_16_bit_from_file(FILE *f)
-{
-   int r;
-   stbi__context s;
-   long pos = ftell(f);
-   stbi__start_file(&s, f);
-   r = stbi__is_16_main(&s);
-   fseek(f,pos,SEEK_SET);
-   return r;
-}
-#endif // !STBI_NO_STDIO
-
-STBIDEF int stbi_info_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *comp)
-{
-   stbi__context s;
-   stbi__start_mem(&s,buffer,len);
-   return stbi__info_main(&s,x,y,comp);
-}
-
-STBIDEF int stbi_info_from_callbacks(stbi_io_callbacks const *c, void *user, int *x, int *y, int *comp)
-{
-   stbi__context s;
-   stbi__start_callbacks(&s, (stbi_io_callbacks *) c, user);
-   return stbi__info_main(&s,x,y,comp);
-}
-
-STBIDEF int stbi_is_16_bit_from_memory(stbi_uc const *buffer, int len)
-{
-   stbi__context s;
-   stbi__start_mem(&s,buffer,len);
-   return stbi__is_16_main(&s);
-}
-
-STBIDEF int stbi_is_16_bit_from_callbacks(stbi_io_callbacks const *c, void *user)
-{
-   stbi__context s;
-   stbi__start_callbacks(&s, (stbi_io_callbacks *) c, user);
-   return stbi__is_16_main(&s);
-}
-
-#endif // STB_IMAGE_IMPLEMENTATION
-
-/*
-   revision history:
-      2.20  (2019-02-07) support utf8 filenames in Windows; fix warnings and platform ifdefs 
-      2.19  (2018-02-11) fix warning
-      2.18  (2018-01-30) fix warnings
-      2.17  (2018-01-29) change sbti__shiftsigned to avoid clang -O2 bug
-                         1-bit BMP
-                         *_is_16_bit api
-                         avoid warnings
-      2.16  (2017-07-23) all functions have 16-bit variants;
-                         STBI_NO_STDIO works again;
-                         compilation fixes;
-                         fix rounding in unpremultiply;
-                         optimize vertical flip;
-                         disable raw_len validation;
-                         documentation fixes
-      2.15  (2017-03-18) fix png-1,2,4 bug; now all Imagenet JPGs decode;
-                         warning fixes; disable run-time SSE detection on gcc;
-                         uniform handling of optional "return" values;
-                         thread-safe initialization of zlib tables
-      2.14  (2017-03-03) remove deprecated STBI_JPEG_OLD; fixes for Imagenet JPGs
-      2.13  (2016-11-29) add 16-bit API, only supported for PNG right now
-      2.12  (2016-04-02) fix typo in 2.11 PSD fix that caused crashes
-      2.11  (2016-04-02) allocate large structures on the stack
-                         remove white matting for transparent PSD
-                         fix reported channel count for PNG & BMP
-                         re-enable SSE2 in non-gcc 64-bit
-                         support RGB-formatted JPEG
-                         read 16-bit PNGs (only as 8-bit)
-      2.10  (2016-01-22) avoid warning introduced in 2.09 by STBI_REALLOC_SIZED
-      2.09  (2016-01-16) allow comments in PNM files
-                         16-bit-per-pixel TGA (not bit-per-component)
-                         info() for TGA could break due to .hdr handling
-                         info() for BMP to shares code instead of sloppy parse
-                         can use STBI_REALLOC_SIZED if allocator doesn't support realloc
-                         code cleanup
-      2.08  (2015-09-13) fix to 2.07 cleanup, reading RGB PSD as RGBA
-      2.07  (2015-09-13) fix compiler warnings
-                         partial animated GIF support
-                         limited 16-bpc PSD support
-                         #ifdef unused functions
-                         bug with < 92 byte PIC,PNM,HDR,TGA
-      2.06  (2015-04-19) fix bug where PSD returns wrong '*comp' value
-      2.05  (2015-04-19) fix bug in progressive JPEG handling, fix warning
-      2.04  (2015-04-15) try to re-enable SIMD on MinGW 64-bit
-      2.03  (2015-04-12) extra corruption checking (mmozeiko)
-                         stbi_set_flip_vertically_on_load (nguillemot)
-                         fix NEON support; fix mingw support
-      2.02  (2015-01-19) fix incorrect assert, fix warning
-      2.01  (2015-01-17) fix various warnings; suppress SIMD on gcc 32-bit without -msse2
-      2.00b (2014-12-25) fix STBI_MALLOC in progressive JPEG
-      2.00  (2014-12-25) optimize JPG, including x86 SSE2 & NEON SIMD (ryg)
-                         progressive JPEG (stb)
-                         PGM/PPM support (Ken Miller)
-                         STBI_MALLOC,STBI_REALLOC,STBI_FREE
-                         GIF bugfix -- seemingly never worked
-                         STBI_NO_*, STBI_ONLY_*
-      1.48  (2014-12-14) fix incorrectly-named assert()
-      1.47  (2014-12-14) 1/2/4-bit PNG support, both direct and paletted (Omar Cornut & stb)
-                         optimize PNG (ryg)
-                         fix bug in interlaced PNG with user-specified channel count (stb)
-      1.46  (2014-08-26)
-              fix broken tRNS chunk (colorkey-style transparency) in non-paletted PNG
-      1.45  (2014-08-16)
-              fix MSVC-ARM internal compiler error by wrapping malloc
-      1.44  (2014-08-07)
-              various warning fixes from Ronny Chevalier
-      1.43  (2014-07-15)
-              fix MSVC-only compiler problem in code changed in 1.42
-      1.42  (2014-07-09)
-              don't define _CRT_SECURE_NO_WARNINGS (affects user code)
-              fixes to stbi__cleanup_jpeg path
-              added STBI_ASSERT to avoid requiring assert.h
-      1.41  (2014-06-25)
-              fix search&replace from 1.36 that messed up comments/error messages
-      1.40  (2014-06-22)
-              fix gcc struct-initialization warning
-      1.39  (2014-06-15)
-              fix to TGA optimization when req_comp != number of components in TGA;
-              fix to GIF loading because BMP wasn't rewinding (whoops, no GIFs in my test suite)
-              add support for BMP version 5 (more ignored fields)
-      1.38  (2014-06-06)
-              suppress MSVC warnings on integer casts truncating values
-              fix accidental rename of 'skip' field of I/O
-      1.37  (2014-06-04)
-              remove duplicate typedef
-      1.36  (2014-06-03)
-              convert to header file single-file library
-              if de-iphone isn't set, load iphone images color-swapped instead of returning NULL
-      1.35  (2014-05-27)
-              various warnings
-              fix broken STBI_SIMD path
-              fix bug where stbi_load_from_file no longer left file pointer in correct place
-              fix broken non-easy path for 32-bit BMP (possibly never used)
-              TGA optimization by Arseny Kapoulkine
-      1.34  (unknown)
-              use STBI_NOTUSED in stbi__resample_row_generic(), fix one more leak in tga failure case
-      1.33  (2011-07-14)
-              make stbi_is_hdr work in STBI_NO_HDR (as specified), minor compiler-friendly improvements
-      1.32  (2011-07-13)
-              support for "info" function for all supported filetypes (SpartanJ)
-      1.31  (2011-06-20)
-              a few more leak fixes, bug in PNG handling (SpartanJ)
-      1.30  (2011-06-11)
-              added ability to load files via callbacks to accomidate custom input streams (Ben Wenger)
-              removed deprecated format-specific test/load functions
-              removed support for installable file formats (stbi_loader) -- would have been broken for IO callbacks anyway
-              error cases in bmp and tga give messages and don't leak (Raymond Barbiero, grisha)
-              fix inefficiency in decoding 32-bit BMP (David Woo)
-      1.29  (2010-08-16)
-              various warning fixes from Aurelien Pocheville
-      1.28  (2010-08-01)
-              fix bug in GIF palette transparency (SpartanJ)
-      1.27  (2010-08-01)
-              cast-to-stbi_uc to fix warnings
-      1.26  (2010-07-24)
-              fix bug in file buffering for PNG reported by SpartanJ
-      1.25  (2010-07-17)
-              refix trans_data warning (Won Chun)
-      1.24  (2010-07-12)
-              perf improvements reading from files on platforms with lock-heavy fgetc()
-              minor perf improvements for jpeg
-              deprecated type-specific functions so we'll get feedback if they're needed
-              attempt to fix trans_data warning (Won Chun)
-      1.23    fixed bug in iPhone support
-      1.22  (2010-07-10)
-              removed image *writing* support
-              stbi_info support from Jetro Lauha
-              GIF support from Jean-Marc Lienher
-              iPhone PNG-extensions from James Brown
-              warning-fixes from Nicolas Schulz and Janez Zemva (i.stbi__err. Janez (U+017D)emva)
-      1.21    fix use of 'stbi_uc' in header (reported by jon blow)
-      1.20    added support for Softimage PIC, by Tom Seddon
-      1.19    bug in interlaced PNG corruption check (found by ryg)
-      1.18  (2008-08-02)
-              fix a threading bug (local mutable static)
-      1.17    support interlaced PNG
-      1.16    major bugfix - stbi__convert_format converted one too many pixels
-      1.15    initialize some fields for thread safety
-      1.14    fix threadsafe conversion bug
-              header-file-only version (#define STBI_HEADER_FILE_ONLY before including)
-      1.13    threadsafe
-      1.12    const qualifiers in the API
-      1.11    Support installable IDCT, colorspace conversion routines
-      1.10    Fixes for 64-bit (don't use "unsigned long")
-              optimized upsampling by Fabian "ryg" Giesen
-      1.09    Fix format-conversion for PSD code (bad global variables!)
-      1.08    Thatcher Ulrich's PSD code integrated by Nicolas Schulz
-      1.07    attempt to fix C++ warning/errors again
-      1.06    attempt to fix C++ warning/errors again
-      1.05    fix TGA loading to return correct *comp and use good luminance calc
-      1.04    default float alpha is 1, not 255; use 'void *' for stbi_image_free
-      1.03    bugfixes to STBI_NO_STDIO, STBI_NO_HDR
-      1.02    support for (subset of) HDR files, float interface for preferred access to them
-      1.01    fix bug: possible bug in handling right-side up bmps... not sure
-              fix bug: the stbi__bmp_load() and stbi__tga_load() functions didn't work at all
-      1.00    interface to zlib that skips zlib header
-      0.99    correct handling of alpha in palette
-      0.98    TGA loader by lonesock; dynamically add loaders (untested)
-      0.97    jpeg errors on too large a file; also catch another malloc failure
-      0.96    fix detection of invalid v value - particleman@mollyrocket forum
-      0.95    during header scan, seek to markers in case of padding
-      0.94    STBI_NO_STDIO to disable stdio usage; rename all #defines the same
-      0.93    handle jpegtran output; verbose errors
-      0.92    read 4,8,16,24,32-bit BMP files of several formats
-      0.91    output 24-bit Windows 3.0 BMP files
-      0.90    fix a few more warnings; bump version number to approach 1.0
-      0.61    bugfixes due to Marc LeBlanc, Christopher Lloyd
-      0.60    fix compiling as c++
-      0.59    fix warnings: merge Dave Moore's -Wall fixes
-      0.58    fix bug: zlib uncompressed mode len/nlen was wrong endian
-      0.57    fix bug: jpg last huffman symbol before marker was >9 bits but less than 16 available
-      0.56    fix bug: zlib uncompressed mode len vs. nlen
-      0.55    fix bug: restart_interval not initialized to 0
-      0.54    allow NULL for 'int *comp'
-      0.53    fix bug in png 3->4; speedup png decoding
-      0.52    png handles req_comp=3,4 directly; minor cleanup; jpeg comments
-      0.51    obey req_comp requests, 1-component jpegs return as 1-component,
-              on 'test' only check type, not whether we support this variant
-      0.50  (2006-11-19)
-              first released version
-*/
-
-
-/*
-------------------------------------------------------------------------------
-This software is available under 2 licenses -- choose whichever you prefer.
-------------------------------------------------------------------------------
-ALTERNATIVE A - MIT License
-Copyright (c) 2017 Sean Barrett
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-------------------------------------------------------------------------------
-ALTERNATIVE B - Public Domain (www.unlicense.org)
-This is free and unencumbered software released into the public domain.
-Anyone is free to copy, modify, publish, use, compile, sell, or distribute this
-software, either in source code form or as a compiled binary, for any purpose,
-commercial or non-commercial, and by any means.
-In jurisdictions that recognize copyright laws, the author or authors of this
-software dedicate any and all copyright interest in the software to the public
-domain. We make this dedication for the benefit of the public at large and to
-the detriment of our heirs and successors. We intend this dedication to be an
-overt act of relinquishment in perpetuity of all present and future rights to
-this software under copyright law.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-------------------------------------------------------------------------------
-*/
\ No newline at end of file
diff --git a/Source/sys-clk/manager/lib/borealis/library/include/borealis/frame_context.hpp b/Source/sys-clk/manager/lib/borealis/library/include/borealis/frame_context.hpp
deleted file mode 100644
index 103f5a4e..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/include/borealis/frame_context.hpp
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-    Borealis, a Nintendo Switch UI Library
-    Copyright (C) 2019  natinusala
-    Copyright (C) 2019  p-sam
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include <nanovg.h>
-
-#include <borealis/style.hpp>
-#include <borealis/theme.hpp>
-
-namespace brls
-{
-
-class FontStash
-{
-  public:
-    int regular       = 0;
-    int korean        = 0;
-
-    int material      = 0;
-    int sharedSymbols = 0;
-};
-
-class FrameContext
-{
-  public:
-    NVGcontext* vg       = nullptr;
-    float pixelRatio     = 0.0;
-    FontStash* fontStash = nullptr;
-    ThemeValues* theme   = nullptr;
-};
-
-} // namespace brls
diff --git a/Source/sys-clk/manager/lib/borealis/library/include/borealis/header.hpp b/Source/sys-clk/manager/lib/borealis/library/include/borealis/header.hpp
deleted file mode 100644
index 7f50cbff..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/include/borealis/header.hpp
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-    Borealis, a Nintendo Switch UI Library
-    Copyright (C) 2019  natinusala
-    Copyright (C) 2019  p-sam
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include <borealis/view.hpp>
-
-namespace brls
-{
-
-// A simple header with text, a rectangle on the left
-// and a separator
-class Header : public View
-{
-  private:
-    std::string label;
-    std::string sublabel;
-    bool separator;
-
-  public:
-    Header(std::string label, bool separator = true, std::string sublabel = "");
-
-    void draw(NVGcontext* vg, int x, int y, unsigned width, unsigned height, Style* style, FrameContext* ctx) override;
-};
-
-} // namespace brls
diff --git a/Source/sys-clk/manager/lib/borealis/library/include/borealis/hint.hpp b/Source/sys-clk/manager/lib/borealis/library/include/borealis/hint.hpp
deleted file mode 100644
index ae7fb5b6..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/include/borealis/hint.hpp
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
-    Borealis, a Nintendo Switch UI Library
-    Copyright (C) 2020  WerWolv
-    Copyright (C) 2020  natinusala
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include <borealis/box_layout.hpp>
-#include <borealis/label.hpp>
-#include <borealis/view.hpp>
-
-namespace brls
-{
-
-// Displays button hints for the currently focused view
-// Depending on the view's available actions
-// there can only be one Hint visible at any time
-class Hint : public BoxLayout
-{
-  private:
-    bool animate;
-
-    GenericEvent::Subscription globalFocusEventSubscriptor;
-    VoidEvent::Subscription globalHintsUpdateEventSubscriptor;
-
-    static inline std::vector<Hint*> globalHintStack;
-
-    static void pushHint(Hint* hint);
-    static void popHint(Hint* hint);
-    static void animateHints();
-
-    static std::string getKeyIcon(Key key);
-
-    void rebuildHints();
-
-  public:
-    Hint(bool animate = true);
-    ~Hint();
-
-    void willAppear(bool resetState = false) override;
-    void willDisappear(bool resetState = false) override;
-
-    void setAnimate(bool animate)
-    {
-        this->animate = animate;
-    }
-};
-
-} // namespace brls
diff --git a/Source/sys-clk/manager/lib/borealis/library/include/borealis/image.hpp b/Source/sys-clk/manager/lib/borealis/library/include/borealis/image.hpp
deleted file mode 100644
index f3092414..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/include/borealis/image.hpp
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-    Borealis, a Nintendo Switch UI Library
-    Copyright (C) 2019  WerWolv
-    Copyright (C) 2019  p-sam
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include <borealis/frame_context.hpp>
-#include <borealis/view.hpp>
-
-namespace brls
-{
-
-enum class ImageScaleType
-{
-    NO_RESIZE = 0, // Nothing is resized
-    FIT, // The image is shrinked to fit the view boundaries
-    CROP, // The image is not resized but is cropped if bigger than the view
-    SCALE, // The image is stretched to match the view boundaries
-    VIEW_RESIZE // The view is resized to match the image
-};
-
-// An image
-class Image : public View
-{
-  public:
-    Image(std::string imagePath);
-    Image(unsigned char* buffer, size_t bufferSize);
-    ~Image();
-
-    void draw(NVGcontext* vg, int x, int y, unsigned width, unsigned height, Style* style, FrameContext* ctx) override;
-    void layout(NVGcontext* vg, Style* style, FontStash* stash) override;
-
-    void setImage(unsigned char* buffer, size_t bufferSize);
-    void setImage(std::string imagePath);
-
-    void setScaleType(ImageScaleType imageScaleType);
-    void setOpacity(float opacity);
-
-    void setCornerRadius(float radius)
-    {
-        this->cornerRadius = radius;
-    }
-
-  private:
-    std::string imagePath;
-    unsigned char* imageBuffer = nullptr;
-    size_t imageBufferSize     = 0;
-
-    int texture = -1;
-    NVGpaint imgPaint;
-
-    ImageScaleType imageScaleType = ImageScaleType::FIT;
-
-    float cornerRadius = 0;
-
-    int imageX = 0, imageY = 0;
-    int imageWidth = 0, imageHeight = 0;
-    int origViewWidth = 0, origViewHeight = 0;
-
-    void reloadTexture();
-};
-
-} // namespace brls
diff --git a/Source/sys-clk/manager/lib/borealis/library/include/borealis/label.hpp b/Source/sys-clk/manager/lib/borealis/library/include/borealis/label.hpp
deleted file mode 100644
index 46396e49..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/include/borealis/label.hpp
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
-    Borealis, a Nintendo Switch UI Library
-    Copyright (C) 2019-2020  natinusala
-    Copyright (C) 2019  p-sam
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include <borealis/view.hpp>
-
-namespace brls
-{
-
-enum class LabelStyle
-{
-    REGULAR = 0,
-    MEDIUM,
-    SMALL,
-    DESCRIPTION,
-    CRASH,
-    BUTTON_PLAIN,
-    BUTTON_PLAIN_DISABLED,
-    BUTTON_BORDERLESS,
-    LIST_ITEM,
-    NOTIFICATION,
-    DIALOG,
-    BUTTON_DIALOG,
-    HINT
-};
-
-// A Label, multiline or with a ticker
-class Label : public View
-{
-  private:
-    std::string text;
-
-    bool multiline;
-    unsigned fontSize;
-    float lineHeight;
-    LabelStyle labelStyle;
-
-    NVGalign horizontalAlign = NVG_ALIGN_LEFT;
-    NVGalign verticalAlign   = NVG_ALIGN_MIDDLE;
-
-    NVGcolor customColor;
-    bool useCustomColor = false;
-
-    int customFont;
-    bool useCustomFont = false;
-
-  public:
-    Label(LabelStyle labelStyle, std::string text, bool multiline = false);
-
-    void draw(NVGcontext* vg, int x, int y, unsigned width, unsigned height, Style* style, FrameContext* ctx) override;
-    void layout(NVGcontext* vg, Style* style, FontStash* stash) override;
-
-    void setVerticalAlign(NVGalign align);
-    void setHorizontalAlign(NVGalign align);
-    void setText(std::string text);
-    void setStyle(LabelStyle style);
-    void setFontSize(unsigned size);
-
-    /**
-     * Sets the label color
-     */
-    void setColor(NVGcolor color);
-
-    /**
-     * Unsets the label color - it
-     * will now use the default one
-     * for the label style
-     */
-    void unsetColor();
-
-    /**
-     * Returns the effective label color
-     * = custom or the style default
-     */
-    NVGcolor getColor(ThemeValues* theme);
-
-    /**
-     * Sets the font id
-     */
-    void setFont(int fontId);
-
-    /**
-     * Unsets the font id - it
-     * will now use the regular one
-     */
-    void unsetFont();
-
-    /**
-     * Returns the font used
-     * = custom or the regular font
-     */
-    int getFont(FontStash* stash);
-};
-
-} // namespace brls
diff --git a/Source/sys-clk/manager/lib/borealis/library/include/borealis/layer_view.hpp b/Source/sys-clk/manager/lib/borealis/library/include/borealis/layer_view.hpp
deleted file mode 100644
index f54c75b9..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/include/borealis/layer_view.hpp
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-    Borealis, a Nintendo Switch UI Library
-    Copyright (C) 2019  WerWolv
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include <borealis/view.hpp>
-#include <vector>
-
-namespace brls
-{
-
-// A view containing multiple children views with the ability to freely switch between these layers
-class LayerView : public View
-{
-  public:
-    LayerView();
-    ~LayerView();
-
-    void addLayer(View* view);
-    void changeLayer(int index, bool focus = false);
-    int getLayerIndex();
-
-    View* getDefaultFocus() override;
-
-    void draw(NVGcontext* vg, int x, int y, unsigned width, unsigned height, Style* style, FrameContext* ctx) override;
-    void layout(NVGcontext* vg, Style* style, FontStash* stash) override;
-
-    void willAppear(bool resetState = false) override;
-    void willDisappear(bool resetState = false) override;
-
-  private:
-    std::vector<View*> layers;
-    int selectedIndex = 0;
-};
-
-}
diff --git a/Source/sys-clk/manager/lib/borealis/library/include/borealis/list.hpp b/Source/sys-clk/manager/lib/borealis/library/include/borealis/list.hpp
deleted file mode 100644
index 4ccdefa0..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/include/borealis/list.hpp
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
-    Borealis, a Nintendo Switch UI Library
-    Copyright (C) 2019-2020  natinusala
-    Copyright (C) 2019  p-sam
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include <borealis/box_layout.hpp>
-#include <borealis/image.hpp>
-#include <borealis/label.hpp>
-#include <borealis/rectangle.hpp>
-#include <borealis/scroll_view.hpp>
-#include <string>
-
-namespace brls
-{
-
-// A list item
-// TODO: Use a Label with integrated ticker
-class ListItem : public View
-{
-  private:
-    std::string label;
-    std::string subLabel;
-    std::string value;
-    bool valueFaint;
-
-    std::string oldValue;
-    bool oldValueFaint;
-    float valueAnimation = 0.0f;
-
-    bool checked = false; // check mark on the right
-
-    unsigned textSize;
-
-    bool drawTopSeparator = true;
-
-    Label* descriptionView = nullptr;
-    Image* thumbnailView   = nullptr;
-
-    bool reduceDescriptionSpacing = false;
-
-    GenericEvent clickEvent;
-
-    bool indented = false;
-
-    void resetValueAnimation();
-
-  public:
-    ListItem(std::string label, std::string description = "", std::string subLabel = "");
-
-    void draw(NVGcontext* vg, int x, int y, unsigned width, unsigned height, Style* style, FrameContext* ctx) override;
-    void layout(NVGcontext* vg, Style* style, FontStash* stash) override;
-    void getHighlightInsets(unsigned* top, unsigned* right, unsigned* bottom, unsigned* left) override;
-    virtual bool onClick();
-    View* getDefaultFocus() override;
-
-    void setThumbnail(Image* image);
-    void setThumbnail(std::string imagePath);
-    void setThumbnail(unsigned char* buffer, size_t bufferSize);
-
-    bool hasDescription();
-    void setDrawTopSeparator(bool draw);
-
-    bool getReduceDescriptionSpacing();
-    void setReduceDescriptionSpacing(bool value);
-
-    void setIndented(bool indented);
-
-    void setTextSize(unsigned textSize);
-
-    void setChecked(bool checked);
-
-    std::string getLabel();
-
-    /**
-     * Sets the value of this list item
-     * (the text on the right)
-     * Set faint to true to have the new value
-     * use a darker color (typically "OFF" labels)
-     */
-    void setValue(std::string value, bool faint = false, bool animate = true);
-    std::string getValue();
-
-    GenericEvent* getClickEvent();
-
-    ~ListItem();
-};
-
-// Some spacing (to make groups of ListItems)
-class ListItemGroupSpacing : public Rectangle
-{
-  public:
-    ListItemGroupSpacing(bool separator = false);
-};
-
-// A list item with mutliple choices for its value
-// (will open a Dropdown)
-
-// Fired when the user has selected a value
-//
-// Parameter is either the selected value index
-// or -1 if the user cancelled
-typedef Event<int> ValueSelectedEvent;
-
-class SelectListItem : public ListItem
-{
-  public:
-    SelectListItem(std::string label, std::vector<std::string> values, unsigned selectedValue = 0);
-
-    void setSelectedValue(unsigned value);
-
-    ValueSelectedEvent* getValueSelectedEvent();
-
-  private:
-    std::vector<std::string> values;
-    unsigned selectedValue;
-
-    ValueSelectedEvent valueEvent;
-};
-
-// A list item with a ON/OFF value
-// that can be toggled
-// Use the click event to detect when the value
-// changes
-class ToggleListItem : public ListItem
-{
-  private:
-    bool toggleState;
-    std::string onValue, offValue;
-
-    void updateValue();
-
-  public:
-    ToggleListItem(std::string label, bool initialValue, std::string description = "", std::string onValue = "On", std::string offValue = "Off");
-
-    virtual bool onClick() override;
-
-    bool getToggleState();
-};
-
-// A list item which spawns the swkbd
-// to input its value (string)
-class InputListItem : public ListItem
-{
-  protected:
-    std::string helpText;
-    int maxInputLength;
-
-  public:
-    InputListItem(std::string label, std::string initialValue, std::string helpText, std::string description = "", int maxInputLength = 32);
-
-    virtual bool onClick() override;
-};
-
-// A list item which spawns the swkbd
-// to input its value (integer)
-class IntegerInputListItem : public InputListItem
-{
-  public:
-    IntegerInputListItem(std::string label, int initialValue, std::string helpText, std::string description = "", int maxInputLength = 32);
-
-    virtual bool onClick() override;
-};
-
-class List; // forward declaration for ListContentView::list
-
-// The content view of lists (used internally)
-class ListContentView : public BoxLayout
-{
-  public:
-    ListContentView(List* list, size_t defaultFocus = 0);
-
-  protected:
-    void customSpacing(View* current, View* next, int* spacing) override;
-
-  private:
-    List* list;
-};
-
-// A vertical list of various widgets, with proper margins and spacing
-// and a scroll bar
-// In practice it's a ScrollView which content view is
-// a ListContentView (BoxLayout)
-class List : public ScrollView
-{
-  private:
-    ListContentView* layout;
-
-  public:
-    List(size_t defaultFocus = 0);
-    ~List();
-
-    // Wrapped BoxLayout methods
-    void addView(View* view, bool fill = false);
-    void setMargins(unsigned top, unsigned right, unsigned bottom, unsigned left);
-    void setMarginBottom(unsigned bottom);
-    void setSpacing(unsigned spacing);
-    unsigned getSpacing();
-    virtual void customSpacing(View* current, View* next, int* spacing);
-};
-
-} // namespace brls
diff --git a/Source/sys-clk/manager/lib/borealis/library/include/borealis/logger.hpp b/Source/sys-clk/manager/lib/borealis/library/include/borealis/logger.hpp
deleted file mode 100644
index 3df39d95..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/include/borealis/logger.hpp
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-    Borealis, a Nintendo Switch UI Library
-    Copyright (C) 2019  natinusala
-    Copyright (C) 2019  p-sam
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include <stdarg.h>
-
-#include <string>
-
-namespace brls
-{
-
-enum class LogLevel
-{
-    ERROR = 0,
-    INFO,
-    DEBUG
-};
-
-class Logger
-{
-  public:
-    static void setLogLevel(LogLevel logLevel);
-
-    static void error(const char* format, ...);
-    static void info(const char* format, ...);
-    static void debug(const char* format, ...);
-
-  protected:
-    static void log(LogLevel logLevel, const char* prefix, const char* color, const char* format, va_list ap);
-};
-
-} // namespace brls
diff --git a/Source/sys-clk/manager/lib/borealis/library/include/borealis/material_icon.hpp b/Source/sys-clk/manager/lib/borealis/library/include/borealis/material_icon.hpp
deleted file mode 100644
index caad89fe..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/include/borealis/material_icon.hpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-    Borealis, a Nintendo Switch UI Library
-    Copyright (C) 2019  natinusala
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include <borealis/view.hpp>
-
-namespace brls
-{
-
-// A Material icon (from the Material font)
-class MaterialIcon : public View
-{
-  private:
-    std::string icon;
-    unsigned middleX, middleY;
-
-  public:
-    MaterialIcon(std::string icon);
-
-    void draw(NVGcontext* vg, int x, int y, unsigned width, unsigned height, Style* style, FrameContext* ctx) override;
-    void layout(NVGcontext* vg, Style* style, FontStash* stash) override;
-};
-
-} // namespace brls
diff --git a/Source/sys-clk/manager/lib/borealis/library/include/borealis/notification_manager.hpp b/Source/sys-clk/manager/lib/borealis/library/include/borealis/notification_manager.hpp
deleted file mode 100644
index 7a5c4811..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/include/borealis/notification_manager.hpp
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
-    Borealis, a Nintendo Switch UI Library
-    Copyright (C) 2019  natinusala
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include <borealis/animations.hpp>
-#include <borealis/label.hpp>
-#include <borealis/view.hpp>
-
-#define BRLS_NOTIFICATIONS_MAX 8
-
-// TODO: check in HOS that the animation duration + notification timeout are correct
-
-namespace brls
-{
-
-class Notification : public View
-{
-  public:
-    Notification(std::string text);
-    ~Notification();
-
-    void draw(NVGcontext* vg, int x, int y, unsigned width, unsigned height, Style* style, FrameContext* ctx) override;
-    void layout(NVGcontext* vg, Style* style, FontStash* stash) override;
-
-    menu_timer_t timeoutTimer;
-
-  private:
-    Label* label;
-};
-
-class NotificationManager : public View
-{
-  private:
-    Notification* notifications[BRLS_NOTIFICATIONS_MAX];
-
-    void layoutNotification(size_t i);
-
-  public:
-    NotificationManager();
-    ~NotificationManager();
-
-    void draw(NVGcontext* vg, int x, int y, unsigned width, unsigned height, Style* style, FrameContext* ctx) override;
-    void layout(NVGcontext* vg, Style* style, FontStash* stash) override;
-
-    void notify(std::string text);
-};
-
-}; // namespace brls
diff --git a/Source/sys-clk/manager/lib/borealis/library/include/borealis/popup_frame.hpp b/Source/sys-clk/manager/lib/borealis/library/include/borealis/popup_frame.hpp
deleted file mode 100644
index dfcd7ad6..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/include/borealis/popup_frame.hpp
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
-    Borealis, a Nintendo Switch UI Library
-    Copyright (C) 2019  natinusala
-    Copyright (C) 2019  WerWolv
-    Copyright (C) 2019  p-sam
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include <borealis/applet_frame.hpp>
-#include <borealis/list.hpp>
-#include <borealis/view.hpp>
-#include <string>
-
-namespace brls
-{
-
-class PopupFrame : public View
-{
-  private:
-    PopupFrame(std::string title, unsigned char* imageBuffer, size_t imageBufferSize, AppletFrame* contentView, std::string subTitleLeft = "", std::string subTitleRight = "");
-    PopupFrame(std::string title, std::string imagePath, AppletFrame* contentView, std::string subTitleLeft = "", std::string subTitleRight = "");
-    PopupFrame(std::string title, AppletFrame* contentView, std::string subTitleLeft = "", std::string subTitleRight = "");
-
-    AppletFrame* contentView = nullptr;
-
-  protected:
-    unsigned getShowAnimationDuration(ViewAnimation animation) override;
-
-  public:
-    ~PopupFrame();
-
-    void draw(NVGcontext* vg, int x, int y, unsigned width, unsigned height, Style* style, FrameContext* ctx) override;
-    void layout(NVGcontext* vg, Style* style, FontStash* stash) override;
-    View* getDefaultFocus() override;
-    virtual bool onCancel();
-    void willAppear(bool resetState = false) override;
-    void willDisappear(bool resetState = false) override;
-
-    static void open(std::string title, unsigned char* imageBuffer, size_t imageBufferSize, AppletFrame* contentView, std::string subTitleLeft = "", std::string subTitleRight = "");
-    static void open(std::string title, std::string imagePath, AppletFrame* contentView, std::string subTitleLeft = "", std::string subTitleRight = "");
-    static void open(std::string title, AppletFrame* contentView, std::string subTitleLeft = "", std::string subTitleRight = "");
-
-    bool isTranslucent() override
-    {
-        return true;
-    }
-};
-
-} // namespace brls
diff --git a/Source/sys-clk/manager/lib/borealis/library/include/borealis/progress_display.hpp b/Source/sys-clk/manager/lib/borealis/library/include/borealis/progress_display.hpp
deleted file mode 100644
index 430838ff..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/include/borealis/progress_display.hpp
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-    Borealis, a Nintendo Switch UI Library
-    Copyright (C) 2019  Billy Laws
-    Copyright (C) 2019  p-sam
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include <borealis/label.hpp>
-#include <borealis/progress_spinner.hpp>
-#include <borealis/view.hpp>
-
-namespace brls
-{
-
-// TODO: Add the "ProgressDisplayFlags_" prefix to the members
-enum ProgressDisplayFlags
-{
-    SPINNER    = 1u << 0,
-    PERCENTAGE = 1u << 1
-};
-
-inline constexpr ProgressDisplayFlags DEFAULT_PROGRESS_DISPLAY_FLAGS = (ProgressDisplayFlags)(ProgressDisplayFlags::SPINNER | ProgressDisplayFlags::PERCENTAGE);
-
-// A progress bar with an optional spinner and percentage text.
-class ProgressDisplay : public View
-{
-  public:
-    ProgressDisplay(ProgressDisplayFlags progressFlags = DEFAULT_PROGRESS_DISPLAY_FLAGS);
-    ~ProgressDisplay();
-
-    void draw(NVGcontext* vg, int x, int y, unsigned width, unsigned height, Style* style, FrameContext* ctx) override;
-    void layout(NVGcontext* vg, Style* style, FontStash* stash) override;
-    void willAppear(bool resetState = false) override;
-    void willDisappear(bool resetState = false) override;
-
-    void setProgress(int current, int max);
-
-  private:
-    float progressPercentage = 0.0f;
-    Label* label;
-    ProgressSpinner* spinner;
-};
-
-} // namespace brls
diff --git a/Source/sys-clk/manager/lib/borealis/library/include/borealis/progress_spinner.hpp b/Source/sys-clk/manager/lib/borealis/library/include/borealis/progress_spinner.hpp
deleted file mode 100644
index 89c460f9..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/include/borealis/progress_spinner.hpp
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-    Borealis, a Nintendo Switch UI Library
-    Copyright (C) 2019  Billy Laws
-    Copyright (C) 2019  p-sam
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include <borealis/view.hpp>
-
-namespace brls
-{
-
-// A progress spinner
-class ProgressSpinner : public View
-{
-  public:
-    ProgressSpinner();
-
-    void draw(NVGcontext* vg, int x, int y, unsigned width, unsigned height, Style* style, FrameContext* ctx) override;
-    void layout(NVGcontext* vg, Style* style, FontStash* stash) override;
-    void willAppear(bool resetState = false) override;
-    void willDisappear(bool resetState = false) override;
-
-  private:
-    float animationValue = 0.0f;
-
-    void restartAnimation();
-};
-
-} // namespace brls
diff --git a/Source/sys-clk/manager/lib/borealis/library/include/borealis/rectangle.hpp b/Source/sys-clk/manager/lib/borealis/library/include/borealis/rectangle.hpp
deleted file mode 100644
index 7c5eac90..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/include/borealis/rectangle.hpp
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-    Borealis, a Nintendo Switch UI Library
-    Copyright (C) 2019  natinusala
-    Copyright (C) 2019  p-sam
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include <borealis/frame_context.hpp>
-#include <borealis/view.hpp>
-
-namespace brls
-{
-
-// A solid color rectangle
-class Rectangle : public View
-{
-  protected:
-    void layout(NVGcontext* vg, Style* style, FontStash* stash) override;
-
-  public:
-    Rectangle(NVGcolor color);
-
-    void draw(NVGcontext* vg, int x, int y, unsigned width, unsigned height, Style* style, FrameContext* ctx) override;
-
-    void setColor(NVGcolor color);
-
-    ~Rectangle() {}
-
-  private:
-    NVGcolor color = nvgRGB(0, 0, 255);
-};
-
-} // namespace brls
diff --git a/Source/sys-clk/manager/lib/borealis/library/include/borealis/repeating_task.hpp b/Source/sys-clk/manager/lib/borealis/library/include/borealis/repeating_task.hpp
deleted file mode 100644
index ca89f6cc..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/include/borealis/repeating_task.hpp
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
-    Borealis, a Nintendo Switch UI Library
-    Copyright (C) 2019  natinusala
-    Copyright (C) 2019  p-sam
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include <features/features_cpu.h>
-
-namespace brls
-{
-
-// A task that is repeated at a given interval
-// by the UI thread
-class RepeatingTask
-{
-  private:
-    retro_time_t interval;
-
-    retro_time_t lastRun = 0;
-
-    bool running       = false;
-    bool stopRequested = false;
-
-  public:
-    RepeatingTask(retro_time_t interval);
-    virtual ~RepeatingTask();
-
-    /**
-      * Actual code to run by the task
-      * Must call RepeatingTask::run() !
-      */
-    virtual void run(retro_time_t currentTime);
-
-    /**
-      * Fired when the task starts
-      */
-    virtual void onStart() {};
-
-    /**
-      * Fired when the task stops
-      */
-    virtual void onStop() {};
-
-    /**
-      * Starts the task
-      */
-    void start();
-
-    /**
-      * Fires the task immediately and delays the
-      * next run
-      */
-    void fireNow();
-
-    /**
-      * Pauses the task without deleting it
-      */
-    void pause();
-
-    /**
-      * Stops and deletes the task
-      */
-    void stop();
-
-    retro_time_t getInterval();
-    retro_time_t getLastRun();
-
-    bool isRunning();
-    bool isStopRequested();
-};
-
-} // namespace brls
diff --git a/Source/sys-clk/manager/lib/borealis/library/include/borealis/scroll_view.hpp b/Source/sys-clk/manager/lib/borealis/library/include/borealis/scroll_view.hpp
deleted file mode 100644
index 4a608726..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/include/borealis/scroll_view.hpp
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
-    Borealis, a Nintendo Switch UI Library
-    Copyright (C) 2020  natinusala
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include <borealis/view.hpp>
-
-namespace brls
-{
-
-// TODO: horizontal scrolling, either in ScrollView or in a separate class (like Android has)
-
-// A view that automatically scrolls vertically
-// when one of its children gains focus
-class ScrollView : public View
-{
-  private:
-    View* contentView = nullptr;
-
-    bool ready = false; // has layout been called at least once?
-
-    unsigned middleY = 0; // y + height/2
-    unsigned bottomY = 0; // y + height
-
-    float scrollY = 0.0f; // from 0.0f to 1.0f, in % of content view height
-
-    bool updateScrollingOnNextLayout = false;
-    bool updateScrollingOnNextFrame  = false;
-
-    unsigned getYCenter(View* view);
-
-    void prebakeScrolling();
-    bool updateScrolling(bool animated);
-    void startScrolling(bool animated, float newScroll);
-    void scrollAnimationTick();
-
-  public:
-    ~ScrollView();
-
-    void draw(NVGcontext* vg, int x, int y, unsigned width, unsigned height, Style* style, FrameContext* ctx) override;
-    void layout(NVGcontext* vg, Style* style, FontStash* stash) override;
-    void willAppear(bool resetState = false) override;
-    void willDisappear(bool resetState = false) override;
-    View* getDefaultFocus() override;
-    void onChildFocusGained(View* child) override;
-    void onWindowSizeChanged() override;
-
-    void setContentView(View* view);
-    View* getContentView();
-};
-
-} // namespace brls
diff --git a/Source/sys-clk/manager/lib/borealis/library/include/borealis/sidebar.hpp b/Source/sys-clk/manager/lib/borealis/library/include/borealis/sidebar.hpp
deleted file mode 100644
index a9b9b5d8..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/include/borealis/sidebar.hpp
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
-    Borealis, a Nintendo Switch UI Library
-    Copyright (C) 2019  natinusala
-    Copyright (C) 2019  p-sam
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include <borealis/box_layout.hpp>
-#include <string>
-#include <vector>
-
-namespace brls
-{
-
-// A sidebar with multiple tabs
-class SidebarSeparator : public View
-{
-  public:
-    SidebarSeparator();
-
-    void draw(NVGcontext* vg, int x, int y, unsigned width, unsigned height, Style* style, FrameContext* ctx) override;
-};
-
-class Sidebar;
-
-// TODO: Use a Label view with integrated ticker for label and sublabel
-// TODO: Have the label always tick when active
-class SidebarItem : public View
-{
-  private:
-    std::string label;
-    bool active = false;
-
-    Sidebar* sidebar     = nullptr;
-    View* associatedView = nullptr;
-
-  public:
-    SidebarItem(std::string label, Sidebar* sidebar);
-
-    void draw(NVGcontext* vg, int x, int y, unsigned width, unsigned height, Style* style, FrameContext* ctx) override;
-
-    View* getDefaultFocus() override
-    {
-        return this;
-    }
-
-    virtual bool onClick();
-
-    void setActive(bool active);
-    bool isActive();
-
-    void onFocusGained() override;
-
-    void setAssociatedView(View* view);
-    View* getAssociatedView();
-
-    ~SidebarItem();
-};
-
-// TODO: Add a style with icons, make it collapsible?
-class Sidebar : public BoxLayout
-{
-  private:
-    SidebarItem* currentActive = nullptr;
-
-  public:
-    Sidebar();
-
-    SidebarItem* addItem(std::string label, View* view);
-    void addSeparator();
-
-    void setActive(SidebarItem* item);
-
-    View* getDefaultFocus() override;
-    void onChildFocusGained(View* child) override;
-
-    size_t lastFocus = 0;
-};
-
-} // namespace brls
diff --git a/Source/sys-clk/manager/lib/borealis/library/include/borealis/staged_applet_frame.hpp b/Source/sys-clk/manager/lib/borealis/library/include/borealis/staged_applet_frame.hpp
deleted file mode 100644
index 0c5c692c..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/include/borealis/staged_applet_frame.hpp
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
-    Borealis, a Nintendo Switch UI Library
-    Copyright (C) 2019  Billy Laws
-    Copyright (C) 2019  p-sam
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include <borealis/applet_frame.hpp>
-#include <borealis/sidebar.hpp>
-#include <string>
-#include <vector>
-
-namespace brls
-{
-
-// An applet frame for implementing a stage based app with a progress display in top right
-class StagedAppletFrame : public AppletFrame
-{
-  public:
-    StagedAppletFrame();
-    ~StagedAppletFrame();
-
-    void draw(NVGcontext* vg, int x, int y, unsigned width, unsigned height, Style* style, FrameContext* ctx) override;
-
-    void addStage(View* view);
-    void nextStage();
-    void previousStage();
-
-    unsigned getCurrentStage();
-    unsigned getStagesCount();
-    unsigned isLastStage();
-
-  private:
-    size_t currentStage = 0;
-    std::vector<View*> stageViews;
-
-    void enterStage(int index, bool requestFocus);
-};
-
-} // namespace brls
diff --git a/Source/sys-clk/manager/lib/borealis/library/include/borealis/style.hpp b/Source/sys-clk/manager/lib/borealis/library/include/borealis/style.hpp
deleted file mode 100644
index ebd72b6a..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/include/borealis/style.hpp
+++ /dev/null
@@ -1,323 +0,0 @@
-/*
-    Borealis, a Nintendo Switch UI Library
-    Copyright (C) 2019  natinusala
-    Copyright (C) 2019  WerWolv
-    Copyright (C) 2019  p-sam
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-namespace brls
-{
-
-class Style
-{
-  public:
-    // AppletFrame
-    struct
-    {
-        unsigned headerHeightRegular;
-        unsigned headerHeightPopup; // PopupFrame
-        unsigned footerHeight;
-
-        unsigned imageLeftPadding;
-        unsigned imageTopPadding;
-        unsigned imageSize;
-        unsigned separatorSpacing;
-
-        unsigned titleSize;
-        unsigned titleStart;
-        unsigned titleOffset;
-
-        unsigned footerTextSize;
-        unsigned footerTextSpacing;
-
-        unsigned slideAnimation;
-    } AppletFrame;
-
-    // Highlight
-    struct
-    {
-        unsigned strokeWidth;
-        float cornerRadius;
-
-        unsigned shadowWidth;
-        unsigned shadowOffset;
-        unsigned shadowFeather;
-        unsigned shadowOpacity;
-
-        unsigned animationDuration;
-    } Highlight;
-
-    // Background
-    struct
-    {
-        unsigned sidebarBorderHeight;
-    } Background;
-
-    // Sidebar
-    struct
-    {
-        unsigned width;
-        unsigned spacing;
-
-        unsigned marginLeft;
-        unsigned marginRight;
-        unsigned marginTop;
-        unsigned marginBottom;
-
-        struct
-        {
-            unsigned height;
-            unsigned textSize;
-            unsigned padding;
-
-            unsigned textOffsetX;
-            unsigned activeMarkerWidth;
-
-            unsigned highlight;
-        } Item;
-
-        struct
-        {
-            unsigned height;
-        } Separator;
-    } Sidebar;
-
-    // List
-    struct
-    {
-        unsigned marginLeftRight;
-        unsigned marginTopBottom;
-        unsigned spacing;
-
-        // Item
-        struct
-        {
-            unsigned height;
-            unsigned heightWithSubLabel;
-            unsigned valueSize;
-            unsigned padding;
-            unsigned thumbnailPadding;
-
-            unsigned descriptionIndent;
-            unsigned descriptionSpacing;
-
-            unsigned indent;
-
-            unsigned selectRadius;
-        } Item;
-    } List;
-
-    // Label
-    struct
-    {
-        unsigned regularFontSize;
-        unsigned mediumFontSize;
-        unsigned smallFontSize;
-        unsigned descriptionFontSize;
-        unsigned crashFontSize;
-        unsigned buttonFontSize;
-        unsigned listItemFontSize;
-        unsigned notificationFontSize;
-        unsigned dialogFontSize;
-        unsigned hintFontSize;
-
-        float lineHeight;
-        float notificationLineHeight;
-    } Label;
-
-    // CrashFrame
-    struct
-    {
-        float labelWidth; // proportional to frame width, from 0 to 1
-        unsigned boxStrokeWidth;
-        unsigned boxSize;
-        unsigned boxSpacing;
-        unsigned buttonWidth;
-        unsigned buttonHeight;
-        unsigned buttonSpacing;
-    } CrashFrame;
-
-    // Button
-    struct
-    {
-        float cornerRadius;
-
-        unsigned highlightInset;
-
-        float shadowWidth;
-        float shadowFeather;
-        float shadowOpacity;
-        float shadowOffset;
-    } Button;
-
-    // TableRow
-    struct
-    {
-        unsigned headerHeight;
-        unsigned headerTextSize;
-
-        unsigned bodyHeight;
-        unsigned bodyIndent;
-        unsigned bodyTextSize;
-
-        unsigned padding;
-    } TableRow;
-
-    // Dropdown
-    struct
-    {
-        unsigned listWidth;
-        unsigned listPadding;
-
-        unsigned listItemHeight;
-        unsigned listItemTextSize;
-
-        unsigned headerHeight;
-        unsigned headerFontSize;
-        unsigned headerPadding;
-    } Dropdown;
-
-    struct
-    {
-        unsigned edgePadding;
-        unsigned separatorSpacing;
-        unsigned footerHeight;
-        unsigned imageLeftPadding;
-        unsigned imageTopPadding;
-        unsigned imageSize;
-        unsigned contentWidth;
-        unsigned contentHeight;
-
-        unsigned headerTextLeftPadding;
-        unsigned headerTextTopPadding;
-
-        unsigned subTitleLeftPadding;
-        unsigned subTitleTopPadding;
-        unsigned subTitleSpacing;
-
-        unsigned subTitleSeparatorLeftPadding;
-        unsigned subTitleSeparatorTopPadding;
-        unsigned subTitleSeparatorHeight;
-
-        unsigned headerFontSize;
-        unsigned subTitleFontSize;
-    } PopupFrame;
-
-    // StagedAppletFrame
-    struct
-    {
-        unsigned progressIndicatorSpacing;
-        unsigned progressIndicatorRadiusUnselected;
-        unsigned progressIndicatorRadiusSelected;
-        unsigned progressIndicatorBorderWidth;
-    } StagedAppletFrame;
-
-    // ProgressSpinner
-    struct
-    {
-        float centerGapMultiplier;
-        float barWidthMultiplier;
-        unsigned animationDuration;
-    } ProgressSpinner;
-
-    // ProgressDisplay
-    struct
-    {
-        unsigned percentageLabelWidth;
-    } ProgressDisplay;
-
-    // Header
-    struct
-    {
-        unsigned height;
-        unsigned padding;
-
-        unsigned rectangleWidth;
-
-        unsigned fontSize;
-    } Header;
-
-    // FramerateCounter
-    struct
-    {
-        unsigned width;
-        unsigned height;
-    } FramerateCounter;
-
-    // ThumbnailSidebar
-    struct
-    {
-        unsigned marginLeftRight;
-        unsigned marginTopBottom;
-
-        unsigned buttonHeight;
-        unsigned buttonMargin;
-    } ThumbnailSidebar;
-
-    // AnimationDuration
-    struct
-    {
-        unsigned show;
-        unsigned showSlide;
-
-        unsigned highlight;
-        unsigned shake;
-
-        unsigned collapse;
-
-        unsigned progress;
-
-        unsigned notificationTimeout;
-    } AnimationDuration;
-
-    // Notification
-    struct
-    {
-        unsigned width;
-        unsigned padding;
-
-        unsigned slideAnimation;
-    } Notification;
-
-    // Dialog
-    struct
-    {
-        unsigned width;
-        unsigned height;
-
-        unsigned paddingTopBottom;
-        unsigned paddingLeftRight;
-
-        float cornerRadius;
-
-        unsigned buttonHeight;
-        unsigned buttonSeparatorHeight;
-
-        float shadowWidth;
-        float shadowFeather;
-        float shadowOpacity;
-        float shadowOffset;
-    } Dialog;
-
-    // As close to HOS as possible
-    static Style horizon();
-
-    // TODO: Make a condensed style
-};
-
-} // namespace brls
diff --git a/Source/sys-clk/manager/lib/borealis/library/include/borealis/swkbd.hpp b/Source/sys-clk/manager/lib/borealis/library/include/borealis/swkbd.hpp
deleted file mode 100644
index 4aaa0971..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/include/borealis/swkbd.hpp
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-    Borealis, a Nintendo Switch UI Library
-    Copyright (C) 2019  WerWolv
-    Copyright (C) 2019  p-sam
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include <functional>
-#include <string>
-
-namespace brls
-{
-
-class Swkbd
-{
-  public:
-    static bool openForText(std::function<void(std::string)> f, std::string headerText = "", std::string subText = "", int maxStringLength = 32, std::string initialText = "");
-    static bool openForNumber(std::function<void(int)> f, std::string headerText = "", std::string subText = "", int maxStringLength = 32, std::string initialText = "", std::string leftButton = "", std::string rightButton = "");
-};
-
-} // namespace brls
diff --git a/Source/sys-clk/manager/lib/borealis/library/include/borealis/tab_frame.hpp b/Source/sys-clk/manager/lib/borealis/library/include/borealis/tab_frame.hpp
deleted file mode 100644
index 40f32d97..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/include/borealis/tab_frame.hpp
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
-    Borealis, a Nintendo Switch UI Library
-    Copyright (C) 2019-2020  natinusala
-    Copyright (C) 2019  p-sam
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include <borealis/applet_frame.hpp>
-#include <borealis/sidebar.hpp>
-#include <string>
-#include <vector>
-
-namespace brls
-{
-
-// An applet frame containing a sidebar on the left with multiple tabs
-class TabFrame : public AppletFrame
-{
-  public:
-    TabFrame();
-
-    /**
-     * Adds a tab with given label and view
-     * All tabs and separators must be added
-     * before the TabFrame is itself added to
-     * the view hierarchy
-     */
-    void addTab(std::string label, View* view);
-    void addSeparator();
-
-    View* getDefaultFocus() override;
-
-    virtual bool onCancel() override;
-
-    ~TabFrame();
-
-  private:
-    Sidebar* sidebar;
-    BoxLayout* layout;
-    View* rightPane = nullptr;
-
-    void switchToView(View* view);
-};
-
-} // namespace brls
diff --git a/Source/sys-clk/manager/lib/borealis/library/include/borealis/table.hpp b/Source/sys-clk/manager/lib/borealis/library/include/borealis/table.hpp
deleted file mode 100644
index 5272447e..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/include/borealis/table.hpp
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
-    Borealis, a Nintendo Switch UI Library
-    Copyright (C) 2019  natinusala
-    Copyright (C) 2019  p-sam
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include <borealis/view.hpp>
-#include <string>
-#include <vector>
-
-namespace brls
-{
-
-// The type of a Table Row
-enum class TableRowType
-{
-    HEADER = 0,
-    BODY
-};
-
-// A Table row
-class TableRow
-{
-  private:
-    TableRowType type;
-
-    std::string label;
-    std::string value;
-
-  public:
-    TableRow(TableRowType type, std::string label, std::string value = "");
-
-    std::string* getLabel();
-    std::string* getValue();
-    TableRowType getType();
-
-    void setValue(std::string value);
-};
-
-// A simple, static two-columns table, as seen in
-// the Settings app (Internet connection details)
-// All rows must be added before adding the view
-// to a layout (it's static)
-class Table : public View
-{
-  private:
-    std::vector<TableRow*> rows;
-
-  public:
-    ~Table();
-
-    void draw(NVGcontext* vg, int x, int y, unsigned width, unsigned height, Style* style, FrameContext* ctx) override;
-    void layout(NVGcontext* vg, Style* style, FontStash* stash) override;
-
-    TableRow* addRow(TableRowType type, std::string label, std::string value = "");
-};
-
-} // namespace brls
diff --git a/Source/sys-clk/manager/lib/borealis/library/include/borealis/task_manager.hpp b/Source/sys-clk/manager/lib/borealis/library/include/borealis/task_manager.hpp
deleted file mode 100644
index ef32e767..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/include/borealis/task_manager.hpp
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-    Borealis, a Nintendo Switch UI Library
-    Copyright (C) 2019  natinusala
-    Copyright (C) 2019  p-sam
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include <borealis/repeating_task.hpp>
-#include <vector>
-
-namespace brls
-{
-
-class TaskManager
-{
-  private:
-    std::vector<RepeatingTask*> repeatingTasks;
-
-    void stopRepeatingTask(RepeatingTask* task);
-
-  public:
-    void frame();
-
-    void registerRepeatingTask(RepeatingTask* task);
-
-    ~TaskManager();
-};
-
-} // namespace brls
diff --git a/Source/sys-clk/manager/lib/borealis/library/include/borealis/theme.hpp b/Source/sys-clk/manager/lib/borealis/library/include/borealis/theme.hpp
deleted file mode 100644
index b4957178..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/include/borealis/theme.hpp
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
-    Borealis, a Nintendo Switch UI Library
-    Copyright (C) 2019  natinusala
-    Copyright (C) 2019  p-sam
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include <nanovg.h>
-
-namespace brls
-{
-
-// Theme variants
-// (used in Application)
-//
-// Not an enum class because it's used
-// as an array index in Theme
-enum ThemeVariant
-{
-    ThemeVariant_LIGHT = 0,
-    ThemeVariant_DARK,
-    ThemeVariant_NUMBER_OF_VARIANTS
-};
-
-typedef struct
-{
-    float backgroundColor[3]; // gl color
-    NVGcolor backgroundColorRGB;
-
-    NVGcolor textColor;
-    NVGcolor descriptionColor;
-
-    NVGcolor notificationTextColor;
-    NVGcolor backdropColor;
-
-    NVGcolor separatorColor;
-
-    NVGcolor sidebarColor;
-    NVGcolor activeTabColor;
-    NVGcolor sidebarSeparatorColor;
-
-    NVGcolor highlightBackgroundColor;
-    NVGcolor highlightColor1;
-    NVGcolor highlightColor2;
-
-    NVGcolor listItemSeparatorColor;
-    NVGcolor listItemValueColor;
-    NVGcolor listItemFaintValueColor;
-
-    NVGcolor tableEvenBackgroundColor;
-    NVGcolor tableBodyTextColor;
-
-    NVGcolor dropdownBackgroundColor;
-
-    NVGcolor nextStageBulletColor;
-
-    NVGcolor spinnerBarColor;
-
-    NVGcolor headerRectangleColor;
-
-    NVGcolor buttonPlainEnabledBackgroundColor;
-    NVGcolor buttonPlainDisabledBackgroundColor;
-    NVGcolor buttonPlainEnabledTextColor;
-    NVGcolor buttonPlainDisabledTextColor;
-
-    NVGcolor dialogColor;
-    NVGcolor dialogBackdrop;
-    NVGcolor dialogButtonColor;
-    NVGcolor dialogButtonSeparatorColor;
-} ThemeValues;
-
-// A theme contains colors for all variants
-class Theme
-{
-  public:
-    ThemeValues colors[ThemeVariant_NUMBER_OF_VARIANTS];
-
-    // As close to HOS as possible
-    static Theme horizon();
-};
-
-} // namespace brls
diff --git a/Source/sys-clk/manager/lib/borealis/library/include/borealis/thumbnail_frame.hpp b/Source/sys-clk/manager/lib/borealis/library/include/borealis/thumbnail_frame.hpp
deleted file mode 100644
index 407722ac..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/include/borealis/thumbnail_frame.hpp
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-    Borealis, a Nintendo Switch UI Library
-    Copyright (C) 2019  natinusala
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include <borealis/applet_frame.hpp>
-#include <borealis/box_layout.hpp>
-#include <borealis/button.hpp>
-#include <borealis/image.hpp>
-
-namespace brls
-{
-
-// The sidebar used in ThumbnailFrame
-class ThumbnailSidebar : public View
-{
-  private:
-    Image* image   = nullptr;
-    Button* button = nullptr;
-
-    Label* title    = nullptr;
-    Label* subTitle = nullptr;
-
-  public:
-    ThumbnailSidebar();
-    ~ThumbnailSidebar();
-
-    void draw(NVGcontext* vg, int x, int y, unsigned width, unsigned height, Style* style, FrameContext* ctx) override;
-    void layout(NVGcontext* vg, Style* style, FontStash* stash) override;
-    View* getDefaultFocus() override;
-
-    void setThumbnail(std::string imagePath);
-    void setThumbnail(unsigned char* buffer, size_t bufferSize);
-
-    void setTitle(std::string title);
-    void setSubtitle(std::string subTitle);
-
-    Button* getButton();
-};
-
-// An applet frame with a sidebar on the right, containing a thumbnail
-// and a button (similar to the Wi-Fi settings in HOS)
-class ThumbnailFrame : public AppletFrame
-{
-  private:
-    ThumbnailSidebar* sidebar = nullptr;
-    BoxLayout* boxLayout      = nullptr;
-
-    View* thumbnailContentView = nullptr;
-
-  public:
-    ThumbnailFrame();
-    ~ThumbnailFrame();
-
-    void setContentView(View* view) override;
-
-  protected:
-    void layout(NVGcontext* vg, Style* style, FontStash* stash) override;
-
-    ThumbnailSidebar* getSidebar();
-};
-
-} // namespace brls
diff --git a/Source/sys-clk/manager/lib/borealis/library/include/borealis/view.hpp b/Source/sys-clk/manager/lib/borealis/library/include/borealis/view.hpp
deleted file mode 100644
index d1c53673..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/include/borealis/view.hpp
+++ /dev/null
@@ -1,406 +0,0 @@
-/*
-    Borealis, a Nintendo Switch UI Library
-    Copyright (C) 2019-2020  natinusala
-    Copyright (C) 2019  p-sam
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include <features/features_cpu.h>
-#include <stdio.h>
-
-#include <borealis/actions.hpp>
-#include <borealis/event.hpp>
-#include <borealis/frame_context.hpp>
-#include <functional>
-#include <map>
-#include <string>
-#include <vector>
-
-namespace brls
-{
-
-// The animation to play when
-// pushing or popping a view
-// (implemented in Application)
-enum class ViewAnimation
-{
-    FADE, // the old view fades away and the new one fades in
-    SLIDE_LEFT, // the old view slides out to the left and the new one slides in from the right
-    SLIDE_RIGHT // inverted SLIDE_LEFT
-};
-
-// Focus direction when navigating
-enum class FocusDirection
-{
-    UP,
-    DOWN,
-    LEFT,
-    RIGHT
-};
-
-// View background
-enum class Background
-{
-    NONE,
-    SIDEBAR,
-    DEBUG,
-    BACKDROP
-};
-
-extern NVGcolor transparent;
-
-class View;
-
-typedef Event<View*> GenericEvent;
-typedef Event<> VoidEvent;
-
-// Superclass for all the other views
-// Lifecycle of a view is :
-//   new -> [willAppear -> willDisappear] -> delete
-//
-// Users have do to the new, the rest of the lifecycle is taken
-// care of by the library
-//
-// willAppear and willDisappear can be called zero or multiple times
-// before deletion (in case of a TabLayout for instance)
-class View
-{
-  private:
-    Background background = Background::NONE;
-
-    void drawBackground(NVGcontext* vg, FrameContext* ctx, Style* style);
-    void drawHighlight(NVGcontext* vg, ThemeValues* theme, float alpha, Style* style, bool background);
-
-    float highlightAlpha = 0.0f;
-
-    bool dirty = true;
-
-    bool highlightShaking = false;
-    retro_time_t highlightShakeStart;
-    FocusDirection highlightShakeDirection;
-    float highlightShakeAmplitude;
-
-    bool fadeIn           = false; // is the fade in animation running?
-    bool forceTranslucent = false;
-
-    ThemeValues* themeOverride = nullptr;
-
-    bool hidden = false;
-
-    std::vector<Action> actions;
-
-    /**
-     * Parent user data, typically the index of the view
-     * in the internal layout structure
-     */
-    void* parentUserdata = nullptr;
-
-  protected:
-    int x = 0;
-    int y = 0;
-
-    unsigned width  = 0;
-    unsigned height = 0;
-
-    float collapseState = 1.0f;
-
-    bool focused = false;
-
-    View* parent = nullptr;
-
-    GenericEvent focusEvent;
-
-    virtual unsigned getShowAnimationDuration(ViewAnimation animation);
-
-    virtual void getHighlightInsets(unsigned* top, unsigned* right, unsigned* bottom, unsigned* left)
-    {
-        *top    = 0;
-        *right  = 0;
-        *bottom = 0;
-        *left   = 0;
-    }
-
-    virtual void getHighlightMetrics(Style* style, float* cornerRadius)
-    {
-        *cornerRadius = style->Highlight.cornerRadius;
-    }
-
-    virtual bool isHighlightBackgroundEnabled()
-    {
-        return true;
-    }
-
-    // Helper functions to apply this view's alpha to a color
-    NVGcolor a(NVGcolor color);
-    NVGpaint a(NVGpaint paint);
-
-    NVGcolor RGB(unsigned r, unsigned g, unsigned b)
-    {
-        return this->a(nvgRGB(r, g, b));
-    }
-
-    NVGcolor RGBA(unsigned r, unsigned g, unsigned b, unsigned a)
-    {
-        return this->a(nvgRGBA(r, g, b, a));
-    }
-
-    NVGcolor RGBf(float r, float g, float b)
-    {
-        return this->a(nvgRGBf(r, g, b));
-    }
-
-    NVGcolor RGBAf(float r, float g, float b, float a)
-    {
-        return this->a(nvgRGBAf(r, g, b, a));
-    }
-
-    /**
-     * Should the hint alpha be animated when
-     * pushing the view?
-     */
-    virtual bool animateHint()
-    {
-        return false;
-    }
-
-  public:
-    void setBoundaries(int x, int y, unsigned width, unsigned height);
-
-    void setBackground(Background background);
-
-    void setWidth(unsigned width);
-    void setHeight(unsigned height);
-
-    void shakeHighlight(FocusDirection direction);
-
-    int getX();
-    int getY();
-    unsigned getWidth();
-    unsigned getHeight(bool includeCollapse = true);
-
-    void setForceTranslucent(bool translucent);
-
-    void setParent(View* parent, void* parentUserdata = nullptr);
-    View* getParent();
-    bool hasParent();
-
-    void* getParentUserData();
-
-    void registerAction(std::string hintText, Key key, ActionListener actionListener, bool hidden = false);
-    void updateActionHint(Key key, std::string hintText);
-    void setActionAvailable(Key key, bool available);
-
-    std::string describe() const { return typeid(*this).name(); }
-
-    const std::vector<Action>& getActions()
-    {
-        return this->actions;
-    }
-
-    /**
-      * Called each frame
-      * Default it to draw your view,
-      * override draw() instead
-      */
-    virtual void frame(FrameContext* ctx);
-
-    /**
-      * Called by frame() to draw
-      * the view onscreen
-      */
-    virtual void draw(NVGcontext* vg, int x, int y, unsigned width, unsigned height, Style* style, FrameContext* ctx) = 0;
-
-    /**
-      * Triggered when the view has been
-      * resized and needs to layout its
-      * children
-      */
-    virtual void layout(NVGcontext* vg, Style* style, FontStash* stash)
-    {
-        // Nothing to do
-    }
-
-    /**
-      * Called when the view will appear
-      * on screen, before or after layout()
-      *
-      * Can be called if the view has
-      * already appeared, so be careful
-      */
-    virtual void willAppear(bool resetState = false)
-    {
-        // Nothing to do
-    }
-
-    /**
-      * Called when the view will disappear
-      * from the screen
-      *
-      * Can be called if the view has
-      * already disappeared, so be careful
-      */
-    virtual void willDisappear(bool resetState = false)
-    {
-        // Nothing to do
-    }
-
-    /**
-      * Called when the show() animation (fade in)
-      * ends
-      */
-    virtual void onShowAnimationEnd() {};
-
-    /**
-      * Shows the view (fade in animation)
-      *
-      * Called once when the view is
-      * pushed to the view stack
-      *
-      * Not recursive
-      */
-    virtual void show(std::function<void(void)> cb, bool animate = true, ViewAnimation animation = ViewAnimation::FADE);
-
-    /**
-      * Hides the view in a collapse animation
-      */
-    void collapse(bool animated = true);
-
-    bool isCollapsed();
-
-    /**
-      * Shows the view in a expand animation (opposite
-      * of collapse)
-      */
-    void expand(bool animated = true);
-
-    /**
-      * Hides the view (fade out animation)
-      *
-      * Called if another view is pushed
-      * on top of this one
-      *
-      * Not recursive
-      */
-    virtual void hide(std::function<void(void)> cb, bool animated = true, ViewAnimation animation = ViewAnimation::FADE);
-
-    bool isHidden();
-
-    /**
-      * Calls layout() on next frame
-      * unless immediate is true in which case
-      * it's called immediately
-      */
-    void invalidate(bool immediate = false);
-
-    /**
-      * Is this view translucent?
-      *
-      * If you override it please return
-      * <value> || View::isTranslucent()
-      * to keep the fadeIn transition
-      */
-    virtual bool isTranslucent()
-    {
-        return fadeIn || forceTranslucent;
-    }
-
-    bool isFocused();
-
-    /**
-     * Returns the default view to focus when focusing this view
-     * Typically the view itself or one of its children
-     *
-     * Returning nullptr means that the view is not focusable
-     * (and neither are its children)
-     *
-     * When pressing a key, the flow is :
-     *    1. starting from the currently focused view's parent, traverse the tree upwards and
-     *       repeatidly call getNextFocus() on every view until we find a next view to focus or meet the end of the tree
-     *    2. if a view is found, getNextFocus() will internally call getDefaultFocus() for the selected child
-     *    3. give focus to the result, if it exists
-     */
-    virtual View* getDefaultFocus()
-    {
-        return nullptr;
-    }
-
-    /**
-     * Returns the next view to focus given the requested direction
-     * and the currently focused view (as parent user data)
-     *
-     * Returning nullptr means that there is no next view to focus
-     * in that direction - getNextFocus will then be called on our
-     * parent if any
-     */
-    virtual View* getNextFocus(FocusDirection direction, void* parentUserdata)
-    {
-        return nullptr;
-    }
-
-    /**
-      * Fired when focus is gained
-      */
-    virtual void onFocusGained();
-
-    /**
-      * Fired when focus is lost
-      */
-    virtual void onFocusLost();
-
-    /**
-     * Fired when focus is gained on one of this view's children
-     */
-    virtual void onChildFocusGained(View* child)
-    {
-        if (this->hasParent())
-            this->getParent()->onChildFocusGained(this);
-    }
-
-    /**
-     * Fired when focus is gained on one of this view's children
-     */
-    virtual void onChildFocusLost(View* child)
-    {
-        if (this->hasParent())
-            this->getParent()->onChildFocusLost(this);
-    }
-
-    /**
-     * Fired when the window size changes
-     * Not guaranteed to be called before or after layout()
-     */
-    virtual void onWindowSizeChanged()
-    {
-        // Nothing by default
-    }
-
-    GenericEvent* getFocusEvent();
-
-    float alpha = 1.0f;
-
-    virtual float getAlpha(bool child = false);
-
-    /**
-      * Forces this view and its children to use
-      * the specified theme variant
-      */
-    void overrideThemeVariant(ThemeValues* newTheme);
-
-    virtual ~View();
-};
-
-} // namespace brls
diff --git a/Source/sys-clk/manager/lib/borealis/library/lib/animations.cpp b/Source/sys-clk/manager/lib/borealis/library/lib/animations.cpp
deleted file mode 100644
index 04c1b018..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/lib/animations.cpp
+++ /dev/null
@@ -1,933 +0,0 @@
-/*  RetroArch - A frontend for libretro.
- *  Borealis, a Nintendo Switch UI Library
- *  Copyright (C) 2014-2018 - Jean-André Santoni
- *  Copyright (C) 2011-2018 - Daniel De Matteis
- *  Copyright (C) 2019      - natinusala
- *  Copyright (C) 2019      - p-sam
- *
- *  RetroArch is free software: you can redistribute it and/or modify it under the terms
- *  of the GNU General Public License as published by the Free Software Found-
- *  ation, either version 3 of the License, or (at your option) any later version.
- *
- *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- *  PURPOSE.  See the GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along with RetroArch.
- *  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <compat/strl.h>
-#include <encodings/utf.h>
-#include <features/features_cpu.h>
-#include <math.h>
-#include <retro_assert.h>
-#include <retro_math.h>
-#include <retro_miscellaneous.h>
-#include <stdio.h>
-#include <string.h>
-#include <string/stdstring.h>
-
-#include <borealis/animations.hpp>
-#include <vector>
-
-namespace brls
-{
-
-struct tween
-{
-    float duration;
-    float running_since;
-    float initial_value;
-    float target_value;
-    float* subject;
-    uintptr_t tag;
-    easing_cb easing;
-    tween_cb cb;
-    tween_cb tick;
-    void* userdata;
-    bool deleted;
-};
-
-struct menu_animation
-{
-    std::vector<tween> list;
-    std::vector<tween> pending;
-    bool pending_deletes;
-    bool in_update;
-};
-
-typedef struct menu_animation menu_animation_t;
-
-#define TICKER_SPEED 333
-#define TICKER_SLOW_SPEED 1600
-
-static const char ticker_spacer_default[] = "   |   ";
-
-static menu_animation_t anim;
-static retro_time_t cur_time    = 0;
-static retro_time_t old_time    = 0;
-static uint64_t ticker_idx      = 0; /* updated every TICKER_SPEED ms */
-static uint64_t ticker_slow_idx = 0; /* updated every TICKER_SLOW_SPEED ms */
-static float delta_time         = 0.0f;
-static bool animation_is_active = false;
-static bool ticker_is_active    = false;
-
-static double highlight_gradient_x = 0.0f;
-static double highlight_gradient_y = 0.0f;
-static double highlight_color      = 0.0f;
-
-/* from https://github.com/kikito/tween.lua/blob/master/tween.lua */
-
-static float easing_linear(float t, float b, float c, float d)
-{
-    return c * t / d + b;
-}
-
-static float easing_in_out_quad(float t, float b, float c, float d)
-{
-    t = t / d * 2;
-    if (t < 1)
-        return c / 2 * pow(t, 2) + b;
-    return -c / 2 * ((t - 1) * (t - 3) - 1) + b;
-}
-
-static float easing_in_quad(float t, float b, float c, float d)
-{
-    return c * pow(t / d, 2) + b;
-}
-
-static float easing_out_quad(float t, float b, float c, float d)
-{
-    t = t / d;
-    return -c * t * (t - 2) + b;
-}
-
-static float easing_out_in_quad(float t, float b, float c, float d)
-{
-    if (t < d / 2)
-        return easing_out_quad(t * 2, b, c / 2, d);
-    return easing_in_quad((t * 2) - d, b + c / 2, c / 2, d);
-}
-
-static float easing_in_cubic(float t, float b, float c, float d)
-{
-    return c * pow(t / d, 3) + b;
-}
-
-static float easing_out_cubic(float t, float b, float c, float d)
-{
-    return c * (pow(t / d - 1, 3) + 1) + b;
-}
-
-static float easing_in_out_cubic(float t, float b, float c, float d)
-{
-    t = t / d * 2;
-    if (t < 1)
-        return c / 2 * t * t * t + b;
-    t = t - 2;
-    return c / 2 * (t * t * t + 2) + b;
-}
-
-static float easing_out_in_cubic(float t, float b, float c, float d)
-{
-    if (t < d / 2)
-        return easing_out_cubic(t * 2, b, c / 2, d);
-    return easing_in_cubic((t * 2) - d, b + c / 2, c / 2, d);
-}
-
-static float easing_in_quart(float t, float b, float c, float d)
-{
-    return c * pow(t / d, 4) + b;
-}
-
-static float easing_out_quart(float t, float b, float c, float d)
-{
-    return -c * (pow(t / d - 1, 4) - 1) + b;
-}
-
-static float easing_in_out_quart(float t, float b, float c, float d)
-{
-    t = t / d * 2;
-    if (t < 1)
-        return c / 2 * pow(t, 4) + b;
-    return -c / 2 * (pow(t - 2, 4) - 2) + b;
-}
-
-static float easing_out_in_quart(float t, float b, float c, float d)
-{
-    if (t < d / 2)
-        return easing_out_quart(t * 2, b, c / 2, d);
-    return easing_in_quart((t * 2) - d, b + c / 2, c / 2, d);
-}
-
-static float easing_in_quint(float t, float b, float c, float d)
-{
-    return c * pow(t / d, 5) + b;
-}
-
-static float easing_out_quint(float t, float b, float c, float d)
-{
-    return c * (pow(t / d - 1, 5) + 1) + b;
-}
-
-static float easing_in_out_quint(float t, float b, float c, float d)
-{
-    t = t / d * 2;
-    if (t < 1)
-        return c / 2 * pow(t, 5) + b;
-    return c / 2 * (pow(t - 2, 5) + 2) + b;
-}
-
-static float easing_out_in_quint(float t, float b, float c, float d)
-{
-    if (t < d / 2)
-        return easing_out_quint(t * 2, b, c / 2, d);
-    return easing_in_quint((t * 2) - d, b + c / 2, c / 2, d);
-}
-
-static float easing_in_sine(float t, float b, float c, float d)
-{
-    return -c * cos(t / d * (M_PI / 2)) + c + b;
-}
-
-static float easing_out_sine(float t, float b, float c, float d)
-{
-    return c * sin(t / d * (M_PI / 2)) + b;
-}
-
-static float easing_in_out_sine(float t, float b, float c, float d)
-{
-    return -c / 2 * (cos(M_PI * t / d) - 1) + b;
-}
-
-static float easing_out_in_sine(float t, float b, float c, float d)
-{
-    if (t < d / 2)
-        return easing_out_sine(t * 2, b, c / 2, d);
-    return easing_in_sine((t * 2) - d, b + c / 2, c / 2, d);
-}
-
-static float easing_in_expo(float t, float b, float c, float d)
-{
-    if (t == 0)
-        return b;
-    return c * powf(2, 10 * (t / d - 1)) + b - c * 0.001;
-}
-
-static float easing_out_expo(float t, float b, float c, float d)
-{
-    if (t == d)
-        return b + c;
-    return c * 1.001 * (-powf(2, -10 * t / d) + 1) + b;
-}
-
-static float easing_in_out_expo(float t, float b, float c, float d)
-{
-    if (t == 0)
-        return b;
-    if (t == d)
-        return b + c;
-    t = t / d * 2;
-    if (t < 1)
-        return c / 2 * powf(2, 10 * (t - 1)) + b - c * 0.0005;
-    return c / 2 * 1.0005 * (-powf(2, -10 * (t - 1)) + 2) + b;
-}
-
-static float easing_out_in_expo(float t, float b, float c, float d)
-{
-    if (t < d / 2)
-        return easing_out_expo(t * 2, b, c / 2, d);
-    return easing_in_expo((t * 2) - d, b + c / 2, c / 2, d);
-}
-
-static float easing_in_circ(float t, float b, float c, float d)
-{
-    return (-c * (sqrt(1 - powf(t / d, 2)) - 1) + b);
-}
-
-static float easing_out_circ(float t, float b, float c, float d)
-{
-    return (c * sqrt(1 - powf(t / d - 1, 2)) + b);
-}
-
-static float easing_in_out_circ(float t, float b, float c, float d)
-{
-    t = t / d * 2;
-    if (t < 1)
-        return -c / 2 * (sqrt(1 - t * t) - 1) + b;
-    t = t - 2;
-    return c / 2 * (sqrt(1 - t * t) + 1) + b;
-}
-
-static float easing_out_in_circ(float t, float b, float c, float d)
-{
-    if (t < d / 2)
-        return easing_out_circ(t * 2, b, c / 2, d);
-    return easing_in_circ((t * 2) - d, b + c / 2, c / 2, d);
-}
-
-static float easing_out_bounce(float t, float b, float c, float d)
-{
-    t = t / d;
-    if (t < 1 / 2.75)
-        return c * (7.5625 * t * t) + b;
-    if (t < 2 / 2.75)
-    {
-        t = t - (1.5 / 2.75);
-        return c * (7.5625 * t * t + 0.75) + b;
-    }
-    else if (t < 2.5 / 2.75)
-    {
-        t = t - (2.25 / 2.75);
-        return c * (7.5625 * t * t + 0.9375) + b;
-    }
-    t = t - (2.625 / 2.75);
-    return c * (7.5625 * t * t + 0.984375) + b;
-}
-
-static float easing_in_bounce(float t, float b, float c, float d)
-{
-    return c - easing_out_bounce(d - t, 0, c, d) + b;
-}
-
-static float easing_in_out_bounce(float t, float b, float c, float d)
-{
-    if (t < d / 2)
-        return easing_in_bounce(t * 2, 0, c, d) * 0.5 + b;
-    return easing_out_bounce(t * 2 - d, 0, c, d) * 0.5 + c * .5 + b;
-}
-
-static float easing_out_in_bounce(float t, float b, float c, float d)
-{
-    if (t < d / 2)
-        return easing_out_bounce(t * 2, b, c / 2, d);
-    return easing_in_bounce((t * 2) - d, b + c / 2, c / 2, d);
-}
-
-static void menu_animation_ticker_generic(uint64_t idx,
-    size_t max_width, size_t* offset, size_t* width)
-{
-    int ticker_period = (int)(2 * (*width - max_width) + 4);
-    int phase         = idx % ticker_period;
-
-    int phase_left_stop   = 2;
-    int phase_left_moving = (int)(phase_left_stop + (*width - max_width));
-    int phase_right_stop  = phase_left_moving + 2;
-
-    int left_offset  = phase - phase_left_stop;
-    int right_offset = (int)((*width - max_width) - (phase - phase_right_stop));
-
-    if (phase < phase_left_stop)
-        *offset = 0;
-    else if (phase < phase_left_moving)
-        *offset = left_offset;
-    else if (phase < phase_right_stop)
-        *offset = *width - max_width;
-    else
-        *offset = right_offset;
-
-    *width = max_width;
-}
-
-static void menu_animation_ticker_loop(uint64_t idx,
-    size_t max_width, size_t str_width, size_t spacer_width,
-    size_t* offset1, size_t* width1,
-    size_t* offset2, size_t* width2,
-    size_t* offset3, size_t* width3)
-{
-    int ticker_period = (int)(str_width + spacer_width);
-    int phase         = idx % ticker_period;
-
-    /* Output offsets/widths are unsigned size_t, but it's
-    * easier to perform the required calculations with ints,
-    * so create some temporary variables... */
-    int offset;
-    int width;
-
-    /* Looping text is composed of up to three strings,
-    * where std::string 1 and 2 are different regions of the
-    * source text and std::string 2 is a spacer:
-    * 
-    *     |-----max_width-----|
-    * [std::string 1][std::string 2][std::string 3]
-    * 
-    * The following implementation could probably be optimised,
-    * but any performance gains would be trivial compared with
-    * all the std::string manipulation that has to happen afterwards...
-    */
-
-    /* String 1 */
-    offset = (phase < (int)str_width) ? phase : 0;
-    width  = (int)(str_width - phase);
-    width  = (width < 0) ? 0 : width;
-    width  = (width > (int)max_width) ? max_width : width;
-
-    *offset1 = offset;
-    *width1  = width;
-
-    /* String 2 */
-    offset = (int)(phase - str_width);
-    offset = offset < 0 ? 0 : offset;
-    width  = (int)(max_width - *width1);
-    width  = (width > (int)spacer_width) ? spacer_width : width;
-    width  = width - offset;
-
-    *offset2 = offset;
-    *width2  = width;
-
-    /* String 3 */
-    width = max_width - (*width1 + *width2);
-    width = width < 0 ? 0 : width;
-
-    /* Note: offset is always zero here so offset3 is
-    * unnecessary - but include it anyway to preserve
-    * symmetry... */
-    *offset3 = 0;
-    *width3  = width;
-}
-
-void menu_animation_init(void)
-{
-    // Nothing to do
-}
-
-void menu_animation_free(void)
-{
-    anim.list.clear();
-    anim.pending.clear();
-
-    anim.in_update       = false;
-    anim.pending_deletes = false;
-}
-
-static void menu_delayed_animation_cb(void* userdata)
-{
-    menu_delayed_animation_t* delayed_animation = (menu_delayed_animation_t*)userdata;
-
-    menu_animation_push(&delayed_animation->entry);
-
-    free(delayed_animation);
-}
-
-void menu_animation_push_delayed(unsigned delay, menu_animation_ctx_entry_t* entry)
-{
-    menu_timer_ctx_entry_t timer_entry;
-    menu_delayed_animation_t* delayed_animation = (menu_delayed_animation_t*)malloc(sizeof(menu_delayed_animation_t));
-
-    delayed_animation->entry.cb           = entry->cb;
-    delayed_animation->entry.duration     = entry->duration;
-    delayed_animation->entry.easing_enum  = entry->easing_enum;
-    delayed_animation->entry.subject      = entry->subject;
-    delayed_animation->entry.tag          = entry->tag;
-    delayed_animation->entry.target_value = entry->target_value;
-    delayed_animation->entry.tick         = entry->tick;
-    delayed_animation->entry.userdata     = entry->userdata;
-
-    timer_entry.cb       = menu_delayed_animation_cb;
-    timer_entry.tick     = NULL;
-    timer_entry.duration = delay;
-    timer_entry.userdata = delayed_animation;
-
-    menu_timer_start(&delayed_animation->timer, &timer_entry);
-}
-
-bool menu_animation_push(menu_animation_ctx_entry_t* entry)
-{
-    struct tween t;
-
-    t.duration      = entry->duration;
-    t.running_since = 0;
-    t.initial_value = *entry->subject;
-    t.target_value  = entry->target_value;
-    t.subject       = entry->subject;
-    t.tag           = entry->tag;
-    t.cb            = entry->cb;
-    t.tick          = entry->tick;
-    t.userdata      = entry->userdata;
-    t.easing        = NULL;
-    t.deleted       = false;
-
-    switch (entry->easing_enum)
-    {
-        case EASING_LINEAR:
-            t.easing = &easing_linear;
-            break;
-            /* Quad */
-        case EASING_IN_QUAD:
-            t.easing = &easing_in_quad;
-            break;
-        case EASING_OUT_QUAD:
-            t.easing = &easing_out_quad;
-            break;
-        case EASING_IN_OUT_QUAD:
-            t.easing = &easing_in_out_quad;
-            break;
-        case EASING_OUT_IN_QUAD:
-            t.easing = &easing_out_in_quad;
-            break;
-            /* Cubic */
-        case EASING_IN_CUBIC:
-            t.easing = &easing_in_cubic;
-            break;
-        case EASING_OUT_CUBIC:
-            t.easing = &easing_out_cubic;
-            break;
-        case EASING_IN_OUT_CUBIC:
-            t.easing = &easing_in_out_cubic;
-            break;
-        case EASING_OUT_IN_CUBIC:
-            t.easing = &easing_out_in_cubic;
-            break;
-            /* Quart */
-        case EASING_IN_QUART:
-            t.easing = &easing_in_quart;
-            break;
-        case EASING_OUT_QUART:
-            t.easing = &easing_out_quart;
-            break;
-        case EASING_IN_OUT_QUART:
-            t.easing = &easing_in_out_quart;
-            break;
-        case EASING_OUT_IN_QUART:
-            t.easing = &easing_out_in_quart;
-            break;
-            /* Quint */
-        case EASING_IN_QUINT:
-            t.easing = &easing_in_quint;
-            break;
-        case EASING_OUT_QUINT:
-            t.easing = &easing_out_quint;
-            break;
-        case EASING_IN_OUT_QUINT:
-            t.easing = &easing_in_out_quint;
-            break;
-        case EASING_OUT_IN_QUINT:
-            t.easing = &easing_out_in_quint;
-            break;
-            /* Sine */
-        case EASING_IN_SINE:
-            t.easing = &easing_in_sine;
-            break;
-        case EASING_OUT_SINE:
-            t.easing = &easing_out_sine;
-            break;
-        case EASING_IN_OUT_SINE:
-            t.easing = &easing_in_out_sine;
-            break;
-        case EASING_OUT_IN_SINE:
-            t.easing = &easing_out_in_sine;
-            break;
-            /* Expo */
-        case EASING_IN_EXPO:
-            t.easing = &easing_in_expo;
-            break;
-        case EASING_OUT_EXPO:
-            t.easing = &easing_out_expo;
-            break;
-        case EASING_IN_OUT_EXPO:
-            t.easing = &easing_in_out_expo;
-            break;
-        case EASING_OUT_IN_EXPO:
-            t.easing = &easing_out_in_expo;
-            break;
-            /* Circ */
-        case EASING_IN_CIRC:
-            t.easing = &easing_in_circ;
-            break;
-        case EASING_OUT_CIRC:
-            t.easing = &easing_out_circ;
-            break;
-        case EASING_IN_OUT_CIRC:
-            t.easing = &easing_in_out_circ;
-            break;
-        case EASING_OUT_IN_CIRC:
-            t.easing = &easing_out_in_circ;
-            break;
-            /* Bounce */
-        case EASING_IN_BOUNCE:
-            t.easing = &easing_in_bounce;
-            break;
-        case EASING_OUT_BOUNCE:
-            t.easing = &easing_out_bounce;
-            break;
-        case EASING_IN_OUT_BOUNCE:
-            t.easing = &easing_in_out_bounce;
-            break;
-        case EASING_OUT_IN_BOUNCE:
-            t.easing = &easing_out_in_bounce;
-            break;
-        default:
-            break;
-    }
-
-    /* ignore born dead tweens */
-    if (!t.easing || t.duration == 0 || t.initial_value == t.target_value)
-        return false;
-
-    if (anim.in_update)
-        anim.pending.push_back(t);
-    else
-        anim.list.push_back(t);
-
-    return true;
-}
-
-void menu_animation_get_highlight(float* gradient_x, float* gradient_y, float* color)
-{
-    if (gradient_x)
-        *gradient_x = (float)highlight_gradient_x;
-
-    if (gradient_y)
-        *gradient_y = (float)highlight_gradient_y;
-
-    if (color)
-        *color = (float)highlight_color;
-}
-
-#define HIGHLIGHT_SPEED 350.0
-
-static void menu_animation_update_time(bool timedate_enable)
-{
-    static retro_time_t
-        last_clock_update
-        = 0;
-    static retro_time_t
-        last_ticker_update
-        = 0;
-    static retro_time_t
-        last_ticker_slow_update
-        = 0;
-
-    /* Adjust ticker speed */
-    float speed_factor         = 1.0f;
-    unsigned ticker_speed      = (unsigned)(((float)TICKER_SPEED / speed_factor) + 0.5);
-    unsigned ticker_slow_speed = (unsigned)(((float)TICKER_SLOW_SPEED / speed_factor) + 0.5);
-
-    cur_time   = cpu_features_get_time_usec() / 1000;
-    delta_time = old_time == 0 ? 0 : cur_time - old_time;
-
-    old_time = cur_time;
-
-    highlight_gradient_x = (cos((double)cur_time / HIGHLIGHT_SPEED / 3.0) + 1.0) / 2.0;
-    highlight_gradient_y = (sin((double)cur_time / HIGHLIGHT_SPEED / 3.0) + 1.0) / 2.0;
-    highlight_color      = (sin((double)cur_time / HIGHLIGHT_SPEED * 2.0) + 1.0) / 2.0;
-
-    if (((cur_time - last_clock_update) > 1000)
-        && timedate_enable)
-    {
-        animation_is_active = true;
-        last_clock_update   = cur_time;
-    }
-
-    if (ticker_is_active
-        && cur_time - last_ticker_update >= ticker_speed)
-    {
-        ticker_idx++;
-        last_ticker_update = cur_time;
-    }
-
-    if (ticker_is_active
-        && cur_time - last_ticker_slow_update >= ticker_slow_speed)
-    {
-        ticker_slow_idx++;
-        last_ticker_slow_update = cur_time;
-    }
-}
-
-bool menu_animation_update(void)
-{
-    unsigned i;
-
-    menu_animation_update_time(false);
-
-    anim.in_update       = true;
-    anim.pending_deletes = false;
-
-    for (i = 0; i < anim.list.size(); i++)
-    {
-        struct tween* tween = &anim.list[i];
-        tween->running_since += delta_time;
-
-        *tween->subject = tween->easing(
-            tween->running_since,
-            tween->initial_value,
-            tween->target_value - tween->initial_value,
-            tween->duration);
-
-        if (tween->tick)
-            tween->tick(tween->userdata);
-
-        if (tween->running_since >= tween->duration)
-        {
-            *tween->subject = tween->target_value;
-
-            if (tween->cb)
-                tween->cb(tween->userdata);
-
-            anim.list.erase(anim.list.begin() + i);
-            i--;
-        }
-    }
-
-    if (anim.pending_deletes)
-    {
-        for (i = 0; i < anim.list.size(); i++)
-        {
-            struct tween* tween = &anim.list[i];
-            if (tween->deleted)
-            {
-                anim.list.erase(anim.list.begin() + i);
-                i--;
-            }
-        }
-        anim.pending_deletes = false;
-    }
-
-    if (anim.pending.size() > 0)
-    {
-        anim.list.insert(anim.list.begin(), anim.pending.begin(), anim.pending.end());
-        anim.pending.clear();
-    }
-
-    anim.in_update      = false;
-    animation_is_active = anim.list.size() > 0;
-
-    return animation_is_active;
-}
-
-bool menu_animation_ticker(menu_animation_ctx_ticker_t* ticker)
-{
-    size_t str_len = utf8len(ticker->str);
-
-    if (!ticker->spacer)
-        ticker->spacer = ticker_spacer_default;
-
-    if ((size_t)str_len <= ticker->len)
-    {
-        utf8cpy(ticker->s,
-            PATH_MAX_LENGTH,
-            ticker->str,
-            ticker->len);
-        return false;
-    }
-
-    if (!ticker->selected)
-    {
-        utf8cpy(ticker->s, PATH_MAX_LENGTH, ticker->str, ticker->len - 3);
-        strlcat(ticker->s, "...", PATH_MAX_LENGTH);
-        return false;
-    }
-
-    /* Note: If we reach this point then str_len > ticker->len
-    * (previously had an unecessary 'if (str_len > ticker->len)'
-    * check here...) */
-    switch (ticker->type_enum)
-    {
-        case TICKER_TYPE_LOOP:
-        {
-            size_t offset1, offset2, offset3;
-            size_t width1, width2, width3;
-
-            /* Horribly oversized temporary buffer
-          * > utf8 support makes this whole thing incredibly
-          *   ugly/inefficient. Not much we can do about it... */
-            char tmp[PATH_MAX_LENGTH];
-
-            tmp[0]       = '\0';
-            ticker->s[0] = '\0';
-
-            menu_animation_ticker_loop(
-                ticker->idx,
-                ticker->len,
-                str_len, utf8len(ticker->spacer),
-                &offset1, &width1,
-                &offset2, &width2,
-                &offset3, &width3);
-
-            if (width1 > 0)
-            {
-                utf8cpy(
-                    ticker->s,
-                    PATH_MAX_LENGTH,
-                    utf8skip(ticker->str, offset1),
-                    width1);
-            }
-
-            if (width2 > 0)
-            {
-                utf8cpy(
-                    tmp,
-                    PATH_MAX_LENGTH,
-                    utf8skip(ticker->spacer, offset2),
-                    width2);
-
-                strlcat(ticker->s, tmp, PATH_MAX_LENGTH);
-            }
-
-            if (width3 > 0)
-            {
-                utf8cpy(
-                    tmp,
-                    PATH_MAX_LENGTH,
-                    utf8skip(ticker->str, offset3),
-                    width3);
-
-                strlcat(ticker->s, tmp, PATH_MAX_LENGTH);
-            }
-
-            break;
-        }
-        case TICKER_TYPE_BOUNCE:
-        default:
-        {
-            size_t offset = 0;
-
-            menu_animation_ticker_generic(
-                ticker->idx,
-                ticker->len,
-                &offset,
-                &str_len);
-
-            utf8cpy(
-                ticker->s,
-                PATH_MAX_LENGTH,
-                utf8skip(ticker->str, offset),
-                str_len);
-
-            break;
-        }
-    }
-
-    ticker_is_active = true;
-
-    return true;
-}
-
-bool menu_animation_is_active(void)
-{
-    return animation_is_active || ticker_is_active;
-}
-
-bool menu_animation_kill_by_tag(menu_animation_ctx_tag* tag)
-{
-    unsigned i;
-
-    if (!tag || *tag == (uintptr_t)-1)
-        return false;
-
-    for (i = 0; i < anim.list.size(); ++i)
-    {
-        struct tween* t = &anim.list[i];
-        if (t->tag != *tag)
-            continue;
-
-        if (anim.in_update)
-        {
-            t->deleted           = true;
-            anim.pending_deletes = true;
-        }
-        else
-        {
-            anim.list.erase(anim.list.begin() + i);
-            --i;
-        }
-    }
-
-    return true;
-}
-
-void menu_animation_kill_by_subject(menu_animation_ctx_subject_t* subject)
-{
-    unsigned i, j, killed = 0;
-    float** sub = (float**)subject->data;
-
-    for (i = 0; i < anim.list.size() && killed < subject->count; ++i)
-    {
-        struct tween* t = &anim.list[i];
-
-        for (j = 0; j < subject->count; ++j)
-        {
-            if (t->subject != sub[j])
-                continue;
-
-            if (anim.in_update)
-            {
-                t->deleted           = true;
-                anim.pending_deletes = true;
-            }
-            else
-            {
-                anim.list.erase(anim.list.begin() + i);
-                --i;
-            }
-
-            killed++;
-            break;
-        }
-    }
-}
-
-float menu_animation_get_delta_time(void)
-{
-    return delta_time;
-}
-
-bool menu_animation_ctl(enum menu_animation_ctl_state state, void* data)
-{
-    switch (state)
-    {
-        case MENU_ANIMATION_CTL_CLEAR_ACTIVE:
-            animation_is_active = false;
-            ticker_is_active    = false;
-            break;
-        case MENU_ANIMATION_CTL_SET_ACTIVE:
-            animation_is_active = true;
-            ticker_is_active    = true;
-            break;
-        case MENU_ANIMATION_CTL_NONE:
-        default:
-            break;
-    }
-
-    return true;
-}
-
-void menu_timer_start(menu_timer_t* timer, menu_timer_ctx_entry_t* timer_entry)
-{
-    menu_animation_ctx_entry_t entry;
-    menu_animation_ctx_tag tag = (uintptr_t)timer;
-
-    menu_timer_kill(timer);
-
-    *timer = 0.0f;
-
-    entry.easing_enum  = EASING_LINEAR;
-    entry.tag          = tag;
-    entry.duration     = timer_entry->duration;
-    entry.target_value = 1.0f;
-    entry.subject      = timer;
-    entry.cb           = timer_entry->cb;
-    entry.tick         = timer_entry->tick;
-    entry.userdata     = timer_entry->userdata;
-
-    menu_animation_push(&entry);
-}
-
-void menu_timer_kill(menu_timer_t* timer)
-{
-    menu_animation_ctx_tag tag = (uintptr_t)timer;
-    menu_animation_kill_by_tag(&tag);
-}
-
-uint64_t menu_animation_get_ticker_idx(void)
-{
-    return ticker_idx;
-}
-
-uint64_t menu_animation_get_ticker_slow_idx(void)
-{
-    return ticker_slow_idx;
-}
-
-} // namespace brls
diff --git a/Source/sys-clk/manager/lib/borealis/library/lib/applet_frame.cpp b/Source/sys-clk/manager/lib/borealis/library/lib/applet_frame.cpp
deleted file mode 100644
index 612b4401..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/lib/applet_frame.cpp
+++ /dev/null
@@ -1,414 +0,0 @@
-/*
-    Borealis, a Nintendo Switch UI Library
-    Copyright (C) 2019  natinusala
-    Copyright (C) 2019  p-sam
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include <borealis/applet_frame.hpp>
-#include <borealis/application.hpp>
-
-namespace brls
-{
-
-AppletFrame::AppletFrame(bool padLeft, bool padRight)
-{
-    Style* style = Application::getStyle();
-
-    if (padLeft)
-        this->leftPadding = style->AppletFrame.separatorSpacing;
-
-    if (padRight)
-        this->rightPadding = style->AppletFrame.separatorSpacing;
-
-    this->hint = new Hint();
-    this->hint->setParent(this);
-
-    this->registerAction("Back", Key::B, [this] { return this->onCancel(); });
-}
-
-void AppletFrame::draw(NVGcontext* vg, int x, int y, unsigned width, unsigned height, Style* style, FrameContext* ctx)
-{
-    // Text
-    if (this->headerStyle == HeaderStyle::REGULAR)
-    {
-        // Title
-        NVGcolor titleColor = a(ctx->theme->textColor);
-
-        if (this->contentView)
-            titleColor.a *= this->contentView->getAlpha();
-
-        nvgFillColor(vg, titleColor);
-        nvgFontSize(vg, style->AppletFrame.titleSize);
-        nvgTextAlign(vg, NVG_ALIGN_LEFT | NVG_ALIGN_MIDDLE);
-        nvgFontFaceId(vg, ctx->fontStash->regular);
-        nvgBeginPath(vg);
-        nvgText(vg, x + style->AppletFrame.titleStart, y + style->AppletFrame.headerHeightRegular / 2 + style->AppletFrame.titleOffset, this->title.c_str(), nullptr);
-
-        // Header
-        nvgBeginPath(vg);
-        nvgFillColor(vg, a(ctx->theme->textColor));
-        nvgRect(vg, x + style->AppletFrame.separatorSpacing, y + style->AppletFrame.headerHeightRegular - 1, width - style->AppletFrame.separatorSpacing * 2, 1);
-        nvgFill(vg);
-    }
-    else if (this->headerStyle == HeaderStyle::POPUP)
-    {
-        // Header Text
-        nvgBeginPath(vg);
-        nvgFillColor(vg, a(ctx->theme->textColor));
-        nvgFontFaceId(vg, ctx->fontStash->regular);
-        nvgFontSize(vg, style->PopupFrame.headerFontSize);
-        nvgTextAlign(vg, NVG_ALIGN_LEFT | NVG_ALIGN_MIDDLE);
-        nvgText(vg, x + style->PopupFrame.headerTextLeftPadding,
-            y + style->PopupFrame.headerTextTopPadding,
-            this->title.c_str(),
-            nullptr);
-
-        // Sub title text 1
-        nvgBeginPath(vg);
-        nvgFillColor(vg, a(ctx->theme->descriptionColor));
-        nvgFontFaceId(vg, ctx->fontStash->regular);
-        nvgFontSize(vg, style->PopupFrame.subTitleFontSize);
-        nvgTextAlign(vg, NVG_ALIGN_LEFT | NVG_ALIGN_TOP);
-        nvgText(vg, x + style->PopupFrame.subTitleLeftPadding,
-            y + style->PopupFrame.subTitleTopPadding,
-            this->subTitleLeft.c_str(),
-            nullptr);
-
-        float bounds[4];
-        nvgTextBounds(vg, x, y, this->subTitleLeft.c_str(), nullptr, bounds);
-
-        // Sub title separator
-        nvgFillColor(vg, a(ctx->theme->descriptionColor)); // we purposely don't apply opacity
-        nvgBeginPath(vg);
-        nvgRect(vg, x + style->PopupFrame.subTitleLeftPadding + (bounds[2] - bounds[0]) + style->PopupFrame.subTitleSpacing,
-            y + style->PopupFrame.subTitleSeparatorTopPadding,
-            1,
-            style->PopupFrame.subTitleSeparatorHeight);
-        nvgFill(vg);
-
-        // Sub title text 2
-        nvgBeginPath(vg);
-        nvgFillColor(vg, a(ctx->theme->descriptionColor));
-        nvgFontFaceId(vg, ctx->fontStash->regular);
-        nvgFontSize(vg, style->PopupFrame.subTitleFontSize);
-        nvgTextAlign(vg, NVG_ALIGN_LEFT | NVG_ALIGN_TOP);
-        nvgText(vg, x + style->PopupFrame.subTitleLeftPadding + (bounds[2] - bounds[0]) + (style->PopupFrame.subTitleSpacing * 2),
-            y + style->PopupFrame.subTitleTopPadding,
-            this->subTitleRight.c_str(),
-            nullptr);
-
-        // Header
-        nvgBeginPath(vg);
-        nvgRect(vg, x + style->AppletFrame.separatorSpacing, y + style->AppletFrame.headerHeightPopup - 1, width - style->AppletFrame.separatorSpacing * 2, 1);
-        nvgFill(vg);
-    }
-
-    // Footer
-    NVGcolor footerColor = a(ctx->theme->textColor);
-
-    if (this->slideIn)
-        footerColor.a = 0.0f;
-    else if (this->slideOut)
-        footerColor.a = 1.0f;
-
-    nvgFillColor(vg, footerColor);
-
-    std::string* text = &this->footerText;
-
-    if (*text == "")
-        text = Application::getCommonFooter();
-
-    nvgFontSize(vg, style->AppletFrame.footerTextSize);
-    nvgTextAlign(vg, NVG_ALIGN_LEFT | NVG_ALIGN_MIDDLE);
-    nvgBeginPath(vg);
-    nvgText(vg, x + style->AppletFrame.separatorSpacing + style->AppletFrame.footerTextSpacing, y + height - style->AppletFrame.footerHeight / 2, text->c_str(), nullptr);
-
-    // Hint
-    this->hint->frame(ctx);
-
-    // Icon
-    if (this->icon)
-        this->icon->frame(ctx);
-
-    // Separators
-    nvgFillColor(vg, a(ctx->theme->separatorColor));
-
-    // Footer
-    nvgBeginPath(vg);
-    nvgRect(vg, x + style->AppletFrame.separatorSpacing, y + height - style->AppletFrame.footerHeight, width - style->AppletFrame.separatorSpacing * 2, 1);
-    nvgFill(vg);
-
-    // Content view
-    if (contentView)
-    {
-        float slideAlpha = 1.0f - this->contentView->alpha;
-
-        if ((this->slideIn && this->animation == ViewAnimation::SLIDE_LEFT) || (this->slideOut && this->animation == ViewAnimation::SLIDE_RIGHT))
-            slideAlpha = 1.0f - slideAlpha;
-
-        int translation = (int)((float)style->AppletFrame.slideAnimation * slideAlpha);
-
-        if ((this->slideIn && this->animation == ViewAnimation::SLIDE_LEFT) || (this->slideOut && this->animation == ViewAnimation::SLIDE_RIGHT))
-            translation -= style->AppletFrame.slideAnimation;
-
-        if (this->slideOut || this->slideIn)
-            nvgTranslate(vg, -translation, 0);
-
-        contentView->frame(ctx);
-
-        if (this->slideOut || this->slideIn)
-            nvgTranslate(vg, translation, 0);
-    }
-}
-
-View* AppletFrame::getDefaultFocus()
-{
-    if (this->contentView)
-        return this->contentView->getDefaultFocus();
-
-    return nullptr;
-}
-
-void AppletFrame::layout(NVGcontext* vg, Style* style, FontStash* stash)
-{
-    // Icon
-    if (this->icon)
-    {
-        if (this->headerStyle == HeaderStyle::REGULAR)
-        {
-            this->icon->setBoundaries(style->AppletFrame.imageLeftPadding, style->AppletFrame.imageTopPadding, style->AppletFrame.imageSize, style->AppletFrame.imageSize);
-            this->icon->invalidate();
-        }
-        else if (this->headerStyle == HeaderStyle::POPUP)
-        {
-            this->icon->setBoundaries(style->PopupFrame.edgePadding + style->PopupFrame.imageLeftPadding, style->PopupFrame.imageTopPadding, style->PopupFrame.imageSize, style->PopupFrame.imageSize);
-            this->icon->invalidate();
-        }
-    }
-
-    // Content
-    if (this->contentView)
-    {
-        if (this->headerStyle == HeaderStyle::REGULAR)
-            this->contentView->setBoundaries(this->x + leftPadding, this->y + style->AppletFrame.headerHeightRegular, this->width - this->leftPadding - this->rightPadding, this->height - style->AppletFrame.footerHeight - style->AppletFrame.headerHeightRegular);
-        else if (this->headerStyle == HeaderStyle::POPUP)
-            this->contentView->setBoundaries(this->x + leftPadding, this->y + style->AppletFrame.headerHeightPopup, this->width - this->leftPadding - this->rightPadding, this->height - style->AppletFrame.footerHeight - style->AppletFrame.headerHeightPopup);
-
-        this->contentView->invalidate();
-    }
-
-    // Hint
-    // TODO: convert the bottom-left footer into a Label to get its width and avoid clipping with the hint
-    unsigned hintWidth = this->width - style->AppletFrame.separatorSpacing * 2 - style->AppletFrame.footerTextSpacing * 2;
-
-    this->hint->setBoundaries(
-        this->x + this->width - hintWidth - style->AppletFrame.separatorSpacing - style->AppletFrame.footerTextSpacing,
-        this->y + this->height - style->AppletFrame.footerHeight,
-        hintWidth,
-        style->AppletFrame.footerHeight);
-    this->hint->invalidate();
-}
-
-void AppletFrame::setContentView(View* view)
-{
-    this->contentView = view;
-
-    if (this->contentView)
-    {
-        this->contentView->setParent(this);
-        this->contentView->willAppear();
-    }
-
-    this->invalidate();
-}
-
-bool AppletFrame::hasContentView()
-{
-    return this->contentView;
-}
-
-void AppletFrame::setTitle(std::string title)
-{
-    this->title = title;
-}
-
-void AppletFrame::setFooterText(std::string footerText)
-{
-    this->footerText = footerText;
-}
-
-void AppletFrame::setSubtitle(std::string left, std::string right)
-{
-    this->subTitleLeft  = left;
-    this->subTitleRight = right;
-}
-
-void AppletFrame::setIcon(unsigned char* buffer, size_t bufferSize)
-{
-    if (!this->icon)
-    {
-        Image* icon = new Image(buffer, bufferSize);
-        icon->setScaleType(ImageScaleType::SCALE);
-        icon->setParent(this);
-
-        this->icon = icon;
-    }
-    else if (Image* icon = dynamic_cast<Image*>(this->icon))
-    {
-        icon->setImage(buffer, bufferSize);
-    }
-
-    this->icon->invalidate();
-}
-
-void AppletFrame::setIcon(std::string imagePath)
-{
-    if (!this->icon)
-    {
-        Image* icon = new Image(imagePath);
-        icon->setScaleType(ImageScaleType::SCALE);
-        icon->setParent(this);
-
-        this->icon = icon;
-    }
-    else if (Image* icon = dynamic_cast<Image*>(this->icon))
-    {
-        icon->setImage(imagePath);
-    }
-
-    this->icon->invalidate();
-}
-
-void AppletFrame::setIcon(View* view)
-{
-    if (this->icon)
-        delete this->icon;
-
-    if (view != nullptr)
-        view->setParent(this);
-
-    this->icon = view;
-}
-
-void AppletFrame::setHeaderStyle(HeaderStyle headerStyle)
-{
-    this->headerStyle = headerStyle;
-
-    this->invalidate();
-}
-
-AppletFrame::~AppletFrame()
-{
-    if (this->contentView)
-    {
-        this->contentView->willDisappear(true);
-        delete this->contentView;
-    }
-
-    if (this->icon)
-        delete this->icon;
-
-    delete this->hint;
-}
-
-void AppletFrame::willAppear(bool resetState)
-{
-    if (this->icon)
-        this->icon->willAppear(resetState);
-
-    if (this->contentView)
-        this->contentView->willAppear(resetState);
-
-    this->hint->willAppear(resetState);
-}
-
-void AppletFrame::willDisappear(bool resetState)
-{
-    if (this->icon)
-        this->icon->willDisappear(resetState);
-
-    if (this->contentView)
-        this->contentView->willDisappear(resetState);
-
-    this->hint->willDisappear(resetState);
-}
-
-void AppletFrame::show(std::function<void(void)> cb, bool animated, ViewAnimation animation)
-{
-    this->animation = animation;
-
-    if (animated && (animation == ViewAnimation::SLIDE_LEFT || animation == ViewAnimation::SLIDE_RIGHT) && this->contentView)
-    {
-        this->slideIn = true;
-
-        this->contentView->show([this]() {
-            this->slideIn = false;
-        },
-            true, animation);
-    }
-    else if (this->contentView && this->contentView->isHidden())
-    {
-        this->contentView->show([]() {}, animated, animation);
-    }
-
-    View::show(cb, animated, animation);
-}
-
-void AppletFrame::hide(std::function<void(void)> cb, bool animated, ViewAnimation animation)
-{
-    this->animation = animation;
-
-    if (animated && (animation == ViewAnimation::SLIDE_LEFT || animation == ViewAnimation::SLIDE_RIGHT) && this->contentView)
-    {
-        this->slideOut = true;
-
-        this->contentView->hide([this, cb]() {
-            this->slideOut = false;
-        },
-            true, animation);
-    }
-    else if (this->contentView && !this->contentView->isHidden())
-    {
-        this->contentView->hide([]() {}, animated, animation);
-    }
-
-    View::hide(cb, animated, animation);
-}
-
-bool AppletFrame::onCancel()
-{
-    /*
-     * TODO: this assumes AppletFrames are used as "activities" in the app, which may be wrong
-     * so we should instead change the view stack to an "activity" stack and have them popped when
-     * the user presses B on the root view of an "activity"
-     */
-    Application::popView();
-    return true;
-}
-
-void AppletFrame::onWindowSizeChanged()
-{
-    if (this->contentView)
-        this->contentView->onWindowSizeChanged();
-
-    if (this->icon)
-        this->icon->onWindowSizeChanged();
-
-    if (this->hint)
-        this->hint->onWindowSizeChanged();
-}
-
-} // namespace brls
diff --git a/Source/sys-clk/manager/lib/borealis/library/lib/application.cpp b/Source/sys-clk/manager/lib/borealis/library/lib/application.cpp
deleted file mode 100644
index be3817a2..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/lib/application.cpp
+++ /dev/null
@@ -1,991 +0,0 @@
-/*
-    Borealis, a Nintendo Switch UI Library
-    Copyright (C) 2019-2020  natinusala
-    Copyright (C) 2019  p-sam
-    Copyright (C) 2020  WerWolv
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#include <algorithm>
-#include <borealis.hpp>
-#include <string>
-
-#define GLFW_INCLUDE_NONE
-#include <GLFW/glfw3.h>
-#include <glad.h>
-
-#define GLM_FORCE_PURE
-#define GLM_ENABLE_EXPERIMENTAL
-#include <nanovg.h>
-
-#include <glm/gtc/matrix_transform.hpp>
-#include <glm/gtc/type_ptr.hpp>
-#include <glm/gtx/rotate_vector.hpp>
-#include <glm/mat4x4.hpp>
-#include <glm/vec3.hpp>
-#include <glm/vec4.hpp>
-#define NANOVG_GL3_IMPLEMENTATION
-#include <nanovg_gl.h>
-
-#ifdef __SWITCH__
-#include <switch.h>
-#endif
-
-#include <chrono>
-#include <set>
-#include <thread>
-
-// Constants used for scaling as well as
-// creating a window of the right size on PC
-constexpr uint32_t WINDOW_WIDTH  = 1280;
-constexpr uint32_t WINDOW_HEIGHT = 720;
-
-#define DEFAULT_FPS 60
-#define BUTTON_REPEAT_DELAY 15
-#define BUTTON_REPEAT_CADENCY 5
-
-// glfw code from the glfw hybrid app by fincs
-// https://github.com/fincs/hybrid_app
-
-namespace brls
-{
-
-// TODO: Use this instead of a glViewport each frame
-static void windowFramebufferSizeCallback(GLFWwindow* window, int width, int height)
-{
-    if (!width || !height)
-        return;
-
-    glViewport(0, 0, width, height);
-    Application::windowScale = (float)width / (float)WINDOW_WIDTH;
-
-    float contentHeight = ((float)height / (Application::windowScale * (float)WINDOW_HEIGHT)) * (float)WINDOW_HEIGHT;
-
-    Application::contentWidth  = WINDOW_WIDTH;
-    Application::contentHeight = (unsigned)roundf(contentHeight);
-
-    Application::resizeNotificationManager();
-
-    Logger::info("Window size changed to %dx%d", width, height);
-    Logger::info("New scale factor is %f", Application::windowScale);
-}
-
-static void joystickCallback(int jid, int event)
-{
-    if (event == GLFW_CONNECTED)
-    {
-        Logger::info("Joystick %d connected", jid);
-        if (glfwJoystickIsGamepad(jid))
-            Logger::info("Joystick %d is gamepad: \"%s\"", jid, glfwGetGamepadName(jid));
-    }
-    else if (event == GLFW_DISCONNECTED)
-        Logger::info("Joystick %d disconnected", jid);
-}
-
-static void errorCallback(int errorCode, const char* description)
-{
-    Logger::error("[GLFW:%d] %s", errorCode, description);
-}
-
-static void windowKeyCallback(GLFWwindow* window, int key, int scancode, int action, int mods)
-{
-    if (action == GLFW_PRESS)
-    {
-        // Check for toggle-fullscreen combo
-        if (key == GLFW_KEY_ENTER && mods == GLFW_MOD_ALT)
-        {
-            static int saved_x, saved_y, saved_width, saved_height;
-
-            if (!glfwGetWindowMonitor(window))
-            {
-                // Back up window position/size
-                glfwGetWindowPos(window, &saved_x, &saved_y);
-                glfwGetWindowSize(window, &saved_width, &saved_height);
-
-                // Switch to fullscreen mode
-                GLFWmonitor* monitor    = glfwGetPrimaryMonitor();
-                const GLFWvidmode* mode = glfwGetVideoMode(monitor);
-                glfwSetWindowMonitor(window, monitor, 0, 0, mode->width, mode->height, mode->refreshRate);
-            }
-            else
-            {
-                // Switch back to windowed mode
-                glfwSetWindowMonitor(window, nullptr, saved_x, saved_y, saved_width, saved_height, GLFW_DONT_CARE);
-            }
-        }
-    }
-}
-
-bool Application::init(std::string title)
-{
-    return Application::init(title, Style::horizon(), Theme::horizon());
-}
-
-bool Application::init(std::string title, Style style, Theme theme)
-{
-    // Init rng
-    std::srand(std::time(nullptr));
-
-    // Init managers
-    Application::taskManager         = new TaskManager();
-    Application::notificationManager = new NotificationManager();
-
-    // Init static variables
-    Application::currentStyle = style;
-    Application::currentFocus = nullptr;
-    Application::oldGamepad   = {};
-    Application::gamepad      = {};
-    Application::title        = title;
-
-    // Init theme to defaults
-    Application::setTheme(theme);
-
-    // Init glfw
-    glfwSetErrorCallback(errorCallback);
-    glfwInitHint(GLFW_JOYSTICK_HAT_BUTTONS, GLFW_FALSE);
-    if (!glfwInit())
-    {
-        Logger::error("Failed to initialize glfw");
-        return false;
-    }
-
-    // Create window
-#ifdef __APPLE__
-    // Explicitly ask for a 3.2 context on OS X
-    glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
-    glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 2);
-    glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GL_TRUE);
-    glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
-    // Force scaling off to keep desired framebuffer size
-    glfwWindowHint(GLFW_COCOA_RETINA_FRAMEBUFFER, GLFW_FALSE);
-#else
-    glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 4);
-    glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 3);
-    glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
-#endif
-
-    Application::window = glfwCreateWindow(WINDOW_WIDTH, WINDOW_HEIGHT, title.c_str(), nullptr, nullptr);
-    if (!window)
-    {
-        Logger::error("glfw: failed to create window\n");
-        glfwTerminate();
-        return false;
-    }
-
-    // Configure window
-    glfwSetInputMode(window, GLFW_STICKY_KEYS, GLFW_TRUE);
-    glfwMakeContextCurrent(window);
-    glfwSetFramebufferSizeCallback(window, windowFramebufferSizeCallback);
-    glfwSetKeyCallback(window, windowKeyCallback);
-    glfwSetJoystickCallback(joystickCallback);
-
-    // Load OpenGL routines using glad
-    gladLoadGLLoader((GLADloadproc)glfwGetProcAddress);
-    glfwSwapInterval(1);
-
-    Logger::info("GL Vendor: %s", glGetString(GL_VENDOR));
-    Logger::info("GL Renderer: %s", glGetString(GL_RENDERER));
-    Logger::info("GL Version: %s", glGetString(GL_VERSION));
-
-    if (glfwJoystickIsGamepad(GLFW_JOYSTICK_1))
-    {
-        GLFWgamepadstate state;
-        Logger::info("Gamepad detected: %s", glfwGetGamepadName(GLFW_JOYSTICK_1));
-        glfwGetGamepadState(GLFW_JOYSTICK_1, &state);
-    }
-
-    // Initialize the scene
-    Application::vg = nvgCreateGL3(NVG_STENCIL_STROKES | NVG_ANTIALIAS);
-    if (!vg)
-    {
-        Logger::error("Unable to init nanovg");
-        glfwTerminate();
-        return false;
-    }
-
-    windowFramebufferSizeCallback(window, WINDOW_WIDTH, WINDOW_HEIGHT);
-    glfwSetTime(0.0);
-
-    // Load fonts
-#ifdef __SWITCH__
-    {
-        PlFontData font;
-
-        // Standard font
-        Result rc = plGetSharedFontByType(&font, PlSharedFontType_Standard);
-        if (R_SUCCEEDED(rc))
-        {
-            Logger::info("Using Switch shared font");
-            Application::fontStash.regular = Application::loadFontFromMemory("regular", font.address, font.size, false);
-        }
-
-        // Korean font
-        rc = plGetSharedFontByType(&font, PlSharedFontType_KO);
-        if (R_SUCCEEDED(rc))
-        {
-            Logger::info("Adding Switch shared Korean font");
-            Application::fontStash.korean = Application::loadFontFromMemory("korean", font.address, font.size, false);
-            nvgAddFallbackFontId(Application::vg, Application::fontStash.regular, Application::fontStash.korean);
-        }
-
-        // Extented font
-        rc = plGetSharedFontByType(&font, PlSharedFontType_NintendoExt);
-        if (R_SUCCEEDED(rc))
-        {
-            Logger::info("Using Switch shared symbols font");
-            Application::fontStash.sharedSymbols = Application::loadFontFromMemory("symbols", font.address, font.size, false);
-        }
-    }
-#else
-    // Use illegal font if available
-    if (access(BOREALIS_ASSET("Illegal-Font.ttf"), F_OK) != -1)
-        Application::fontStash.regular = Application::loadFont("regular", BOREALIS_ASSET("Illegal-Font.ttf"));
-    else
-        Application::fontStash.regular = Application::loadFont("regular", BOREALIS_ASSET("inter/Inter-Switch.ttf"));
-
-    if (access(BOREALIS_ASSET("Wingdings.ttf"), F_OK) != -1)
-        Application::fontStash.sharedSymbols = Application::loadFont("sharedSymbols", BOREALIS_ASSET("Wingdings.ttf"));
-#endif
-
-    // Material font
-    if (access(BOREALIS_ASSET("material/MaterialIcons-Regular.ttf"), F_OK) != -1)
-        Application::fontStash.material = Application::loadFont("material", BOREALIS_ASSET("material/MaterialIcons-Regular.ttf"));
-
-    // Set symbols font as fallback
-    if (Application::fontStash.sharedSymbols)
-    {
-        Logger::info("Using shared symbols font");
-        nvgAddFallbackFontId(Application::vg, Application::fontStash.regular, Application::fontStash.sharedSymbols);
-    }
-    else
-    {
-        Logger::error("Shared symbols font not found");
-    }
-
-    // Set Material as fallback
-    if (Application::fontStash.material)
-    {
-        Logger::info("Using Material font");
-        nvgAddFallbackFontId(Application::vg, Application::fontStash.regular, Application::fontStash.material);
-    }
-    else
-    {
-        Logger::error("Material font not found");
-    }
-
-    // Load theme
-#ifdef __SWITCH__
-    ColorSetId nxTheme;
-    setsysGetColorSetId(&nxTheme);
-
-    if (nxTheme == ColorSetId_Dark)
-        Application::currentThemeVariant = ThemeVariant_DARK;
-    else
-        Application::currentThemeVariant = ThemeVariant_LIGHT;
-#else
-    char* themeEnv = getenv("BOREALIS_THEME");
-    if (themeEnv != nullptr && !strcasecmp(themeEnv, "DARK"))
-        Application::currentThemeVariant = ThemeVariant_DARK;
-    else
-        Application::currentThemeVariant = ThemeVariant_LIGHT;
-#endif
-
-    // Init window size
-    GLint viewport[4];
-    glGetIntegerv(GL_VIEWPORT, viewport);
-
-    Application::windowWidth  = viewport[2];
-    Application::windowHeight = viewport[3];
-
-    // Init animations engine
-    menu_animation_init();
-
-    // Default FPS cap
-    Application::setMaximumFPS(DEFAULT_FPS);
-
-    return true;
-}
-
-bool Application::mainLoop()
-{
-    // Frame start
-    retro_time_t frameStart = 0;
-    if (Application::frameTime > 0.0f)
-        frameStart = cpu_features_get_time_usec();
-
-    // glfw events
-    bool is_active;
-    do
-    {
-        is_active = !glfwGetWindowAttrib(Application::window, GLFW_ICONIFIED);
-        if (is_active)
-            glfwPollEvents();
-        else
-            glfwWaitEvents();
-
-        if (glfwWindowShouldClose(Application::window))
-        {
-            Application::exit();
-            return false;
-        }
-    } while (!is_active);
-
-    // libnx applet main loop
-#ifdef __SWITCH__
-    if (!appletMainLoop())
-    {
-        Application::exit();
-        return false;
-    }
-#endif
-
-    // Gamepad
-    if (!glfwGetGamepadState(GLFW_JOYSTICK_1, &Application::gamepad))
-    {
-        // Keyboard -> DPAD Mapping
-        Application::gamepad.buttons[GLFW_GAMEPAD_BUTTON_DPAD_LEFT]    = glfwGetKey(window, GLFW_KEY_LEFT);
-        Application::gamepad.buttons[GLFW_GAMEPAD_BUTTON_DPAD_RIGHT]   = glfwGetKey(window, GLFW_KEY_RIGHT);
-        Application::gamepad.buttons[GLFW_GAMEPAD_BUTTON_DPAD_UP]      = glfwGetKey(window, GLFW_KEY_UP);
-        Application::gamepad.buttons[GLFW_GAMEPAD_BUTTON_DPAD_DOWN]    = glfwGetKey(window, GLFW_KEY_DOWN);
-        Application::gamepad.buttons[GLFW_GAMEPAD_BUTTON_START]        = glfwGetKey(window, GLFW_KEY_ESCAPE);
-        Application::gamepad.buttons[GLFW_GAMEPAD_BUTTON_BACK]         = glfwGetKey(window, GLFW_KEY_F1);
-        Application::gamepad.buttons[GLFW_GAMEPAD_BUTTON_A]            = glfwGetKey(window, GLFW_KEY_ENTER);
-        Application::gamepad.buttons[GLFW_GAMEPAD_BUTTON_B]            = glfwGetKey(window, GLFW_KEY_BACKSPACE);
-        Application::gamepad.buttons[GLFW_GAMEPAD_BUTTON_LEFT_BUMPER]  = glfwGetKey(window, GLFW_KEY_L);
-        Application::gamepad.buttons[GLFW_GAMEPAD_BUTTON_RIGHT_BUMPER] = glfwGetKey(window, GLFW_KEY_R);
-    }
-
-    // Trigger gamepad events
-    // TODO: Translate axis events to dpad events here
-
-    bool anyButtonPressed               = false;
-    bool repeating                      = false;
-    static retro_time_t buttonPressTime = 0;
-    static int repeatingButtonTimer     = 0;
-
-    for (int i = GLFW_GAMEPAD_BUTTON_A; i <= GLFW_GAMEPAD_BUTTON_LAST; i++)
-    {
-        if (Application::gamepad.buttons[i] == GLFW_PRESS)
-        {
-            anyButtonPressed = true;
-            repeating        = (repeatingButtonTimer > BUTTON_REPEAT_DELAY && repeatingButtonTimer % BUTTON_REPEAT_CADENCY == 0);
-
-            if (Application::oldGamepad.buttons[i] != GLFW_PRESS || repeating)
-                Application::onGamepadButtonPressed(i, repeating);
-        }
-
-        if (Application::gamepad.buttons[i] != Application::oldGamepad.buttons[i])
-            buttonPressTime = repeatingButtonTimer = 0;
-    }
-
-    if (anyButtonPressed && cpu_features_get_time_usec() - buttonPressTime > 1000)
-    {
-        buttonPressTime = cpu_features_get_time_usec();
-        repeatingButtonTimer++; // Increased once every ~1ms
-    }
-
-    Application::oldGamepad = Application::gamepad;
-
-    // Handle window size changes
-    GLint viewport[4];
-    glGetIntegerv(GL_VIEWPORT, viewport);
-
-    unsigned newWidth  = viewport[2];
-    unsigned newHeight = viewport[3];
-
-    if (Application::windowWidth != newWidth || Application::windowHeight != newHeight)
-    {
-        Application::windowWidth  = newWidth;
-        Application::windowHeight = newHeight;
-        Application::onWindowSizeChanged();
-    }
-
-    // Animations
-    menu_animation_update();
-
-    // Tasks
-    Application::taskManager->frame();
-
-    // Render
-    Application::frame();
-    glfwSwapBuffers(window);
-
-    // Sleep if necessary
-    if (Application::frameTime > 0.0f)
-    {
-        retro_time_t currentFrameTime = cpu_features_get_time_usec() - frameStart;
-        retro_time_t frameTime        = (retro_time_t)(Application::frameTime * 1000);
-
-        if (frameTime > currentFrameTime)
-        {
-            retro_time_t toSleep = frameTime - currentFrameTime;
-            std::this_thread::sleep_for(std::chrono::microseconds(toSleep));
-        }
-    }
-
-    return true;
-}
-
-void Application::quit()
-{
-    glfwSetWindowShouldClose(window, GLFW_TRUE);
-}
-
-void Application::navigate(FocusDirection direction)
-{
-    View* currentFocus = Application::currentFocus;
-
-    // Do nothing if there is no current focus or if it doesn't have a parent
-    // (in which case there is nothing to traverse)
-    if (!currentFocus || !currentFocus->hasParent())
-        return;
-
-    // Get next view to focus by traversing the views tree upwards
-    View* nextFocus = currentFocus->getParent()->getNextFocus(direction, currentFocus->getParentUserData());
-
-    while (!nextFocus) // stop when we find a view to focus
-    {
-        if (!currentFocus->hasParent() || !currentFocus->getParent()->hasParent()) // stop when we reach the root of the tree
-            break;
-
-        currentFocus = currentFocus->getParent();
-        nextFocus    = currentFocus->getParent()->getNextFocus(direction, currentFocus->getParentUserData());
-    }
-
-    // No view to focus at the end of the traversal: wiggle and return
-    if (!nextFocus)
-    {
-        Application::currentFocus->shakeHighlight(direction);
-        return;
-    }
-
-    // Otherwise give it focus
-    Application::giveFocus(nextFocus);
-}
-
-void Application::onGamepadButtonPressed(char button, bool repeating)
-{
-    if (Application::blockInputsTokens != 0)
-        return;
-
-    if (repeating && Application::repetitionOldFocus == Application::currentFocus)
-        return;
-
-    Application::repetitionOldFocus = Application::currentFocus;
-
-    // Actions
-    if (Application::handleAction(button))
-        return;
-
-    // Navigation
-    // Only navigate if the button hasn't been consumed by an action
-    // (allows overriding DPAD buttons using actions)
-    switch (button)
-    {
-        case GLFW_GAMEPAD_BUTTON_DPAD_DOWN:
-            Application::navigate(FocusDirection::DOWN);
-            break;
-        case GLFW_GAMEPAD_BUTTON_DPAD_UP:
-            Application::navigate(FocusDirection::UP);
-            break;
-        case GLFW_GAMEPAD_BUTTON_DPAD_LEFT:
-            Application::navigate(FocusDirection::LEFT);
-            break;
-        case GLFW_GAMEPAD_BUTTON_DPAD_RIGHT:
-            Application::navigate(FocusDirection::RIGHT);
-            break;
-        default:
-            break;
-    }
-}
-
-View* Application::getCurrentFocus()
-{
-    return Application::currentFocus;
-}
-
-bool Application::handleAction(char button)
-{
-    View* hintParent = Application::currentFocus;
-    std::set<Key> consumedKeys;
-
-    while (hintParent != nullptr)
-    {
-        for (auto& action : hintParent->getActions())
-        {
-            if (action.key != static_cast<Key>(button))
-                continue;
-
-            if (consumedKeys.find(action.key) != consumedKeys.end())
-                continue;
-
-            if (action.available)
-                if (action.actionListener())
-                    consumedKeys.insert(action.key);
-        }
-
-        hintParent = hintParent->getParent();
-    }
-
-    return !consumedKeys.empty();
-}
-
-void Application::frame()
-{
-    // Frame context
-    FrameContext frameContext = FrameContext();
-
-    frameContext.pixelRatio = (float)Application::windowWidth / (float)Application::windowHeight;
-    frameContext.vg         = Application::vg;
-    frameContext.fontStash  = &Application::fontStash;
-    frameContext.theme      = Application::getThemeValues();
-
-    nvgBeginFrame(Application::vg, Application::windowWidth, Application::windowHeight, frameContext.pixelRatio);
-    nvgScale(Application::vg, Application::windowScale, Application::windowScale);
-
-    // GL Clear
-    glClearColor(
-        frameContext.theme->backgroundColor[0],
-        frameContext.theme->backgroundColor[1],
-        frameContext.theme->backgroundColor[2],
-        1.0f);
-
-    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
-
-    std::vector<View*> viewsToDraw;
-
-    // Draw all views in the stack
-    // until we find one that's not translucent
-    for (size_t i = 0; i < Application::viewStack.size(); i++)
-    {
-        View* view = Application::viewStack[Application::viewStack.size() - 1 - i];
-        viewsToDraw.push_back(view);
-
-        if (!view->isTranslucent())
-            break;
-    }
-
-    for (size_t i = 0; i < viewsToDraw.size(); i++)
-    {
-        View* view = viewsToDraw[viewsToDraw.size() - 1 - i];
-        view->frame(&frameContext);
-    }
-
-    // Framerate counter
-    if (Application::framerateCounter)
-        Application::framerateCounter->frame(&frameContext);
-
-    // Notifications
-    Application::notificationManager->frame(&frameContext);
-
-    // End frame
-    nvgResetTransform(Application::vg); // scale
-    nvgEndFrame(Application::vg);
-}
-
-void Application::exit()
-{
-    Application::clear();
-
-    if (Application::vg)
-        nvgDeleteGL3(Application::vg);
-
-    glfwTerminate();
-
-    menu_animation_free();
-
-    if (Application::framerateCounter)
-        delete Application::framerateCounter;
-
-    delete Application::taskManager;
-    delete Application::notificationManager;
-}
-
-void Application::setDisplayFramerate(bool enabled)
-{
-    if (!Application::framerateCounter && enabled)
-    {
-        Logger::info("Enabling framerate counter");
-        Application::framerateCounter = new FramerateCounter();
-        Application::resizeFramerateCounter();
-    }
-    else if (Application::framerateCounter && !enabled)
-    {
-        Logger::info("Disabling framerate counter");
-        delete Application::framerateCounter;
-        Application::framerateCounter = nullptr;
-    }
-}
-
-void Application::toggleFramerateDisplay()
-{
-    Application::setDisplayFramerate(!Application::framerateCounter);
-}
-
-void Application::resizeFramerateCounter()
-{
-    if (!Application::framerateCounter)
-        return;
-
-    Style* style                   = Application::getStyle();
-    unsigned framerateCounterWidth = style->FramerateCounter.width;
-    unsigned width                 = WINDOW_WIDTH;
-
-    Application::framerateCounter->setBoundaries(
-        width - framerateCounterWidth,
-        0,
-        framerateCounterWidth,
-        style->FramerateCounter.height);
-    Application::framerateCounter->invalidate();
-}
-
-void Application::resizeNotificationManager()
-{
-    Application::notificationManager->setBoundaries(0, 0, Application::contentWidth, Application::contentHeight);
-    Application::notificationManager->invalidate();
-}
-
-void Application::notify(std::string text)
-{
-    Application::notificationManager->notify(text);
-}
-
-NotificationManager* Application::getNotificationManager()
-{
-    return Application::notificationManager;
-}
-
-void Application::giveFocus(View* view)
-{
-    View* oldFocus = Application::currentFocus;
-    View* newFocus = view ? view->getDefaultFocus() : nullptr;
-
-    if (oldFocus != newFocus)
-    {
-        if (oldFocus)
-            oldFocus->onFocusLost();
-
-        Application::currentFocus = newFocus;
-        Application::globalFocusChangeEvent.fire(newFocus);
-
-        if (newFocus)
-        {
-            newFocus->onFocusGained();
-            Logger::debug("Giving focus to %s", newFocus->describe().c_str());
-        }
-    }
-}
-
-void Application::popView(ViewAnimation animation, std::function<void(void)> cb)
-{
-    if (Application::viewStack.size() <= 1) // never pop the root view
-        return;
-
-    Application::blockInputs();
-
-    View* last = Application::viewStack[Application::viewStack.size() - 1];
-    last->willDisappear(true);
-
-    last->setForceTranslucent(true);
-
-    bool wait = animation == ViewAnimation::FADE; // wait for the new view animation to be done before showing the old one?
-
-    // Hide animation (and show previous view, if any)
-    last->hide([last, animation, wait, cb]() {
-        last->setForceTranslucent(false);
-        Application::viewStack.pop_back();
-        delete last;
-
-        // Animate the old view once the new one
-        // has ended its animation
-        if (Application::viewStack.size() > 0 && wait)
-        {
-            View* newLast = Application::viewStack[Application::viewStack.size() - 1];
-
-            if (newLast->isHidden())
-            {
-                newLast->willAppear(false);
-                newLast->show(cb, true, animation);
-            }
-            else
-            {
-                cb();
-            }
-        }
-
-        Application::unblockInputs();
-    },
-        true, animation);
-
-    // Animate the old view immediately
-    if (!wait && Application::viewStack.size() > 1)
-    {
-        View* toShow = Application::viewStack[Application::viewStack.size() - 2];
-        toShow->willAppear(false);
-        toShow->show(cb, true, animation);
-    }
-
-    // Focus
-    if (Application::focusStack.size() > 0)
-    {
-        View* newFocus = Application::focusStack[Application::focusStack.size() - 1];
-
-        Logger::debug("Giving focus to %s, and removing it from the focus stack", newFocus->describe().c_str());
-
-        Application::giveFocus(newFocus);
-        Application::focusStack.pop_back();
-    }
-}
-
-void Application::pushView(View* view, ViewAnimation animation)
-{
-    Application::blockInputs();
-
-    // Call hide() on the previous view in the stack if no
-    // views are translucent, then call show() once the animation ends
-    View* last = nullptr;
-    if (Application::viewStack.size() > 0)
-        last = Application::viewStack[Application::viewStack.size() - 1];
-
-    bool fadeOut = last && !last->isTranslucent() && !view->isTranslucent(); // play the fade out animation?
-    bool wait    = animation == ViewAnimation::FADE; // wait for the old view animation to be done before showing the new one?
-
-    view->registerAction("Exit", Key::PLUS, [] { Application::quit(); return true; });
-    view->registerAction(
-        "FPS", Key::MINUS, [] { Application::toggleFramerateDisplay(); return true; }, true);
-
-    // Fade out animation
-    if (fadeOut)
-    {
-        view->setForceTranslucent(true); // set the new view translucent until the fade out animation is done playing
-
-        // Animate the new view directly
-        if (!wait)
-        {
-            view->show([]() {
-                Application::unblockInputs();
-            },
-                true, animation);
-        }
-
-        last->hide([animation, wait]() {
-            View* newLast = Application::viewStack[Application::viewStack.size() - 1];
-            newLast->setForceTranslucent(false);
-
-            // Animate the new view once the old one
-            // has ended its animation
-            if (wait)
-                newLast->show([]() { Application::unblockInputs(); }, true, animation);
-        },
-            true, animation);
-    }
-
-    view->setBoundaries(0, 0, Application::contentWidth, Application::contentHeight);
-
-    if (!fadeOut)
-        view->show([]() { Application::unblockInputs(); }, true, animation);
-    else
-        view->alpha = 0.0f;
-
-    // Focus
-    if (Application::viewStack.size() > 0)
-    {
-        Logger::debug("Pushing %s to the focus stack", Application::currentFocus->describe().c_str());
-        Application::focusStack.push_back(Application::currentFocus);
-    }
-
-    // Layout and prepare view
-    view->invalidate(true);
-    view->willAppear(true);
-    Application::giveFocus(view->getDefaultFocus());
-
-    // And push it
-    Application::viewStack.push_back(view);
-}
-
-void Application::onWindowSizeChanged()
-{
-    Logger::debug("Layout triggered");
-
-    for (View* view : Application::viewStack)
-    {
-        view->setBoundaries(0, 0, Application::contentWidth, Application::contentHeight);
-        view->invalidate();
-
-        view->onWindowSizeChanged();
-    }
-
-    Application::resizeNotificationManager();
-    Application::resizeFramerateCounter();
-}
-
-void Application::clear()
-{
-    for (View* view : Application::viewStack)
-    {
-        view->willDisappear(true);
-        delete view;
-    }
-
-    Application::viewStack.clear();
-}
-
-Style* Application::getStyle()
-{
-    return &Application::currentStyle;
-}
-
-void Application::setTheme(Theme theme)
-{
-    Application::currentTheme = theme;
-}
-
-ThemeValues* Application::getThemeValues()
-{
-    return &Application::currentTheme.colors[Application::currentThemeVariant];
-}
-
-ThemeValues* Application::getThemeValuesForVariant(ThemeVariant variant)
-{
-    return &Application::currentTheme.colors[variant];
-}
-
-ThemeVariant Application::getThemeVariant()
-{
-    return Application::currentThemeVariant;
-}
-
-int Application::loadFont(const char* fontName, const char* filePath)
-{
-    return nvgCreateFont(Application::vg, fontName, filePath);
-}
-
-int Application::loadFontFromMemory(const char* fontName, void* address, size_t size, bool freeData)
-{
-    return nvgCreateFontMem(Application::vg, fontName, (unsigned char*)address, size, freeData);
-}
-
-int Application::findFont(const char* fontName)
-{
-    return nvgFindFont(Application::vg, fontName);
-}
-
-void Application::crash(std::string text)
-{
-    CrashFrame* crashFrame = new CrashFrame(text);
-    Application::pushView(crashFrame);
-}
-
-void Application::blockInputs()
-{
-    Application::blockInputsTokens += 1;
-}
-
-void Application::unblockInputs()
-{
-    if (Application::blockInputsTokens > 0)
-        Application::blockInputsTokens -= 1;
-}
-
-NVGcontext* Application::getNVGContext()
-{
-    return Application::vg;
-}
-
-TaskManager* Application::getTaskManager()
-{
-    return Application::taskManager;
-}
-
-void Application::setCommonFooter(std::string footer)
-{
-    Application::commonFooter = footer;
-}
-
-std::string* Application::getCommonFooter()
-{
-    return &Application::commonFooter;
-}
-
-FramerateCounter::FramerateCounter()
-    : Label(LabelStyle::LIST_ITEM, "FPS: ---")
-{
-    this->setColor(nvgRGB(255, 255, 255));
-    this->setVerticalAlign(NVG_ALIGN_MIDDLE);
-    this->setHorizontalAlign(NVG_ALIGN_RIGHT);
-    this->setBackground(Background::BACKDROP);
-
-    this->lastSecond = cpu_features_get_time_usec() / 1000;
-}
-
-void FramerateCounter::frame(FrameContext* ctx)
-{
-    // Update counter
-    retro_time_t current = cpu_features_get_time_usec() / 1000;
-
-    if (current - this->lastSecond >= 1000)
-    {
-        char fps[10];
-        snprintf(fps, sizeof(fps), "FPS: %03d", this->frames);
-        this->setText(std::string(fps));
-        this->invalidate(); // update width for background
-
-        this->frames     = 0;
-        this->lastSecond = current;
-    }
-
-    this->frames++;
-
-    // Regular frame
-    Label::frame(ctx);
-}
-
-void Application::setMaximumFPS(unsigned fps)
-{
-    if (fps == 0)
-        Application::frameTime = 0.0f;
-    else
-    {
-        Application::frameTime = 1000 / (float)fps;
-    }
-
-    Logger::info("Maximum FPS set to %d - using a frame time of %.2f ms", fps, Application::frameTime);
-}
-
-std::string Application::getTitle()
-{
-    return Application::title;
-}
-
-GenericEvent* Application::getGlobalFocusChangeEvent()
-{
-    return &Application::globalFocusChangeEvent;
-}
-
-VoidEvent* Application::getGlobalHintsUpdateEvent()
-{
-    return &Application::globalHintsUpdateEvent;
-}
-
-FontStash* Application::getFontStash()
-{
-    return &Application::fontStash;
-}
-
-} // namespace brls
diff --git a/Source/sys-clk/manager/lib/borealis/library/lib/box_layout.cpp b/Source/sys-clk/manager/lib/borealis/library/lib/box_layout.cpp
deleted file mode 100644
index 3655e022..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/lib/box_layout.cpp
+++ /dev/null
@@ -1,376 +0,0 @@
-/*
-    Borealis, a Nintendo Switch UI Library
-    Copyright (C) 2019  natinusala
-    Copyright (C) 2019  WerWolv
-    Copyright (C) 2019  p-sam
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include <math.h>
-#include <stdio.h>
-
-#include <borealis/animations.hpp>
-#include <borealis/application.hpp>
-#include <borealis/box_layout.hpp>
-#include <borealis/logger.hpp>
-#include <iterator>
-
-namespace brls
-{
-
-BoxLayout::BoxLayout(BoxLayoutOrientation orientation, size_t defaultFocus)
-    : orientation(orientation)
-    , originalDefaultFocus(defaultFocus)
-    , defaultFocusedIndex(defaultFocus)
-{
-}
-
-void BoxLayout::draw(NVGcontext* vg, int x, int y, unsigned width, unsigned height, Style* style, FrameContext* ctx)
-{
-    // Draw children
-    for (BoxLayoutChild* child : this->children)
-        child->view->frame(ctx);
-}
-
-void BoxLayout::setGravity(BoxLayoutGravity gravity)
-{
-    this->gravity = gravity;
-    this->invalidate();
-}
-
-void BoxLayout::setSpacing(unsigned spacing)
-{
-    this->spacing = spacing;
-    this->invalidate();
-}
-
-unsigned BoxLayout::getSpacing()
-{
-    return this->spacing;
-}
-
-void BoxLayout::setMargins(unsigned top, unsigned right, unsigned bottom, unsigned left)
-{
-    this->marginBottom = bottom;
-    this->marginLeft   = left;
-    this->marginRight  = right;
-    this->marginTop    = top;
-    this->invalidate();
-}
-
-void BoxLayout::setMarginBottom(unsigned bottom)
-{
-    this->marginBottom = bottom;
-    this->invalidate();
-}
-
-size_t BoxLayout::getViewsCount()
-{
-    return this->children.size();
-}
-
-View* BoxLayout::getDefaultFocus()
-{
-    // Focus default focus first
-    if (this->defaultFocusedIndex < this->children.size())
-    {
-        View* newFocus = this->children[this->defaultFocusedIndex]->view->getDefaultFocus();
-
-        if (newFocus)
-            return newFocus;
-    }
-
-    // Fallback to finding the first focusable view
-    for (size_t i = 0; i < this->children.size(); i++)
-    {
-        View* newFocus = this->children[i]->view->getDefaultFocus();
-
-        if (newFocus)
-            return newFocus;
-    }
-
-    return nullptr;
-}
-
-View* BoxLayout::getNextFocus(FocusDirection direction, void* parentUserData)
-{
-    // Return nullptr immediately if focus direction mismatches the layout direction
-    if ((this->orientation == BoxLayoutOrientation::HORIZONTAL && direction != FocusDirection::LEFT && direction != FocusDirection::RIGHT) || (this->orientation == BoxLayoutOrientation::VERTICAL && direction != FocusDirection::UP && direction != FocusDirection::DOWN))
-    {
-        return nullptr;
-    }
-
-    // Traverse the children
-    size_t offset = 1; // which way are we going in the children list
-
-    if ((this->orientation == BoxLayoutOrientation::HORIZONTAL && direction == FocusDirection::LEFT) || (this->orientation == BoxLayoutOrientation::VERTICAL && direction == FocusDirection::UP))
-    {
-        offset = -1;
-    }
-
-    size_t currentFocusIndex = *((size_t*)parentUserData) + offset;
-    View* currentFocus       = nullptr;
-
-    while (!currentFocus && currentFocusIndex >= 0 && currentFocusIndex < this->children.size())
-    {
-        currentFocus = this->children[currentFocusIndex]->view->getDefaultFocus();
-        currentFocusIndex += offset;
-    }
-
-    return currentFocus;
-}
-
-void BoxLayout::removeView(int index, bool free)
-{
-    BoxLayoutChild* toRemove = this->children[index];
-    toRemove->view->willDisappear(true);
-    if (free)
-        delete toRemove->view;
-    delete toRemove;
-    this->children.erase(this->children.begin() + index);
-}
-
-void BoxLayout::clear(bool free)
-{
-    while (!this->children.empty())
-        this->removeView(0, free);
-}
-
-void BoxLayout::layout(NVGcontext* vg, Style* style, FontStash* stash)
-{
-    // Vertical orientation
-    if (this->orientation == BoxLayoutOrientation::VERTICAL)
-    {
-        unsigned entriesHeight = 0;
-        int yAdvance           = this->y + this->marginTop;
-
-        for (size_t i = 0; i < this->children.size(); i++)
-        {
-            BoxLayoutChild* child = this->children[i];
-            unsigned childHeight  = child->view->getHeight();
-
-            if (child->fill)
-                child->view->setBoundaries(this->x + this->marginLeft,
-                    yAdvance,
-                    this->width - this->marginLeft - this->marginRight,
-                    this->y + this->height - yAdvance - this->marginBottom);
-            else
-                child->view->setBoundaries(this->x + this->marginLeft,
-                    yAdvance,
-                    this->width - this->marginLeft - this->marginRight,
-                    child->view->getHeight(false));
-
-            child->view->invalidate(true); // call layout directly in case height is updated
-            childHeight = child->view->getHeight();
-
-            int spacing = (int)this->spacing;
-            View* next  = (this->children.size() > 1 && i <= this->children.size() - 2) ? this->children[i + 1]->view : nullptr;
-
-            this->customSpacing(child->view, next, &spacing);
-
-            if (child->view->isCollapsed())
-                spacing = 0;
-
-            if (!child->view->isHidden())
-                entriesHeight += spacing + childHeight;
-
-            yAdvance += spacing + childHeight;
-        }
-
-        // TODO: apply gravity
-
-        // Update height if needed
-        if (this->resize)
-            this->setHeight(entriesHeight - spacing + this->marginTop + this->marginBottom);
-    }
-    // Horizontal orientation
-    else if (this->orientation == BoxLayoutOrientation::HORIZONTAL)
-    {
-        // Layout
-        int xAdvance = this->x + this->marginLeft;
-        for (size_t i = 0; i < this->children.size(); i++)
-        {
-            BoxLayoutChild* child = this->children[i];
-            unsigned childWidth   = child->view->getWidth();
-
-            if (child->fill)
-                child->view->setBoundaries(xAdvance,
-                    this->y + this->marginTop,
-                    this->x + this->width - xAdvance - this->marginRight,
-                    this->height - this->marginTop - this->marginBottom);
-            else
-                child->view->setBoundaries(xAdvance,
-                    this->y + this->marginTop,
-                    childWidth,
-                    this->height - this->marginTop - this->marginBottom);
-
-            child->view->invalidate(true); // call layout directly in case width is updated
-            childWidth = child->view->getWidth();
-
-            int spacing = (int)this->spacing;
-
-            View* next = (this->children.size() > 1 && i <= this->children.size() - 2) ? this->children[i + 1]->view : nullptr;
-
-            this->customSpacing(child->view, next, &spacing);
-
-            if (child->view->isCollapsed())
-                spacing = 0;
-
-            xAdvance += spacing + childWidth;
-        }
-
-        // Apply gravity
-        // TODO: more efficient gravity implementation?
-        if (!this->children.empty())
-        {
-            switch (this->gravity)
-            {
-                case BoxLayoutGravity::RIGHT:
-                {
-                    // Take the remaining empty space between the last view's
-                    // right boundary and ours and push all views by this amount
-                    View* lastView = this->children[this->children.size() - 1]->view;
-
-                    unsigned lastViewRight = lastView->getX() + lastView->getWidth();
-                    unsigned ourRight      = this->getX() + this->getWidth();
-
-                    if (lastViewRight <= ourRight)
-                    {
-                        unsigned difference = ourRight - lastViewRight;
-
-                        for (BoxLayoutChild* child : this->children)
-                        {
-                            View* view = child->view;
-                            view->setBoundaries(
-                                view->getX() + difference,
-                                view->getY(),
-                                view->getWidth(),
-                                view->getHeight());
-                            view->invalidate();
-                        }
-                    }
-
-                    break;
-                }
-                default:
-                    break;
-            }
-        }
-
-        // TODO: update width if needed (introduce entriesWidth)
-    }
-}
-
-void BoxLayout::setResize(bool resize)
-{
-    this->resize = resize;
-    this->invalidate();
-}
-
-void BoxLayout::addView(View* view, bool fill, bool resetState)
-{
-    BoxLayoutChild* child = new BoxLayoutChild();
-    child->view           = view;
-    child->fill           = fill;
-
-    this->children.push_back(child);
-
-    size_t position = this->children.size() - 1;
-
-    size_t* userdata = (size_t*)malloc(sizeof(size_t));
-    *userdata        = position;
-
-    view->setParent(this, userdata);
-
-    view->willAppear(resetState);
-    this->invalidate();
-}
-
-View* BoxLayout::getChild(size_t index)
-{
-    return this->children[index]->view;
-}
-
-bool BoxLayout::isEmpty()
-{
-    return this->children.size() == 0;
-}
-
-bool BoxLayout::isChildFocused()
-{
-    return this->childFocused;
-}
-
-void BoxLayout::onChildFocusGained(View* child)
-{
-    this->childFocused = true;
-
-    // Remember focus if needed
-    if (this->rememberFocus)
-    {
-        size_t index              = *((size_t*)child->getParentUserData());
-        this->defaultFocusedIndex = index;
-    }
-
-    View::onChildFocusGained(child);
-}
-
-void BoxLayout::onChildFocusLost(View* child)
-{
-    this->childFocused = false;
-
-    View::onChildFocusLost(child);
-}
-
-BoxLayout::~BoxLayout()
-{
-    for (BoxLayoutChild* child : this->children)
-    {
-        child->view->willDisappear(true);
-        delete child->view;
-        delete child;
-    }
-
-    this->children.clear();
-}
-
-void BoxLayout::willAppear(bool resetState)
-{
-    for (BoxLayoutChild* child : this->children)
-        child->view->willAppear(resetState);
-}
-
-void BoxLayout::willDisappear(bool resetState)
-{
-    for (BoxLayoutChild* child : this->children)
-        child->view->willDisappear(resetState);
-
-    // Reset default focus to original one if needed
-    if (this->rememberFocus)
-        this->defaultFocusedIndex = this->originalDefaultFocus;
-}
-
-void BoxLayout::onWindowSizeChanged()
-{
-    for (BoxLayoutChild* child : this->children)
-        child->view->onWindowSizeChanged();
-}
-
-void BoxLayout::setRememberFocus(bool remember)
-{
-    this->rememberFocus = remember;
-}
-
-} // namespace brls
diff --git a/Source/sys-clk/manager/lib/borealis/library/lib/button.cpp b/Source/sys-clk/manager/lib/borealis/library/lib/button.cpp
deleted file mode 100644
index 26b63854..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/lib/button.cpp
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
-    Borealis, a Nintendo Switch UI Library
-    Copyright (C) 2019-2020  natinusala
-    Copyright (C) 2019  p-sam
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include <math.h>
-
-#include <borealis/application.hpp>
-#include <borealis/button.hpp>
-
-namespace brls
-{
-
-Button::Button(ButtonStyle style)
-    : style(style)
-{
-    this->registerAction("OK", Key::A, [this] { return this->onClick(); });
-}
-
-LabelStyle Button::getLabelStyle()
-{
-    if (this->style == ButtonStyle::BORDERLESS)
-        return LabelStyle::BUTTON_BORDERLESS;
-    else if (this->style == ButtonStyle::DIALOG)
-        return LabelStyle::BUTTON_DIALOG;
-    else if (this->style == ButtonStyle::CRASH)
-        return LabelStyle::CRASH;
-
-    if (this->state == ButtonState::DISABLED)
-        return LabelStyle::BUTTON_PLAIN_DISABLED;
-    else
-        return LabelStyle::BUTTON_PLAIN;
-}
-
-Button::~Button()
-{
-    if (this->label != nullptr)
-        delete this->label;
-    if (this->image != nullptr)
-        delete this->image;
-}
-
-void Button::layout(NVGcontext* vg, Style* style, FontStash* stash)
-{
-    unsigned imageWidth  = this->label ? this->getHeight() : this->getWidth();
-    unsigned imageHeight = this->getHeight();
-
-    if (!this->image)
-        imageWidth = 0;
-
-    if (this->label != nullptr)
-    {
-        this->label->setWidth(this->getWidth() - imageWidth);
-        this->label->invalidate(true);
-        this->label->setBoundaries(
-            this->x + imageWidth,
-            this->y + this->getHeight() / 2 - this->label->getHeight() / 2,
-            this->label->getWidth(),
-            this->label->getHeight());
-        this->label->invalidate();
-    }
-    if (this->image != nullptr)
-    {
-        this->image->setHeight(imageHeight);
-        this->image->setWidth(imageWidth);
-        this->image->invalidate(true);
-        this->image->setBoundaries(
-            this->x,
-            this->y + this->getHeight() / 2 - this->image->getHeight() / 2,
-            this->image->getWidth(),
-            this->image->getHeight());
-    }
-}
-
-Button* Button::setLabel(std::string label)
-{
-    if (this->label != nullptr)
-        delete this->label;
-
-    this->label = new Label(this->getLabelStyle(), label, true);
-    this->label->setHorizontalAlign(NVG_ALIGN_CENTER);
-    this->label->setParent(this);
-
-    return this;
-}
-
-Button* Button::setImage(std::string path)
-{
-    this->image = new Image(path);
-    this->image->setParent(this);
-    return this;
-}
-
-Button* Button::setImage(unsigned char* buffer, size_t bufferSize)
-{
-    this->image = new Image(buffer, bufferSize);
-    this->image->setParent(this);
-    return this;
-}
-
-void Button::setState(ButtonState state)
-{
-    this->state = state;
-    if (this->label != nullptr)
-        this->label->setStyle(this->getLabelStyle());
-}
-
-ButtonState Button::getState()
-{
-    return this->state;
-}
-
-void Button::getHighlightInsets(unsigned* top, unsigned* right, unsigned* bottom, unsigned* left)
-{
-    if (this->style == ButtonStyle::DIALOG)
-    {
-        View::getHighlightInsets(top, right, bottom, left);
-        *right -= 1;
-        return;
-    }
-
-    Style* style = Application::getStyle();
-    *top         = style->Button.highlightInset;
-    *right       = style->Button.highlightInset;
-    *bottom      = style->Button.highlightInset;
-    *left        = style->Button.highlightInset;
-}
-
-void Button::draw(NVGcontext* vg, int x, int y, unsigned width, unsigned height, Style* style, FrameContext* ctx)
-{
-    float cornerRadius = this->cornerRadiusOverride ? this->cornerRadiusOverride : (float)style->Button.cornerRadius;
-
-    // Background
-    switch (this->style)
-    {
-        case ButtonStyle::PLAIN:
-        {
-            nvgFillColor(vg, a(this->state == ButtonState::DISABLED ? ctx->theme->buttonPlainDisabledBackgroundColor : ctx->theme->buttonPlainEnabledBackgroundColor));
-            nvgBeginPath(vg);
-            nvgRoundedRect(vg, x, y, width, height, cornerRadius);
-            nvgFill(vg);
-            break;
-        }
-        default:
-            break;
-    }
-
-    // Shadow
-    if (this->state == ButtonState::ENABLED && this->style == ButtonStyle::PLAIN)
-    {
-        float shadowWidth   = style->Button.shadowWidth;
-        float shadowFeather = style->Button.shadowFeather;
-        float shadowOpacity = style->Button.shadowOpacity;
-        float shadowOffset  = style->Button.shadowOffset;
-
-        NVGpaint shadowPaint = nvgBoxGradient(vg,
-            x, y + shadowWidth,
-            width, height,
-            cornerRadius * 2, shadowFeather,
-            RGBA(0, 0, 0, shadowOpacity * alpha), transparent);
-
-        nvgBeginPath(vg);
-        nvgRect(vg, x - shadowOffset, y - shadowOffset,
-            width + shadowOffset * 2, height + shadowOffset * 3);
-        nvgRoundedRect(vg, x, y, width, height, cornerRadius);
-        nvgPathWinding(vg, NVG_HOLE);
-        nvgFillPaint(vg, shadowPaint);
-        nvgFill(vg);
-    }
-
-    // Label
-    if (this->label != nullptr)
-        this->label->frame(ctx);
-
-    if (this->image != nullptr)
-        this->image->frame(ctx);
-}
-
-bool Button::onClick()
-{
-    if (this->state == ButtonState::DISABLED)
-        return false;
-
-    return this->clickEvent.fire(this);
-}
-
-GenericEvent* Button::getClickEvent()
-{
-    return &this->clickEvent;
-}
-
-void Button::setCornerRadius(float cornerRadius)
-{
-    this->cornerRadiusOverride = cornerRadius;
-
-    if (this->image != nullptr)
-        this->image->setCornerRadius(cornerRadius);
-}
-} // namespace brls
diff --git a/Source/sys-clk/manager/lib/borealis/library/lib/crash_frame.cpp b/Source/sys-clk/manager/lib/borealis/library/lib/crash_frame.cpp
deleted file mode 100644
index 95af34ee..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/lib/crash_frame.cpp
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
-    Borealis, a Nintendo Switch UI Library
-    Copyright (C) 2019-2020  natinusala
-    Copyright (C) 2019  p-sam
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include <math.h>
-
-#include <borealis/animations.hpp>
-#include <borealis/application.hpp>
-#include <borealis/crash_frame.hpp>
-
-namespace brls
-{
-
-CrashFrame::CrashFrame(std::string text)
-{
-    // Label
-    this->label = new Label(LabelStyle::CRASH, text, true);
-    this->label->setHorizontalAlign(NVG_ALIGN_CENTER);
-    this->label->setParent(this);
-
-    // Button
-    this->button = (new Button(ButtonStyle::CRASH))->setLabel("OK");
-    this->button->setParent(this);
-    this->button->alpha = 0.0f;
-    this->button->getClickEvent()->subscribe([](View* view) { Application::quit(); });
-    this->button->overrideThemeVariant(Application::getThemeValuesForVariant(ThemeVariant_DARK));
-
-    // Hint
-    this->hint = new Hint();
-    this->hint->setParent(this);
-}
-
-void CrashFrame::draw(NVGcontext* vg, int x, int y, unsigned width, unsigned height, Style* style, FrameContext* ctx)
-{
-    nvgSave(vg);
-
-    // Background
-    nvgFillColor(vg, RGB(0, 0, 0));
-    nvgBeginPath(vg);
-    nvgRect(vg, x, y, width, height);
-    nvgFill(vg);
-
-    // Scale
-    float scale = (this->alpha + 2.0f) / 3.0f;
-    nvgTranslate(vg, (1.0f - scale) * width * 0.5f, (1.0f - scale) * height * 0.5f);
-    nvgScale(vg, scale, scale);
-
-    // Label
-    this->label->frame(ctx);
-
-    // [!] box
-    unsigned boxSize = style->CrashFrame.boxSize;
-    nvgStrokeColor(vg, RGB(255, 255, 255));
-    nvgStrokeWidth(vg, style->CrashFrame.boxStrokeWidth);
-    nvgBeginPath(vg);
-    nvgRect(vg, x + width / 2 - boxSize / 2, y + style->CrashFrame.boxSpacing, boxSize, boxSize);
-    nvgStroke(vg);
-
-    nvgFillColor(vg, RGB(255, 255, 255));
-
-    nvgFontSize(vg, (float)style->CrashFrame.boxSize / 1.25f);
-    nvgTextAlign(vg, NVG_ALIGN_CENTER | NVG_ALIGN_MIDDLE);
-    nvgBeginPath(vg);
-    nvgText(vg, x + width / 2, y + style->CrashFrame.boxSpacing + boxSize / 2, "!", nullptr);
-    nvgFill(vg);
-
-    // End scale
-    nvgResetTransform(vg);
-    nvgRestore(vg);
-
-    // Footer
-    nvgBeginPath(vg);
-    nvgRect(vg, x + style->AppletFrame.separatorSpacing, y + height - style->AppletFrame.footerHeight, width - style->AppletFrame.separatorSpacing * 2, 1);
-    nvgFill(vg);
-
-    nvgFontSize(vg, style->AppletFrame.footerTextSize);
-    nvgTextAlign(vg, NVG_ALIGN_LEFT | NVG_ALIGN_MIDDLE);
-    nvgBeginPath(vg);
-    nvgText(vg, x + style->AppletFrame.separatorSpacing + style->AppletFrame.footerTextSpacing, y + height - style->AppletFrame.footerHeight / 2, Application::getTitle().c_str(), nullptr);
-
-    // Button
-    this->button->frame(ctx);
-
-    // Hint
-    this->hint->frame(ctx);
-}
-
-void CrashFrame::onShowAnimationEnd()
-{
-    this->button->show([]() {});
-}
-
-View* CrashFrame::getDefaultFocus()
-{
-    return this->button->getDefaultFocus();
-}
-
-void CrashFrame::layout(NVGcontext* vg, Style* style, FontStash* stash)
-{
-    // Label
-    this->label->setWidth(roundf((float)this->width * style->CrashFrame.labelWidth));
-    this->label->invalidate(true);
-
-    this->label->setBoundaries(
-        this->x + this->width / 2 - this->label->getWidth() / 2,
-        this->y + (this->height - style->AppletFrame.footerHeight) / 2,
-        this->label->getWidth(),
-        this->label->getHeight());
-
-    // Button
-    this->button->setBoundaries(
-        this->x + this->width / 2 - style->CrashFrame.buttonWidth / 2,
-        this->y + this->height - style->AppletFrame.footerHeight - style->CrashFrame.boxSpacing - style->CrashFrame.buttonHeight,
-        style->CrashFrame.buttonWidth,
-        style->CrashFrame.buttonHeight);
-    this->button->invalidate();
-
-    // Hint
-    // TODO: convert the bottom-left footer into a Label to get its width and avoid clipping with the hint
-    unsigned hintWidth = this->width - style->AppletFrame.separatorSpacing * 2 - style->AppletFrame.footerTextSpacing * 2;
-
-    this->hint->setBoundaries(
-        this->x + this->width - hintWidth - style->AppletFrame.separatorSpacing - style->AppletFrame.footerTextSpacing,
-        this->y + this->height - style->AppletFrame.footerHeight,
-        hintWidth,
-        style->AppletFrame.footerHeight);
-    this->hint->invalidate();
-}
-
-CrashFrame::~CrashFrame()
-{
-    delete this->label;
-    delete this->hint;
-}
-
-} // namespace brls
diff --git a/Source/sys-clk/manager/lib/borealis/library/lib/dialog.cpp b/Source/sys-clk/manager/lib/borealis/library/lib/dialog.cpp
deleted file mode 100644
index 40f0fdf4..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/lib/dialog.cpp
+++ /dev/null
@@ -1,342 +0,0 @@
-/*
-    Borealis, a Nintendo Switch UI Library
-    Copyright (C) 2019-2020  natinusala
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include <borealis/application.hpp>
-#include <borealis/button.hpp>
-#include <borealis/dialog.hpp>
-
-// TODO: different open animation?
-
-namespace brls
-{
-
-Dialog::Dialog(View* contentView)
-    : contentView(contentView)
-{
-    if (contentView)
-        contentView->setParent(this);
-
-    this->registerAction("Back", Key::B, [this] { return this->onCancel(); });
-}
-
-Dialog::Dialog(std::string text)
-    : Dialog(new Label(LabelStyle::DIALOG, text, true))
-{
-}
-
-void Dialog::addButton(std::string label, GenericEvent::Callback cb)
-{
-    if (this->buttons.size() >= 3)
-        return;
-
-    DialogButton* button = new DialogButton();
-    button->label        = label;
-    button->cb           = cb;
-
-    this->buttons.push_back(button);
-
-    this->rebuildButtons();
-    this->invalidate();
-}
-
-void Dialog::open()
-{
-    Application::pushView(this);
-
-    if (this->buttons.size() == 0)
-        Application::blockInputs();
-}
-
-// TODO: do something better in case another view was pushed in the meantime
-void Dialog::close(std::function<void(void)> cb)
-{
-    Application::popView(ViewAnimation::FADE, cb);
-
-    if (this->buttons.size() == 0)
-        Application::unblockInputs();
-}
-
-void Dialog::setCancelable(bool cancelable)
-{
-    this->cancelable = cancelable;
-}
-
-void Dialog::draw(NVGcontext* vg, int x, int y, unsigned width, unsigned height, Style* style, FrameContext* ctx)
-{
-    // Backdrop
-    nvgFillColor(vg, a(ctx->theme->dialogBackdrop));
-    nvgBeginPath(vg);
-    nvgRect(vg, x, y, width, height);
-    nvgFill(vg);
-
-    // Shadow
-    float shadowWidth   = style->Dialog.shadowWidth;
-    float shadowFeather = style->Dialog.shadowFeather;
-    float shadowOpacity = style->Dialog.shadowOpacity;
-    float shadowOffset  = style->Dialog.shadowOffset;
-
-    NVGpaint shadowPaint = nvgBoxGradient(vg,
-        this->frameX, this->frameY + shadowWidth,
-        this->frameWidth, this->frameHeight,
-        style->Dialog.cornerRadius * 2, shadowFeather,
-        RGBA(0, 0, 0, shadowOpacity * alpha), transparent);
-
-    nvgBeginPath(vg);
-    nvgRect(vg, this->frameX - shadowOffset, this->frameY - shadowOffset,
-        this->frameWidth + shadowOffset * 2, this->frameHeight + shadowOffset * 3);
-    nvgRoundedRect(vg, this->frameX, this->frameY, this->frameWidth, this->frameHeight, style->Dialog.cornerRadius);
-    nvgPathWinding(vg, NVG_HOLE);
-    nvgFillPaint(vg, shadowPaint);
-    nvgFill(vg);
-
-    // Frame
-    nvgFillColor(vg, a(ctx->theme->dialogColor));
-    nvgBeginPath(vg);
-    nvgRoundedRect(vg, this->frameX, this->frameY, this->frameWidth, this->frameHeight, style->Dialog.cornerRadius);
-    nvgFill(vg);
-
-    // Content view
-    if (this->contentView)
-        this->contentView->frame(ctx);
-
-    // Buttons separator
-    if (this->buttons.size() > 0)
-    {
-        unsigned buttonsHeight = this->getButtonsHeight();
-        nvgFillColor(vg, a(ctx->theme->dialogButtonSeparatorColor));
-
-        // First vertical separator
-        nvgBeginPath(vg);
-        nvgRect(vg, this->frameX, this->frameY + this->frameHeight - buttonsHeight, this->frameWidth, style->Dialog.buttonSeparatorHeight);
-        nvgFill(vg);
-
-        // Second vertical separator
-        if (this->buttons.size() == 3)
-        {
-            nvgBeginPath(vg);
-            nvgRect(vg, this->frameX, this->frameY + this->frameHeight - style->Dialog.buttonHeight, this->frameWidth, style->Dialog.buttonSeparatorHeight);
-            nvgFill(vg);
-        }
-
-        // Horizontal separator
-        if (this->buttons.size() >= 2)
-        {
-            nvgBeginPath(vg);
-            nvgRect(
-                vg,
-                this->frameX + this->frameWidth / 2 + style->Dialog.buttonSeparatorHeight / 2,
-                this->frameY + this->frameHeight - style->Dialog.buttonHeight + 1, // offset by 1 to fix aliasing artifact
-                style->Dialog.buttonSeparatorHeight,
-                style->Dialog.buttonHeight - 1);
-            nvgFill(vg);
-        }
-    }
-
-    // Buttons
-    if (this->verticalButtonsLayout)
-        this->verticalButtonsLayout->frame(ctx);
-}
-
-View* Dialog::getDefaultFocus()
-{
-    if (this->buttons.size() > 0 && this->verticalButtonsLayout)
-        return this->verticalButtonsLayout->getDefaultFocus();
-
-    return nullptr;
-}
-
-bool Dialog::onCancel()
-{
-    if (this->cancelable)
-        this->close();
-
-    return this->cancelable;
-}
-
-unsigned Dialog::getButtonsHeight()
-{
-    Style* style = Application::getStyle();
-    if (this->buttons.size() == 3)
-        return style->Dialog.buttonHeight * 2;
-    else if (this->buttons.size() > 0) // 1 or 2
-        return style->Dialog.buttonHeight;
-    else
-        return 0;
-}
-
-void Dialog::layout(NVGcontext* vg, Style* style, FontStash* stash)
-{
-    this->frameWidth  = style->Dialog.width;
-    this->frameHeight = style->Dialog.height;
-
-    unsigned buttonsHeight = this->getButtonsHeight();
-    this->frameHeight += buttonsHeight;
-
-    this->frameX = getWidth() / 2 - this->frameWidth / 2;
-    this->frameY = getHeight() / 2 - this->frameHeight / 2;
-
-    unsigned contentX      = this->frameX + style->Dialog.paddingLeftRight;
-    unsigned contentY      = this->frameY + style->Dialog.paddingTopBottom;
-    unsigned contentWidth  = this->frameWidth - style->Dialog.paddingLeftRight * 2;
-    unsigned contentHeight = this->frameHeight - style->Dialog.paddingTopBottom * 2 - buttonsHeight;
-
-    if (this->contentView)
-    {
-        // First layout to get height
-        this->contentView->setBoundaries(
-            contentX,
-            contentY,
-            contentWidth,
-            contentHeight);
-
-        this->contentView->invalidate(true); // layout directly to get height
-
-        // Center the content view in the dialog
-        // or resize it if needed
-        unsigned newContentHeight = this->contentView->getHeight();
-
-        int difference = contentHeight - newContentHeight;
-
-        if (difference < 0)
-        {
-            this->frameHeight += -difference;
-        }
-        else
-        {
-            contentY += difference / 2;
-
-            this->contentView->setBoundaries(
-                contentX,
-                contentY,
-                contentWidth,
-                contentHeight);
-
-            this->contentView->invalidate();
-        }
-    }
-
-    // Buttons
-    if (this->verticalButtonsLayout)
-    {
-        this->verticalButtonsLayout->setBoundaries(
-            this->frameX,
-            this->frameY + this->frameHeight - buttonsHeight,
-            this->frameWidth,
-            style->Dialog.buttonHeight);
-
-        // Only one big button
-        if (this->buttons.size() == 1)
-        {
-            this->verticalButtonsLayout->getChild(0)->setHeight(style->Dialog.buttonHeight);
-        }
-        // Two buttons on one row
-        else if (this->buttons.size() == 2)
-        {
-            this->horizontalButtonsLayout->setHeight(style->Dialog.buttonHeight);
-
-            this->horizontalButtonsLayout->getChild(0)->setWidth(this->frameWidth / 2);
-            this->horizontalButtonsLayout->getChild(1)->setWidth(this->frameWidth / 2);
-        }
-        // Two rows: one with one button and one with two
-        else if (this->buttons.size() == 3)
-        {
-            this->verticalButtonsLayout->getChild(0)->setHeight(style->Dialog.buttonHeight);
-
-            this->horizontalButtonsLayout->setHeight(style->Dialog.buttonHeight);
-
-            this->horizontalButtonsLayout->getChild(0)->setWidth(this->frameWidth / 2);
-            this->horizontalButtonsLayout->getChild(1)->setWidth(this->frameWidth / 2);
-        }
-
-        this->verticalButtonsLayout->invalidate();
-        if (this->horizontalButtonsLayout)
-            this->horizontalButtonsLayout->invalidate();
-    }
-}
-
-void Dialog::rebuildButtons()
-{
-    if (this->verticalButtonsLayout)
-        delete this->verticalButtonsLayout;
-    this->verticalButtonsLayout = nullptr;
-
-    // horizontal box layout will be deleted by
-    // the vertical layout destructor
-
-    if (this->buttons.size() > 0)
-    {
-        this->verticalButtonsLayout = new BoxLayout(BoxLayoutOrientation::VERTICAL);
-        this->verticalButtonsLayout->setParent(this);
-
-        // Only one big button
-        if (this->buttons.size() == 1)
-        {
-            Button* button = (new Button(ButtonStyle::DIALOG))->setLabel(this->buttons[0]->label);
-            button->getClickEvent()->subscribe(this->buttons[0]->cb);
-            this->verticalButtonsLayout->addView(button);
-        }
-        // Two buttons on one row
-        else if (this->buttons.size() == 2)
-        {
-            this->horizontalButtonsLayout = new BoxLayout(BoxLayoutOrientation::HORIZONTAL);
-            this->verticalButtonsLayout->addView(this->horizontalButtonsLayout);
-
-            for (DialogButton* dialogButton : this->buttons)
-            {
-                Button* button = (new Button(ButtonStyle::DIALOG))->setLabel(dialogButton->label);
-                button->getClickEvent()->subscribe(dialogButton->cb);
-                this->horizontalButtonsLayout->addView(button);
-            }
-        }
-        // Two rows: one with one button and one with two
-        else if (this->buttons.size() == 3)
-        {
-            Button* button = (new Button(ButtonStyle::DIALOG))->setLabel(this->buttons[0]->label);
-            button->getClickEvent()->subscribe(this->buttons[0]->cb);
-            this->verticalButtonsLayout->addView(button);
-
-            this->horizontalButtonsLayout = new BoxLayout(BoxLayoutOrientation::HORIZONTAL);
-            this->verticalButtonsLayout->addView(this->horizontalButtonsLayout);
-
-            for (size_t i = 1; i < this->buttons.size(); i++)
-            {
-                DialogButton* dialogButton = this->buttons[i];
-                Button* button             = (new Button(ButtonStyle::DIALOG))->setLabel(dialogButton->label);
-                button->getClickEvent()->subscribe(dialogButton->cb);
-                this->horizontalButtonsLayout->addView(button);
-            }
-        }
-    }
-}
-
-Dialog::~Dialog()
-{
-    if (this->contentView)
-        delete this->contentView;
-
-    if (this->verticalButtonsLayout)
-        delete this->verticalButtonsLayout;
-
-    for (DialogButton* dialogButton : this->buttons)
-        delete dialogButton;
-
-    // horizontal box layout will be deleted by
-    // the vertical layout destructor
-}
-
-} // namespace brls
diff --git a/Source/sys-clk/manager/lib/borealis/library/lib/dropdown.cpp b/Source/sys-clk/manager/lib/borealis/library/lib/dropdown.cpp
deleted file mode 100644
index a56736ef..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/lib/dropdown.cpp
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
-    Borealis, a Nintendo Switch UI Library
-    Copyright (C) 2019-2020  natinusala
-    Copyright (C) 2019  p-sam
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include <borealis/animations.hpp>
-#include <borealis/application.hpp>
-#include <borealis/dropdown.hpp>
-#include <borealis/logger.hpp>
-
-#define SELECT_VIEW_MAX_ITEMS 6 // for max height
-
-#define min(a, b) ((a < b) ? a : b)
-
-// TODO: Turns out the fade out animation is the same as the fade in (top -> bottom)
-
-namespace brls
-{
-
-Dropdown::Dropdown(std::string title, std::vector<std::string> values, ValueSelectedEvent::Callback cb, size_t selected)
-    : title(title)
-{
-    Style* style = Application::getStyle();
-
-    this->valueEvent.subscribe(cb);
-
-    this->topOffset = (float)style->Dropdown.listPadding / 8.0f;
-
-    this->valuesCount = values.size();
-
-    this->list = new List(selected);
-    this->list->setParent(this);
-    this->list->setMargins(1, 0, 1, 0);
-
-    for (size_t i = 0; i < values.size(); i++)
-    {
-        std::string value = values[i];
-
-        ListItem* item = new ListItem(value);
-
-        if (i == selected)
-            item->setChecked(true);
-
-        item->setHeight(style->Dropdown.listItemHeight);
-        item->setTextSize(style->Dropdown.listItemTextSize);
-
-        item->getClickEvent()->subscribe([this, i](View* view) {
-            this->valueEvent.fire(i);
-            Application::popView();
-        });
-
-        this->list->addView(item);
-    }
-
-    this->hint = new Hint();
-    this->hint->setParent(this);
-
-    this->registerAction("Back", Key::B, [this] { return this->onCancel(); });
-}
-
-void Dropdown::show(std::function<void(void)> cb, bool animate, ViewAnimation animation)
-{
-    View::show(cb);
-
-    menu_animation_ctx_entry_t entry;
-
-    entry.duration     = this->getShowAnimationDuration(animation);
-    entry.easing_enum  = EASING_OUT_QUAD;
-    entry.subject      = &this->topOffset;
-    entry.tag          = (uintptr_t) nullptr;
-    entry.target_value = 0.0f;
-    entry.tick         = [this](void* userdata) { this->invalidate(); };
-    entry.userdata     = nullptr;
-
-    menu_animation_push(&entry);
-}
-
-void Dropdown::draw(NVGcontext* vg, int x, int y, unsigned width, unsigned height, Style* style, FrameContext* ctx)
-{
-    unsigned top = this->list->getY() - style->Dropdown.headerHeight - style->Dropdown.listPadding;
-
-    // Backdrop
-    nvgFillColor(vg, a(ctx->theme->dropdownBackgroundColor));
-    nvgBeginPath(vg);
-    nvgRect(vg, x, y, width, top);
-    nvgFill(vg);
-
-    // TODO: Shadow
-
-    // Background
-    nvgFillColor(vg, a(ctx->theme->sidebarColor));
-    nvgBeginPath(vg);
-    nvgRect(vg, x, top, width, height - top);
-    nvgFill(vg);
-
-    // List
-    this->list->frame(ctx);
-
-    // Footer
-    this->hint->frame(ctx);
-
-    nvgFillColor(vg, ctx->theme->separatorColor); // we purposely don't apply opacity
-
-    nvgBeginPath(vg);
-    nvgRect(vg, x + style->AppletFrame.separatorSpacing, y + height - style->AppletFrame.footerHeight, width - style->AppletFrame.separatorSpacing * 2, 1);
-    nvgFill(vg);
-
-    nvgFillColor(vg, ctx->theme->textColor); // we purposely don't apply opacity
-    nvgFontSize(vg, style->AppletFrame.footerTextSize);
-    nvgTextAlign(vg, NVG_ALIGN_LEFT | NVG_ALIGN_MIDDLE);
-    nvgBeginPath(vg);
-    nvgText(vg, x + style->AppletFrame.separatorSpacing + style->AppletFrame.footerTextSpacing, y + height - style->AppletFrame.footerHeight / 2, Application::getCommonFooter()->c_str(), nullptr);
-
-    // Header
-    nvgFillColor(vg, a(ctx->theme->separatorColor));
-    nvgBeginPath(vg);
-    nvgRect(vg, x + style->AppletFrame.separatorSpacing, top + style->Dropdown.headerHeight - 1, width - style->AppletFrame.separatorSpacing * 2, 1);
-    nvgFill(vg);
-
-    nvgBeginPath(vg);
-    nvgFillColor(vg, a(ctx->theme->textColor));
-    nvgFontFaceId(vg, ctx->fontStash->regular);
-    nvgFontSize(vg, style->Dropdown.headerFontSize);
-    nvgTextAlign(vg, NVG_ALIGN_LEFT | NVG_ALIGN_MIDDLE);
-    nvgText(vg, x + style->Dropdown.headerPadding, top + style->Dropdown.headerHeight / 2, this->title.c_str(), nullptr);
-}
-
-bool Dropdown::onCancel()
-{
-    this->valueEvent.fire(-1);
-    Application::popView();
-    return true;
-}
-
-unsigned Dropdown::getShowAnimationDuration(ViewAnimation animation)
-{
-    return View::getShowAnimationDuration(animation) / 2;
-}
-
-void Dropdown::layout(NVGcontext* vg, Style* style, FontStash* stash)
-{
-    // Layout and move the list
-    unsigned listHeight = min(SELECT_VIEW_MAX_ITEMS, this->valuesCount) * style->Dropdown.listItemHeight - (unsigned)this->topOffset;
-    unsigned listWidth  = style->Dropdown.listWidth + style->List.marginLeftRight * 2;
-
-    this->list->setBoundaries(
-        this->width / 2 - listWidth / 2,
-        this->height - style->AppletFrame.footerHeight - listHeight - style->Dropdown.listPadding + (unsigned)this->topOffset,
-        listWidth,
-        listHeight);
-    this->list->invalidate(true); // call layout directly to update scrolling
-
-    // Hint
-    // TODO: convert the bottom-left footer into a Label to get its width and avoid clipping with the hint
-    unsigned hintWidth = this->width - style->AppletFrame.separatorSpacing * 2 - style->AppletFrame.footerTextSpacing * 2;
-
-    this->hint->setBoundaries(
-        this->x + this->width - hintWidth - style->AppletFrame.separatorSpacing - style->AppletFrame.footerTextSpacing,
-        this->y + this->height - style->AppletFrame.footerHeight,
-        hintWidth,
-        style->AppletFrame.footerHeight);
-    this->hint->invalidate();
-}
-
-View* Dropdown::getDefaultFocus()
-{
-    return this->list->getDefaultFocus();
-}
-
-void Dropdown::open(std::string title, std::vector<std::string> values, ValueSelectedEvent::Callback cb, int selected)
-{
-    Dropdown* dropdown = new Dropdown(title, values, cb, selected);
-    Application::pushView(dropdown);
-}
-
-void Dropdown::willAppear(bool resetState)
-{
-    if (this->list)
-        this->list->willAppear(resetState);
-
-    if (this->hint)
-        this->hint->willAppear(resetState);
-}
-
-void Dropdown::willDisappear(bool resetState)
-{
-    if (this->list)
-        this->list->willDisappear(resetState);
-
-    if (this->hint)
-        this->hint->willDisappear(resetState);
-}
-
-Dropdown::~Dropdown()
-{
-    delete this->list;
-    delete this->hint;
-}
-
-} // namespace brls
diff --git a/Source/sys-clk/manager/lib/borealis/library/lib/extern/glad/glad.c b/Source/sys-clk/manager/lib/borealis/library/lib/extern/glad/glad.c
deleted file mode 100644
index 3467b692..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/lib/extern/glad/glad.c
+++ /dev/null
@@ -1,1413 +0,0 @@
-/*
-
-    OpenGL loader generated by glad 0.1.27 on Wed Sep 19 00:03:30 2018.
-
-    Language/Generator: C/C++
-    Specification: gl
-    APIs: gl=4.3
-    Profile: core
-    Extensions:
-        
-    Loader: False
-    Local files: True
-    Omit khrplatform: True
-    Reproducible: False
-
-    Commandline:
-        --profile="core" --api="gl=4.3" --generator="c" --spec="gl" --no-loader --local-files --omit-khrplatform --extensions=""
-    Online:
-        http://glad.dav1d.de/#profile=core&language=c&specification=gl&api=gl%3D4.3
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "glad.h"
-
-struct gladGLversionStruct GLVersion = { 0, 0 };
-
-#if defined(GL_ES_VERSION_3_0) || defined(GL_VERSION_3_0)
-#define _GLAD_IS_SOME_NEW_VERSION 1
-#endif
-
-static int max_loaded_major;
-static int max_loaded_minor;
-
-static const char *exts = NULL;
-static int num_exts_i = 0;
-static char **exts_i = NULL;
-
-static int get_exts(void) {
-#ifdef _GLAD_IS_SOME_NEW_VERSION
-    if(max_loaded_major < 3) {
-#endif
-        exts = (const char *)glGetString(GL_EXTENSIONS);
-#ifdef _GLAD_IS_SOME_NEW_VERSION
-    } else {
-        unsigned int index;
-
-        num_exts_i = 0;
-        glGetIntegerv(GL_NUM_EXTENSIONS, &num_exts_i);
-        if (num_exts_i > 0) {
-            exts_i = (char **)realloc((void *)exts_i, (size_t)num_exts_i * (sizeof *exts_i));
-        }
-
-        if (exts_i == NULL) {
-            return 0;
-        }
-
-        for(index = 0; index < (unsigned)num_exts_i; index++) {
-            const char *gl_str_tmp = (const char*)glGetStringi(GL_EXTENSIONS, index);
-            size_t len = strlen(gl_str_tmp);
-
-            char *local_str = (char*)malloc((len+1) * sizeof(char));
-            if(local_str != NULL) {
-                memcpy(local_str, gl_str_tmp, (len+1) * sizeof(char));
-            }
-            exts_i[index] = local_str;
-        }
-    }
-#endif
-    return 1;
-}
-
-static void free_exts(void) {
-    if (exts_i != NULL) {
-        int index;
-        for(index = 0; index < num_exts_i; index++) {
-            free((char *)exts_i[index]);
-        }
-        free((void *)exts_i);
-        exts_i = NULL;
-    }
-}
-
-static int has_ext(const char *ext) {
-#ifdef _GLAD_IS_SOME_NEW_VERSION
-    if(max_loaded_major < 3) {
-#endif
-        const char *extensions;
-        const char *loc;
-        const char *terminator;
-        extensions = exts;
-        if(extensions == NULL || ext == NULL) {
-            return 0;
-        }
-
-        while(1) {
-            loc = strstr(extensions, ext);
-            if(loc == NULL) {
-                return 0;
-            }
-
-            terminator = loc + strlen(ext);
-            if((loc == extensions || *(loc - 1) == ' ') &&
-                (*terminator == ' ' || *terminator == '\0')) {
-                return 1;
-            }
-            extensions = terminator;
-        }
-#ifdef _GLAD_IS_SOME_NEW_VERSION
-    } else {
-        int index;
-        if(exts_i == NULL) return 0;
-        for(index = 0; index < num_exts_i; index++) {
-            const char *e = exts_i[index];
-
-            if(exts_i[index] != NULL && strcmp(e, ext) == 0) {
-                return 1;
-            }
-        }
-    }
-#endif
-
-    return 0;
-}
-int GLAD_GL_VERSION_1_0 = 0;
-int GLAD_GL_VERSION_1_1 = 0;
-int GLAD_GL_VERSION_1_2 = 0;
-int GLAD_GL_VERSION_1_3 = 0;
-int GLAD_GL_VERSION_1_4 = 0;
-int GLAD_GL_VERSION_1_5 = 0;
-int GLAD_GL_VERSION_2_0 = 0;
-int GLAD_GL_VERSION_2_1 = 0;
-int GLAD_GL_VERSION_3_0 = 0;
-int GLAD_GL_VERSION_3_1 = 0;
-int GLAD_GL_VERSION_3_2 = 0;
-int GLAD_GL_VERSION_3_3 = 0;
-int GLAD_GL_VERSION_4_0 = 0;
-int GLAD_GL_VERSION_4_1 = 0;
-int GLAD_GL_VERSION_4_2 = 0;
-int GLAD_GL_VERSION_4_3 = 0;
-PFNGLACTIVESHADERPROGRAMPROC glad_glActiveShaderProgram = NULL;
-PFNGLACTIVETEXTUREPROC glad_glActiveTexture = NULL;
-PFNGLATTACHSHADERPROC glad_glAttachShader = NULL;
-PFNGLBEGINCONDITIONALRENDERPROC glad_glBeginConditionalRender = NULL;
-PFNGLBEGINQUERYPROC glad_glBeginQuery = NULL;
-PFNGLBEGINQUERYINDEXEDPROC glad_glBeginQueryIndexed = NULL;
-PFNGLBEGINTRANSFORMFEEDBACKPROC glad_glBeginTransformFeedback = NULL;
-PFNGLBINDATTRIBLOCATIONPROC glad_glBindAttribLocation = NULL;
-PFNGLBINDBUFFERPROC glad_glBindBuffer = NULL;
-PFNGLBINDBUFFERBASEPROC glad_glBindBufferBase = NULL;
-PFNGLBINDBUFFERRANGEPROC glad_glBindBufferRange = NULL;
-PFNGLBINDFRAGDATALOCATIONPROC glad_glBindFragDataLocation = NULL;
-PFNGLBINDFRAGDATALOCATIONINDEXEDPROC glad_glBindFragDataLocationIndexed = NULL;
-PFNGLBINDFRAMEBUFFERPROC glad_glBindFramebuffer = NULL;
-PFNGLBINDIMAGETEXTUREPROC glad_glBindImageTexture = NULL;
-PFNGLBINDPROGRAMPIPELINEPROC glad_glBindProgramPipeline = NULL;
-PFNGLBINDRENDERBUFFERPROC glad_glBindRenderbuffer = NULL;
-PFNGLBINDSAMPLERPROC glad_glBindSampler = NULL;
-PFNGLBINDTEXTUREPROC glad_glBindTexture = NULL;
-PFNGLBINDTRANSFORMFEEDBACKPROC glad_glBindTransformFeedback = NULL;
-PFNGLBINDVERTEXARRAYPROC glad_glBindVertexArray = NULL;
-PFNGLBINDVERTEXBUFFERPROC glad_glBindVertexBuffer = NULL;
-PFNGLBLENDCOLORPROC glad_glBlendColor = NULL;
-PFNGLBLENDEQUATIONPROC glad_glBlendEquation = NULL;
-PFNGLBLENDEQUATIONSEPARATEPROC glad_glBlendEquationSeparate = NULL;
-PFNGLBLENDEQUATIONSEPARATEIPROC glad_glBlendEquationSeparatei = NULL;
-PFNGLBLENDEQUATIONIPROC glad_glBlendEquationi = NULL;
-PFNGLBLENDFUNCPROC glad_glBlendFunc = NULL;
-PFNGLBLENDFUNCSEPARATEPROC glad_glBlendFuncSeparate = NULL;
-PFNGLBLENDFUNCSEPARATEIPROC glad_glBlendFuncSeparatei = NULL;
-PFNGLBLENDFUNCIPROC glad_glBlendFunci = NULL;
-PFNGLBLITFRAMEBUFFERPROC glad_glBlitFramebuffer = NULL;
-PFNGLBUFFERDATAPROC glad_glBufferData = NULL;
-PFNGLBUFFERSUBDATAPROC glad_glBufferSubData = NULL;
-PFNGLCHECKFRAMEBUFFERSTATUSPROC glad_glCheckFramebufferStatus = NULL;
-PFNGLCLAMPCOLORPROC glad_glClampColor = NULL;
-PFNGLCLEARPROC glad_glClear = NULL;
-PFNGLCLEARBUFFERDATAPROC glad_glClearBufferData = NULL;
-PFNGLCLEARBUFFERSUBDATAPROC glad_glClearBufferSubData = NULL;
-PFNGLCLEARBUFFERFIPROC glad_glClearBufferfi = NULL;
-PFNGLCLEARBUFFERFVPROC glad_glClearBufferfv = NULL;
-PFNGLCLEARBUFFERIVPROC glad_glClearBufferiv = NULL;
-PFNGLCLEARBUFFERUIVPROC glad_glClearBufferuiv = NULL;
-PFNGLCLEARCOLORPROC glad_glClearColor = NULL;
-PFNGLCLEARDEPTHPROC glad_glClearDepth = NULL;
-PFNGLCLEARDEPTHFPROC glad_glClearDepthf = NULL;
-PFNGLCLEARSTENCILPROC glad_glClearStencil = NULL;
-PFNGLCLIENTWAITSYNCPROC glad_glClientWaitSync = NULL;
-PFNGLCOLORMASKPROC glad_glColorMask = NULL;
-PFNGLCOLORMASKIPROC glad_glColorMaski = NULL;
-PFNGLCOLORP3UIPROC glad_glColorP3ui = NULL;
-PFNGLCOLORP3UIVPROC glad_glColorP3uiv = NULL;
-PFNGLCOLORP4UIPROC glad_glColorP4ui = NULL;
-PFNGLCOLORP4UIVPROC glad_glColorP4uiv = NULL;
-PFNGLCOMPILESHADERPROC glad_glCompileShader = NULL;
-PFNGLCOMPRESSEDTEXIMAGE1DPROC glad_glCompressedTexImage1D = NULL;
-PFNGLCOMPRESSEDTEXIMAGE2DPROC glad_glCompressedTexImage2D = NULL;
-PFNGLCOMPRESSEDTEXIMAGE3DPROC glad_glCompressedTexImage3D = NULL;
-PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC glad_glCompressedTexSubImage1D = NULL;
-PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC glad_glCompressedTexSubImage2D = NULL;
-PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC glad_glCompressedTexSubImage3D = NULL;
-PFNGLCOPYBUFFERSUBDATAPROC glad_glCopyBufferSubData = NULL;
-PFNGLCOPYIMAGESUBDATAPROC glad_glCopyImageSubData = NULL;
-PFNGLCOPYTEXIMAGE1DPROC glad_glCopyTexImage1D = NULL;
-PFNGLCOPYTEXIMAGE2DPROC glad_glCopyTexImage2D = NULL;
-PFNGLCOPYTEXSUBIMAGE1DPROC glad_glCopyTexSubImage1D = NULL;
-PFNGLCOPYTEXSUBIMAGE2DPROC glad_glCopyTexSubImage2D = NULL;
-PFNGLCOPYTEXSUBIMAGE3DPROC glad_glCopyTexSubImage3D = NULL;
-PFNGLCREATEPROGRAMPROC glad_glCreateProgram = NULL;
-PFNGLCREATESHADERPROC glad_glCreateShader = NULL;
-PFNGLCREATESHADERPROGRAMVPROC glad_glCreateShaderProgramv = NULL;
-PFNGLCULLFACEPROC glad_glCullFace = NULL;
-PFNGLDEBUGMESSAGECALLBACKPROC glad_glDebugMessageCallback = NULL;
-PFNGLDEBUGMESSAGECONTROLPROC glad_glDebugMessageControl = NULL;
-PFNGLDEBUGMESSAGEINSERTPROC glad_glDebugMessageInsert = NULL;
-PFNGLDELETEBUFFERSPROC glad_glDeleteBuffers = NULL;
-PFNGLDELETEFRAMEBUFFERSPROC glad_glDeleteFramebuffers = NULL;
-PFNGLDELETEPROGRAMPROC glad_glDeleteProgram = NULL;
-PFNGLDELETEPROGRAMPIPELINESPROC glad_glDeleteProgramPipelines = NULL;
-PFNGLDELETEQUERIESPROC glad_glDeleteQueries = NULL;
-PFNGLDELETERENDERBUFFERSPROC glad_glDeleteRenderbuffers = NULL;
-PFNGLDELETESAMPLERSPROC glad_glDeleteSamplers = NULL;
-PFNGLDELETESHADERPROC glad_glDeleteShader = NULL;
-PFNGLDELETESYNCPROC glad_glDeleteSync = NULL;
-PFNGLDELETETEXTURESPROC glad_glDeleteTextures = NULL;
-PFNGLDELETETRANSFORMFEEDBACKSPROC glad_glDeleteTransformFeedbacks = NULL;
-PFNGLDELETEVERTEXARRAYSPROC glad_glDeleteVertexArrays = NULL;
-PFNGLDEPTHFUNCPROC glad_glDepthFunc = NULL;
-PFNGLDEPTHMASKPROC glad_glDepthMask = NULL;
-PFNGLDEPTHRANGEPROC glad_glDepthRange = NULL;
-PFNGLDEPTHRANGEARRAYVPROC glad_glDepthRangeArrayv = NULL;
-PFNGLDEPTHRANGEINDEXEDPROC glad_glDepthRangeIndexed = NULL;
-PFNGLDEPTHRANGEFPROC glad_glDepthRangef = NULL;
-PFNGLDETACHSHADERPROC glad_glDetachShader = NULL;
-PFNGLDISABLEPROC glad_glDisable = NULL;
-PFNGLDISABLEVERTEXATTRIBARRAYPROC glad_glDisableVertexAttribArray = NULL;
-PFNGLDISABLEIPROC glad_glDisablei = NULL;
-PFNGLDISPATCHCOMPUTEPROC glad_glDispatchCompute = NULL;
-PFNGLDISPATCHCOMPUTEINDIRECTPROC glad_glDispatchComputeIndirect = NULL;
-PFNGLDRAWARRAYSPROC glad_glDrawArrays = NULL;
-PFNGLDRAWARRAYSINDIRECTPROC glad_glDrawArraysIndirect = NULL;
-PFNGLDRAWARRAYSINSTANCEDPROC glad_glDrawArraysInstanced = NULL;
-PFNGLDRAWARRAYSINSTANCEDBASEINSTANCEPROC glad_glDrawArraysInstancedBaseInstance = NULL;
-PFNGLDRAWBUFFERPROC glad_glDrawBuffer = NULL;
-PFNGLDRAWBUFFERSPROC glad_glDrawBuffers = NULL;
-PFNGLDRAWELEMENTSPROC glad_glDrawElements = NULL;
-PFNGLDRAWELEMENTSBASEVERTEXPROC glad_glDrawElementsBaseVertex = NULL;
-PFNGLDRAWELEMENTSINDIRECTPROC glad_glDrawElementsIndirect = NULL;
-PFNGLDRAWELEMENTSINSTANCEDPROC glad_glDrawElementsInstanced = NULL;
-PFNGLDRAWELEMENTSINSTANCEDBASEINSTANCEPROC glad_glDrawElementsInstancedBaseInstance = NULL;
-PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXPROC glad_glDrawElementsInstancedBaseVertex = NULL;
-PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXBASEINSTANCEPROC glad_glDrawElementsInstancedBaseVertexBaseInstance = NULL;
-PFNGLDRAWRANGEELEMENTSPROC glad_glDrawRangeElements = NULL;
-PFNGLDRAWRANGEELEMENTSBASEVERTEXPROC glad_glDrawRangeElementsBaseVertex = NULL;
-PFNGLDRAWTRANSFORMFEEDBACKPROC glad_glDrawTransformFeedback = NULL;
-PFNGLDRAWTRANSFORMFEEDBACKINSTANCEDPROC glad_glDrawTransformFeedbackInstanced = NULL;
-PFNGLDRAWTRANSFORMFEEDBACKSTREAMPROC glad_glDrawTransformFeedbackStream = NULL;
-PFNGLDRAWTRANSFORMFEEDBACKSTREAMINSTANCEDPROC glad_glDrawTransformFeedbackStreamInstanced = NULL;
-PFNGLENABLEPROC glad_glEnable = NULL;
-PFNGLENABLEVERTEXATTRIBARRAYPROC glad_glEnableVertexAttribArray = NULL;
-PFNGLENABLEIPROC glad_glEnablei = NULL;
-PFNGLENDCONDITIONALRENDERPROC glad_glEndConditionalRender = NULL;
-PFNGLENDQUERYPROC glad_glEndQuery = NULL;
-PFNGLENDQUERYINDEXEDPROC glad_glEndQueryIndexed = NULL;
-PFNGLENDTRANSFORMFEEDBACKPROC glad_glEndTransformFeedback = NULL;
-PFNGLFENCESYNCPROC glad_glFenceSync = NULL;
-PFNGLFINISHPROC glad_glFinish = NULL;
-PFNGLFLUSHPROC glad_glFlush = NULL;
-PFNGLFLUSHMAPPEDBUFFERRANGEPROC glad_glFlushMappedBufferRange = NULL;
-PFNGLFRAMEBUFFERPARAMETERIPROC glad_glFramebufferParameteri = NULL;
-PFNGLFRAMEBUFFERRENDERBUFFERPROC glad_glFramebufferRenderbuffer = NULL;
-PFNGLFRAMEBUFFERTEXTUREPROC glad_glFramebufferTexture = NULL;
-PFNGLFRAMEBUFFERTEXTURE1DPROC glad_glFramebufferTexture1D = NULL;
-PFNGLFRAMEBUFFERTEXTURE2DPROC glad_glFramebufferTexture2D = NULL;
-PFNGLFRAMEBUFFERTEXTURE3DPROC glad_glFramebufferTexture3D = NULL;
-PFNGLFRAMEBUFFERTEXTURELAYERPROC glad_glFramebufferTextureLayer = NULL;
-PFNGLFRONTFACEPROC glad_glFrontFace = NULL;
-PFNGLGENBUFFERSPROC glad_glGenBuffers = NULL;
-PFNGLGENFRAMEBUFFERSPROC glad_glGenFramebuffers = NULL;
-PFNGLGENPROGRAMPIPELINESPROC glad_glGenProgramPipelines = NULL;
-PFNGLGENQUERIESPROC glad_glGenQueries = NULL;
-PFNGLGENRENDERBUFFERSPROC glad_glGenRenderbuffers = NULL;
-PFNGLGENSAMPLERSPROC glad_glGenSamplers = NULL;
-PFNGLGENTEXTURESPROC glad_glGenTextures = NULL;
-PFNGLGENTRANSFORMFEEDBACKSPROC glad_glGenTransformFeedbacks = NULL;
-PFNGLGENVERTEXARRAYSPROC glad_glGenVertexArrays = NULL;
-PFNGLGENERATEMIPMAPPROC glad_glGenerateMipmap = NULL;
-PFNGLGETACTIVEATOMICCOUNTERBUFFERIVPROC glad_glGetActiveAtomicCounterBufferiv = NULL;
-PFNGLGETACTIVEATTRIBPROC glad_glGetActiveAttrib = NULL;
-PFNGLGETACTIVESUBROUTINENAMEPROC glad_glGetActiveSubroutineName = NULL;
-PFNGLGETACTIVESUBROUTINEUNIFORMNAMEPROC glad_glGetActiveSubroutineUniformName = NULL;
-PFNGLGETACTIVESUBROUTINEUNIFORMIVPROC glad_glGetActiveSubroutineUniformiv = NULL;
-PFNGLGETACTIVEUNIFORMPROC glad_glGetActiveUniform = NULL;
-PFNGLGETACTIVEUNIFORMBLOCKNAMEPROC glad_glGetActiveUniformBlockName = NULL;
-PFNGLGETACTIVEUNIFORMBLOCKIVPROC glad_glGetActiveUniformBlockiv = NULL;
-PFNGLGETACTIVEUNIFORMNAMEPROC glad_glGetActiveUniformName = NULL;
-PFNGLGETACTIVEUNIFORMSIVPROC glad_glGetActiveUniformsiv = NULL;
-PFNGLGETATTACHEDSHADERSPROC glad_glGetAttachedShaders = NULL;
-PFNGLGETATTRIBLOCATIONPROC glad_glGetAttribLocation = NULL;
-PFNGLGETBOOLEANI_VPROC glad_glGetBooleani_v = NULL;
-PFNGLGETBOOLEANVPROC glad_glGetBooleanv = NULL;
-PFNGLGETBUFFERPARAMETERI64VPROC glad_glGetBufferParameteri64v = NULL;
-PFNGLGETBUFFERPARAMETERIVPROC glad_glGetBufferParameteriv = NULL;
-PFNGLGETBUFFERPOINTERVPROC glad_glGetBufferPointerv = NULL;
-PFNGLGETBUFFERSUBDATAPROC glad_glGetBufferSubData = NULL;
-PFNGLGETCOMPRESSEDTEXIMAGEPROC glad_glGetCompressedTexImage = NULL;
-PFNGLGETDEBUGMESSAGELOGPROC glad_glGetDebugMessageLog = NULL;
-PFNGLGETDOUBLEI_VPROC glad_glGetDoublei_v = NULL;
-PFNGLGETDOUBLEVPROC glad_glGetDoublev = NULL;
-PFNGLGETERRORPROC glad_glGetError = NULL;
-PFNGLGETFLOATI_VPROC glad_glGetFloati_v = NULL;
-PFNGLGETFLOATVPROC glad_glGetFloatv = NULL;
-PFNGLGETFRAGDATAINDEXPROC glad_glGetFragDataIndex = NULL;
-PFNGLGETFRAGDATALOCATIONPROC glad_glGetFragDataLocation = NULL;
-PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVPROC glad_glGetFramebufferAttachmentParameteriv = NULL;
-PFNGLGETFRAMEBUFFERPARAMETERIVPROC glad_glGetFramebufferParameteriv = NULL;
-PFNGLGETINTEGER64I_VPROC glad_glGetInteger64i_v = NULL;
-PFNGLGETINTEGER64VPROC glad_glGetInteger64v = NULL;
-PFNGLGETINTEGERI_VPROC glad_glGetIntegeri_v = NULL;
-PFNGLGETINTEGERVPROC glad_glGetIntegerv = NULL;
-PFNGLGETINTERNALFORMATI64VPROC glad_glGetInternalformati64v = NULL;
-PFNGLGETINTERNALFORMATIVPROC glad_glGetInternalformativ = NULL;
-PFNGLGETMULTISAMPLEFVPROC glad_glGetMultisamplefv = NULL;
-PFNGLGETOBJECTLABELPROC glad_glGetObjectLabel = NULL;
-PFNGLGETOBJECTPTRLABELPROC glad_glGetObjectPtrLabel = NULL;
-PFNGLGETPOINTERVPROC glad_glGetPointerv = NULL;
-PFNGLGETPROGRAMBINARYPROC glad_glGetProgramBinary = NULL;
-PFNGLGETPROGRAMINFOLOGPROC glad_glGetProgramInfoLog = NULL;
-PFNGLGETPROGRAMINTERFACEIVPROC glad_glGetProgramInterfaceiv = NULL;
-PFNGLGETPROGRAMPIPELINEINFOLOGPROC glad_glGetProgramPipelineInfoLog = NULL;
-PFNGLGETPROGRAMPIPELINEIVPROC glad_glGetProgramPipelineiv = NULL;
-PFNGLGETPROGRAMRESOURCEINDEXPROC glad_glGetProgramResourceIndex = NULL;
-PFNGLGETPROGRAMRESOURCELOCATIONPROC glad_glGetProgramResourceLocation = NULL;
-PFNGLGETPROGRAMRESOURCELOCATIONINDEXPROC glad_glGetProgramResourceLocationIndex = NULL;
-PFNGLGETPROGRAMRESOURCENAMEPROC glad_glGetProgramResourceName = NULL;
-PFNGLGETPROGRAMRESOURCEIVPROC glad_glGetProgramResourceiv = NULL;
-PFNGLGETPROGRAMSTAGEIVPROC glad_glGetProgramStageiv = NULL;
-PFNGLGETPROGRAMIVPROC glad_glGetProgramiv = NULL;
-PFNGLGETQUERYINDEXEDIVPROC glad_glGetQueryIndexediv = NULL;
-PFNGLGETQUERYOBJECTI64VPROC glad_glGetQueryObjecti64v = NULL;
-PFNGLGETQUERYOBJECTIVPROC glad_glGetQueryObjectiv = NULL;
-PFNGLGETQUERYOBJECTUI64VPROC glad_glGetQueryObjectui64v = NULL;
-PFNGLGETQUERYOBJECTUIVPROC glad_glGetQueryObjectuiv = NULL;
-PFNGLGETQUERYIVPROC glad_glGetQueryiv = NULL;
-PFNGLGETRENDERBUFFERPARAMETERIVPROC glad_glGetRenderbufferParameteriv = NULL;
-PFNGLGETSAMPLERPARAMETERIIVPROC glad_glGetSamplerParameterIiv = NULL;
-PFNGLGETSAMPLERPARAMETERIUIVPROC glad_glGetSamplerParameterIuiv = NULL;
-PFNGLGETSAMPLERPARAMETERFVPROC glad_glGetSamplerParameterfv = NULL;
-PFNGLGETSAMPLERPARAMETERIVPROC glad_glGetSamplerParameteriv = NULL;
-PFNGLGETSHADERINFOLOGPROC glad_glGetShaderInfoLog = NULL;
-PFNGLGETSHADERPRECISIONFORMATPROC glad_glGetShaderPrecisionFormat = NULL;
-PFNGLGETSHADERSOURCEPROC glad_glGetShaderSource = NULL;
-PFNGLGETSHADERIVPROC glad_glGetShaderiv = NULL;
-PFNGLGETSTRINGPROC glad_glGetString = NULL;
-PFNGLGETSTRINGIPROC glad_glGetStringi = NULL;
-PFNGLGETSUBROUTINEINDEXPROC glad_glGetSubroutineIndex = NULL;
-PFNGLGETSUBROUTINEUNIFORMLOCATIONPROC glad_glGetSubroutineUniformLocation = NULL;
-PFNGLGETSYNCIVPROC glad_glGetSynciv = NULL;
-PFNGLGETTEXIMAGEPROC glad_glGetTexImage = NULL;
-PFNGLGETTEXLEVELPARAMETERFVPROC glad_glGetTexLevelParameterfv = NULL;
-PFNGLGETTEXLEVELPARAMETERIVPROC glad_glGetTexLevelParameteriv = NULL;
-PFNGLGETTEXPARAMETERIIVPROC glad_glGetTexParameterIiv = NULL;
-PFNGLGETTEXPARAMETERIUIVPROC glad_glGetTexParameterIuiv = NULL;
-PFNGLGETTEXPARAMETERFVPROC glad_glGetTexParameterfv = NULL;
-PFNGLGETTEXPARAMETERIVPROC glad_glGetTexParameteriv = NULL;
-PFNGLGETTRANSFORMFEEDBACKVARYINGPROC glad_glGetTransformFeedbackVarying = NULL;
-PFNGLGETUNIFORMBLOCKINDEXPROC glad_glGetUniformBlockIndex = NULL;
-PFNGLGETUNIFORMINDICESPROC glad_glGetUniformIndices = NULL;
-PFNGLGETUNIFORMLOCATIONPROC glad_glGetUniformLocation = NULL;
-PFNGLGETUNIFORMSUBROUTINEUIVPROC glad_glGetUniformSubroutineuiv = NULL;
-PFNGLGETUNIFORMDVPROC glad_glGetUniformdv = NULL;
-PFNGLGETUNIFORMFVPROC glad_glGetUniformfv = NULL;
-PFNGLGETUNIFORMIVPROC glad_glGetUniformiv = NULL;
-PFNGLGETUNIFORMUIVPROC glad_glGetUniformuiv = NULL;
-PFNGLGETVERTEXATTRIBIIVPROC glad_glGetVertexAttribIiv = NULL;
-PFNGLGETVERTEXATTRIBIUIVPROC glad_glGetVertexAttribIuiv = NULL;
-PFNGLGETVERTEXATTRIBLDVPROC glad_glGetVertexAttribLdv = NULL;
-PFNGLGETVERTEXATTRIBPOINTERVPROC glad_glGetVertexAttribPointerv = NULL;
-PFNGLGETVERTEXATTRIBDVPROC glad_glGetVertexAttribdv = NULL;
-PFNGLGETVERTEXATTRIBFVPROC glad_glGetVertexAttribfv = NULL;
-PFNGLGETVERTEXATTRIBIVPROC glad_glGetVertexAttribiv = NULL;
-PFNGLHINTPROC glad_glHint = NULL;
-PFNGLINVALIDATEBUFFERDATAPROC glad_glInvalidateBufferData = NULL;
-PFNGLINVALIDATEBUFFERSUBDATAPROC glad_glInvalidateBufferSubData = NULL;
-PFNGLINVALIDATEFRAMEBUFFERPROC glad_glInvalidateFramebuffer = NULL;
-PFNGLINVALIDATESUBFRAMEBUFFERPROC glad_glInvalidateSubFramebuffer = NULL;
-PFNGLINVALIDATETEXIMAGEPROC glad_glInvalidateTexImage = NULL;
-PFNGLINVALIDATETEXSUBIMAGEPROC glad_glInvalidateTexSubImage = NULL;
-PFNGLISBUFFERPROC glad_glIsBuffer = NULL;
-PFNGLISENABLEDPROC glad_glIsEnabled = NULL;
-PFNGLISENABLEDIPROC glad_glIsEnabledi = NULL;
-PFNGLISFRAMEBUFFERPROC glad_glIsFramebuffer = NULL;
-PFNGLISPROGRAMPROC glad_glIsProgram = NULL;
-PFNGLISPROGRAMPIPELINEPROC glad_glIsProgramPipeline = NULL;
-PFNGLISQUERYPROC glad_glIsQuery = NULL;
-PFNGLISRENDERBUFFERPROC glad_glIsRenderbuffer = NULL;
-PFNGLISSAMPLERPROC glad_glIsSampler = NULL;
-PFNGLISSHADERPROC glad_glIsShader = NULL;
-PFNGLISSYNCPROC glad_glIsSync = NULL;
-PFNGLISTEXTUREPROC glad_glIsTexture = NULL;
-PFNGLISTRANSFORMFEEDBACKPROC glad_glIsTransformFeedback = NULL;
-PFNGLISVERTEXARRAYPROC glad_glIsVertexArray = NULL;
-PFNGLLINEWIDTHPROC glad_glLineWidth = NULL;
-PFNGLLINKPROGRAMPROC glad_glLinkProgram = NULL;
-PFNGLLOGICOPPROC glad_glLogicOp = NULL;
-PFNGLMAPBUFFERPROC glad_glMapBuffer = NULL;
-PFNGLMAPBUFFERRANGEPROC glad_glMapBufferRange = NULL;
-PFNGLMEMORYBARRIERPROC glad_glMemoryBarrier = NULL;
-PFNGLMINSAMPLESHADINGPROC glad_glMinSampleShading = NULL;
-PFNGLMULTIDRAWARRAYSPROC glad_glMultiDrawArrays = NULL;
-PFNGLMULTIDRAWARRAYSINDIRECTPROC glad_glMultiDrawArraysIndirect = NULL;
-PFNGLMULTIDRAWELEMENTSPROC glad_glMultiDrawElements = NULL;
-PFNGLMULTIDRAWELEMENTSBASEVERTEXPROC glad_glMultiDrawElementsBaseVertex = NULL;
-PFNGLMULTIDRAWELEMENTSINDIRECTPROC glad_glMultiDrawElementsIndirect = NULL;
-PFNGLMULTITEXCOORDP1UIPROC glad_glMultiTexCoordP1ui = NULL;
-PFNGLMULTITEXCOORDP1UIVPROC glad_glMultiTexCoordP1uiv = NULL;
-PFNGLMULTITEXCOORDP2UIPROC glad_glMultiTexCoordP2ui = NULL;
-PFNGLMULTITEXCOORDP2UIVPROC glad_glMultiTexCoordP2uiv = NULL;
-PFNGLMULTITEXCOORDP3UIPROC glad_glMultiTexCoordP3ui = NULL;
-PFNGLMULTITEXCOORDP3UIVPROC glad_glMultiTexCoordP3uiv = NULL;
-PFNGLMULTITEXCOORDP4UIPROC glad_glMultiTexCoordP4ui = NULL;
-PFNGLMULTITEXCOORDP4UIVPROC glad_glMultiTexCoordP4uiv = NULL;
-PFNGLNORMALP3UIPROC glad_glNormalP3ui = NULL;
-PFNGLNORMALP3UIVPROC glad_glNormalP3uiv = NULL;
-PFNGLOBJECTLABELPROC glad_glObjectLabel = NULL;
-PFNGLOBJECTPTRLABELPROC glad_glObjectPtrLabel = NULL;
-PFNGLPATCHPARAMETERFVPROC glad_glPatchParameterfv = NULL;
-PFNGLPATCHPARAMETERIPROC glad_glPatchParameteri = NULL;
-PFNGLPAUSETRANSFORMFEEDBACKPROC glad_glPauseTransformFeedback = NULL;
-PFNGLPIXELSTOREFPROC glad_glPixelStoref = NULL;
-PFNGLPIXELSTOREIPROC glad_glPixelStorei = NULL;
-PFNGLPOINTPARAMETERFPROC glad_glPointParameterf = NULL;
-PFNGLPOINTPARAMETERFVPROC glad_glPointParameterfv = NULL;
-PFNGLPOINTPARAMETERIPROC glad_glPointParameteri = NULL;
-PFNGLPOINTPARAMETERIVPROC glad_glPointParameteriv = NULL;
-PFNGLPOINTSIZEPROC glad_glPointSize = NULL;
-PFNGLPOLYGONMODEPROC glad_glPolygonMode = NULL;
-PFNGLPOLYGONOFFSETPROC glad_glPolygonOffset = NULL;
-PFNGLPOPDEBUGGROUPPROC glad_glPopDebugGroup = NULL;
-PFNGLPRIMITIVERESTARTINDEXPROC glad_glPrimitiveRestartIndex = NULL;
-PFNGLPROGRAMBINARYPROC glad_glProgramBinary = NULL;
-PFNGLPROGRAMPARAMETERIPROC glad_glProgramParameteri = NULL;
-PFNGLPROGRAMUNIFORM1DPROC glad_glProgramUniform1d = NULL;
-PFNGLPROGRAMUNIFORM1DVPROC glad_glProgramUniform1dv = NULL;
-PFNGLPROGRAMUNIFORM1FPROC glad_glProgramUniform1f = NULL;
-PFNGLPROGRAMUNIFORM1FVPROC glad_glProgramUniform1fv = NULL;
-PFNGLPROGRAMUNIFORM1IPROC glad_glProgramUniform1i = NULL;
-PFNGLPROGRAMUNIFORM1IVPROC glad_glProgramUniform1iv = NULL;
-PFNGLPROGRAMUNIFORM1UIPROC glad_glProgramUniform1ui = NULL;
-PFNGLPROGRAMUNIFORM1UIVPROC glad_glProgramUniform1uiv = NULL;
-PFNGLPROGRAMUNIFORM2DPROC glad_glProgramUniform2d = NULL;
-PFNGLPROGRAMUNIFORM2DVPROC glad_glProgramUniform2dv = NULL;
-PFNGLPROGRAMUNIFORM2FPROC glad_glProgramUniform2f = NULL;
-PFNGLPROGRAMUNIFORM2FVPROC glad_glProgramUniform2fv = NULL;
-PFNGLPROGRAMUNIFORM2IPROC glad_glProgramUniform2i = NULL;
-PFNGLPROGRAMUNIFORM2IVPROC glad_glProgramUniform2iv = NULL;
-PFNGLPROGRAMUNIFORM2UIPROC glad_glProgramUniform2ui = NULL;
-PFNGLPROGRAMUNIFORM2UIVPROC glad_glProgramUniform2uiv = NULL;
-PFNGLPROGRAMUNIFORM3DPROC glad_glProgramUniform3d = NULL;
-PFNGLPROGRAMUNIFORM3DVPROC glad_glProgramUniform3dv = NULL;
-PFNGLPROGRAMUNIFORM3FPROC glad_glProgramUniform3f = NULL;
-PFNGLPROGRAMUNIFORM3FVPROC glad_glProgramUniform3fv = NULL;
-PFNGLPROGRAMUNIFORM3IPROC glad_glProgramUniform3i = NULL;
-PFNGLPROGRAMUNIFORM3IVPROC glad_glProgramUniform3iv = NULL;
-PFNGLPROGRAMUNIFORM3UIPROC glad_glProgramUniform3ui = NULL;
-PFNGLPROGRAMUNIFORM3UIVPROC glad_glProgramUniform3uiv = NULL;
-PFNGLPROGRAMUNIFORM4DPROC glad_glProgramUniform4d = NULL;
-PFNGLPROGRAMUNIFORM4DVPROC glad_glProgramUniform4dv = NULL;
-PFNGLPROGRAMUNIFORM4FPROC glad_glProgramUniform4f = NULL;
-PFNGLPROGRAMUNIFORM4FVPROC glad_glProgramUniform4fv = NULL;
-PFNGLPROGRAMUNIFORM4IPROC glad_glProgramUniform4i = NULL;
-PFNGLPROGRAMUNIFORM4IVPROC glad_glProgramUniform4iv = NULL;
-PFNGLPROGRAMUNIFORM4UIPROC glad_glProgramUniform4ui = NULL;
-PFNGLPROGRAMUNIFORM4UIVPROC glad_glProgramUniform4uiv = NULL;
-PFNGLPROGRAMUNIFORMMATRIX2DVPROC glad_glProgramUniformMatrix2dv = NULL;
-PFNGLPROGRAMUNIFORMMATRIX2FVPROC glad_glProgramUniformMatrix2fv = NULL;
-PFNGLPROGRAMUNIFORMMATRIX2X3DVPROC glad_glProgramUniformMatrix2x3dv = NULL;
-PFNGLPROGRAMUNIFORMMATRIX2X3FVPROC glad_glProgramUniformMatrix2x3fv = NULL;
-PFNGLPROGRAMUNIFORMMATRIX2X4DVPROC glad_glProgramUniformMatrix2x4dv = NULL;
-PFNGLPROGRAMUNIFORMMATRIX2X4FVPROC glad_glProgramUniformMatrix2x4fv = NULL;
-PFNGLPROGRAMUNIFORMMATRIX3DVPROC glad_glProgramUniformMatrix3dv = NULL;
-PFNGLPROGRAMUNIFORMMATRIX3FVPROC glad_glProgramUniformMatrix3fv = NULL;
-PFNGLPROGRAMUNIFORMMATRIX3X2DVPROC glad_glProgramUniformMatrix3x2dv = NULL;
-PFNGLPROGRAMUNIFORMMATRIX3X2FVPROC glad_glProgramUniformMatrix3x2fv = NULL;
-PFNGLPROGRAMUNIFORMMATRIX3X4DVPROC glad_glProgramUniformMatrix3x4dv = NULL;
-PFNGLPROGRAMUNIFORMMATRIX3X4FVPROC glad_glProgramUniformMatrix3x4fv = NULL;
-PFNGLPROGRAMUNIFORMMATRIX4DVPROC glad_glProgramUniformMatrix4dv = NULL;
-PFNGLPROGRAMUNIFORMMATRIX4FVPROC glad_glProgramUniformMatrix4fv = NULL;
-PFNGLPROGRAMUNIFORMMATRIX4X2DVPROC glad_glProgramUniformMatrix4x2dv = NULL;
-PFNGLPROGRAMUNIFORMMATRIX4X2FVPROC glad_glProgramUniformMatrix4x2fv = NULL;
-PFNGLPROGRAMUNIFORMMATRIX4X3DVPROC glad_glProgramUniformMatrix4x3dv = NULL;
-PFNGLPROGRAMUNIFORMMATRIX4X3FVPROC glad_glProgramUniformMatrix4x3fv = NULL;
-PFNGLPROVOKINGVERTEXPROC glad_glProvokingVertex = NULL;
-PFNGLPUSHDEBUGGROUPPROC glad_glPushDebugGroup = NULL;
-PFNGLQUERYCOUNTERPROC glad_glQueryCounter = NULL;
-PFNGLREADBUFFERPROC glad_glReadBuffer = NULL;
-PFNGLREADPIXELSPROC glad_glReadPixels = NULL;
-PFNGLRELEASESHADERCOMPILERPROC glad_glReleaseShaderCompiler = NULL;
-PFNGLRENDERBUFFERSTORAGEPROC glad_glRenderbufferStorage = NULL;
-PFNGLRENDERBUFFERSTORAGEMULTISAMPLEPROC glad_glRenderbufferStorageMultisample = NULL;
-PFNGLRESUMETRANSFORMFEEDBACKPROC glad_glResumeTransformFeedback = NULL;
-PFNGLSAMPLECOVERAGEPROC glad_glSampleCoverage = NULL;
-PFNGLSAMPLEMASKIPROC glad_glSampleMaski = NULL;
-PFNGLSAMPLERPARAMETERIIVPROC glad_glSamplerParameterIiv = NULL;
-PFNGLSAMPLERPARAMETERIUIVPROC glad_glSamplerParameterIuiv = NULL;
-PFNGLSAMPLERPARAMETERFPROC glad_glSamplerParameterf = NULL;
-PFNGLSAMPLERPARAMETERFVPROC glad_glSamplerParameterfv = NULL;
-PFNGLSAMPLERPARAMETERIPROC glad_glSamplerParameteri = NULL;
-PFNGLSAMPLERPARAMETERIVPROC glad_glSamplerParameteriv = NULL;
-PFNGLSCISSORPROC glad_glScissor = NULL;
-PFNGLSCISSORARRAYVPROC glad_glScissorArrayv = NULL;
-PFNGLSCISSORINDEXEDPROC glad_glScissorIndexed = NULL;
-PFNGLSCISSORINDEXEDVPROC glad_glScissorIndexedv = NULL;
-PFNGLSECONDARYCOLORP3UIPROC glad_glSecondaryColorP3ui = NULL;
-PFNGLSECONDARYCOLORP3UIVPROC glad_glSecondaryColorP3uiv = NULL;
-PFNGLSHADERBINARYPROC glad_glShaderBinary = NULL;
-PFNGLSHADERSOURCEPROC glad_glShaderSource = NULL;
-PFNGLSHADERSTORAGEBLOCKBINDINGPROC glad_glShaderStorageBlockBinding = NULL;
-PFNGLSTENCILFUNCPROC glad_glStencilFunc = NULL;
-PFNGLSTENCILFUNCSEPARATEPROC glad_glStencilFuncSeparate = NULL;
-PFNGLSTENCILMASKPROC glad_glStencilMask = NULL;
-PFNGLSTENCILMASKSEPARATEPROC glad_glStencilMaskSeparate = NULL;
-PFNGLSTENCILOPPROC glad_glStencilOp = NULL;
-PFNGLSTENCILOPSEPARATEPROC glad_glStencilOpSeparate = NULL;
-PFNGLTEXBUFFERPROC glad_glTexBuffer = NULL;
-PFNGLTEXBUFFERRANGEPROC glad_glTexBufferRange = NULL;
-PFNGLTEXCOORDP1UIPROC glad_glTexCoordP1ui = NULL;
-PFNGLTEXCOORDP1UIVPROC glad_glTexCoordP1uiv = NULL;
-PFNGLTEXCOORDP2UIPROC glad_glTexCoordP2ui = NULL;
-PFNGLTEXCOORDP2UIVPROC glad_glTexCoordP2uiv = NULL;
-PFNGLTEXCOORDP3UIPROC glad_glTexCoordP3ui = NULL;
-PFNGLTEXCOORDP3UIVPROC glad_glTexCoordP3uiv = NULL;
-PFNGLTEXCOORDP4UIPROC glad_glTexCoordP4ui = NULL;
-PFNGLTEXCOORDP4UIVPROC glad_glTexCoordP4uiv = NULL;
-PFNGLTEXIMAGE1DPROC glad_glTexImage1D = NULL;
-PFNGLTEXIMAGE2DPROC glad_glTexImage2D = NULL;
-PFNGLTEXIMAGE2DMULTISAMPLEPROC glad_glTexImage2DMultisample = NULL;
-PFNGLTEXIMAGE3DPROC glad_glTexImage3D = NULL;
-PFNGLTEXIMAGE3DMULTISAMPLEPROC glad_glTexImage3DMultisample = NULL;
-PFNGLTEXPARAMETERIIVPROC glad_glTexParameterIiv = NULL;
-PFNGLTEXPARAMETERIUIVPROC glad_glTexParameterIuiv = NULL;
-PFNGLTEXPARAMETERFPROC glad_glTexParameterf = NULL;
-PFNGLTEXPARAMETERFVPROC glad_glTexParameterfv = NULL;
-PFNGLTEXPARAMETERIPROC glad_glTexParameteri = NULL;
-PFNGLTEXPARAMETERIVPROC glad_glTexParameteriv = NULL;
-PFNGLTEXSTORAGE1DPROC glad_glTexStorage1D = NULL;
-PFNGLTEXSTORAGE2DPROC glad_glTexStorage2D = NULL;
-PFNGLTEXSTORAGE2DMULTISAMPLEPROC glad_glTexStorage2DMultisample = NULL;
-PFNGLTEXSTORAGE3DPROC glad_glTexStorage3D = NULL;
-PFNGLTEXSTORAGE3DMULTISAMPLEPROC glad_glTexStorage3DMultisample = NULL;
-PFNGLTEXSUBIMAGE1DPROC glad_glTexSubImage1D = NULL;
-PFNGLTEXSUBIMAGE2DPROC glad_glTexSubImage2D = NULL;
-PFNGLTEXSUBIMAGE3DPROC glad_glTexSubImage3D = NULL;
-PFNGLTEXTUREVIEWPROC glad_glTextureView = NULL;
-PFNGLTRANSFORMFEEDBACKVARYINGSPROC glad_glTransformFeedbackVaryings = NULL;
-PFNGLUNIFORM1DPROC glad_glUniform1d = NULL;
-PFNGLUNIFORM1DVPROC glad_glUniform1dv = NULL;
-PFNGLUNIFORM1FPROC glad_glUniform1f = NULL;
-PFNGLUNIFORM1FVPROC glad_glUniform1fv = NULL;
-PFNGLUNIFORM1IPROC glad_glUniform1i = NULL;
-PFNGLUNIFORM1IVPROC glad_glUniform1iv = NULL;
-PFNGLUNIFORM1UIPROC glad_glUniform1ui = NULL;
-PFNGLUNIFORM1UIVPROC glad_glUniform1uiv = NULL;
-PFNGLUNIFORM2DPROC glad_glUniform2d = NULL;
-PFNGLUNIFORM2DVPROC glad_glUniform2dv = NULL;
-PFNGLUNIFORM2FPROC glad_glUniform2f = NULL;
-PFNGLUNIFORM2FVPROC glad_glUniform2fv = NULL;
-PFNGLUNIFORM2IPROC glad_glUniform2i = NULL;
-PFNGLUNIFORM2IVPROC glad_glUniform2iv = NULL;
-PFNGLUNIFORM2UIPROC glad_glUniform2ui = NULL;
-PFNGLUNIFORM2UIVPROC glad_glUniform2uiv = NULL;
-PFNGLUNIFORM3DPROC glad_glUniform3d = NULL;
-PFNGLUNIFORM3DVPROC glad_glUniform3dv = NULL;
-PFNGLUNIFORM3FPROC glad_glUniform3f = NULL;
-PFNGLUNIFORM3FVPROC glad_glUniform3fv = NULL;
-PFNGLUNIFORM3IPROC glad_glUniform3i = NULL;
-PFNGLUNIFORM3IVPROC glad_glUniform3iv = NULL;
-PFNGLUNIFORM3UIPROC glad_glUniform3ui = NULL;
-PFNGLUNIFORM3UIVPROC glad_glUniform3uiv = NULL;
-PFNGLUNIFORM4DPROC glad_glUniform4d = NULL;
-PFNGLUNIFORM4DVPROC glad_glUniform4dv = NULL;
-PFNGLUNIFORM4FPROC glad_glUniform4f = NULL;
-PFNGLUNIFORM4FVPROC glad_glUniform4fv = NULL;
-PFNGLUNIFORM4IPROC glad_glUniform4i = NULL;
-PFNGLUNIFORM4IVPROC glad_glUniform4iv = NULL;
-PFNGLUNIFORM4UIPROC glad_glUniform4ui = NULL;
-PFNGLUNIFORM4UIVPROC glad_glUniform4uiv = NULL;
-PFNGLUNIFORMBLOCKBINDINGPROC glad_glUniformBlockBinding = NULL;
-PFNGLUNIFORMMATRIX2DVPROC glad_glUniformMatrix2dv = NULL;
-PFNGLUNIFORMMATRIX2FVPROC glad_glUniformMatrix2fv = NULL;
-PFNGLUNIFORMMATRIX2X3DVPROC glad_glUniformMatrix2x3dv = NULL;
-PFNGLUNIFORMMATRIX2X3FVPROC glad_glUniformMatrix2x3fv = NULL;
-PFNGLUNIFORMMATRIX2X4DVPROC glad_glUniformMatrix2x4dv = NULL;
-PFNGLUNIFORMMATRIX2X4FVPROC glad_glUniformMatrix2x4fv = NULL;
-PFNGLUNIFORMMATRIX3DVPROC glad_glUniformMatrix3dv = NULL;
-PFNGLUNIFORMMATRIX3FVPROC glad_glUniformMatrix3fv = NULL;
-PFNGLUNIFORMMATRIX3X2DVPROC glad_glUniformMatrix3x2dv = NULL;
-PFNGLUNIFORMMATRIX3X2FVPROC glad_glUniformMatrix3x2fv = NULL;
-PFNGLUNIFORMMATRIX3X4DVPROC glad_glUniformMatrix3x4dv = NULL;
-PFNGLUNIFORMMATRIX3X4FVPROC glad_glUniformMatrix3x4fv = NULL;
-PFNGLUNIFORMMATRIX4DVPROC glad_glUniformMatrix4dv = NULL;
-PFNGLUNIFORMMATRIX4FVPROC glad_glUniformMatrix4fv = NULL;
-PFNGLUNIFORMMATRIX4X2DVPROC glad_glUniformMatrix4x2dv = NULL;
-PFNGLUNIFORMMATRIX4X2FVPROC glad_glUniformMatrix4x2fv = NULL;
-PFNGLUNIFORMMATRIX4X3DVPROC glad_glUniformMatrix4x3dv = NULL;
-PFNGLUNIFORMMATRIX4X3FVPROC glad_glUniformMatrix4x3fv = NULL;
-PFNGLUNIFORMSUBROUTINESUIVPROC glad_glUniformSubroutinesuiv = NULL;
-PFNGLUNMAPBUFFERPROC glad_glUnmapBuffer = NULL;
-PFNGLUSEPROGRAMPROC glad_glUseProgram = NULL;
-PFNGLUSEPROGRAMSTAGESPROC glad_glUseProgramStages = NULL;
-PFNGLVALIDATEPROGRAMPROC glad_glValidateProgram = NULL;
-PFNGLVALIDATEPROGRAMPIPELINEPROC glad_glValidateProgramPipeline = NULL;
-PFNGLVERTEXATTRIB1DPROC glad_glVertexAttrib1d = NULL;
-PFNGLVERTEXATTRIB1DVPROC glad_glVertexAttrib1dv = NULL;
-PFNGLVERTEXATTRIB1FPROC glad_glVertexAttrib1f = NULL;
-PFNGLVERTEXATTRIB1FVPROC glad_glVertexAttrib1fv = NULL;
-PFNGLVERTEXATTRIB1SPROC glad_glVertexAttrib1s = NULL;
-PFNGLVERTEXATTRIB1SVPROC glad_glVertexAttrib1sv = NULL;
-PFNGLVERTEXATTRIB2DPROC glad_glVertexAttrib2d = NULL;
-PFNGLVERTEXATTRIB2DVPROC glad_glVertexAttrib2dv = NULL;
-PFNGLVERTEXATTRIB2FPROC glad_glVertexAttrib2f = NULL;
-PFNGLVERTEXATTRIB2FVPROC glad_glVertexAttrib2fv = NULL;
-PFNGLVERTEXATTRIB2SPROC glad_glVertexAttrib2s = NULL;
-PFNGLVERTEXATTRIB2SVPROC glad_glVertexAttrib2sv = NULL;
-PFNGLVERTEXATTRIB3DPROC glad_glVertexAttrib3d = NULL;
-PFNGLVERTEXATTRIB3DVPROC glad_glVertexAttrib3dv = NULL;
-PFNGLVERTEXATTRIB3FPROC glad_glVertexAttrib3f = NULL;
-PFNGLVERTEXATTRIB3FVPROC glad_glVertexAttrib3fv = NULL;
-PFNGLVERTEXATTRIB3SPROC glad_glVertexAttrib3s = NULL;
-PFNGLVERTEXATTRIB3SVPROC glad_glVertexAttrib3sv = NULL;
-PFNGLVERTEXATTRIB4NBVPROC glad_glVertexAttrib4Nbv = NULL;
-PFNGLVERTEXATTRIB4NIVPROC glad_glVertexAttrib4Niv = NULL;
-PFNGLVERTEXATTRIB4NSVPROC glad_glVertexAttrib4Nsv = NULL;
-PFNGLVERTEXATTRIB4NUBPROC glad_glVertexAttrib4Nub = NULL;
-PFNGLVERTEXATTRIB4NUBVPROC glad_glVertexAttrib4Nubv = NULL;
-PFNGLVERTEXATTRIB4NUIVPROC glad_glVertexAttrib4Nuiv = NULL;
-PFNGLVERTEXATTRIB4NUSVPROC glad_glVertexAttrib4Nusv = NULL;
-PFNGLVERTEXATTRIB4BVPROC glad_glVertexAttrib4bv = NULL;
-PFNGLVERTEXATTRIB4DPROC glad_glVertexAttrib4d = NULL;
-PFNGLVERTEXATTRIB4DVPROC glad_glVertexAttrib4dv = NULL;
-PFNGLVERTEXATTRIB4FPROC glad_glVertexAttrib4f = NULL;
-PFNGLVERTEXATTRIB4FVPROC glad_glVertexAttrib4fv = NULL;
-PFNGLVERTEXATTRIB4IVPROC glad_glVertexAttrib4iv = NULL;
-PFNGLVERTEXATTRIB4SPROC glad_glVertexAttrib4s = NULL;
-PFNGLVERTEXATTRIB4SVPROC glad_glVertexAttrib4sv = NULL;
-PFNGLVERTEXATTRIB4UBVPROC glad_glVertexAttrib4ubv = NULL;
-PFNGLVERTEXATTRIB4UIVPROC glad_glVertexAttrib4uiv = NULL;
-PFNGLVERTEXATTRIB4USVPROC glad_glVertexAttrib4usv = NULL;
-PFNGLVERTEXATTRIBBINDINGPROC glad_glVertexAttribBinding = NULL;
-PFNGLVERTEXATTRIBDIVISORPROC glad_glVertexAttribDivisor = NULL;
-PFNGLVERTEXATTRIBFORMATPROC glad_glVertexAttribFormat = NULL;
-PFNGLVERTEXATTRIBI1IPROC glad_glVertexAttribI1i = NULL;
-PFNGLVERTEXATTRIBI1IVPROC glad_glVertexAttribI1iv = NULL;
-PFNGLVERTEXATTRIBI1UIPROC glad_glVertexAttribI1ui = NULL;
-PFNGLVERTEXATTRIBI1UIVPROC glad_glVertexAttribI1uiv = NULL;
-PFNGLVERTEXATTRIBI2IPROC glad_glVertexAttribI2i = NULL;
-PFNGLVERTEXATTRIBI2IVPROC glad_glVertexAttribI2iv = NULL;
-PFNGLVERTEXATTRIBI2UIPROC glad_glVertexAttribI2ui = NULL;
-PFNGLVERTEXATTRIBI2UIVPROC glad_glVertexAttribI2uiv = NULL;
-PFNGLVERTEXATTRIBI3IPROC glad_glVertexAttribI3i = NULL;
-PFNGLVERTEXATTRIBI3IVPROC glad_glVertexAttribI3iv = NULL;
-PFNGLVERTEXATTRIBI3UIPROC glad_glVertexAttribI3ui = NULL;
-PFNGLVERTEXATTRIBI3UIVPROC glad_glVertexAttribI3uiv = NULL;
-PFNGLVERTEXATTRIBI4BVPROC glad_glVertexAttribI4bv = NULL;
-PFNGLVERTEXATTRIBI4IPROC glad_glVertexAttribI4i = NULL;
-PFNGLVERTEXATTRIBI4IVPROC glad_glVertexAttribI4iv = NULL;
-PFNGLVERTEXATTRIBI4SVPROC glad_glVertexAttribI4sv = NULL;
-PFNGLVERTEXATTRIBI4UBVPROC glad_glVertexAttribI4ubv = NULL;
-PFNGLVERTEXATTRIBI4UIPROC glad_glVertexAttribI4ui = NULL;
-PFNGLVERTEXATTRIBI4UIVPROC glad_glVertexAttribI4uiv = NULL;
-PFNGLVERTEXATTRIBI4USVPROC glad_glVertexAttribI4usv = NULL;
-PFNGLVERTEXATTRIBIFORMATPROC glad_glVertexAttribIFormat = NULL;
-PFNGLVERTEXATTRIBIPOINTERPROC glad_glVertexAttribIPointer = NULL;
-PFNGLVERTEXATTRIBL1DPROC glad_glVertexAttribL1d = NULL;
-PFNGLVERTEXATTRIBL1DVPROC glad_glVertexAttribL1dv = NULL;
-PFNGLVERTEXATTRIBL2DPROC glad_glVertexAttribL2d = NULL;
-PFNGLVERTEXATTRIBL2DVPROC glad_glVertexAttribL2dv = NULL;
-PFNGLVERTEXATTRIBL3DPROC glad_glVertexAttribL3d = NULL;
-PFNGLVERTEXATTRIBL3DVPROC glad_glVertexAttribL3dv = NULL;
-PFNGLVERTEXATTRIBL4DPROC glad_glVertexAttribL4d = NULL;
-PFNGLVERTEXATTRIBL4DVPROC glad_glVertexAttribL4dv = NULL;
-PFNGLVERTEXATTRIBLFORMATPROC glad_glVertexAttribLFormat = NULL;
-PFNGLVERTEXATTRIBLPOINTERPROC glad_glVertexAttribLPointer = NULL;
-PFNGLVERTEXATTRIBP1UIPROC glad_glVertexAttribP1ui = NULL;
-PFNGLVERTEXATTRIBP1UIVPROC glad_glVertexAttribP1uiv = NULL;
-PFNGLVERTEXATTRIBP2UIPROC glad_glVertexAttribP2ui = NULL;
-PFNGLVERTEXATTRIBP2UIVPROC glad_glVertexAttribP2uiv = NULL;
-PFNGLVERTEXATTRIBP3UIPROC glad_glVertexAttribP3ui = NULL;
-PFNGLVERTEXATTRIBP3UIVPROC glad_glVertexAttribP3uiv = NULL;
-PFNGLVERTEXATTRIBP4UIPROC glad_glVertexAttribP4ui = NULL;
-PFNGLVERTEXATTRIBP4UIVPROC glad_glVertexAttribP4uiv = NULL;
-PFNGLVERTEXATTRIBPOINTERPROC glad_glVertexAttribPointer = NULL;
-PFNGLVERTEXBINDINGDIVISORPROC glad_glVertexBindingDivisor = NULL;
-PFNGLVERTEXP2UIPROC glad_glVertexP2ui = NULL;
-PFNGLVERTEXP2UIVPROC glad_glVertexP2uiv = NULL;
-PFNGLVERTEXP3UIPROC glad_glVertexP3ui = NULL;
-PFNGLVERTEXP3UIVPROC glad_glVertexP3uiv = NULL;
-PFNGLVERTEXP4UIPROC glad_glVertexP4ui = NULL;
-PFNGLVERTEXP4UIVPROC glad_glVertexP4uiv = NULL;
-PFNGLVIEWPORTPROC glad_glViewport = NULL;
-PFNGLVIEWPORTARRAYVPROC glad_glViewportArrayv = NULL;
-PFNGLVIEWPORTINDEXEDFPROC glad_glViewportIndexedf = NULL;
-PFNGLVIEWPORTINDEXEDFVPROC glad_glViewportIndexedfv = NULL;
-PFNGLWAITSYNCPROC glad_glWaitSync = NULL;
-static void load_GL_VERSION_1_0(GLADloadproc load) {
-	if(!GLAD_GL_VERSION_1_0) return;
-	glad_glCullFace = (PFNGLCULLFACEPROC)load("glCullFace");
-	glad_glFrontFace = (PFNGLFRONTFACEPROC)load("glFrontFace");
-	glad_glHint = (PFNGLHINTPROC)load("glHint");
-	glad_glLineWidth = (PFNGLLINEWIDTHPROC)load("glLineWidth");
-	glad_glPointSize = (PFNGLPOINTSIZEPROC)load("glPointSize");
-	glad_glPolygonMode = (PFNGLPOLYGONMODEPROC)load("glPolygonMode");
-	glad_glScissor = (PFNGLSCISSORPROC)load("glScissor");
-	glad_glTexParameterf = (PFNGLTEXPARAMETERFPROC)load("glTexParameterf");
-	glad_glTexParameterfv = (PFNGLTEXPARAMETERFVPROC)load("glTexParameterfv");
-	glad_glTexParameteri = (PFNGLTEXPARAMETERIPROC)load("glTexParameteri");
-	glad_glTexParameteriv = (PFNGLTEXPARAMETERIVPROC)load("glTexParameteriv");
-	glad_glTexImage1D = (PFNGLTEXIMAGE1DPROC)load("glTexImage1D");
-	glad_glTexImage2D = (PFNGLTEXIMAGE2DPROC)load("glTexImage2D");
-	glad_glDrawBuffer = (PFNGLDRAWBUFFERPROC)load("glDrawBuffer");
-	glad_glClear = (PFNGLCLEARPROC)load("glClear");
-	glad_glClearColor = (PFNGLCLEARCOLORPROC)load("glClearColor");
-	glad_glClearStencil = (PFNGLCLEARSTENCILPROC)load("glClearStencil");
-	glad_glClearDepth = (PFNGLCLEARDEPTHPROC)load("glClearDepth");
-	glad_glStencilMask = (PFNGLSTENCILMASKPROC)load("glStencilMask");
-	glad_glColorMask = (PFNGLCOLORMASKPROC)load("glColorMask");
-	glad_glDepthMask = (PFNGLDEPTHMASKPROC)load("glDepthMask");
-	glad_glDisable = (PFNGLDISABLEPROC)load("glDisable");
-	glad_glEnable = (PFNGLENABLEPROC)load("glEnable");
-	glad_glFinish = (PFNGLFINISHPROC)load("glFinish");
-	glad_glFlush = (PFNGLFLUSHPROC)load("glFlush");
-	glad_glBlendFunc = (PFNGLBLENDFUNCPROC)load("glBlendFunc");
-	glad_glLogicOp = (PFNGLLOGICOPPROC)load("glLogicOp");
-	glad_glStencilFunc = (PFNGLSTENCILFUNCPROC)load("glStencilFunc");
-	glad_glStencilOp = (PFNGLSTENCILOPPROC)load("glStencilOp");
-	glad_glDepthFunc = (PFNGLDEPTHFUNCPROC)load("glDepthFunc");
-	glad_glPixelStoref = (PFNGLPIXELSTOREFPROC)load("glPixelStoref");
-	glad_glPixelStorei = (PFNGLPIXELSTOREIPROC)load("glPixelStorei");
-	glad_glReadBuffer = (PFNGLREADBUFFERPROC)load("glReadBuffer");
-	glad_glReadPixels = (PFNGLREADPIXELSPROC)load("glReadPixels");
-	glad_glGetBooleanv = (PFNGLGETBOOLEANVPROC)load("glGetBooleanv");
-	glad_glGetDoublev = (PFNGLGETDOUBLEVPROC)load("glGetDoublev");
-	glad_glGetError = (PFNGLGETERRORPROC)load("glGetError");
-	glad_glGetFloatv = (PFNGLGETFLOATVPROC)load("glGetFloatv");
-	glad_glGetIntegerv = (PFNGLGETINTEGERVPROC)load("glGetIntegerv");
-	glad_glGetString = (PFNGLGETSTRINGPROC)load("glGetString");
-	glad_glGetTexImage = (PFNGLGETTEXIMAGEPROC)load("glGetTexImage");
-	glad_glGetTexParameterfv = (PFNGLGETTEXPARAMETERFVPROC)load("glGetTexParameterfv");
-	glad_glGetTexParameteriv = (PFNGLGETTEXPARAMETERIVPROC)load("glGetTexParameteriv");
-	glad_glGetTexLevelParameterfv = (PFNGLGETTEXLEVELPARAMETERFVPROC)load("glGetTexLevelParameterfv");
-	glad_glGetTexLevelParameteriv = (PFNGLGETTEXLEVELPARAMETERIVPROC)load("glGetTexLevelParameteriv");
-	glad_glIsEnabled = (PFNGLISENABLEDPROC)load("glIsEnabled");
-	glad_glDepthRange = (PFNGLDEPTHRANGEPROC)load("glDepthRange");
-	glad_glViewport = (PFNGLVIEWPORTPROC)load("glViewport");
-}
-static void load_GL_VERSION_1_1(GLADloadproc load) {
-	if(!GLAD_GL_VERSION_1_1) return;
-	glad_glDrawArrays = (PFNGLDRAWARRAYSPROC)load("glDrawArrays");
-	glad_glDrawElements = (PFNGLDRAWELEMENTSPROC)load("glDrawElements");
-	glad_glPolygonOffset = (PFNGLPOLYGONOFFSETPROC)load("glPolygonOffset");
-	glad_glCopyTexImage1D = (PFNGLCOPYTEXIMAGE1DPROC)load("glCopyTexImage1D");
-	glad_glCopyTexImage2D = (PFNGLCOPYTEXIMAGE2DPROC)load("glCopyTexImage2D");
-	glad_glCopyTexSubImage1D = (PFNGLCOPYTEXSUBIMAGE1DPROC)load("glCopyTexSubImage1D");
-	glad_glCopyTexSubImage2D = (PFNGLCOPYTEXSUBIMAGE2DPROC)load("glCopyTexSubImage2D");
-	glad_glTexSubImage1D = (PFNGLTEXSUBIMAGE1DPROC)load("glTexSubImage1D");
-	glad_glTexSubImage2D = (PFNGLTEXSUBIMAGE2DPROC)load("glTexSubImage2D");
-	glad_glBindTexture = (PFNGLBINDTEXTUREPROC)load("glBindTexture");
-	glad_glDeleteTextures = (PFNGLDELETETEXTURESPROC)load("glDeleteTextures");
-	glad_glGenTextures = (PFNGLGENTEXTURESPROC)load("glGenTextures");
-	glad_glIsTexture = (PFNGLISTEXTUREPROC)load("glIsTexture");
-}
-static void load_GL_VERSION_1_2(GLADloadproc load) {
-	if(!GLAD_GL_VERSION_1_2) return;
-	glad_glDrawRangeElements = (PFNGLDRAWRANGEELEMENTSPROC)load("glDrawRangeElements");
-	glad_glTexImage3D = (PFNGLTEXIMAGE3DPROC)load("glTexImage3D");
-	glad_glTexSubImage3D = (PFNGLTEXSUBIMAGE3DPROC)load("glTexSubImage3D");
-	glad_glCopyTexSubImage3D = (PFNGLCOPYTEXSUBIMAGE3DPROC)load("glCopyTexSubImage3D");
-}
-static void load_GL_VERSION_1_3(GLADloadproc load) {
-	if(!GLAD_GL_VERSION_1_3) return;
-	glad_glActiveTexture = (PFNGLACTIVETEXTUREPROC)load("glActiveTexture");
-	glad_glSampleCoverage = (PFNGLSAMPLECOVERAGEPROC)load("glSampleCoverage");
-	glad_glCompressedTexImage3D = (PFNGLCOMPRESSEDTEXIMAGE3DPROC)load("glCompressedTexImage3D");
-	glad_glCompressedTexImage2D = (PFNGLCOMPRESSEDTEXIMAGE2DPROC)load("glCompressedTexImage2D");
-	glad_glCompressedTexImage1D = (PFNGLCOMPRESSEDTEXIMAGE1DPROC)load("glCompressedTexImage1D");
-	glad_glCompressedTexSubImage3D = (PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC)load("glCompressedTexSubImage3D");
-	glad_glCompressedTexSubImage2D = (PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC)load("glCompressedTexSubImage2D");
-	glad_glCompressedTexSubImage1D = (PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC)load("glCompressedTexSubImage1D");
-	glad_glGetCompressedTexImage = (PFNGLGETCOMPRESSEDTEXIMAGEPROC)load("glGetCompressedTexImage");
-}
-static void load_GL_VERSION_1_4(GLADloadproc load) {
-	if(!GLAD_GL_VERSION_1_4) return;
-	glad_glBlendFuncSeparate = (PFNGLBLENDFUNCSEPARATEPROC)load("glBlendFuncSeparate");
-	glad_glMultiDrawArrays = (PFNGLMULTIDRAWARRAYSPROC)load("glMultiDrawArrays");
-	glad_glMultiDrawElements = (PFNGLMULTIDRAWELEMENTSPROC)load("glMultiDrawElements");
-	glad_glPointParameterf = (PFNGLPOINTPARAMETERFPROC)load("glPointParameterf");
-	glad_glPointParameterfv = (PFNGLPOINTPARAMETERFVPROC)load("glPointParameterfv");
-	glad_glPointParameteri = (PFNGLPOINTPARAMETERIPROC)load("glPointParameteri");
-	glad_glPointParameteriv = (PFNGLPOINTPARAMETERIVPROC)load("glPointParameteriv");
-	glad_glBlendColor = (PFNGLBLENDCOLORPROC)load("glBlendColor");
-	glad_glBlendEquation = (PFNGLBLENDEQUATIONPROC)load("glBlendEquation");
-}
-static void load_GL_VERSION_1_5(GLADloadproc load) {
-	if(!GLAD_GL_VERSION_1_5) return;
-	glad_glGenQueries = (PFNGLGENQUERIESPROC)load("glGenQueries");
-	glad_glDeleteQueries = (PFNGLDELETEQUERIESPROC)load("glDeleteQueries");
-	glad_glIsQuery = (PFNGLISQUERYPROC)load("glIsQuery");
-	glad_glBeginQuery = (PFNGLBEGINQUERYPROC)load("glBeginQuery");
-	glad_glEndQuery = (PFNGLENDQUERYPROC)load("glEndQuery");
-	glad_glGetQueryiv = (PFNGLGETQUERYIVPROC)load("glGetQueryiv");
-	glad_glGetQueryObjectiv = (PFNGLGETQUERYOBJECTIVPROC)load("glGetQueryObjectiv");
-	glad_glGetQueryObjectuiv = (PFNGLGETQUERYOBJECTUIVPROC)load("glGetQueryObjectuiv");
-	glad_glBindBuffer = (PFNGLBINDBUFFERPROC)load("glBindBuffer");
-	glad_glDeleteBuffers = (PFNGLDELETEBUFFERSPROC)load("glDeleteBuffers");
-	glad_glGenBuffers = (PFNGLGENBUFFERSPROC)load("glGenBuffers");
-	glad_glIsBuffer = (PFNGLISBUFFERPROC)load("glIsBuffer");
-	glad_glBufferData = (PFNGLBUFFERDATAPROC)load("glBufferData");
-	glad_glBufferSubData = (PFNGLBUFFERSUBDATAPROC)load("glBufferSubData");
-	glad_glGetBufferSubData = (PFNGLGETBUFFERSUBDATAPROC)load("glGetBufferSubData");
-	glad_glMapBuffer = (PFNGLMAPBUFFERPROC)load("glMapBuffer");
-	glad_glUnmapBuffer = (PFNGLUNMAPBUFFERPROC)load("glUnmapBuffer");
-	glad_glGetBufferParameteriv = (PFNGLGETBUFFERPARAMETERIVPROC)load("glGetBufferParameteriv");
-	glad_glGetBufferPointerv = (PFNGLGETBUFFERPOINTERVPROC)load("glGetBufferPointerv");
-}
-static void load_GL_VERSION_2_0(GLADloadproc load) {
-	if(!GLAD_GL_VERSION_2_0) return;
-	glad_glBlendEquationSeparate = (PFNGLBLENDEQUATIONSEPARATEPROC)load("glBlendEquationSeparate");
-	glad_glDrawBuffers = (PFNGLDRAWBUFFERSPROC)load("glDrawBuffers");
-	glad_glStencilOpSeparate = (PFNGLSTENCILOPSEPARATEPROC)load("glStencilOpSeparate");
-	glad_glStencilFuncSeparate = (PFNGLSTENCILFUNCSEPARATEPROC)load("glStencilFuncSeparate");
-	glad_glStencilMaskSeparate = (PFNGLSTENCILMASKSEPARATEPROC)load("glStencilMaskSeparate");
-	glad_glAttachShader = (PFNGLATTACHSHADERPROC)load("glAttachShader");
-	glad_glBindAttribLocation = (PFNGLBINDATTRIBLOCATIONPROC)load("glBindAttribLocation");
-	glad_glCompileShader = (PFNGLCOMPILESHADERPROC)load("glCompileShader");
-	glad_glCreateProgram = (PFNGLCREATEPROGRAMPROC)load("glCreateProgram");
-	glad_glCreateShader = (PFNGLCREATESHADERPROC)load("glCreateShader");
-	glad_glDeleteProgram = (PFNGLDELETEPROGRAMPROC)load("glDeleteProgram");
-	glad_glDeleteShader = (PFNGLDELETESHADERPROC)load("glDeleteShader");
-	glad_glDetachShader = (PFNGLDETACHSHADERPROC)load("glDetachShader");
-	glad_glDisableVertexAttribArray = (PFNGLDISABLEVERTEXATTRIBARRAYPROC)load("glDisableVertexAttribArray");
-	glad_glEnableVertexAttribArray = (PFNGLENABLEVERTEXATTRIBARRAYPROC)load("glEnableVertexAttribArray");
-	glad_glGetActiveAttrib = (PFNGLGETACTIVEATTRIBPROC)load("glGetActiveAttrib");
-	glad_glGetActiveUniform = (PFNGLGETACTIVEUNIFORMPROC)load("glGetActiveUniform");
-	glad_glGetAttachedShaders = (PFNGLGETATTACHEDSHADERSPROC)load("glGetAttachedShaders");
-	glad_glGetAttribLocation = (PFNGLGETATTRIBLOCATIONPROC)load("glGetAttribLocation");
-	glad_glGetProgramiv = (PFNGLGETPROGRAMIVPROC)load("glGetProgramiv");
-	glad_glGetProgramInfoLog = (PFNGLGETPROGRAMINFOLOGPROC)load("glGetProgramInfoLog");
-	glad_glGetShaderiv = (PFNGLGETSHADERIVPROC)load("glGetShaderiv");
-	glad_glGetShaderInfoLog = (PFNGLGETSHADERINFOLOGPROC)load("glGetShaderInfoLog");
-	glad_glGetShaderSource = (PFNGLGETSHADERSOURCEPROC)load("glGetShaderSource");
-	glad_glGetUniformLocation = (PFNGLGETUNIFORMLOCATIONPROC)load("glGetUniformLocation");
-	glad_glGetUniformfv = (PFNGLGETUNIFORMFVPROC)load("glGetUniformfv");
-	glad_glGetUniformiv = (PFNGLGETUNIFORMIVPROC)load("glGetUniformiv");
-	glad_glGetVertexAttribdv = (PFNGLGETVERTEXATTRIBDVPROC)load("glGetVertexAttribdv");
-	glad_glGetVertexAttribfv = (PFNGLGETVERTEXATTRIBFVPROC)load("glGetVertexAttribfv");
-	glad_glGetVertexAttribiv = (PFNGLGETVERTEXATTRIBIVPROC)load("glGetVertexAttribiv");
-	glad_glGetVertexAttribPointerv = (PFNGLGETVERTEXATTRIBPOINTERVPROC)load("glGetVertexAttribPointerv");
-	glad_glIsProgram = (PFNGLISPROGRAMPROC)load("glIsProgram");
-	glad_glIsShader = (PFNGLISSHADERPROC)load("glIsShader");
-	glad_glLinkProgram = (PFNGLLINKPROGRAMPROC)load("glLinkProgram");
-	glad_glShaderSource = (PFNGLSHADERSOURCEPROC)load("glShaderSource");
-	glad_glUseProgram = (PFNGLUSEPROGRAMPROC)load("glUseProgram");
-	glad_glUniform1f = (PFNGLUNIFORM1FPROC)load("glUniform1f");
-	glad_glUniform2f = (PFNGLUNIFORM2FPROC)load("glUniform2f");
-	glad_glUniform3f = (PFNGLUNIFORM3FPROC)load("glUniform3f");
-	glad_glUniform4f = (PFNGLUNIFORM4FPROC)load("glUniform4f");
-	glad_glUniform1i = (PFNGLUNIFORM1IPROC)load("glUniform1i");
-	glad_glUniform2i = (PFNGLUNIFORM2IPROC)load("glUniform2i");
-	glad_glUniform3i = (PFNGLUNIFORM3IPROC)load("glUniform3i");
-	glad_glUniform4i = (PFNGLUNIFORM4IPROC)load("glUniform4i");
-	glad_glUniform1fv = (PFNGLUNIFORM1FVPROC)load("glUniform1fv");
-	glad_glUniform2fv = (PFNGLUNIFORM2FVPROC)load("glUniform2fv");
-	glad_glUniform3fv = (PFNGLUNIFORM3FVPROC)load("glUniform3fv");
-	glad_glUniform4fv = (PFNGLUNIFORM4FVPROC)load("glUniform4fv");
-	glad_glUniform1iv = (PFNGLUNIFORM1IVPROC)load("glUniform1iv");
-	glad_glUniform2iv = (PFNGLUNIFORM2IVPROC)load("glUniform2iv");
-	glad_glUniform3iv = (PFNGLUNIFORM3IVPROC)load("glUniform3iv");
-	glad_glUniform4iv = (PFNGLUNIFORM4IVPROC)load("glUniform4iv");
-	glad_glUniformMatrix2fv = (PFNGLUNIFORMMATRIX2FVPROC)load("glUniformMatrix2fv");
-	glad_glUniformMatrix3fv = (PFNGLUNIFORMMATRIX3FVPROC)load("glUniformMatrix3fv");
-	glad_glUniformMatrix4fv = (PFNGLUNIFORMMATRIX4FVPROC)load("glUniformMatrix4fv");
-	glad_glValidateProgram = (PFNGLVALIDATEPROGRAMPROC)load("glValidateProgram");
-	glad_glVertexAttrib1d = (PFNGLVERTEXATTRIB1DPROC)load("glVertexAttrib1d");
-	glad_glVertexAttrib1dv = (PFNGLVERTEXATTRIB1DVPROC)load("glVertexAttrib1dv");
-	glad_glVertexAttrib1f = (PFNGLVERTEXATTRIB1FPROC)load("glVertexAttrib1f");
-	glad_glVertexAttrib1fv = (PFNGLVERTEXATTRIB1FVPROC)load("glVertexAttrib1fv");
-	glad_glVertexAttrib1s = (PFNGLVERTEXATTRIB1SPROC)load("glVertexAttrib1s");
-	glad_glVertexAttrib1sv = (PFNGLVERTEXATTRIB1SVPROC)load("glVertexAttrib1sv");
-	glad_glVertexAttrib2d = (PFNGLVERTEXATTRIB2DPROC)load("glVertexAttrib2d");
-	glad_glVertexAttrib2dv = (PFNGLVERTEXATTRIB2DVPROC)load("glVertexAttrib2dv");
-	glad_glVertexAttrib2f = (PFNGLVERTEXATTRIB2FPROC)load("glVertexAttrib2f");
-	glad_glVertexAttrib2fv = (PFNGLVERTEXATTRIB2FVPROC)load("glVertexAttrib2fv");
-	glad_glVertexAttrib2s = (PFNGLVERTEXATTRIB2SPROC)load("glVertexAttrib2s");
-	glad_glVertexAttrib2sv = (PFNGLVERTEXATTRIB2SVPROC)load("glVertexAttrib2sv");
-	glad_glVertexAttrib3d = (PFNGLVERTEXATTRIB3DPROC)load("glVertexAttrib3d");
-	glad_glVertexAttrib3dv = (PFNGLVERTEXATTRIB3DVPROC)load("glVertexAttrib3dv");
-	glad_glVertexAttrib3f = (PFNGLVERTEXATTRIB3FPROC)load("glVertexAttrib3f");
-	glad_glVertexAttrib3fv = (PFNGLVERTEXATTRIB3FVPROC)load("glVertexAttrib3fv");
-	glad_glVertexAttrib3s = (PFNGLVERTEXATTRIB3SPROC)load("glVertexAttrib3s");
-	glad_glVertexAttrib3sv = (PFNGLVERTEXATTRIB3SVPROC)load("glVertexAttrib3sv");
-	glad_glVertexAttrib4Nbv = (PFNGLVERTEXATTRIB4NBVPROC)load("glVertexAttrib4Nbv");
-	glad_glVertexAttrib4Niv = (PFNGLVERTEXATTRIB4NIVPROC)load("glVertexAttrib4Niv");
-	glad_glVertexAttrib4Nsv = (PFNGLVERTEXATTRIB4NSVPROC)load("glVertexAttrib4Nsv");
-	glad_glVertexAttrib4Nub = (PFNGLVERTEXATTRIB4NUBPROC)load("glVertexAttrib4Nub");
-	glad_glVertexAttrib4Nubv = (PFNGLVERTEXATTRIB4NUBVPROC)load("glVertexAttrib4Nubv");
-	glad_glVertexAttrib4Nuiv = (PFNGLVERTEXATTRIB4NUIVPROC)load("glVertexAttrib4Nuiv");
-	glad_glVertexAttrib4Nusv = (PFNGLVERTEXATTRIB4NUSVPROC)load("glVertexAttrib4Nusv");
-	glad_glVertexAttrib4bv = (PFNGLVERTEXATTRIB4BVPROC)load("glVertexAttrib4bv");
-	glad_glVertexAttrib4d = (PFNGLVERTEXATTRIB4DPROC)load("glVertexAttrib4d");
-	glad_glVertexAttrib4dv = (PFNGLVERTEXATTRIB4DVPROC)load("glVertexAttrib4dv");
-	glad_glVertexAttrib4f = (PFNGLVERTEXATTRIB4FPROC)load("glVertexAttrib4f");
-	glad_glVertexAttrib4fv = (PFNGLVERTEXATTRIB4FVPROC)load("glVertexAttrib4fv");
-	glad_glVertexAttrib4iv = (PFNGLVERTEXATTRIB4IVPROC)load("glVertexAttrib4iv");
-	glad_glVertexAttrib4s = (PFNGLVERTEXATTRIB4SPROC)load("glVertexAttrib4s");
-	glad_glVertexAttrib4sv = (PFNGLVERTEXATTRIB4SVPROC)load("glVertexAttrib4sv");
-	glad_glVertexAttrib4ubv = (PFNGLVERTEXATTRIB4UBVPROC)load("glVertexAttrib4ubv");
-	glad_glVertexAttrib4uiv = (PFNGLVERTEXATTRIB4UIVPROC)load("glVertexAttrib4uiv");
-	glad_glVertexAttrib4usv = (PFNGLVERTEXATTRIB4USVPROC)load("glVertexAttrib4usv");
-	glad_glVertexAttribPointer = (PFNGLVERTEXATTRIBPOINTERPROC)load("glVertexAttribPointer");
-}
-static void load_GL_VERSION_2_1(GLADloadproc load) {
-	if(!GLAD_GL_VERSION_2_1) return;
-	glad_glUniformMatrix2x3fv = (PFNGLUNIFORMMATRIX2X3FVPROC)load("glUniformMatrix2x3fv");
-	glad_glUniformMatrix3x2fv = (PFNGLUNIFORMMATRIX3X2FVPROC)load("glUniformMatrix3x2fv");
-	glad_glUniformMatrix2x4fv = (PFNGLUNIFORMMATRIX2X4FVPROC)load("glUniformMatrix2x4fv");
-	glad_glUniformMatrix4x2fv = (PFNGLUNIFORMMATRIX4X2FVPROC)load("glUniformMatrix4x2fv");
-	glad_glUniformMatrix3x4fv = (PFNGLUNIFORMMATRIX3X4FVPROC)load("glUniformMatrix3x4fv");
-	glad_glUniformMatrix4x3fv = (PFNGLUNIFORMMATRIX4X3FVPROC)load("glUniformMatrix4x3fv");
-}
-static void load_GL_VERSION_3_0(GLADloadproc load) {
-	if(!GLAD_GL_VERSION_3_0) return;
-	glad_glColorMaski = (PFNGLCOLORMASKIPROC)load("glColorMaski");
-	glad_glGetBooleani_v = (PFNGLGETBOOLEANI_VPROC)load("glGetBooleani_v");
-	glad_glGetIntegeri_v = (PFNGLGETINTEGERI_VPROC)load("glGetIntegeri_v");
-	glad_glEnablei = (PFNGLENABLEIPROC)load("glEnablei");
-	glad_glDisablei = (PFNGLDISABLEIPROC)load("glDisablei");
-	glad_glIsEnabledi = (PFNGLISENABLEDIPROC)load("glIsEnabledi");
-	glad_glBeginTransformFeedback = (PFNGLBEGINTRANSFORMFEEDBACKPROC)load("glBeginTransformFeedback");
-	glad_glEndTransformFeedback = (PFNGLENDTRANSFORMFEEDBACKPROC)load("glEndTransformFeedback");
-	glad_glBindBufferRange = (PFNGLBINDBUFFERRANGEPROC)load("glBindBufferRange");
-	glad_glBindBufferBase = (PFNGLBINDBUFFERBASEPROC)load("glBindBufferBase");
-	glad_glTransformFeedbackVaryings = (PFNGLTRANSFORMFEEDBACKVARYINGSPROC)load("glTransformFeedbackVaryings");
-	glad_glGetTransformFeedbackVarying = (PFNGLGETTRANSFORMFEEDBACKVARYINGPROC)load("glGetTransformFeedbackVarying");
-	glad_glClampColor = (PFNGLCLAMPCOLORPROC)load("glClampColor");
-	glad_glBeginConditionalRender = (PFNGLBEGINCONDITIONALRENDERPROC)load("glBeginConditionalRender");
-	glad_glEndConditionalRender = (PFNGLENDCONDITIONALRENDERPROC)load("glEndConditionalRender");
-	glad_glVertexAttribIPointer = (PFNGLVERTEXATTRIBIPOINTERPROC)load("glVertexAttribIPointer");
-	glad_glGetVertexAttribIiv = (PFNGLGETVERTEXATTRIBIIVPROC)load("glGetVertexAttribIiv");
-	glad_glGetVertexAttribIuiv = (PFNGLGETVERTEXATTRIBIUIVPROC)load("glGetVertexAttribIuiv");
-	glad_glVertexAttribI1i = (PFNGLVERTEXATTRIBI1IPROC)load("glVertexAttribI1i");
-	glad_glVertexAttribI2i = (PFNGLVERTEXATTRIBI2IPROC)load("glVertexAttribI2i");
-	glad_glVertexAttribI3i = (PFNGLVERTEXATTRIBI3IPROC)load("glVertexAttribI3i");
-	glad_glVertexAttribI4i = (PFNGLVERTEXATTRIBI4IPROC)load("glVertexAttribI4i");
-	glad_glVertexAttribI1ui = (PFNGLVERTEXATTRIBI1UIPROC)load("glVertexAttribI1ui");
-	glad_glVertexAttribI2ui = (PFNGLVERTEXATTRIBI2UIPROC)load("glVertexAttribI2ui");
-	glad_glVertexAttribI3ui = (PFNGLVERTEXATTRIBI3UIPROC)load("glVertexAttribI3ui");
-	glad_glVertexAttribI4ui = (PFNGLVERTEXATTRIBI4UIPROC)load("glVertexAttribI4ui");
-	glad_glVertexAttribI1iv = (PFNGLVERTEXATTRIBI1IVPROC)load("glVertexAttribI1iv");
-	glad_glVertexAttribI2iv = (PFNGLVERTEXATTRIBI2IVPROC)load("glVertexAttribI2iv");
-	glad_glVertexAttribI3iv = (PFNGLVERTEXATTRIBI3IVPROC)load("glVertexAttribI3iv");
-	glad_glVertexAttribI4iv = (PFNGLVERTEXATTRIBI4IVPROC)load("glVertexAttribI4iv");
-	glad_glVertexAttribI1uiv = (PFNGLVERTEXATTRIBI1UIVPROC)load("glVertexAttribI1uiv");
-	glad_glVertexAttribI2uiv = (PFNGLVERTEXATTRIBI2UIVPROC)load("glVertexAttribI2uiv");
-	glad_glVertexAttribI3uiv = (PFNGLVERTEXATTRIBI3UIVPROC)load("glVertexAttribI3uiv");
-	glad_glVertexAttribI4uiv = (PFNGLVERTEXATTRIBI4UIVPROC)load("glVertexAttribI4uiv");
-	glad_glVertexAttribI4bv = (PFNGLVERTEXATTRIBI4BVPROC)load("glVertexAttribI4bv");
-	glad_glVertexAttribI4sv = (PFNGLVERTEXATTRIBI4SVPROC)load("glVertexAttribI4sv");
-	glad_glVertexAttribI4ubv = (PFNGLVERTEXATTRIBI4UBVPROC)load("glVertexAttribI4ubv");
-	glad_glVertexAttribI4usv = (PFNGLVERTEXATTRIBI4USVPROC)load("glVertexAttribI4usv");
-	glad_glGetUniformuiv = (PFNGLGETUNIFORMUIVPROC)load("glGetUniformuiv");
-	glad_glBindFragDataLocation = (PFNGLBINDFRAGDATALOCATIONPROC)load("glBindFragDataLocation");
-	glad_glGetFragDataLocation = (PFNGLGETFRAGDATALOCATIONPROC)load("glGetFragDataLocation");
-	glad_glUniform1ui = (PFNGLUNIFORM1UIPROC)load("glUniform1ui");
-	glad_glUniform2ui = (PFNGLUNIFORM2UIPROC)load("glUniform2ui");
-	glad_glUniform3ui = (PFNGLUNIFORM3UIPROC)load("glUniform3ui");
-	glad_glUniform4ui = (PFNGLUNIFORM4UIPROC)load("glUniform4ui");
-	glad_glUniform1uiv = (PFNGLUNIFORM1UIVPROC)load("glUniform1uiv");
-	glad_glUniform2uiv = (PFNGLUNIFORM2UIVPROC)load("glUniform2uiv");
-	glad_glUniform3uiv = (PFNGLUNIFORM3UIVPROC)load("glUniform3uiv");
-	glad_glUniform4uiv = (PFNGLUNIFORM4UIVPROC)load("glUniform4uiv");
-	glad_glTexParameterIiv = (PFNGLTEXPARAMETERIIVPROC)load("glTexParameterIiv");
-	glad_glTexParameterIuiv = (PFNGLTEXPARAMETERIUIVPROC)load("glTexParameterIuiv");
-	glad_glGetTexParameterIiv = (PFNGLGETTEXPARAMETERIIVPROC)load("glGetTexParameterIiv");
-	glad_glGetTexParameterIuiv = (PFNGLGETTEXPARAMETERIUIVPROC)load("glGetTexParameterIuiv");
-	glad_glClearBufferiv = (PFNGLCLEARBUFFERIVPROC)load("glClearBufferiv");
-	glad_glClearBufferuiv = (PFNGLCLEARBUFFERUIVPROC)load("glClearBufferuiv");
-	glad_glClearBufferfv = (PFNGLCLEARBUFFERFVPROC)load("glClearBufferfv");
-	glad_glClearBufferfi = (PFNGLCLEARBUFFERFIPROC)load("glClearBufferfi");
-	glad_glGetStringi = (PFNGLGETSTRINGIPROC)load("glGetStringi");
-	glad_glIsRenderbuffer = (PFNGLISRENDERBUFFERPROC)load("glIsRenderbuffer");
-	glad_glBindRenderbuffer = (PFNGLBINDRENDERBUFFERPROC)load("glBindRenderbuffer");
-	glad_glDeleteRenderbuffers = (PFNGLDELETERENDERBUFFERSPROC)load("glDeleteRenderbuffers");
-	glad_glGenRenderbuffers = (PFNGLGENRENDERBUFFERSPROC)load("glGenRenderbuffers");
-	glad_glRenderbufferStorage = (PFNGLRENDERBUFFERSTORAGEPROC)load("glRenderbufferStorage");
-	glad_glGetRenderbufferParameteriv = (PFNGLGETRENDERBUFFERPARAMETERIVPROC)load("glGetRenderbufferParameteriv");
-	glad_glIsFramebuffer = (PFNGLISFRAMEBUFFERPROC)load("glIsFramebuffer");
-	glad_glBindFramebuffer = (PFNGLBINDFRAMEBUFFERPROC)load("glBindFramebuffer");
-	glad_glDeleteFramebuffers = (PFNGLDELETEFRAMEBUFFERSPROC)load("glDeleteFramebuffers");
-	glad_glGenFramebuffers = (PFNGLGENFRAMEBUFFERSPROC)load("glGenFramebuffers");
-	glad_glCheckFramebufferStatus = (PFNGLCHECKFRAMEBUFFERSTATUSPROC)load("glCheckFramebufferStatus");
-	glad_glFramebufferTexture1D = (PFNGLFRAMEBUFFERTEXTURE1DPROC)load("glFramebufferTexture1D");
-	glad_glFramebufferTexture2D = (PFNGLFRAMEBUFFERTEXTURE2DPROC)load("glFramebufferTexture2D");
-	glad_glFramebufferTexture3D = (PFNGLFRAMEBUFFERTEXTURE3DPROC)load("glFramebufferTexture3D");
-	glad_glFramebufferRenderbuffer = (PFNGLFRAMEBUFFERRENDERBUFFERPROC)load("glFramebufferRenderbuffer");
-	glad_glGetFramebufferAttachmentParameteriv = (PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVPROC)load("glGetFramebufferAttachmentParameteriv");
-	glad_glGenerateMipmap = (PFNGLGENERATEMIPMAPPROC)load("glGenerateMipmap");
-	glad_glBlitFramebuffer = (PFNGLBLITFRAMEBUFFERPROC)load("glBlitFramebuffer");
-	glad_glRenderbufferStorageMultisample = (PFNGLRENDERBUFFERSTORAGEMULTISAMPLEPROC)load("glRenderbufferStorageMultisample");
-	glad_glFramebufferTextureLayer = (PFNGLFRAMEBUFFERTEXTURELAYERPROC)load("glFramebufferTextureLayer");
-	glad_glMapBufferRange = (PFNGLMAPBUFFERRANGEPROC)load("glMapBufferRange");
-	glad_glFlushMappedBufferRange = (PFNGLFLUSHMAPPEDBUFFERRANGEPROC)load("glFlushMappedBufferRange");
-	glad_glBindVertexArray = (PFNGLBINDVERTEXARRAYPROC)load("glBindVertexArray");
-	glad_glDeleteVertexArrays = (PFNGLDELETEVERTEXARRAYSPROC)load("glDeleteVertexArrays");
-	glad_glGenVertexArrays = (PFNGLGENVERTEXARRAYSPROC)load("glGenVertexArrays");
-	glad_glIsVertexArray = (PFNGLISVERTEXARRAYPROC)load("glIsVertexArray");
-}
-static void load_GL_VERSION_3_1(GLADloadproc load) {
-	if(!GLAD_GL_VERSION_3_1) return;
-	glad_glDrawArraysInstanced = (PFNGLDRAWARRAYSINSTANCEDPROC)load("glDrawArraysInstanced");
-	glad_glDrawElementsInstanced = (PFNGLDRAWELEMENTSINSTANCEDPROC)load("glDrawElementsInstanced");
-	glad_glTexBuffer = (PFNGLTEXBUFFERPROC)load("glTexBuffer");
-	glad_glPrimitiveRestartIndex = (PFNGLPRIMITIVERESTARTINDEXPROC)load("glPrimitiveRestartIndex");
-	glad_glCopyBufferSubData = (PFNGLCOPYBUFFERSUBDATAPROC)load("glCopyBufferSubData");
-	glad_glGetUniformIndices = (PFNGLGETUNIFORMINDICESPROC)load("glGetUniformIndices");
-	glad_glGetActiveUniformsiv = (PFNGLGETACTIVEUNIFORMSIVPROC)load("glGetActiveUniformsiv");
-	glad_glGetActiveUniformName = (PFNGLGETACTIVEUNIFORMNAMEPROC)load("glGetActiveUniformName");
-	glad_glGetUniformBlockIndex = (PFNGLGETUNIFORMBLOCKINDEXPROC)load("glGetUniformBlockIndex");
-	glad_glGetActiveUniformBlockiv = (PFNGLGETACTIVEUNIFORMBLOCKIVPROC)load("glGetActiveUniformBlockiv");
-	glad_glGetActiveUniformBlockName = (PFNGLGETACTIVEUNIFORMBLOCKNAMEPROC)load("glGetActiveUniformBlockName");
-	glad_glUniformBlockBinding = (PFNGLUNIFORMBLOCKBINDINGPROC)load("glUniformBlockBinding");
-	glad_glBindBufferRange = (PFNGLBINDBUFFERRANGEPROC)load("glBindBufferRange");
-	glad_glBindBufferBase = (PFNGLBINDBUFFERBASEPROC)load("glBindBufferBase");
-	glad_glGetIntegeri_v = (PFNGLGETINTEGERI_VPROC)load("glGetIntegeri_v");
-}
-static void load_GL_VERSION_3_2(GLADloadproc load) {
-	if(!GLAD_GL_VERSION_3_2) return;
-	glad_glDrawElementsBaseVertex = (PFNGLDRAWELEMENTSBASEVERTEXPROC)load("glDrawElementsBaseVertex");
-	glad_glDrawRangeElementsBaseVertex = (PFNGLDRAWRANGEELEMENTSBASEVERTEXPROC)load("glDrawRangeElementsBaseVertex");
-	glad_glDrawElementsInstancedBaseVertex = (PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXPROC)load("glDrawElementsInstancedBaseVertex");
-	glad_glMultiDrawElementsBaseVertex = (PFNGLMULTIDRAWELEMENTSBASEVERTEXPROC)load("glMultiDrawElementsBaseVertex");
-	glad_glProvokingVertex = (PFNGLPROVOKINGVERTEXPROC)load("glProvokingVertex");
-	glad_glFenceSync = (PFNGLFENCESYNCPROC)load("glFenceSync");
-	glad_glIsSync = (PFNGLISSYNCPROC)load("glIsSync");
-	glad_glDeleteSync = (PFNGLDELETESYNCPROC)load("glDeleteSync");
-	glad_glClientWaitSync = (PFNGLCLIENTWAITSYNCPROC)load("glClientWaitSync");
-	glad_glWaitSync = (PFNGLWAITSYNCPROC)load("glWaitSync");
-	glad_glGetInteger64v = (PFNGLGETINTEGER64VPROC)load("glGetInteger64v");
-	glad_glGetSynciv = (PFNGLGETSYNCIVPROC)load("glGetSynciv");
-	glad_glGetInteger64i_v = (PFNGLGETINTEGER64I_VPROC)load("glGetInteger64i_v");
-	glad_glGetBufferParameteri64v = (PFNGLGETBUFFERPARAMETERI64VPROC)load("glGetBufferParameteri64v");
-	glad_glFramebufferTexture = (PFNGLFRAMEBUFFERTEXTUREPROC)load("glFramebufferTexture");
-	glad_glTexImage2DMultisample = (PFNGLTEXIMAGE2DMULTISAMPLEPROC)load("glTexImage2DMultisample");
-	glad_glTexImage3DMultisample = (PFNGLTEXIMAGE3DMULTISAMPLEPROC)load("glTexImage3DMultisample");
-	glad_glGetMultisamplefv = (PFNGLGETMULTISAMPLEFVPROC)load("glGetMultisamplefv");
-	glad_glSampleMaski = (PFNGLSAMPLEMASKIPROC)load("glSampleMaski");
-}
-static void load_GL_VERSION_3_3(GLADloadproc load) {
-	if(!GLAD_GL_VERSION_3_3) return;
-	glad_glBindFragDataLocationIndexed = (PFNGLBINDFRAGDATALOCATIONINDEXEDPROC)load("glBindFragDataLocationIndexed");
-	glad_glGetFragDataIndex = (PFNGLGETFRAGDATAINDEXPROC)load("glGetFragDataIndex");
-	glad_glGenSamplers = (PFNGLGENSAMPLERSPROC)load("glGenSamplers");
-	glad_glDeleteSamplers = (PFNGLDELETESAMPLERSPROC)load("glDeleteSamplers");
-	glad_glIsSampler = (PFNGLISSAMPLERPROC)load("glIsSampler");
-	glad_glBindSampler = (PFNGLBINDSAMPLERPROC)load("glBindSampler");
-	glad_glSamplerParameteri = (PFNGLSAMPLERPARAMETERIPROC)load("glSamplerParameteri");
-	glad_glSamplerParameteriv = (PFNGLSAMPLERPARAMETERIVPROC)load("glSamplerParameteriv");
-	glad_glSamplerParameterf = (PFNGLSAMPLERPARAMETERFPROC)load("glSamplerParameterf");
-	glad_glSamplerParameterfv = (PFNGLSAMPLERPARAMETERFVPROC)load("glSamplerParameterfv");
-	glad_glSamplerParameterIiv = (PFNGLSAMPLERPARAMETERIIVPROC)load("glSamplerParameterIiv");
-	glad_glSamplerParameterIuiv = (PFNGLSAMPLERPARAMETERIUIVPROC)load("glSamplerParameterIuiv");
-	glad_glGetSamplerParameteriv = (PFNGLGETSAMPLERPARAMETERIVPROC)load("glGetSamplerParameteriv");
-	glad_glGetSamplerParameterIiv = (PFNGLGETSAMPLERPARAMETERIIVPROC)load("glGetSamplerParameterIiv");
-	glad_glGetSamplerParameterfv = (PFNGLGETSAMPLERPARAMETERFVPROC)load("glGetSamplerParameterfv");
-	glad_glGetSamplerParameterIuiv = (PFNGLGETSAMPLERPARAMETERIUIVPROC)load("glGetSamplerParameterIuiv");
-	glad_glQueryCounter = (PFNGLQUERYCOUNTERPROC)load("glQueryCounter");
-	glad_glGetQueryObjecti64v = (PFNGLGETQUERYOBJECTI64VPROC)load("glGetQueryObjecti64v");
-	glad_glGetQueryObjectui64v = (PFNGLGETQUERYOBJECTUI64VPROC)load("glGetQueryObjectui64v");
-	glad_glVertexAttribDivisor = (PFNGLVERTEXATTRIBDIVISORPROC)load("glVertexAttribDivisor");
-	glad_glVertexAttribP1ui = (PFNGLVERTEXATTRIBP1UIPROC)load("glVertexAttribP1ui");
-	glad_glVertexAttribP1uiv = (PFNGLVERTEXATTRIBP1UIVPROC)load("glVertexAttribP1uiv");
-	glad_glVertexAttribP2ui = (PFNGLVERTEXATTRIBP2UIPROC)load("glVertexAttribP2ui");
-	glad_glVertexAttribP2uiv = (PFNGLVERTEXATTRIBP2UIVPROC)load("glVertexAttribP2uiv");
-	glad_glVertexAttribP3ui = (PFNGLVERTEXATTRIBP3UIPROC)load("glVertexAttribP3ui");
-	glad_glVertexAttribP3uiv = (PFNGLVERTEXATTRIBP3UIVPROC)load("glVertexAttribP3uiv");
-	glad_glVertexAttribP4ui = (PFNGLVERTEXATTRIBP4UIPROC)load("glVertexAttribP4ui");
-	glad_glVertexAttribP4uiv = (PFNGLVERTEXATTRIBP4UIVPROC)load("glVertexAttribP4uiv");
-	glad_glVertexP2ui = (PFNGLVERTEXP2UIPROC)load("glVertexP2ui");
-	glad_glVertexP2uiv = (PFNGLVERTEXP2UIVPROC)load("glVertexP2uiv");
-	glad_glVertexP3ui = (PFNGLVERTEXP3UIPROC)load("glVertexP3ui");
-	glad_glVertexP3uiv = (PFNGLVERTEXP3UIVPROC)load("glVertexP3uiv");
-	glad_glVertexP4ui = (PFNGLVERTEXP4UIPROC)load("glVertexP4ui");
-	glad_glVertexP4uiv = (PFNGLVERTEXP4UIVPROC)load("glVertexP4uiv");
-	glad_glTexCoordP1ui = (PFNGLTEXCOORDP1UIPROC)load("glTexCoordP1ui");
-	glad_glTexCoordP1uiv = (PFNGLTEXCOORDP1UIVPROC)load("glTexCoordP1uiv");
-	glad_glTexCoordP2ui = (PFNGLTEXCOORDP2UIPROC)load("glTexCoordP2ui");
-	glad_glTexCoordP2uiv = (PFNGLTEXCOORDP2UIVPROC)load("glTexCoordP2uiv");
-	glad_glTexCoordP3ui = (PFNGLTEXCOORDP3UIPROC)load("glTexCoordP3ui");
-	glad_glTexCoordP3uiv = (PFNGLTEXCOORDP3UIVPROC)load("glTexCoordP3uiv");
-	glad_glTexCoordP4ui = (PFNGLTEXCOORDP4UIPROC)load("glTexCoordP4ui");
-	glad_glTexCoordP4uiv = (PFNGLTEXCOORDP4UIVPROC)load("glTexCoordP4uiv");
-	glad_glMultiTexCoordP1ui = (PFNGLMULTITEXCOORDP1UIPROC)load("glMultiTexCoordP1ui");
-	glad_glMultiTexCoordP1uiv = (PFNGLMULTITEXCOORDP1UIVPROC)load("glMultiTexCoordP1uiv");
-	glad_glMultiTexCoordP2ui = (PFNGLMULTITEXCOORDP2UIPROC)load("glMultiTexCoordP2ui");
-	glad_glMultiTexCoordP2uiv = (PFNGLMULTITEXCOORDP2UIVPROC)load("glMultiTexCoordP2uiv");
-	glad_glMultiTexCoordP3ui = (PFNGLMULTITEXCOORDP3UIPROC)load("glMultiTexCoordP3ui");
-	glad_glMultiTexCoordP3uiv = (PFNGLMULTITEXCOORDP3UIVPROC)load("glMultiTexCoordP3uiv");
-	glad_glMultiTexCoordP4ui = (PFNGLMULTITEXCOORDP4UIPROC)load("glMultiTexCoordP4ui");
-	glad_glMultiTexCoordP4uiv = (PFNGLMULTITEXCOORDP4UIVPROC)load("glMultiTexCoordP4uiv");
-	glad_glNormalP3ui = (PFNGLNORMALP3UIPROC)load("glNormalP3ui");
-	glad_glNormalP3uiv = (PFNGLNORMALP3UIVPROC)load("glNormalP3uiv");
-	glad_glColorP3ui = (PFNGLCOLORP3UIPROC)load("glColorP3ui");
-	glad_glColorP3uiv = (PFNGLCOLORP3UIVPROC)load("glColorP3uiv");
-	glad_glColorP4ui = (PFNGLCOLORP4UIPROC)load("glColorP4ui");
-	glad_glColorP4uiv = (PFNGLCOLORP4UIVPROC)load("glColorP4uiv");
-	glad_glSecondaryColorP3ui = (PFNGLSECONDARYCOLORP3UIPROC)load("glSecondaryColorP3ui");
-	glad_glSecondaryColorP3uiv = (PFNGLSECONDARYCOLORP3UIVPROC)load("glSecondaryColorP3uiv");
-}
-static void load_GL_VERSION_4_0(GLADloadproc load) {
-	if(!GLAD_GL_VERSION_4_0) return;
-	glad_glMinSampleShading = (PFNGLMINSAMPLESHADINGPROC)load("glMinSampleShading");
-	glad_glBlendEquationi = (PFNGLBLENDEQUATIONIPROC)load("glBlendEquationi");
-	glad_glBlendEquationSeparatei = (PFNGLBLENDEQUATIONSEPARATEIPROC)load("glBlendEquationSeparatei");
-	glad_glBlendFunci = (PFNGLBLENDFUNCIPROC)load("glBlendFunci");
-	glad_glBlendFuncSeparatei = (PFNGLBLENDFUNCSEPARATEIPROC)load("glBlendFuncSeparatei");
-	glad_glDrawArraysIndirect = (PFNGLDRAWARRAYSINDIRECTPROC)load("glDrawArraysIndirect");
-	glad_glDrawElementsIndirect = (PFNGLDRAWELEMENTSINDIRECTPROC)load("glDrawElementsIndirect");
-	glad_glUniform1d = (PFNGLUNIFORM1DPROC)load("glUniform1d");
-	glad_glUniform2d = (PFNGLUNIFORM2DPROC)load("glUniform2d");
-	glad_glUniform3d = (PFNGLUNIFORM3DPROC)load("glUniform3d");
-	glad_glUniform4d = (PFNGLUNIFORM4DPROC)load("glUniform4d");
-	glad_glUniform1dv = (PFNGLUNIFORM1DVPROC)load("glUniform1dv");
-	glad_glUniform2dv = (PFNGLUNIFORM2DVPROC)load("glUniform2dv");
-	glad_glUniform3dv = (PFNGLUNIFORM3DVPROC)load("glUniform3dv");
-	glad_glUniform4dv = (PFNGLUNIFORM4DVPROC)load("glUniform4dv");
-	glad_glUniformMatrix2dv = (PFNGLUNIFORMMATRIX2DVPROC)load("glUniformMatrix2dv");
-	glad_glUniformMatrix3dv = (PFNGLUNIFORMMATRIX3DVPROC)load("glUniformMatrix3dv");
-	glad_glUniformMatrix4dv = (PFNGLUNIFORMMATRIX4DVPROC)load("glUniformMatrix4dv");
-	glad_glUniformMatrix2x3dv = (PFNGLUNIFORMMATRIX2X3DVPROC)load("glUniformMatrix2x3dv");
-	glad_glUniformMatrix2x4dv = (PFNGLUNIFORMMATRIX2X4DVPROC)load("glUniformMatrix2x4dv");
-	glad_glUniformMatrix3x2dv = (PFNGLUNIFORMMATRIX3X2DVPROC)load("glUniformMatrix3x2dv");
-	glad_glUniformMatrix3x4dv = (PFNGLUNIFORMMATRIX3X4DVPROC)load("glUniformMatrix3x4dv");
-	glad_glUniformMatrix4x2dv = (PFNGLUNIFORMMATRIX4X2DVPROC)load("glUniformMatrix4x2dv");
-	glad_glUniformMatrix4x3dv = (PFNGLUNIFORMMATRIX4X3DVPROC)load("glUniformMatrix4x3dv");
-	glad_glGetUniformdv = (PFNGLGETUNIFORMDVPROC)load("glGetUniformdv");
-	glad_glGetSubroutineUniformLocation = (PFNGLGETSUBROUTINEUNIFORMLOCATIONPROC)load("glGetSubroutineUniformLocation");
-	glad_glGetSubroutineIndex = (PFNGLGETSUBROUTINEINDEXPROC)load("glGetSubroutineIndex");
-	glad_glGetActiveSubroutineUniformiv = (PFNGLGETACTIVESUBROUTINEUNIFORMIVPROC)load("glGetActiveSubroutineUniformiv");
-	glad_glGetActiveSubroutineUniformName = (PFNGLGETACTIVESUBROUTINEUNIFORMNAMEPROC)load("glGetActiveSubroutineUniformName");
-	glad_glGetActiveSubroutineName = (PFNGLGETACTIVESUBROUTINENAMEPROC)load("glGetActiveSubroutineName");
-	glad_glUniformSubroutinesuiv = (PFNGLUNIFORMSUBROUTINESUIVPROC)load("glUniformSubroutinesuiv");
-	glad_glGetUniformSubroutineuiv = (PFNGLGETUNIFORMSUBROUTINEUIVPROC)load("glGetUniformSubroutineuiv");
-	glad_glGetProgramStageiv = (PFNGLGETPROGRAMSTAGEIVPROC)load("glGetProgramStageiv");
-	glad_glPatchParameteri = (PFNGLPATCHPARAMETERIPROC)load("glPatchParameteri");
-	glad_glPatchParameterfv = (PFNGLPATCHPARAMETERFVPROC)load("glPatchParameterfv");
-	glad_glBindTransformFeedback = (PFNGLBINDTRANSFORMFEEDBACKPROC)load("glBindTransformFeedback");
-	glad_glDeleteTransformFeedbacks = (PFNGLDELETETRANSFORMFEEDBACKSPROC)load("glDeleteTransformFeedbacks");
-	glad_glGenTransformFeedbacks = (PFNGLGENTRANSFORMFEEDBACKSPROC)load("glGenTransformFeedbacks");
-	glad_glIsTransformFeedback = (PFNGLISTRANSFORMFEEDBACKPROC)load("glIsTransformFeedback");
-	glad_glPauseTransformFeedback = (PFNGLPAUSETRANSFORMFEEDBACKPROC)load("glPauseTransformFeedback");
-	glad_glResumeTransformFeedback = (PFNGLRESUMETRANSFORMFEEDBACKPROC)load("glResumeTransformFeedback");
-	glad_glDrawTransformFeedback = (PFNGLDRAWTRANSFORMFEEDBACKPROC)load("glDrawTransformFeedback");
-	glad_glDrawTransformFeedbackStream = (PFNGLDRAWTRANSFORMFEEDBACKSTREAMPROC)load("glDrawTransformFeedbackStream");
-	glad_glBeginQueryIndexed = (PFNGLBEGINQUERYINDEXEDPROC)load("glBeginQueryIndexed");
-	glad_glEndQueryIndexed = (PFNGLENDQUERYINDEXEDPROC)load("glEndQueryIndexed");
-	glad_glGetQueryIndexediv = (PFNGLGETQUERYINDEXEDIVPROC)load("glGetQueryIndexediv");
-}
-static void load_GL_VERSION_4_1(GLADloadproc load) {
-	if(!GLAD_GL_VERSION_4_1) return;
-	glad_glReleaseShaderCompiler = (PFNGLRELEASESHADERCOMPILERPROC)load("glReleaseShaderCompiler");
-	glad_glShaderBinary = (PFNGLSHADERBINARYPROC)load("glShaderBinary");
-	glad_glGetShaderPrecisionFormat = (PFNGLGETSHADERPRECISIONFORMATPROC)load("glGetShaderPrecisionFormat");
-	glad_glDepthRangef = (PFNGLDEPTHRANGEFPROC)load("glDepthRangef");
-	glad_glClearDepthf = (PFNGLCLEARDEPTHFPROC)load("glClearDepthf");
-	glad_glGetProgramBinary = (PFNGLGETPROGRAMBINARYPROC)load("glGetProgramBinary");
-	glad_glProgramBinary = (PFNGLPROGRAMBINARYPROC)load("glProgramBinary");
-	glad_glProgramParameteri = (PFNGLPROGRAMPARAMETERIPROC)load("glProgramParameteri");
-	glad_glUseProgramStages = (PFNGLUSEPROGRAMSTAGESPROC)load("glUseProgramStages");
-	glad_glActiveShaderProgram = (PFNGLACTIVESHADERPROGRAMPROC)load("glActiveShaderProgram");
-	glad_glCreateShaderProgramv = (PFNGLCREATESHADERPROGRAMVPROC)load("glCreateShaderProgramv");
-	glad_glBindProgramPipeline = (PFNGLBINDPROGRAMPIPELINEPROC)load("glBindProgramPipeline");
-	glad_glDeleteProgramPipelines = (PFNGLDELETEPROGRAMPIPELINESPROC)load("glDeleteProgramPipelines");
-	glad_glGenProgramPipelines = (PFNGLGENPROGRAMPIPELINESPROC)load("glGenProgramPipelines");
-	glad_glIsProgramPipeline = (PFNGLISPROGRAMPIPELINEPROC)load("glIsProgramPipeline");
-	glad_glGetProgramPipelineiv = (PFNGLGETPROGRAMPIPELINEIVPROC)load("glGetProgramPipelineiv");
-	glad_glProgramParameteri = (PFNGLPROGRAMPARAMETERIPROC)load("glProgramParameteri");
-	glad_glProgramUniform1i = (PFNGLPROGRAMUNIFORM1IPROC)load("glProgramUniform1i");
-	glad_glProgramUniform1iv = (PFNGLPROGRAMUNIFORM1IVPROC)load("glProgramUniform1iv");
-	glad_glProgramUniform1f = (PFNGLPROGRAMUNIFORM1FPROC)load("glProgramUniform1f");
-	glad_glProgramUniform1fv = (PFNGLPROGRAMUNIFORM1FVPROC)load("glProgramUniform1fv");
-	glad_glProgramUniform1d = (PFNGLPROGRAMUNIFORM1DPROC)load("glProgramUniform1d");
-	glad_glProgramUniform1dv = (PFNGLPROGRAMUNIFORM1DVPROC)load("glProgramUniform1dv");
-	glad_glProgramUniform1ui = (PFNGLPROGRAMUNIFORM1UIPROC)load("glProgramUniform1ui");
-	glad_glProgramUniform1uiv = (PFNGLPROGRAMUNIFORM1UIVPROC)load("glProgramUniform1uiv");
-	glad_glProgramUniform2i = (PFNGLPROGRAMUNIFORM2IPROC)load("glProgramUniform2i");
-	glad_glProgramUniform2iv = (PFNGLPROGRAMUNIFORM2IVPROC)load("glProgramUniform2iv");
-	glad_glProgramUniform2f = (PFNGLPROGRAMUNIFORM2FPROC)load("glProgramUniform2f");
-	glad_glProgramUniform2fv = (PFNGLPROGRAMUNIFORM2FVPROC)load("glProgramUniform2fv");
-	glad_glProgramUniform2d = (PFNGLPROGRAMUNIFORM2DPROC)load("glProgramUniform2d");
-	glad_glProgramUniform2dv = (PFNGLPROGRAMUNIFORM2DVPROC)load("glProgramUniform2dv");
-	glad_glProgramUniform2ui = (PFNGLPROGRAMUNIFORM2UIPROC)load("glProgramUniform2ui");
-	glad_glProgramUniform2uiv = (PFNGLPROGRAMUNIFORM2UIVPROC)load("glProgramUniform2uiv");
-	glad_glProgramUniform3i = (PFNGLPROGRAMUNIFORM3IPROC)load("glProgramUniform3i");
-	glad_glProgramUniform3iv = (PFNGLPROGRAMUNIFORM3IVPROC)load("glProgramUniform3iv");
-	glad_glProgramUniform3f = (PFNGLPROGRAMUNIFORM3FPROC)load("glProgramUniform3f");
-	glad_glProgramUniform3fv = (PFNGLPROGRAMUNIFORM3FVPROC)load("glProgramUniform3fv");
-	glad_glProgramUniform3d = (PFNGLPROGRAMUNIFORM3DPROC)load("glProgramUniform3d");
-	glad_glProgramUniform3dv = (PFNGLPROGRAMUNIFORM3DVPROC)load("glProgramUniform3dv");
-	glad_glProgramUniform3ui = (PFNGLPROGRAMUNIFORM3UIPROC)load("glProgramUniform3ui");
-	glad_glProgramUniform3uiv = (PFNGLPROGRAMUNIFORM3UIVPROC)load("glProgramUniform3uiv");
-	glad_glProgramUniform4i = (PFNGLPROGRAMUNIFORM4IPROC)load("glProgramUniform4i");
-	glad_glProgramUniform4iv = (PFNGLPROGRAMUNIFORM4IVPROC)load("glProgramUniform4iv");
-	glad_glProgramUniform4f = (PFNGLPROGRAMUNIFORM4FPROC)load("glProgramUniform4f");
-	glad_glProgramUniform4fv = (PFNGLPROGRAMUNIFORM4FVPROC)load("glProgramUniform4fv");
-	glad_glProgramUniform4d = (PFNGLPROGRAMUNIFORM4DPROC)load("glProgramUniform4d");
-	glad_glProgramUniform4dv = (PFNGLPROGRAMUNIFORM4DVPROC)load("glProgramUniform4dv");
-	glad_glProgramUniform4ui = (PFNGLPROGRAMUNIFORM4UIPROC)load("glProgramUniform4ui");
-	glad_glProgramUniform4uiv = (PFNGLPROGRAMUNIFORM4UIVPROC)load("glProgramUniform4uiv");
-	glad_glProgramUniformMatrix2fv = (PFNGLPROGRAMUNIFORMMATRIX2FVPROC)load("glProgramUniformMatrix2fv");
-	glad_glProgramUniformMatrix3fv = (PFNGLPROGRAMUNIFORMMATRIX3FVPROC)load("glProgramUniformMatrix3fv");
-	glad_glProgramUniformMatrix4fv = (PFNGLPROGRAMUNIFORMMATRIX4FVPROC)load("glProgramUniformMatrix4fv");
-	glad_glProgramUniformMatrix2dv = (PFNGLPROGRAMUNIFORMMATRIX2DVPROC)load("glProgramUniformMatrix2dv");
-	glad_glProgramUniformMatrix3dv = (PFNGLPROGRAMUNIFORMMATRIX3DVPROC)load("glProgramUniformMatrix3dv");
-	glad_glProgramUniformMatrix4dv = (PFNGLPROGRAMUNIFORMMATRIX4DVPROC)load("glProgramUniformMatrix4dv");
-	glad_glProgramUniformMatrix2x3fv = (PFNGLPROGRAMUNIFORMMATRIX2X3FVPROC)load("glProgramUniformMatrix2x3fv");
-	glad_glProgramUniformMatrix3x2fv = (PFNGLPROGRAMUNIFORMMATRIX3X2FVPROC)load("glProgramUniformMatrix3x2fv");
-	glad_glProgramUniformMatrix2x4fv = (PFNGLPROGRAMUNIFORMMATRIX2X4FVPROC)load("glProgramUniformMatrix2x4fv");
-	glad_glProgramUniformMatrix4x2fv = (PFNGLPROGRAMUNIFORMMATRIX4X2FVPROC)load("glProgramUniformMatrix4x2fv");
-	glad_glProgramUniformMatrix3x4fv = (PFNGLPROGRAMUNIFORMMATRIX3X4FVPROC)load("glProgramUniformMatrix3x4fv");
-	glad_glProgramUniformMatrix4x3fv = (PFNGLPROGRAMUNIFORMMATRIX4X3FVPROC)load("glProgramUniformMatrix4x3fv");
-	glad_glProgramUniformMatrix2x3dv = (PFNGLPROGRAMUNIFORMMATRIX2X3DVPROC)load("glProgramUniformMatrix2x3dv");
-	glad_glProgramUniformMatrix3x2dv = (PFNGLPROGRAMUNIFORMMATRIX3X2DVPROC)load("glProgramUniformMatrix3x2dv");
-	glad_glProgramUniformMatrix2x4dv = (PFNGLPROGRAMUNIFORMMATRIX2X4DVPROC)load("glProgramUniformMatrix2x4dv");
-	glad_glProgramUniformMatrix4x2dv = (PFNGLPROGRAMUNIFORMMATRIX4X2DVPROC)load("glProgramUniformMatrix4x2dv");
-	glad_glProgramUniformMatrix3x4dv = (PFNGLPROGRAMUNIFORMMATRIX3X4DVPROC)load("glProgramUniformMatrix3x4dv");
-	glad_glProgramUniformMatrix4x3dv = (PFNGLPROGRAMUNIFORMMATRIX4X3DVPROC)load("glProgramUniformMatrix4x3dv");
-	glad_glValidateProgramPipeline = (PFNGLVALIDATEPROGRAMPIPELINEPROC)load("glValidateProgramPipeline");
-	glad_glGetProgramPipelineInfoLog = (PFNGLGETPROGRAMPIPELINEINFOLOGPROC)load("glGetProgramPipelineInfoLog");
-	glad_glVertexAttribL1d = (PFNGLVERTEXATTRIBL1DPROC)load("glVertexAttribL1d");
-	glad_glVertexAttribL2d = (PFNGLVERTEXATTRIBL2DPROC)load("glVertexAttribL2d");
-	glad_glVertexAttribL3d = (PFNGLVERTEXATTRIBL3DPROC)load("glVertexAttribL3d");
-	glad_glVertexAttribL4d = (PFNGLVERTEXATTRIBL4DPROC)load("glVertexAttribL4d");
-	glad_glVertexAttribL1dv = (PFNGLVERTEXATTRIBL1DVPROC)load("glVertexAttribL1dv");
-	glad_glVertexAttribL2dv = (PFNGLVERTEXATTRIBL2DVPROC)load("glVertexAttribL2dv");
-	glad_glVertexAttribL3dv = (PFNGLVERTEXATTRIBL3DVPROC)load("glVertexAttribL3dv");
-	glad_glVertexAttribL4dv = (PFNGLVERTEXATTRIBL4DVPROC)load("glVertexAttribL4dv");
-	glad_glVertexAttribLPointer = (PFNGLVERTEXATTRIBLPOINTERPROC)load("glVertexAttribLPointer");
-	glad_glGetVertexAttribLdv = (PFNGLGETVERTEXATTRIBLDVPROC)load("glGetVertexAttribLdv");
-	glad_glViewportArrayv = (PFNGLVIEWPORTARRAYVPROC)load("glViewportArrayv");
-	glad_glViewportIndexedf = (PFNGLVIEWPORTINDEXEDFPROC)load("glViewportIndexedf");
-	glad_glViewportIndexedfv = (PFNGLVIEWPORTINDEXEDFVPROC)load("glViewportIndexedfv");
-	glad_glScissorArrayv = (PFNGLSCISSORARRAYVPROC)load("glScissorArrayv");
-	glad_glScissorIndexed = (PFNGLSCISSORINDEXEDPROC)load("glScissorIndexed");
-	glad_glScissorIndexedv = (PFNGLSCISSORINDEXEDVPROC)load("glScissorIndexedv");
-	glad_glDepthRangeArrayv = (PFNGLDEPTHRANGEARRAYVPROC)load("glDepthRangeArrayv");
-	glad_glDepthRangeIndexed = (PFNGLDEPTHRANGEINDEXEDPROC)load("glDepthRangeIndexed");
-	glad_glGetFloati_v = (PFNGLGETFLOATI_VPROC)load("glGetFloati_v");
-	glad_glGetDoublei_v = (PFNGLGETDOUBLEI_VPROC)load("glGetDoublei_v");
-}
-static void load_GL_VERSION_4_2(GLADloadproc load) {
-	if(!GLAD_GL_VERSION_4_2) return;
-	glad_glDrawArraysInstancedBaseInstance = (PFNGLDRAWARRAYSINSTANCEDBASEINSTANCEPROC)load("glDrawArraysInstancedBaseInstance");
-	glad_glDrawElementsInstancedBaseInstance = (PFNGLDRAWELEMENTSINSTANCEDBASEINSTANCEPROC)load("glDrawElementsInstancedBaseInstance");
-	glad_glDrawElementsInstancedBaseVertexBaseInstance = (PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXBASEINSTANCEPROC)load("glDrawElementsInstancedBaseVertexBaseInstance");
-	glad_glGetInternalformativ = (PFNGLGETINTERNALFORMATIVPROC)load("glGetInternalformativ");
-	glad_glGetActiveAtomicCounterBufferiv = (PFNGLGETACTIVEATOMICCOUNTERBUFFERIVPROC)load("glGetActiveAtomicCounterBufferiv");
-	glad_glBindImageTexture = (PFNGLBINDIMAGETEXTUREPROC)load("glBindImageTexture");
-	glad_glMemoryBarrier = (PFNGLMEMORYBARRIERPROC)load("glMemoryBarrier");
-	glad_glTexStorage1D = (PFNGLTEXSTORAGE1DPROC)load("glTexStorage1D");
-	glad_glTexStorage2D = (PFNGLTEXSTORAGE2DPROC)load("glTexStorage2D");
-	glad_glTexStorage3D = (PFNGLTEXSTORAGE3DPROC)load("glTexStorage3D");
-	glad_glDrawTransformFeedbackInstanced = (PFNGLDRAWTRANSFORMFEEDBACKINSTANCEDPROC)load("glDrawTransformFeedbackInstanced");
-	glad_glDrawTransformFeedbackStreamInstanced = (PFNGLDRAWTRANSFORMFEEDBACKSTREAMINSTANCEDPROC)load("glDrawTransformFeedbackStreamInstanced");
-}
-static void load_GL_VERSION_4_3(GLADloadproc load) {
-	if(!GLAD_GL_VERSION_4_3) return;
-	glad_glClearBufferData = (PFNGLCLEARBUFFERDATAPROC)load("glClearBufferData");
-	glad_glClearBufferSubData = (PFNGLCLEARBUFFERSUBDATAPROC)load("glClearBufferSubData");
-	glad_glDispatchCompute = (PFNGLDISPATCHCOMPUTEPROC)load("glDispatchCompute");
-	glad_glDispatchComputeIndirect = (PFNGLDISPATCHCOMPUTEINDIRECTPROC)load("glDispatchComputeIndirect");
-	glad_glCopyImageSubData = (PFNGLCOPYIMAGESUBDATAPROC)load("glCopyImageSubData");
-	glad_glFramebufferParameteri = (PFNGLFRAMEBUFFERPARAMETERIPROC)load("glFramebufferParameteri");
-	glad_glGetFramebufferParameteriv = (PFNGLGETFRAMEBUFFERPARAMETERIVPROC)load("glGetFramebufferParameteriv");
-	glad_glGetInternalformati64v = (PFNGLGETINTERNALFORMATI64VPROC)load("glGetInternalformati64v");
-	glad_glInvalidateTexSubImage = (PFNGLINVALIDATETEXSUBIMAGEPROC)load("glInvalidateTexSubImage");
-	glad_glInvalidateTexImage = (PFNGLINVALIDATETEXIMAGEPROC)load("glInvalidateTexImage");
-	glad_glInvalidateBufferSubData = (PFNGLINVALIDATEBUFFERSUBDATAPROC)load("glInvalidateBufferSubData");
-	glad_glInvalidateBufferData = (PFNGLINVALIDATEBUFFERDATAPROC)load("glInvalidateBufferData");
-	glad_glInvalidateFramebuffer = (PFNGLINVALIDATEFRAMEBUFFERPROC)load("glInvalidateFramebuffer");
-	glad_glInvalidateSubFramebuffer = (PFNGLINVALIDATESUBFRAMEBUFFERPROC)load("glInvalidateSubFramebuffer");
-	glad_glMultiDrawArraysIndirect = (PFNGLMULTIDRAWARRAYSINDIRECTPROC)load("glMultiDrawArraysIndirect");
-	glad_glMultiDrawElementsIndirect = (PFNGLMULTIDRAWELEMENTSINDIRECTPROC)load("glMultiDrawElementsIndirect");
-	glad_glGetProgramInterfaceiv = (PFNGLGETPROGRAMINTERFACEIVPROC)load("glGetProgramInterfaceiv");
-	glad_glGetProgramResourceIndex = (PFNGLGETPROGRAMRESOURCEINDEXPROC)load("glGetProgramResourceIndex");
-	glad_glGetProgramResourceName = (PFNGLGETPROGRAMRESOURCENAMEPROC)load("glGetProgramResourceName");
-	glad_glGetProgramResourceiv = (PFNGLGETPROGRAMRESOURCEIVPROC)load("glGetProgramResourceiv");
-	glad_glGetProgramResourceLocation = (PFNGLGETPROGRAMRESOURCELOCATIONPROC)load("glGetProgramResourceLocation");
-	glad_glGetProgramResourceLocationIndex = (PFNGLGETPROGRAMRESOURCELOCATIONINDEXPROC)load("glGetProgramResourceLocationIndex");
-	glad_glShaderStorageBlockBinding = (PFNGLSHADERSTORAGEBLOCKBINDINGPROC)load("glShaderStorageBlockBinding");
-	glad_glTexBufferRange = (PFNGLTEXBUFFERRANGEPROC)load("glTexBufferRange");
-	glad_glTexStorage2DMultisample = (PFNGLTEXSTORAGE2DMULTISAMPLEPROC)load("glTexStorage2DMultisample");
-	glad_glTexStorage3DMultisample = (PFNGLTEXSTORAGE3DMULTISAMPLEPROC)load("glTexStorage3DMultisample");
-	glad_glTextureView = (PFNGLTEXTUREVIEWPROC)load("glTextureView");
-	glad_glBindVertexBuffer = (PFNGLBINDVERTEXBUFFERPROC)load("glBindVertexBuffer");
-	glad_glVertexAttribFormat = (PFNGLVERTEXATTRIBFORMATPROC)load("glVertexAttribFormat");
-	glad_glVertexAttribIFormat = (PFNGLVERTEXATTRIBIFORMATPROC)load("glVertexAttribIFormat");
-	glad_glVertexAttribLFormat = (PFNGLVERTEXATTRIBLFORMATPROC)load("glVertexAttribLFormat");
-	glad_glVertexAttribBinding = (PFNGLVERTEXATTRIBBINDINGPROC)load("glVertexAttribBinding");
-	glad_glVertexBindingDivisor = (PFNGLVERTEXBINDINGDIVISORPROC)load("glVertexBindingDivisor");
-	glad_glDebugMessageControl = (PFNGLDEBUGMESSAGECONTROLPROC)load("glDebugMessageControl");
-	glad_glDebugMessageInsert = (PFNGLDEBUGMESSAGEINSERTPROC)load("glDebugMessageInsert");
-	glad_glDebugMessageCallback = (PFNGLDEBUGMESSAGECALLBACKPROC)load("glDebugMessageCallback");
-	glad_glGetDebugMessageLog = (PFNGLGETDEBUGMESSAGELOGPROC)load("glGetDebugMessageLog");
-	glad_glPushDebugGroup = (PFNGLPUSHDEBUGGROUPPROC)load("glPushDebugGroup");
-	glad_glPopDebugGroup = (PFNGLPOPDEBUGGROUPPROC)load("glPopDebugGroup");
-	glad_glObjectLabel = (PFNGLOBJECTLABELPROC)load("glObjectLabel");
-	glad_glGetObjectLabel = (PFNGLGETOBJECTLABELPROC)load("glGetObjectLabel");
-	glad_glObjectPtrLabel = (PFNGLOBJECTPTRLABELPROC)load("glObjectPtrLabel");
-	glad_glGetObjectPtrLabel = (PFNGLGETOBJECTPTRLABELPROC)load("glGetObjectPtrLabel");
-	glad_glGetPointerv = (PFNGLGETPOINTERVPROC)load("glGetPointerv");
-}
-static int find_extensionsGL(void) {
-	if (!get_exts()) return 0;
-	(void)&has_ext;
-	free_exts();
-	return 1;
-}
-
-static void find_coreGL(void) {
-
-    /* Thank you @elmindreda
-     * https://github.com/elmindreda/greg/blob/master/templates/greg.c.in#L176
-     * https://github.com/glfw/glfw/blob/master/src/context.c#L36
-     */
-    int i, major, minor;
-
-    const char* version;
-    const char* prefixes[] = {
-        "OpenGL ES-CM ",
-        "OpenGL ES-CL ",
-        "OpenGL ES ",
-        NULL
-    };
-
-    version = (const char*) glGetString(GL_VERSION);
-    if (!version) return;
-
-    for (i = 0;  prefixes[i];  i++) {
-        const size_t length = strlen(prefixes[i]);
-        if (strncmp(version, prefixes[i], length) == 0) {
-            version += length;
-            break;
-        }
-    }
-
-/* PR #18 */
-#ifdef _MSC_VER
-    sscanf_s(version, "%d.%d", &major, &minor);
-#else
-    sscanf(version, "%d.%d", &major, &minor);
-#endif
-
-    GLVersion.major = major; GLVersion.minor = minor;
-    max_loaded_major = major; max_loaded_minor = minor;
-	GLAD_GL_VERSION_1_0 = (major == 1 && minor >= 0) || major > 1;
-	GLAD_GL_VERSION_1_1 = (major == 1 && minor >= 1) || major > 1;
-	GLAD_GL_VERSION_1_2 = (major == 1 && minor >= 2) || major > 1;
-	GLAD_GL_VERSION_1_3 = (major == 1 && minor >= 3) || major > 1;
-	GLAD_GL_VERSION_1_4 = (major == 1 && minor >= 4) || major > 1;
-	GLAD_GL_VERSION_1_5 = (major == 1 && minor >= 5) || major > 1;
-	GLAD_GL_VERSION_2_0 = (major == 2 && minor >= 0) || major > 2;
-	GLAD_GL_VERSION_2_1 = (major == 2 && minor >= 1) || major > 2;
-	GLAD_GL_VERSION_3_0 = (major == 3 && minor >= 0) || major > 3;
-	GLAD_GL_VERSION_3_1 = (major == 3 && minor >= 1) || major > 3;
-	GLAD_GL_VERSION_3_2 = (major == 3 && minor >= 2) || major > 3;
-	GLAD_GL_VERSION_3_3 = (major == 3 && minor >= 3) || major > 3;
-	GLAD_GL_VERSION_4_0 = (major == 4 && minor >= 0) || major > 4;
-	GLAD_GL_VERSION_4_1 = (major == 4 && minor >= 1) || major > 4;
-	GLAD_GL_VERSION_4_2 = (major == 4 && minor >= 2) || major > 4;
-	GLAD_GL_VERSION_4_3 = (major == 4 && minor >= 3) || major > 4;
-	if (GLVersion.major > 4 || (GLVersion.major >= 4 && GLVersion.minor >= 3)) {
-		max_loaded_major = 4;
-		max_loaded_minor = 3;
-	}
-}
-
-int gladLoadGLLoader(GLADloadproc load) {
-	GLVersion.major = 0; GLVersion.minor = 0;
-	glGetString = (PFNGLGETSTRINGPROC)load("glGetString");
-	if(glGetString == NULL) return 0;
-	if(glGetString(GL_VERSION) == NULL) return 0;
-	find_coreGL();
-	load_GL_VERSION_1_0(load);
-	load_GL_VERSION_1_1(load);
-	load_GL_VERSION_1_2(load);
-	load_GL_VERSION_1_3(load);
-	load_GL_VERSION_1_4(load);
-	load_GL_VERSION_1_5(load);
-	load_GL_VERSION_2_0(load);
-	load_GL_VERSION_2_1(load);
-	load_GL_VERSION_3_0(load);
-	load_GL_VERSION_3_1(load);
-	load_GL_VERSION_3_2(load);
-	load_GL_VERSION_3_3(load);
-	load_GL_VERSION_4_0(load);
-	load_GL_VERSION_4_1(load);
-	load_GL_VERSION_4_2(load);
-	load_GL_VERSION_4_3(load);
-
-	if (!find_extensionsGL()) return 0;
-	return GLVersion.major != 0 || GLVersion.minor != 0;
-}
-
diff --git a/Source/sys-clk/manager/lib/borealis/library/lib/extern/libretro-common/.gitignore b/Source/sys-clk/manager/lib/borealis/library/lib/extern/libretro-common/.gitignore
deleted file mode 100644
index 6467048e..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/lib/extern/libretro-common/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-*.dll
-*.exe
-*.c~
-*.un~
-*.o
diff --git a/Source/sys-clk/manager/lib/borealis/library/lib/extern/libretro-common/compat/compat_strl.c b/Source/sys-clk/manager/lib/borealis/library/lib/extern/libretro-common/compat/compat_strl.c
deleted file mode 100644
index 94cb39b6..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/lib/extern/libretro-common/compat/compat_strl.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/* Copyright  (C) 2010-2018 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (compat_strl.c).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <stdlib.h>
-#include <ctype.h>
-
-#include <compat/strl.h>
-
-/* Implementation of strlcpy()/strlcat() based on OpenBSD. */
-
-#ifndef __MACH__
-
-size_t strlcpy(char *dest, const char *source, size_t size)
-{
-   size_t src_size = 0;
-   size_t        n = size;
-
-   if (n)
-      while (--n && (*dest++ = *source++)) src_size++;
-
-   if (!n)
-   {
-      if (size) *dest = '\0';
-      while (*source++) src_size++;
-   }
-
-   return src_size;
-}
-
-size_t strlcat(char *dest, const char *source, size_t size)
-{
-   size_t len = strlen(dest);
-
-   dest += len;
-
-   if (len > size)
-      size = 0;
-   else
-      size -= len;
-
-   return len + strlcpy(dest, source, size);
-}
-#endif
-
-char *strldup(const char *s, size_t n)
-{
-   char *dst = (char*)malloc(sizeof(char) * (n + 1));
-   strlcpy(dst, s, n);
-   return dst;
-}
diff --git a/Source/sys-clk/manager/lib/borealis/library/lib/extern/libretro-common/encodings/encoding_utf.c b/Source/sys-clk/manager/lib/borealis/library/lib/extern/libretro-common/encodings/encoding_utf.c
deleted file mode 100644
index b6ad2f96..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/lib/extern/libretro-common/encodings/encoding_utf.c
+++ /dev/null
@@ -1,510 +0,0 @@
-/* Copyright  (C) 2010-2018 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (encoding_utf.c).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <stdint.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <string.h>
-
-#include <boolean.h>
-#include <compat/strl.h>
-#include <retro_inline.h>
-
-#include <encodings/utf.h>
-
-#if defined(_WIN32) && !defined(_XBOX)
-#include <windows.h>
-#elif defined(_XBOX)
-#include <xtl.h>
-#endif
-
-static unsigned leading_ones(uint8_t c)
-{
-   unsigned ones = 0;
-   while (c & 0x80)
-   {
-      ones++;
-      c <<= 1;
-   }
-
-   return ones;
-}
-
-/* Simple implementation. Assumes the sequence is
- * properly synchronized and terminated. */
-
-size_t utf8_conv_utf32(uint32_t *out, size_t out_chars,
-      const char *in, size_t in_size)
-{
-   unsigned i;
-   size_t ret = 0;
-   while (in_size && out_chars)
-   {
-      unsigned extra, shift;
-      uint32_t c;
-      uint8_t first = *in++;
-      unsigned ones = leading_ones(first);
-
-      if (ones > 6 || ones == 1) /* Invalid or desync. */
-         break;
-
-      extra = ones ? ones - 1 : ones;
-      if (1 + extra > in_size) /* Overflow. */
-         break;
-
-      shift = (extra - 1) * 6;
-      c     = (first & ((1 << (7 - ones)) - 1)) << (6 * extra);
-
-      for (i = 0; i < extra; i++, in++, shift -= 6)
-         c |= (*in & 0x3f) << shift;
-
-      *out++ = c;
-      in_size -= 1 + extra;
-      out_chars--;
-      ret++;
-   }
-
-   return ret;
-}
-
-bool utf16_conv_utf8(uint8_t *out, size_t *out_chars,
-     const uint16_t *in, size_t in_size)
-{
-   static uint8_t kUtf8Limits[5] = { 0xC0, 0xE0, 0xF0, 0xF8, 0xFC };
-   size_t out_pos = 0;
-   size_t in_pos  = 0;
-
-   for (;;)
-   {
-      unsigned numAdds;
-      uint32_t value;
-
-      if (in_pos == in_size)
-      {
-         *out_chars = out_pos;
-         return true;
-      }
-      value = in[in_pos++];
-      if (value < 0x80)
-      {
-         if (out)
-            out[out_pos] = (char)value;
-         out_pos++;
-         continue;
-      }
-
-      if (value >= 0xD800 && value < 0xE000)
-      {
-         uint32_t c2;
-
-         if (value >= 0xDC00 || in_pos == in_size)
-            break;
-         c2 = in[in_pos++];
-         if (c2 < 0xDC00 || c2 >= 0xE000)
-            break;
-         value = (((value - 0xD800) << 10) | (c2 - 0xDC00)) + 0x10000;
-      }
-
-      for (numAdds = 1; numAdds < 5; numAdds++)
-         if (value < (((uint32_t)1) << (numAdds * 5 + 6)))
-            break;
-      if (out)
-         out[out_pos] = (char)(kUtf8Limits[numAdds - 1]
-               + (value >> (6 * numAdds)));
-      out_pos++;
-      do
-      {
-         numAdds--;
-         if (out)
-            out[out_pos] = (char)(0x80
-                  + ((value >> (6 * numAdds)) & 0x3F));
-         out_pos++;
-      }while (numAdds != 0);
-   }
-
-   *out_chars = out_pos;
-   return false;
-}
-
-/* Acts mostly like strlcpy.
- *
- * Copies the given number of UTF-8 characters,
- * but at most d_len bytes.
- *
- * Always NULL terminates.
- * Does not copy half a character.
- *
- * Returns number of bytes. 's' is assumed valid UTF-8.
- * Use only if 'chars' is considerably less than 'd_len'. */
-size_t utf8cpy(char *d, size_t d_len, const char *s, size_t chars)
-{
-   const uint8_t *sb     = (const uint8_t*)s;
-   const uint8_t *sb_org = sb;
-
-   if (!s)
-      return 0;
-
-   while (*sb && chars-- > 0)
-   {
-      sb++;
-      while ((*sb & 0xC0) == 0x80) sb++;
-   }
-
-   if ((size_t)(sb - sb_org) > d_len-1 /* NUL */)
-   {
-      sb = sb_org + d_len-1;
-      while ((*sb & 0xC0) == 0x80) sb--;
-   }
-
-   memcpy(d, sb_org, sb-sb_org);
-   d[sb-sb_org] = '\0';
-
-   return sb-sb_org;
-}
-
-const char *utf8skip(const char *str, size_t chars)
-{
-   const uint8_t *strb = (const uint8_t*)str;
-   if (!chars)
-      return str;
-   do
-   {
-      strb++;
-      while ((*strb & 0xC0)==0x80) strb++;
-      chars--;
-   } while(chars);
-   return (const char*)strb;
-}
-
-size_t utf8len(const char *string)
-{
-   size_t ret = 0;
-
-   if (!string)
-      return 0;
-
-   while (*string)
-   {
-      if ((*string & 0xC0) != 0x80)
-         ret++;
-      string++;
-   }
-   return ret;
-}
-
-#define utf8_walkbyte(string) (*((*(string))++))
-
-/* Does not validate the input, returns garbage if it's not UTF-8. */
-uint32_t utf8_walk(const char **string)
-{
-   uint8_t first = utf8_walkbyte(string);
-   uint32_t ret  = 0;
-
-   if (first < 128)
-      return first;
-
-   ret    = (ret << 6) | (utf8_walkbyte(string) & 0x3F);
-   if (first >= 0xE0)
-   {
-      ret = (ret << 6) | (utf8_walkbyte(string) & 0x3F);
-      if (first >= 0xF0)
-      {
-         ret = (ret << 6) | (utf8_walkbyte(string) & 0x3F);
-         return ret | (first & 7) << 18;
-      }
-      return ret | (first & 15) << 12;
-   }
-
-   return ret | (first & 31) << 6;
-}
-
-static bool utf16_to_char(uint8_t **utf_data,
-      size_t *dest_len, const uint16_t *in)
-{
-   unsigned len    = 0;
-
-   while (in[len] != '\0')
-      len++;
-
-   utf16_conv_utf8(NULL, dest_len, in, len);
-   *dest_len  += 1;
-   *utf_data   = (uint8_t*)malloc(*dest_len);
-   if (*utf_data == 0)
-      return false;
-
-   return utf16_conv_utf8(*utf_data, dest_len, in, len);
-}
-
-bool utf16_to_char_string(const uint16_t *in, char *s, size_t len)
-{
-   size_t     dest_len  = 0;
-   uint8_t *utf16_data  = NULL;
-   bool            ret  = utf16_to_char(&utf16_data, &dest_len, in);
-
-   if (ret)
-   {
-      utf16_data[dest_len] = 0;
-      strlcpy(s, (const char*)utf16_data, len);
-   }
-
-   free(utf16_data);
-   utf16_data = NULL;
-
-   return ret;
-}
-
-#if defined(_WIN32) && !defined(_XBOX) && !defined(UNICODE)
-/* Returned pointer MUST be freed by the caller if non-NULL. */
-static char *mb_to_mb_string_alloc(const char *str,
-      enum CodePage cp_in, enum CodePage cp_out)
-{
-   char *path_buf         = NULL;
-   wchar_t *path_buf_wide = NULL;
-   int path_buf_len       = 0;
-   int path_buf_wide_len  = MultiByteToWideChar(cp_in, 0, str, -1, NULL, 0);
-
-   /* Windows 95 will return 0 from these functions with 
-    * a UTF8 codepage set without MSLU.
-    *
-    * From an unknown MSDN version (others omit this info):
-    *   - CP_UTF8 Windows 98/Me, Windows NT 4.0 and later: 
-    *   Translate using UTF-8. When this is set, dwFlags must be zero.
-    *   - Windows 95: Under the Microsoft Layer for Unicode, 
-    *   MultiByteToWideChar also supports CP_UTF7 and CP_UTF8.
-    */
-
-   if (path_buf_wide_len)
-   {
-      path_buf_wide = (wchar_t*)
-         calloc(path_buf_wide_len + sizeof(wchar_t), sizeof(wchar_t));
-
-      if (path_buf_wide)
-      {
-         MultiByteToWideChar(cp_in, 0,
-               str, -1, path_buf_wide, path_buf_wide_len);
-
-         if (*path_buf_wide)
-         {
-            path_buf_len = WideCharToMultiByte(cp_out, 0,
-                  path_buf_wide, -1, NULL, 0, NULL, NULL);
-
-            if (path_buf_len)
-            {
-               path_buf = (char*)
-                  calloc(path_buf_len + sizeof(char), sizeof(char));
-
-               if (path_buf)
-               {
-                  WideCharToMultiByte(cp_out, 0,
-                        path_buf_wide, -1, path_buf,
-                        path_buf_len, NULL, NULL);
-
-                  free(path_buf_wide);
-
-                  if (*path_buf)
-                     return path_buf;
-
-                  free(path_buf);
-                  return NULL;
-               }
-            }
-            else
-            {
-               free(path_buf_wide);
-               return strdup(str);
-            }
-         }
-      }
-   }
-   else
-      return strdup(str);
-
-   if (path_buf_wide)
-      free(path_buf_wide);
-
-   return NULL;
-}
-#endif
-
-/* Returned pointer MUST be freed by the caller if non-NULL. */
-char* utf8_to_local_string_alloc(const char *str)
-{
-   if (str && *str)
-   {
-#if defined(_WIN32) && !defined(_XBOX) && !defined(UNICODE)
-      return mb_to_mb_string_alloc(str, CODEPAGE_UTF8, CODEPAGE_LOCAL);
-#else
-      /* assume string needs no modification if not on Windows */
-      return strdup(str);
-#endif
-   }
-   return NULL;
-}
-
-/* Returned pointer MUST be freed by the caller if non-NULL. */
-char* local_to_utf8_string_alloc(const char *str)
-{
-   if (str && *str)
-   {
-#if defined(_WIN32) && !defined(_XBOX) && !defined(UNICODE)
-      return mb_to_mb_string_alloc(str, CODEPAGE_LOCAL, CODEPAGE_UTF8);
-#else
-      /* assume string needs no modification if not on Windows */
-      return strdup(str);
-#endif
-   }
-   return NULL;
-}
-
-/* Returned pointer MUST be freed by the caller if non-NULL. */
-wchar_t* utf8_to_utf16_string_alloc(const char *str)
-{
-#ifdef _WIN32
-   int len = 0;
-   int out_len = 0;
-#else
-   size_t len = 0;
-   size_t out_len = 0;
-#endif
-   wchar_t *buf = NULL;
-
-   if (!str || !*str)
-      return NULL;
-
-#ifdef _WIN32
-   len = MultiByteToWideChar(CP_UTF8, 0, str, -1, NULL, 0);
-
-   if (len)
-   {
-      buf = (wchar_t*)calloc(len, sizeof(wchar_t));
-
-      if (!buf)
-         return NULL;
-
-      out_len = MultiByteToWideChar(CP_UTF8, 0, str, -1, buf, len);
-   }
-   else
-   {
-      /* fallback to ANSI codepage instead */
-      len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0);
-
-      if (len)
-      {
-         buf = (wchar_t*)calloc(len, sizeof(wchar_t));
-
-         if (!buf)
-            return NULL;
-
-         out_len = MultiByteToWideChar(CP_ACP, 0, str, -1, buf, len);
-      }
-   }
-
-   if (out_len < 0)
-   {
-      free(buf);
-      return NULL;
-   }
-#else
-   /* NOTE: For now, assume non-Windows platforms' locale is already UTF-8. */
-   len = mbstowcs(NULL, str, 0) + 1;
-
-   if (len)
-   {
-      buf = (wchar_t*)calloc(len, sizeof(wchar_t));
-
-      if (!buf)
-         return NULL;
-
-      out_len = mbstowcs(buf, str, len);
-   }
-
-   if (out_len == (size_t)-1)
-   {
-      free(buf);
-      return NULL;
-   }
-#endif
-
-   return buf;
-}
-
-/* Returned pointer MUST be freed by the caller if non-NULL. */
-char* utf16_to_utf8_string_alloc(const wchar_t *str)
-{
-#ifdef _WIN32
-   int len        = 0;
-#else
-   size_t len     = 0;
-#endif
-   char *buf      = NULL;
-
-   if (!str || !*str)
-      return NULL;
-
-#ifdef _WIN32
-   {
-      UINT code_page = CP_UTF8;
-      len            = WideCharToMultiByte(code_page,
-            0, str, -1, NULL, 0, NULL, NULL);
-
-      /* fallback to ANSI codepage instead */
-      if (!len)
-      {
-         code_page   = CP_ACP;
-         len         = WideCharToMultiByte(code_page,
-               0, str, -1, NULL, 0, NULL, NULL);
-      }
-
-      buf = (char*)calloc(len, sizeof(char));
-
-      if (!buf)
-         return NULL;
-
-      if (WideCharToMultiByte(code_page,
-            0, str, -1, buf, len, NULL, NULL) < 0)
-      {
-         free(buf);
-         return NULL;
-      }
-   }
-#else
-   /* NOTE: For now, assume non-Windows platforms' 
-    * locale is already UTF-8. */
-   len = wcstombs(NULL, str, 0) + 1;
-
-   if (len)
-   {
-      buf = (char*)calloc(len, sizeof(char));
-
-      if (!buf)
-         return NULL;
-
-      if (wcstombs(buf, str, len) == (size_t)-1)
-      {
-         free(buf);
-         return NULL;
-      }
-   }
-#endif
-
-   return buf;
-}
diff --git a/Source/sys-clk/manager/lib/borealis/library/lib/extern/libretro-common/features/features_cpu.c b/Source/sys-clk/manager/lib/borealis/library/lib/extern/libretro-common/features/features_cpu.c
deleted file mode 100644
index 5b4595b0..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/lib/extern/libretro-common/features/features_cpu.c
+++ /dev/null
@@ -1,889 +0,0 @@
-/* Copyright  (C) 2010-2018 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (features_cpu.c).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#if defined(_WIN32)
-#include <direct.h>
-#else
-#include <unistd.h>
-#endif
-
-#include <compat/strl.h>
-#include <streams/file_stream.h>
-#include <libretro.h>
-#include <features/features_cpu.h>
-#include <retro_timers.h>
-
-#if defined(_WIN32) && !defined(_XBOX)
-#include <windows.h>
-#endif
-
-#if defined(__CELLOS_LV2__)
-#ifndef _PPU_INTRINSICS_H
-#include <ppu_intrinsics.h>
-#endif
-#elif defined(_XBOX360)
-#include <PPCIntrinsics.h>
-#elif defined(_POSIX_MONOTONIC_CLOCK) || defined(ANDROID) || defined(__QNX__) || defined(DJGPP)
-/* POSIX_MONOTONIC_CLOCK is not being defined in Android headers despite support being present. */
-#include <time.h>
-#endif
-
-#if defined(__QNX__) && !defined(CLOCK_MONOTONIC)
-#define CLOCK_MONOTONIC 2
-#endif
-
-#if defined(PSP)
-#include <pspkernel.h>
-#include <sys/time.h>
-#include <psprtc.h>
-#endif
-
-#if defined(VITA)
-#include <psp2/kernel/processmgr.h>
-#include <psp2/rtc.h>
-#endif
-
-#if defined(PS2)
-#include <kernel.h>
-#include <timer.h>
-#include <time.h>
-#endif
-
-#if defined(__PSL1GHT__)
-#include <sys/time.h>
-#elif defined(__CELLOS_LV2__)
-#include <sys/sys_time.h>
-#endif
-
-#ifdef GEKKO
-#include <ogc/lwp_watchdog.h>
-#endif
-
-#ifdef WIIU
-#include <wiiu/os/time.h>
-#endif
-
-#if defined(HAVE_LIBNX)
-#include <switch.h>
-#elif defined(SWITCH)
-#include <libtransistor/types.h>
-#include <libtransistor/svc.h>
-#endif
-
-#if defined(_3DS)
-#include <3ds/svc.h>
-#include <3ds/os.h>
-#include <3ds/services/cfgu.h>
-#endif
-
-/* iOS/OSX specific. Lacks clock_gettime(), so implement it. */
-#ifdef __MACH__
-#include <sys/time.h>
-
-#ifndef CLOCK_MONOTONIC
-#define CLOCK_MONOTONIC 0
-#endif
-
-#ifndef CLOCK_REALTIME
-#define CLOCK_REALTIME 0
-#endif
-
-/* this function is part of iOS 10 now */
-static int ra_clock_gettime(int clk_ik, struct timespec *t)
-{
-   struct timeval now;
-   int rv = gettimeofday(&now, NULL);
-   if (rv)
-      return rv;
-   t->tv_sec  = now.tv_sec;
-   t->tv_nsec = now.tv_usec * 1000;
-   return 0;
-}
-#endif
-
-#if defined(__MACH__) && __IPHONE_OS_VERSION_MIN_REQUIRED < 100000
-#else
-#define ra_clock_gettime clock_gettime
-#endif
-
-#ifdef EMSCRIPTEN
-#include <emscripten.h>
-#endif
-
-#if defined(BSD) || defined(__APPLE__)
-#include <sys/sysctl.h>
-#endif
-
-#include <string.h>
-
-/**
- * cpu_features_get_perf_counter:
- *
- * Gets performance counter.
- *
- * Returns: performance counter.
- **/
-retro_perf_tick_t cpu_features_get_perf_counter(void)
-{
-   retro_perf_tick_t time_ticks = 0;
-#if defined(_WIN32)
-   long tv_sec, tv_usec;
-#if defined(_MSC_VER) && _MSC_VER <= 1200
-   static const unsigned __int64 epoch = 11644473600000000;
-#else
-   static const unsigned __int64 epoch = 11644473600000000ULL;
-#endif
-   FILETIME file_time;
-   SYSTEMTIME system_time;
-   ULARGE_INTEGER ularge;
-
-   GetSystemTime(&system_time);
-   SystemTimeToFileTime(&system_time, &file_time);
-   ularge.LowPart  = file_time.dwLowDateTime;
-   ularge.HighPart = file_time.dwHighDateTime;
-
-   tv_sec     = (long)((ularge.QuadPart - epoch) / 10000000L);
-   tv_usec    = (long)(system_time.wMilliseconds * 1000);
-   time_ticks = (1000000 * tv_sec + tv_usec);
-#elif defined(__linux__) || defined(__QNX__) || defined(__MACH__)
-   struct timespec tv = {0};
-   if (ra_clock_gettime(CLOCK_MONOTONIC, &tv) == 0)
-      time_ticks = (retro_perf_tick_t)tv.tv_sec * 1000000000 +
-         (retro_perf_tick_t)tv.tv_nsec;
-
-#elif defined(__GNUC__) && defined(__i386__) || defined(__i486__) || defined(__i686__) || defined(_M_X64) || defined(_M_AMD64)
-   __asm__ volatile ("rdtsc" : "=A" (time_ticks));
-#elif defined(__GNUC__) && defined(__x86_64__) || defined(_M_IX86)
-   unsigned a, d;
-   __asm__ volatile ("rdtsc" : "=a" (a), "=d" (d));
-   time_ticks = (retro_perf_tick_t)a | ((retro_perf_tick_t)d << 32);
-#elif defined(__ARM_ARCH_6__)
-   __asm__ volatile( "mrc p15, 0, %0, c9, c13, 0" : "=r"(time_ticks) );
-#elif defined(__CELLOS_LV2__) || defined(_XBOX360) || defined(__powerpc__) || defined(__ppc__) || defined(__POWERPC__)
-   time_ticks = __mftb();
-#elif defined(GEKKO)
-   time_ticks = gettime();
-#elif defined(PSP)
-   sceRtcGetCurrentTick((uint64_t*)&time_ticks);
-#elif defined(VITA)
-   sceRtcGetCurrentTick((SceRtcTick*)&time_ticks);
-#elif defined(PS2)
-   time_ticks = clock()*294912; // 294,912MHZ / 1000 msecs
-#elif defined(_3DS)
-   time_ticks = svcGetSystemTick();
-#elif defined(WIIU)
-   time_ticks = OSGetSystemTime();
-#elif defined(__mips__)
-   struct timeval tv;
-   gettimeofday(&tv,NULL);
-   time_ticks = (1000000 * tv.tv_sec + tv.tv_usec);
-#elif defined(HAVE_LIBNX)
-   time_ticks = armGetSystemTick();
-#endif
-
-   return time_ticks;
-}
-
-/**
- * cpu_features_get_time_usec:
- *
- * Gets time in microseconds.
- *
- * Returns: time in microseconds.
- **/
-retro_time_t cpu_features_get_time_usec(void)
-{
-#if defined(_WIN32)
-   static LARGE_INTEGER freq;
-   LARGE_INTEGER count;
-
-   /* Frequency is guaranteed to not change. */
-   if (!freq.QuadPart && !QueryPerformanceFrequency(&freq))
-      return 0;
-
-   if (!QueryPerformanceCounter(&count))
-      return 0;
-   return count.QuadPart * 1000000 / freq.QuadPart;
-#elif defined(__CELLOS_LV2__)
-   return sys_time_get_system_time();
-#elif defined(GEKKO)
-   return ticks_to_microsecs(gettime());
-#elif defined(WIIU)
-   return ticks_to_us(OSGetSystemTime());
-#elif defined(SWITCH) || defined(HAVE_LIBNX)
-   return (svcGetSystemTick() * 10) / 192;
-#elif defined(_POSIX_MONOTONIC_CLOCK) || defined(__QNX__) || defined(ANDROID) || defined(__MACH__)
-   struct timespec tv = {0};
-   if (ra_clock_gettime(CLOCK_MONOTONIC, &tv) < 0)
-      return 0;
-   return tv.tv_sec * INT64_C(1000000) + (tv.tv_nsec + 500) / 1000;
-#elif defined(EMSCRIPTEN)
-   return emscripten_get_now() * 1000;
-#elif defined(PS2)
-      return clock()*1000;
-#elif defined(__mips__) || defined(DJGPP)
-   struct timeval tv;
-   gettimeofday(&tv,NULL);
-   return (1000000 * tv.tv_sec + tv.tv_usec);
-#elif defined(_3DS)
-   return osGetTime() * 1000;
-#elif defined(VITA)
-   return sceKernelGetProcessTimeWide();
-#else
-#error "Your platform does not have a timer function implemented in cpu_features_get_time_usec(). Cannot continue."
-#endif
-}
-
-#if defined(__x86_64__) || defined(__i386__) || defined(__i486__) || defined(__i686__) || (defined(_M_X64) && _MSC_VER > 1310) || (defined(_M_IX86) && _MSC_VER > 1310)
-#define CPU_X86
-#endif
-
-#if defined(_MSC_VER) && !defined(_XBOX)
-#if (_MSC_VER > 1310)
-#include <intrin.h>
-#endif
-#endif
-
-#if defined(CPU_X86) && !defined(__MACH__)
-void x86_cpuid(int func, int flags[4])
-{
-   /* On Android, we compile RetroArch with PIC, and we
-    * are not allowed to clobber the ebx register. */
-#ifdef __x86_64__
-#define REG_b "rbx"
-#define REG_S "rsi"
-#else
-#define REG_b "ebx"
-#define REG_S "esi"
-#endif
-
-#if defined(__GNUC__)
-   __asm__ volatile (
-         "mov %%" REG_b ", %%" REG_S "\n"
-         "cpuid\n"
-         "xchg %%" REG_b ", %%" REG_S "\n"
-         : "=a"(flags[0]), "=S"(flags[1]), "=c"(flags[2]), "=d"(flags[3])
-         : "a"(func));
-#elif defined(_MSC_VER)
-   __cpuid(flags, func);
-#else
-   printf("Unknown compiler. Cannot check CPUID with inline assembly.\n");
-   memset(flags, 0, 4 * sizeof(int));
-#endif
-}
-
-/* Only runs on i686 and above. Needs to be conditionally run. */
-static uint64_t xgetbv_x86(uint32_t idx)
-{
-#if defined(__GNUC__)
-   uint32_t eax, edx;
-   __asm__ volatile (
-         /* Older GCC versions (Apple's GCC for example) do
-          * not understand xgetbv instruction.
-          * Stamp out the machine code directly.
-          */
-         ".byte 0x0f, 0x01, 0xd0\n"
-         : "=a"(eax), "=d"(edx) : "c"(idx));
-   return ((uint64_t)edx << 32) | eax;
-#elif _MSC_FULL_VER >= 160040219
-   /* Intrinsic only works on 2010 SP1 and above. */
-   return _xgetbv(idx);
-#else
-   printf("Unknown compiler. Cannot check xgetbv bits.\n");
-   return 0;
-#endif
-}
-#endif
-
-#if defined(__ARM_NEON__)
-static void arm_enable_runfast_mode(void)
-{
-   /* RunFast mode. Enables flush-to-zero and some
-    * floating point optimizations. */
-   static const unsigned x = 0x04086060;
-   static const unsigned y = 0x03000000;
-   int r;
-   __asm__ volatile(
-         "fmrx	%0, fpscr   \n\t" /* r0 = FPSCR */
-         "and	%0, %0, %1  \n\t" /* r0 = r0 & 0x04086060 */
-         "orr	%0, %0, %2  \n\t" /* r0 = r0 | 0x03000000 */
-         "fmxr	fpscr, %0   \n\t" /* FPSCR = r0 */
-         : "=r"(r)
-         : "r"(x), "r"(y)
-        );
-}
-#endif
-
-#if defined(__linux__) && !defined(CPU_X86)
-static unsigned char check_arm_cpu_feature(const char* feature)
-{
-   char line[1024];
-   unsigned char status = 0;
-   RFILE *fp = filestream_open("/proc/cpuinfo",
-         RETRO_VFS_FILE_ACCESS_READ,
-         RETRO_VFS_FILE_ACCESS_HINT_NONE);
-
-   if (!fp)
-      return 0;
-
-   while (filestream_gets(fp, line, sizeof(line)) != NULL)
-   {
-      if (strncmp(line, "Features\t: ", 11))
-         continue;
-
-      if (strstr(line + 11, feature) != NULL)
-         status = 1;
-
-      break;
-   }
-
-   filestream_close(fp);
-
-   return status;
-}
-
-#if !defined(_SC_NPROCESSORS_ONLN)
-/* Parse an decimal integer starting from 'input', but not going further
- * than 'limit'. Return the value into '*result'.
- *
- * NOTE: Does not skip over leading spaces, or deal with sign characters.
- * NOTE: Ignores overflows.
- *
- * The function returns NULL in case of error (bad format), or the new
- * position after the decimal number in case of success (which will always
- * be <= 'limit').
- */
-static const char *parse_decimal(const char* input,
-      const char* limit, int* result)
-{
-    const char* p = input;
-    int       val = 0;
-
-    while (p < limit)
-    {
-        int d = (*p - '0');
-        if ((unsigned)d >= 10U)
-            break;
-        val = val*10 + d;
-        p++;
-    }
-    if (p == input)
-        return NULL;
-
-    *result = val;
-    return p;
-}
-
-/* Parse a textual list of cpus and store the result inside a CpuList object.
- * Input format is the following:
- * - comma-separated list of items (no spaces)
- * - each item is either a single decimal number (cpu index), or a range made
- *   of two numbers separated by a single dash (-). Ranges are inclusive.
- *
- * Examples:   0
- *             2,4-127,128-143
- *             0-1
- */
-static void cpulist_parse(CpuList* list, char **buf, ssize_t length)
-{
-   const char* p   = (const char*)buf;
-   const char* end = p + length;
-
-   /* NOTE: the input line coming from sysfs typically contains a
-    * trailing newline, so take care of it in the code below
-    */
-   while (p < end && *p != '\n')
-   {
-      int val, start_value, end_value;
-      /* Find the end of current item, and put it into 'q' */
-      const char *q = (const char*)memchr(p, ',', end-p);
-
-      if (!q)
-         q = end;
-
-      /* Get first value */
-      p = parse_decimal(p, q, &start_value);
-      if (p == NULL)
-         return;
-
-      end_value = start_value;
-
-      /* If we're not at the end of the item, expect a dash and
-       * and integer; extract end value.
-       */
-      if (p < q && *p == '-')
-      {
-         p = parse_decimal(p+1, q, &end_value);
-         if (p == NULL)
-            return;
-      }
-
-      /* Set bits CPU list bits */
-      for (val = start_value; val <= end_value; val++)
-      {
-         if ((unsigned)val < 32)
-            list->mask |= (uint32_t)(1U << val);
-      }
-
-      /* Jump to next item */
-      p = q;
-      if (p < end)
-         p++;
-   }
-}
-
-/* Read a CPU list from one sysfs file */
-static void cpulist_read_from(CpuList* list, const char* filename)
-{
-   ssize_t length;
-   char *buf  = NULL;
-
-   list->mask = 0;
-
-   if (filestream_read_file(filename, (void**)&buf, &length) != 1)
-      return;
-
-   cpulist_parse(list, &buf, length);
-   if (buf)
-      free(buf);
-   buf = NULL;
-}
-#endif
-
-#endif
-
-/**
- * cpu_features_get_core_amount:
- *
- * Gets the amount of available CPU cores.
- *
- * Returns: amount of CPU cores available.
- **/
-unsigned cpu_features_get_core_amount(void)
-{
-#if defined(_WIN32) && !defined(_XBOX)
-   /* Win32 */
-   SYSTEM_INFO sysinfo;
-#if defined(__WINRT__) || defined(WINAPI_FAMILY) && WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP
-   GetNativeSystemInfo(&sysinfo);
-#else
-   GetSystemInfo(&sysinfo);
-#endif
-   return sysinfo.dwNumberOfProcessors;
-#elif defined(GEKKO)
-   return 1;
-#elif defined(PSP) || defined(PS2)
-   return 1;
-#elif defined(VITA)
-   return 4;
-#elif defined(HAVE_LIBNX) || defined(SWITCH)
-   return 4;
-#elif defined(_3DS)
-   u8 device_model = 0xFF;
-   CFGU_GetSystemModel(&device_model);/*(0 = O3DS, 1 = O3DSXL, 2 = N3DS, 3 = 2DS, 4 = N3DSXL, 5 = N2DSXL)*/
-   switch (device_model)
-   {
-		case 0:
-		case 1:
-		case 3:
-			/*Old 3/2DS*/
-			return 2;
-
-		case 2:
-		case 4:
-		case 5:
-			/*New 3/2DS*/
-			return 4;
-
-		default:
-			/*Unknown Device Or Check Failed*/
-			break;
-   }
-   return 1;
-#elif defined(WIIU)
-   return 3;
-#elif defined(_SC_NPROCESSORS_ONLN)
-   /* Linux, most UNIX-likes. */
-   long ret = sysconf(_SC_NPROCESSORS_ONLN);
-   if (ret <= 0)
-      return (unsigned)1;
-   return (unsigned)ret;
-#elif defined(BSD) || defined(__APPLE__)
-   /* BSD */
-   /* Copypasta from stackoverflow, dunno if it works. */
-   int num_cpu = 0;
-   int mib[4];
-   size_t len = sizeof(num_cpu);
-
-   mib[0] = CTL_HW;
-   mib[1] = HW_AVAILCPU;
-   sysctl(mib, 2, &num_cpu, &len, NULL, 0);
-   if (num_cpu < 1)
-   {
-      mib[1] = HW_NCPU;
-      sysctl(mib, 2, &num_cpu, &len, NULL, 0);
-      if (num_cpu < 1)
-         num_cpu = 1;
-   }
-   return num_cpu;
-#elif defined(__linux__)
-   CpuList  cpus_present[1];
-   CpuList  cpus_possible[1];
-   int amount = 0;
-
-   cpulist_read_from(cpus_present, "/sys/devices/system/cpu/present");
-   cpulist_read_from(cpus_possible, "/sys/devices/system/cpu/possible");
-
-   /* Compute the intersection of both sets to get the actual number of
-    * CPU cores that can be used on this device by the kernel.
-    */
-   cpus_present->mask &= cpus_possible->mask;
-   amount              = __builtin_popcount(cpus_present->mask);
-
-   if (amount == 0)
-      return 1;
-   return amount;
-#elif defined(_XBOX360)
-   return 3;
-#else
-   /* No idea, assume single core. */
-   return 1;
-#endif
-}
-
-/* According to http://en.wikipedia.org/wiki/CPUID */
-#define VENDOR_INTEL_b  0x756e6547
-#define VENDOR_INTEL_c  0x6c65746e
-#define VENDOR_INTEL_d  0x49656e69
-
-/**
- * cpu_features_get:
- *
- * Gets CPU features..
- *
- * Returns: bitmask of all CPU features available.
- **/
-uint64_t cpu_features_get(void)
-{
-   int flags[4];
-   int vendor_shuffle[3];
-   char vendor[13];
-   size_t len          = 0;
-   uint64_t cpu_flags  = 0;
-   uint64_t cpu        = 0;
-   unsigned max_flag   = 0;
-#if defined(CPU_X86) && !defined(__MACH__)
-   int vendor_is_intel = 0;
-   const int avx_flags = (1 << 27) | (1 << 28);
-#endif
-
-   char buf[sizeof(" MMX MMXEXT SSE SSE2 SSE3 SSSE3 SS4 SSE4.2 AES AVX AVX2 NEON VMX VMX128 VFPU PS")];
-
-   memset(buf, 0, sizeof(buf));
-
-   (void)len;
-   (void)cpu_flags;
-   (void)flags;
-   (void)max_flag;
-   (void)vendor;
-   (void)vendor_shuffle;
-
-#if defined(__MACH__)
-   len     = sizeof(size_t);
-   if (sysctlbyname("hw.optional.mmx", NULL, &len, NULL, 0) == 0)
-   {
-      cpu |= RETRO_SIMD_MMX;
-      cpu |= RETRO_SIMD_MMXEXT;
-   }
-
-   len            = sizeof(size_t);
-   if (sysctlbyname("hw.optional.floatingpoint", NULL, &len, NULL, 0) == 0)
-   {
-      cpu |= RETRO_SIMD_CMOV;
-   }
-
-   len            = sizeof(size_t);
-   if (sysctlbyname("hw.optional.sse", NULL, &len, NULL, 0) == 0)
-      cpu |= RETRO_SIMD_SSE;
-
-   len            = sizeof(size_t);
-   if (sysctlbyname("hw.optional.sse2", NULL, &len, NULL, 0) == 0)
-      cpu |= RETRO_SIMD_SSE2;
-
-   len            = sizeof(size_t);
-   if (sysctlbyname("hw.optional.sse3", NULL, &len, NULL, 0) == 0)
-      cpu |= RETRO_SIMD_SSE3;
-
-   len            = sizeof(size_t);
-   if (sysctlbyname("hw.optional.supplementalsse3", NULL, &len, NULL, 0) == 0)
-      cpu |= RETRO_SIMD_SSSE3;
-
-   len            = sizeof(size_t);
-   if (sysctlbyname("hw.optional.sse4_1", NULL, &len, NULL, 0) == 0)
-      cpu |= RETRO_SIMD_SSE4;
-
-   len            = sizeof(size_t);
-   if (sysctlbyname("hw.optional.sse4_2", NULL, &len, NULL, 0) == 0)
-      cpu |= RETRO_SIMD_SSE42;
-
-   len            = sizeof(size_t);
-   if (sysctlbyname("hw.optional.aes", NULL, &len, NULL, 0) == 0)
-      cpu |= RETRO_SIMD_AES;
-
-   len            = sizeof(size_t);
-   if (sysctlbyname("hw.optional.avx1_0", NULL, &len, NULL, 0) == 0)
-      cpu |= RETRO_SIMD_AVX;
-
-   len            = sizeof(size_t);
-   if (sysctlbyname("hw.optional.avx2_0", NULL, &len, NULL, 0) == 0)
-      cpu |= RETRO_SIMD_AVX2;
-
-   len            = sizeof(size_t);
-   if (sysctlbyname("hw.optional.altivec", NULL, &len, NULL, 0) == 0)
-      cpu |= RETRO_SIMD_VMX;
-
-   len            = sizeof(size_t);
-   if (sysctlbyname("hw.optional.neon", NULL, &len, NULL, 0) == 0)
-      cpu |= RETRO_SIMD_NEON;
-
-#elif defined(_XBOX1)
-   cpu |= RETRO_SIMD_MMX;
-   cpu |= RETRO_SIMD_SSE;
-   cpu |= RETRO_SIMD_MMXEXT;
-#elif defined(CPU_X86)
-   (void)avx_flags;
-
-   x86_cpuid(0, flags);
-   vendor_shuffle[0] = flags[1];
-   vendor_shuffle[1] = flags[3];
-   vendor_shuffle[2] = flags[2];
-
-   vendor[0]         = '\0';
-   memcpy(vendor, vendor_shuffle, sizeof(vendor_shuffle));
-
-   /* printf("[CPUID]: Vendor: %s\n", vendor); */
-
-   vendor_is_intel = (
-         flags[1] == VENDOR_INTEL_b &&
-         flags[2] == VENDOR_INTEL_c &&
-         flags[3] == VENDOR_INTEL_d);
-
-   max_flag = flags[0];
-   if (max_flag < 1) /* Does CPUID not support func = 1? (unlikely ...) */
-      return 0;
-
-   x86_cpuid(1, flags);
-
-   if (flags[3] & (1 << 15))
-      cpu |= RETRO_SIMD_CMOV;
-
-   if (flags[3] & (1 << 23))
-      cpu |= RETRO_SIMD_MMX;
-
-   if (flags[3] & (1 << 25))
-   {
-      /* SSE also implies MMXEXT (according to FFmpeg source). */
-      cpu |= RETRO_SIMD_SSE;
-      cpu |= RETRO_SIMD_MMXEXT;
-   }
-
-   if (flags[3] & (1 << 26))
-      cpu |= RETRO_SIMD_SSE2;
-
-   if (flags[2] & (1 << 0))
-      cpu |= RETRO_SIMD_SSE3;
-
-   if (flags[2] & (1 << 9))
-      cpu |= RETRO_SIMD_SSSE3;
-
-   if (flags[2] & (1 << 19))
-      cpu |= RETRO_SIMD_SSE4;
-
-   if (flags[2] & (1 << 20))
-      cpu |= RETRO_SIMD_SSE42;
-
-   if ((flags[2] & (1 << 23)))
-      cpu |= RETRO_SIMD_POPCNT;
-
-   if (vendor_is_intel && (flags[2] & (1 << 22)))
-      cpu |= RETRO_SIMD_MOVBE;
-
-   if (flags[2] & (1 << 25))
-      cpu |= RETRO_SIMD_AES;
-
-   /* Must only perform xgetbv check if we have
-    * AVX CPU support (guaranteed to have at least i686). */
-   if (((flags[2] & avx_flags) == avx_flags)
-         && ((xgetbv_x86(0) & 0x6) == 0x6))
-      cpu |= RETRO_SIMD_AVX;
-
-   if (max_flag >= 7)
-   {
-      x86_cpuid(7, flags);
-      if (flags[1] & (1 << 5))
-         cpu |= RETRO_SIMD_AVX2;
-   }
-
-   x86_cpuid(0x80000000, flags);
-   max_flag = flags[0];
-   if (max_flag >= 0x80000001u)
-   {
-      x86_cpuid(0x80000001, flags);
-      if (flags[3] & (1 << 23))
-         cpu |= RETRO_SIMD_MMX;
-      if (flags[3] & (1 << 22))
-         cpu |= RETRO_SIMD_MMXEXT;
-   }
-#elif defined(__linux__)
-   if (check_arm_cpu_feature("neon"))
-   {
-      cpu |= RETRO_SIMD_NEON;
-#ifdef __ARM_NEON__
-      arm_enable_runfast_mode();
-#endif
-   }
-
-   if (check_arm_cpu_feature("vfpv3"))
-      cpu |= RETRO_SIMD_VFPV3;
-
-   if (check_arm_cpu_feature("vfpv4"))
-      cpu |= RETRO_SIMD_VFPV4;
-
-   if (check_arm_cpu_feature("asimd"))
-   {
-      cpu |= RETRO_SIMD_ASIMD;
-#ifdef __ARM_NEON__
-      cpu |= RETRO_SIMD_NEON;
-      arm_enable_runfast_mode();
-#endif
-   }
-
-#if 0
-    check_arm_cpu_feature("swp");
-    check_arm_cpu_feature("half");
-    check_arm_cpu_feature("thumb");
-    check_arm_cpu_feature("fastmult");
-    check_arm_cpu_feature("vfp");
-    check_arm_cpu_feature("edsp");
-    check_arm_cpu_feature("thumbee");
-    check_arm_cpu_feature("tls");
-    check_arm_cpu_feature("idiva");
-    check_arm_cpu_feature("idivt");
-#endif
-
-#elif defined(__ARM_NEON__)
-   cpu |= RETRO_SIMD_NEON;
-   arm_enable_runfast_mode();
-#elif defined(__ALTIVEC__)
-   cpu |= RETRO_SIMD_VMX;
-#elif defined(XBOX360)
-   cpu |= RETRO_SIMD_VMX128;
-#elif defined(PSP) || defined(PS2)
-   cpu |= RETRO_SIMD_VFPU;
-#elif defined(GEKKO)
-   cpu |= RETRO_SIMD_PS;
-#endif
-
-   if (cpu & RETRO_SIMD_MMX)    strlcat(buf, " MMX", sizeof(buf));
-   if (cpu & RETRO_SIMD_MMXEXT) strlcat(buf, " MMXEXT", sizeof(buf));
-   if (cpu & RETRO_SIMD_SSE)    strlcat(buf, " SSE", sizeof(buf));
-   if (cpu & RETRO_SIMD_SSE2)   strlcat(buf, " SSE2", sizeof(buf));
-   if (cpu & RETRO_SIMD_SSE3)   strlcat(buf, " SSE3", sizeof(buf));
-   if (cpu & RETRO_SIMD_SSSE3)  strlcat(buf, " SSSE3", sizeof(buf));
-   if (cpu & RETRO_SIMD_SSE4)   strlcat(buf, " SSE4", sizeof(buf));
-   if (cpu & RETRO_SIMD_SSE42)  strlcat(buf, " SSE4.2", sizeof(buf));
-   if (cpu & RETRO_SIMD_AES)    strlcat(buf, " AES", sizeof(buf));
-   if (cpu & RETRO_SIMD_AVX)    strlcat(buf, " AVX", sizeof(buf));
-   if (cpu & RETRO_SIMD_AVX2)   strlcat(buf, " AVX2", sizeof(buf));
-   if (cpu & RETRO_SIMD_NEON)   strlcat(buf, " NEON", sizeof(buf));
-   if (cpu & RETRO_SIMD_VFPV3)  strlcat(buf, " VFPv3", sizeof(buf));
-   if (cpu & RETRO_SIMD_VFPV4)  strlcat(buf, " VFPv4", sizeof(buf));
-   if (cpu & RETRO_SIMD_VMX)    strlcat(buf, " VMX", sizeof(buf));
-   if (cpu & RETRO_SIMD_VMX128) strlcat(buf, " VMX128", sizeof(buf));
-   if (cpu & RETRO_SIMD_VFPU)   strlcat(buf, " VFPU", sizeof(buf));
-   if (cpu & RETRO_SIMD_PS)     strlcat(buf, " PS", sizeof(buf));
-   if (cpu & RETRO_SIMD_ASIMD)  strlcat(buf, " ASIMD", sizeof(buf));
-
-   return cpu;
-}
-
-void cpu_features_get_model_name(char *name, int len)
-{
-#if defined(CPU_X86) && !defined(__MACH__)
-   union {
-      int i[4];
-      unsigned char s[16];
-   } flags;
-   int i, j;
-   size_t pos = 0;
-   bool start = false;
-
-   if (!name)
-      return;
-
-   x86_cpuid(0x80000000, flags.i);
-
-   if (flags.i[0] < 0x80000004)
-      return;
-
-   for (i = 0; i < 3; i++)
-   {
-      memset(flags.i, 0, sizeof(flags.i));
-      x86_cpuid(0x80000002 + i, flags.i);
-
-      for (j = 0; j < sizeof(flags.s); j++)
-      {
-         if (!start && flags.s[j] == ' ')
-            continue;
-         else
-            start = true;
-
-         if (pos == len - 1)
-         {
-            /* truncate if we ran out of room */
-            name[pos] = '\0';
-            goto end;
-         }
-
-         name[pos++] = flags.s[j];
-      }
-   }
-end:
-   /* terminate our string */
-   if (pos < (size_t)len)
-      name[pos] = '\0';
-#elif defined(__MACH__)
-   if (!name)
-      return;
-   {
-      size_t len_size = len;
-      sysctlbyname("machdep.cpu.brand_string", name, &len_size, NULL, 0);
-   }
-#else
-   if (!name)
-      return;
-   return;
-#endif
-}
diff --git a/Source/sys-clk/manager/lib/borealis/library/lib/extern/nanovg/LICENSE.txt b/Source/sys-clk/manager/lib/borealis/library/lib/extern/nanovg/LICENSE.txt
deleted file mode 100644
index c9a15346..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/lib/extern/nanovg/LICENSE.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-Copyright (c) 2013 Mikko Mononen memon@inside.org
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-claim that you wrote the original software. If you use this software
-in a product, an acknowledgment in the product documentation would be
-appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-
diff --git a/Source/sys-clk/manager/lib/borealis/library/lib/extern/nanovg/nanovg.c b/Source/sys-clk/manager/lib/borealis/library/lib/extern/nanovg/nanovg.c
deleted file mode 100644
index 488b8022..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/lib/extern/nanovg/nanovg.c
+++ /dev/null
@@ -1,2906 +0,0 @@
-//
-// Copyright (c) 2013 Mikko Mononen memon@inside.org
-//
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <math.h>
-#include <memory.h>
-
-#include <nanovg.h>
-#define FONTSTASH_IMPLEMENTATION
-#include <fontstash.h>
-#define STB_IMAGE_IMPLEMENTATION
-#include <stb_image.h>
-
-#ifdef _MSC_VER
-#pragma warning(disable: 4100)  // unreferenced formal parameter
-#pragma warning(disable: 4127)  // conditional expression is constant
-#pragma warning(disable: 4204)  // nonstandard extension used : non-constant aggregate initializer
-#pragma warning(disable: 4706)  // assignment within conditional expression
-#endif
-
-#define NVG_INIT_FONTIMAGE_SIZE  512
-#define NVG_MAX_FONTIMAGE_SIZE   2048
-#define NVG_MAX_FONTIMAGES       4
-
-#define NVG_INIT_COMMANDS_SIZE 256
-#define NVG_INIT_POINTS_SIZE 128
-#define NVG_INIT_PATHS_SIZE 16
-#define NVG_INIT_VERTS_SIZE 256
-#define NVG_MAX_STATES 32
-
-#define NVG_KAPPA90 0.5522847493f	// Length proportional to radius of a cubic bezier handle for 90deg arcs.
-
-#define NVG_COUNTOF(arr) (sizeof(arr) / sizeof(0[arr]))
-
-
-enum NVGcommands {
-	NVG_MOVETO = 0,
-	NVG_LINETO = 1,
-	NVG_BEZIERTO = 2,
-	NVG_CLOSE = 3,
-	NVG_WINDING = 4,
-};
-
-enum NVGpointFlags
-{
-	NVG_PT_CORNER = 0x01,
-	NVG_PT_LEFT = 0x02,
-	NVG_PT_BEVEL = 0x04,
-	NVG_PR_INNERBEVEL = 0x08,
-};
-
-struct NVGstate {
-	NVGcompositeOperationState compositeOperation;
-	int shapeAntiAlias;
-	NVGpaint fill;
-	NVGpaint stroke;
-	float strokeWidth;
-	float miterLimit;
-	int lineJoin;
-	int lineCap;
-	float alpha;
-	float xform[6];
-	NVGscissor scissor;
-	float fontSize;
-	float letterSpacing;
-	float lineHeight;
-	float fontBlur;
-	int textAlign;
-	int fontId;
-};
-typedef struct NVGstate NVGstate;
-
-struct NVGpoint {
-	float x,y;
-	float dx, dy;
-	float len;
-	float dmx, dmy;
-	unsigned char flags;
-};
-typedef struct NVGpoint NVGpoint;
-
-struct NVGpathCache {
-	NVGpoint* points;
-	int npoints;
-	int cpoints;
-	NVGpath* paths;
-	int npaths;
-	int cpaths;
-	NVGvertex* verts;
-	int nverts;
-	int cverts;
-	float bounds[4];
-};
-typedef struct NVGpathCache NVGpathCache;
-
-struct NVGcontext {
-	NVGparams params;
-	float* commands;
-	int ccommands;
-	int ncommands;
-	float commandx, commandy;
-	NVGstate states[NVG_MAX_STATES];
-	int nstates;
-	NVGpathCache* cache;
-	float tessTol;
-	float distTol;
-	float fringeWidth;
-	float devicePxRatio;
-	struct FONScontext* fs;
-	int fontImages[NVG_MAX_FONTIMAGES];
-	int fontImageIdx;
-	int drawCallCount;
-	int fillTriCount;
-	int strokeTriCount;
-	int textTriCount;
-};
-
-static float nvg__sqrtf(float a) { return sqrtf(a); }
-static float nvg__modf(float a, float b) { return fmodf(a, b); }
-static float nvg__sinf(float a) { return sinf(a); }
-static float nvg__cosf(float a) { return cosf(a); }
-static float nvg__tanf(float a) { return tanf(a); }
-static float nvg__atan2f(float a,float b) { return atan2f(a, b); }
-static float nvg__acosf(float a) { return acosf(a); }
-
-static int nvg__mini(int a, int b) { return a < b ? a : b; }
-static int nvg__maxi(int a, int b) { return a > b ? a : b; }
-static int nvg__clampi(int a, int mn, int mx) { return a < mn ? mn : (a > mx ? mx : a); }
-static float nvg__minf(float a, float b) { return a < b ? a : b; }
-static float nvg__maxf(float a, float b) { return a > b ? a : b; }
-static float nvg__absf(float a) { return a >= 0.0f ? a : -a; }
-static float nvg__signf(float a) { return a >= 0.0f ? 1.0f : -1.0f; }
-static float nvg__clampf(float a, float mn, float mx) { return a < mn ? mn : (a > mx ? mx : a); }
-static float nvg__cross(float dx0, float dy0, float dx1, float dy1) { return dx1*dy0 - dx0*dy1; }
-
-static float nvg__normalize(float *x, float* y)
-{
-	float d = nvg__sqrtf((*x)*(*x) + (*y)*(*y));
-	if (d > 1e-6f) {
-		float id = 1.0f / d;
-		*x *= id;
-		*y *= id;
-	}
-	return d;
-}
-
-
-static void nvg__deletePathCache(NVGpathCache* c)
-{
-	if (c == NULL) return;
-	if (c->points != NULL) free(c->points);
-	if (c->paths != NULL) free(c->paths);
-	if (c->verts != NULL) free(c->verts);
-	free(c);
-}
-
-static NVGpathCache* nvg__allocPathCache(void)
-{
-	NVGpathCache* c = (NVGpathCache*)malloc(sizeof(NVGpathCache));
-	if (c == NULL) goto error;
-	memset(c, 0, sizeof(NVGpathCache));
-
-	c->points = (NVGpoint*)malloc(sizeof(NVGpoint)*NVG_INIT_POINTS_SIZE);
-	if (!c->points) goto error;
-	c->npoints = 0;
-	c->cpoints = NVG_INIT_POINTS_SIZE;
-
-	c->paths = (NVGpath*)malloc(sizeof(NVGpath)*NVG_INIT_PATHS_SIZE);
-	if (!c->paths) goto error;
-	c->npaths = 0;
-	c->cpaths = NVG_INIT_PATHS_SIZE;
-
-	c->verts = (NVGvertex*)malloc(sizeof(NVGvertex)*NVG_INIT_VERTS_SIZE);
-	if (!c->verts) goto error;
-	c->nverts = 0;
-	c->cverts = NVG_INIT_VERTS_SIZE;
-
-	return c;
-error:
-	nvg__deletePathCache(c);
-	return NULL;
-}
-
-static void nvg__setDevicePixelRatio(NVGcontext* ctx, float ratio)
-{
-	ctx->tessTol = 0.25f / ratio;
-	ctx->distTol = 0.01f / ratio;
-	ctx->fringeWidth = 1.0f / ratio;
-	ctx->devicePxRatio = ratio;
-}
-
-static NVGcompositeOperationState nvg__compositeOperationState(int op)
-{
-	int sfactor, dfactor;
-
-	if (op == NVG_SOURCE_OVER)
-	{
-		sfactor = NVG_ONE;
-		dfactor = NVG_ONE_MINUS_SRC_ALPHA;
-	}
-	else if (op == NVG_SOURCE_IN)
-	{
-		sfactor = NVG_DST_ALPHA;
-		dfactor = NVG_ZERO;
-	}
-	else if (op == NVG_SOURCE_OUT)
-	{
-		sfactor = NVG_ONE_MINUS_DST_ALPHA;
-		dfactor = NVG_ZERO;
-	}
-	else if (op == NVG_ATOP)
-	{
-		sfactor = NVG_DST_ALPHA;
-		dfactor = NVG_ONE_MINUS_SRC_ALPHA;
-	}
-	else if (op == NVG_DESTINATION_OVER)
-	{
-		sfactor = NVG_ONE_MINUS_DST_ALPHA;
-		dfactor = NVG_ONE;
-	}
-	else if (op == NVG_DESTINATION_IN)
-	{
-		sfactor = NVG_ZERO;
-		dfactor = NVG_SRC_ALPHA;
-	}
-	else if (op == NVG_DESTINATION_OUT)
-	{
-		sfactor = NVG_ZERO;
-		dfactor = NVG_ONE_MINUS_SRC_ALPHA;
-	}
-	else if (op == NVG_DESTINATION_ATOP)
-	{
-		sfactor = NVG_ONE_MINUS_DST_ALPHA;
-		dfactor = NVG_SRC_ALPHA;
-	}
-	else if (op == NVG_LIGHTER)
-	{
-		sfactor = NVG_ONE;
-		dfactor = NVG_ONE;
-	}
-	else if (op == NVG_COPY)
-	{
-		sfactor = NVG_ONE;
-		dfactor = NVG_ZERO;
-	}
-	else if (op == NVG_XOR)
-	{
-		sfactor = NVG_ONE_MINUS_DST_ALPHA;
-		dfactor = NVG_ONE_MINUS_SRC_ALPHA;
-	}
-	else
-	{
-		sfactor = NVG_ONE;
-		dfactor = NVG_ZERO;
-	}
-
-	NVGcompositeOperationState state;
-	state.srcRGB = sfactor;
-	state.dstRGB = dfactor;
-	state.srcAlpha = sfactor;
-	state.dstAlpha = dfactor;
-	return state;
-}
-
-static NVGstate* nvg__getState(NVGcontext* ctx)
-{
-	return &ctx->states[ctx->nstates-1];
-}
-
-NVGcontext* nvgCreateInternal(NVGparams* params)
-{
-	FONSparams fontParams;
-	NVGcontext* ctx = (NVGcontext*)malloc(sizeof(NVGcontext));
-	int i;
-	if (ctx == NULL) goto error;
-	memset(ctx, 0, sizeof(NVGcontext));
-
-	ctx->params = *params;
-	for (i = 0; i < NVG_MAX_FONTIMAGES; i++)
-		ctx->fontImages[i] = 0;
-
-	ctx->commands = (float*)malloc(sizeof(float)*NVG_INIT_COMMANDS_SIZE);
-	if (!ctx->commands) goto error;
-	ctx->ncommands = 0;
-	ctx->ccommands = NVG_INIT_COMMANDS_SIZE;
-
-	ctx->cache = nvg__allocPathCache();
-	if (ctx->cache == NULL) goto error;
-
-	nvgSave(ctx);
-	nvgReset(ctx);
-
-	nvg__setDevicePixelRatio(ctx, 1.0f);
-
-	if (ctx->params.renderCreate(ctx->params.userPtr) == 0) goto error;
-
-	// Init font rendering
-	memset(&fontParams, 0, sizeof(fontParams));
-	fontParams.width = NVG_INIT_FONTIMAGE_SIZE;
-	fontParams.height = NVG_INIT_FONTIMAGE_SIZE;
-	fontParams.flags = FONS_ZERO_TOPLEFT;
-	fontParams.renderCreate = NULL;
-	fontParams.renderUpdate = NULL;
-	fontParams.renderDraw = NULL;
-	fontParams.renderDelete = NULL;
-	fontParams.userPtr = NULL;
-	ctx->fs = fonsCreateInternal(&fontParams);
-	if (ctx->fs == NULL) goto error;
-
-	// Create font texture
-	ctx->fontImages[0] = ctx->params.renderCreateTexture(ctx->params.userPtr, NVG_TEXTURE_ALPHA, fontParams.width, fontParams.height, 0, NULL);
-	if (ctx->fontImages[0] == 0) goto error;
-	ctx->fontImageIdx = 0;
-
-	return ctx;
-
-error:
-	nvgDeleteInternal(ctx);
-	return 0;
-}
-
-NVGparams* nvgInternalParams(NVGcontext* ctx)
-{
-    return &ctx->params;
-}
-
-void nvgDeleteInternal(NVGcontext* ctx)
-{
-	int i;
-	if (ctx == NULL) return;
-	if (ctx->commands != NULL) free(ctx->commands);
-	if (ctx->cache != NULL) nvg__deletePathCache(ctx->cache);
-
-	if (ctx->fs)
-		fonsDeleteInternal(ctx->fs);
-
-	for (i = 0; i < NVG_MAX_FONTIMAGES; i++) {
-		if (ctx->fontImages[i] != 0) {
-			nvgDeleteImage(ctx, ctx->fontImages[i]);
-			ctx->fontImages[i] = 0;
-		}
-	}
-
-	if (ctx->params.renderDelete != NULL)
-		ctx->params.renderDelete(ctx->params.userPtr);
-
-	free(ctx);
-}
-
-void nvgBeginFrame(NVGcontext* ctx, float windowWidth, float windowHeight, float devicePixelRatio)
-{
-/*	printf("Tris: draws:%d  fill:%d  stroke:%d  text:%d  TOT:%d\n",
-		ctx->drawCallCount, ctx->fillTriCount, ctx->strokeTriCount, ctx->textTriCount,
-		ctx->fillTriCount+ctx->strokeTriCount+ctx->textTriCount);*/
-
-	ctx->nstates = 0;
-	nvgSave(ctx);
-	nvgReset(ctx);
-
-	nvg__setDevicePixelRatio(ctx, devicePixelRatio);
-
-	ctx->params.renderViewport(ctx->params.userPtr, windowWidth, windowHeight, devicePixelRatio);
-
-	ctx->drawCallCount = 0;
-	ctx->fillTriCount = 0;
-	ctx->strokeTriCount = 0;
-	ctx->textTriCount = 0;
-}
-
-void nvgCancelFrame(NVGcontext* ctx)
-{
-	ctx->params.renderCancel(ctx->params.userPtr);
-}
-
-void nvgEndFrame(NVGcontext* ctx)
-{
-	ctx->params.renderFlush(ctx->params.userPtr);
-	if (ctx->fontImageIdx != 0) {
-		int fontImage = ctx->fontImages[ctx->fontImageIdx];
-		int i, j, iw, ih;
-		// delete images that smaller than current one
-		if (fontImage == 0)
-			return;
-		nvgImageSize(ctx, fontImage, &iw, &ih);
-		for (i = j = 0; i < ctx->fontImageIdx; i++) {
-			if (ctx->fontImages[i] != 0) {
-				int nw, nh;
-				nvgImageSize(ctx, ctx->fontImages[i], &nw, &nh);
-				if (nw < iw || nh < ih)
-					nvgDeleteImage(ctx, ctx->fontImages[i]);
-				else
-					ctx->fontImages[j++] = ctx->fontImages[i];
-			}
-		}
-		// make current font image to first
-		ctx->fontImages[j++] = ctx->fontImages[0];
-		ctx->fontImages[0] = fontImage;
-		ctx->fontImageIdx = 0;
-		// clear all images after j
-		for (i = j; i < NVG_MAX_FONTIMAGES; i++)
-			ctx->fontImages[i] = 0;
-	}
-}
-
-NVGcolor nvgRGB(unsigned char r, unsigned char g, unsigned char b)
-{
-	return nvgRGBA(r,g,b,255);
-}
-
-NVGcolor nvgRGBf(float r, float g, float b)
-{
-	return nvgRGBAf(r,g,b,1.0f);
-}
-
-NVGcolor nvgRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a)
-{
-	NVGcolor color;
-	// Use longer initialization to suppress warning.
-	color.r = r / 255.0f;
-	color.g = g / 255.0f;
-	color.b = b / 255.0f;
-	color.a = a / 255.0f;
-	return color;
-}
-
-NVGcolor nvgRGBAf(float r, float g, float b, float a)
-{
-	NVGcolor color;
-	// Use longer initialization to suppress warning.
-	color.r = r;
-	color.g = g;
-	color.b = b;
-	color.a = a;
-	return color;
-}
-
-NVGcolor nvgTransRGBA(NVGcolor c, unsigned char a)
-{
-	c.a = a / 255.0f;
-	return c;
-}
-
-NVGcolor nvgTransRGBAf(NVGcolor c, float a)
-{
-	c.a = a;
-	return c;
-}
-
-NVGcolor nvgLerpRGBA(NVGcolor c0, NVGcolor c1, float u)
-{
-	int i;
-	float oneminu;
-	NVGcolor cint = {{{0}}};
-
-	u = nvg__clampf(u, 0.0f, 1.0f);
-	oneminu = 1.0f - u;
-	for( i = 0; i <4; i++ )
-	{
-		cint.rgba[i] = c0.rgba[i] * oneminu + c1.rgba[i] * u;
-	}
-
-	return cint;
-}
-
-NVGcolor nvgHSL(float h, float s, float l)
-{
-	return nvgHSLA(h,s,l,255);
-}
-
-static float nvg__hue(float h, float m1, float m2)
-{
-	if (h < 0) h += 1;
-	if (h > 1) h -= 1;
-	if (h < 1.0f/6.0f)
-		return m1 + (m2 - m1) * h * 6.0f;
-	else if (h < 3.0f/6.0f)
-		return m2;
-	else if (h < 4.0f/6.0f)
-		return m1 + (m2 - m1) * (2.0f/3.0f - h) * 6.0f;
-	return m1;
-}
-
-NVGcolor nvgHSLA(float h, float s, float l, unsigned char a)
-{
-	float m1, m2;
-	NVGcolor col;
-	h = nvg__modf(h, 1.0f);
-	if (h < 0.0f) h += 1.0f;
-	s = nvg__clampf(s, 0.0f, 1.0f);
-	l = nvg__clampf(l, 0.0f, 1.0f);
-	m2 = l <= 0.5f ? (l * (1 + s)) : (l + s - l * s);
-	m1 = 2 * l - m2;
-	col.r = nvg__clampf(nvg__hue(h + 1.0f/3.0f, m1, m2), 0.0f, 1.0f);
-	col.g = nvg__clampf(nvg__hue(h, m1, m2), 0.0f, 1.0f);
-	col.b = nvg__clampf(nvg__hue(h - 1.0f/3.0f, m1, m2), 0.0f, 1.0f);
-	col.a = a/255.0f;
-	return col;
-}
-
-void nvgTransformIdentity(float* t)
-{
-	t[0] = 1.0f; t[1] = 0.0f;
-	t[2] = 0.0f; t[3] = 1.0f;
-	t[4] = 0.0f; t[5] = 0.0f;
-}
-
-void nvgTransformTranslate(float* t, float tx, float ty)
-{
-	t[0] = 1.0f; t[1] = 0.0f;
-	t[2] = 0.0f; t[3] = 1.0f;
-	t[4] = tx; t[5] = ty;
-}
-
-void nvgTransformScale(float* t, float sx, float sy)
-{
-	t[0] = sx; t[1] = 0.0f;
-	t[2] = 0.0f; t[3] = sy;
-	t[4] = 0.0f; t[5] = 0.0f;
-}
-
-void nvgTransformRotate(float* t, float a)
-{
-	float cs = nvg__cosf(a), sn = nvg__sinf(a);
-	t[0] = cs; t[1] = sn;
-	t[2] = -sn; t[3] = cs;
-	t[4] = 0.0f; t[5] = 0.0f;
-}
-
-void nvgTransformSkewX(float* t, float a)
-{
-	t[0] = 1.0f; t[1] = 0.0f;
-	t[2] = nvg__tanf(a); t[3] = 1.0f;
-	t[4] = 0.0f; t[5] = 0.0f;
-}
-
-void nvgTransformSkewY(float* t, float a)
-{
-	t[0] = 1.0f; t[1] = nvg__tanf(a);
-	t[2] = 0.0f; t[3] = 1.0f;
-	t[4] = 0.0f; t[5] = 0.0f;
-}
-
-void nvgTransformMultiply(float* t, const float* s)
-{
-	float t0 = t[0] * s[0] + t[1] * s[2];
-	float t2 = t[2] * s[0] + t[3] * s[2];
-	float t4 = t[4] * s[0] + t[5] * s[2] + s[4];
-	t[1] = t[0] * s[1] + t[1] * s[3];
-	t[3] = t[2] * s[1] + t[3] * s[3];
-	t[5] = t[4] * s[1] + t[5] * s[3] + s[5];
-	t[0] = t0;
-	t[2] = t2;
-	t[4] = t4;
-}
-
-void nvgTransformPremultiply(float* t, const float* s)
-{
-	float s2[6];
-	memcpy(s2, s, sizeof(float)*6);
-	nvgTransformMultiply(s2, t);
-	memcpy(t, s2, sizeof(float)*6);
-}
-
-int nvgTransformInverse(float* inv, const float* t)
-{
-	double invdet, det = (double)t[0] * t[3] - (double)t[2] * t[1];
-	if (det > -1e-6 && det < 1e-6) {
-		nvgTransformIdentity(inv);
-		return 0;
-	}
-	invdet = 1.0 / det;
-	inv[0] = (float)(t[3] * invdet);
-	inv[2] = (float)(-t[2] * invdet);
-	inv[4] = (float)(((double)t[2] * t[5] - (double)t[3] * t[4]) * invdet);
-	inv[1] = (float)(-t[1] * invdet);
-	inv[3] = (float)(t[0] * invdet);
-	inv[5] = (float)(((double)t[1] * t[4] - (double)t[0] * t[5]) * invdet);
-	return 1;
-}
-
-void nvgTransformPoint(float* dx, float* dy, const float* t, float sx, float sy)
-{
-	*dx = sx*t[0] + sy*t[2] + t[4];
-	*dy = sx*t[1] + sy*t[3] + t[5];
-}
-
-float nvgDegToRad(float deg)
-{
-	return deg / 180.0f * NVG_PI;
-}
-
-float nvgRadToDeg(float rad)
-{
-	return rad / NVG_PI * 180.0f;
-}
-
-static void nvg__setPaintColor(NVGpaint* p, NVGcolor color)
-{
-	memset(p, 0, sizeof(*p));
-	nvgTransformIdentity(p->xform);
-	p->radius = 0.0f;
-	p->feather = 1.0f;
-	p->innerColor = color;
-	p->outerColor = color;
-}
-
-
-// State handling
-void nvgSave(NVGcontext* ctx)
-{
-	if (ctx->nstates >= NVG_MAX_STATES)
-		return;
-	if (ctx->nstates > 0)
-		memcpy(&ctx->states[ctx->nstates], &ctx->states[ctx->nstates-1], sizeof(NVGstate));
-	ctx->nstates++;
-}
-
-void nvgRestore(NVGcontext* ctx)
-{
-	if (ctx->nstates <= 1)
-		return;
-	ctx->nstates--;
-}
-
-void nvgReset(NVGcontext* ctx)
-{
-	NVGstate* state = nvg__getState(ctx);
-	memset(state, 0, sizeof(*state));
-
-	nvg__setPaintColor(&state->fill, nvgRGBA(255,255,255,255));
-	nvg__setPaintColor(&state->stroke, nvgRGBA(0,0,0,255));
-	state->compositeOperation = nvg__compositeOperationState(NVG_SOURCE_OVER);
-	state->shapeAntiAlias = 1;
-	state->strokeWidth = 1.0f;
-	state->miterLimit = 10.0f;
-	state->lineCap = NVG_BUTT;
-	state->lineJoin = NVG_MITER;
-	state->alpha = 1.0f;
-	nvgTransformIdentity(state->xform);
-
-	state->scissor.extent[0] = -1.0f;
-	state->scissor.extent[1] = -1.0f;
-
-	state->fontSize = 16.0f;
-	state->letterSpacing = 0.0f;
-	state->lineHeight = 1.0f;
-	state->fontBlur = 0.0f;
-	state->textAlign = NVG_ALIGN_LEFT | NVG_ALIGN_BASELINE;
-	state->fontId = 0;
-}
-
-// State setting
-void nvgShapeAntiAlias(NVGcontext* ctx, int enabled)
-{
-	NVGstate* state = nvg__getState(ctx);
-	state->shapeAntiAlias = enabled;
-}
-
-void nvgStrokeWidth(NVGcontext* ctx, float width)
-{
-	NVGstate* state = nvg__getState(ctx);
-	state->strokeWidth = width;
-}
-
-void nvgMiterLimit(NVGcontext* ctx, float limit)
-{
-	NVGstate* state = nvg__getState(ctx);
-	state->miterLimit = limit;
-}
-
-void nvgLineCap(NVGcontext* ctx, int cap)
-{
-	NVGstate* state = nvg__getState(ctx);
-	state->lineCap = cap;
-}
-
-void nvgLineJoin(NVGcontext* ctx, int join)
-{
-	NVGstate* state = nvg__getState(ctx);
-	state->lineJoin = join;
-}
-
-void nvgGlobalAlpha(NVGcontext* ctx, float alpha)
-{
-	NVGstate* state = nvg__getState(ctx);
-	state->alpha = alpha;
-}
-
-void nvgTransform(NVGcontext* ctx, float a, float b, float c, float d, float e, float f)
-{
-	NVGstate* state = nvg__getState(ctx);
-	float t[6] = { a, b, c, d, e, f };
-	nvgTransformPremultiply(state->xform, t);
-}
-
-void nvgResetTransform(NVGcontext* ctx)
-{
-	NVGstate* state = nvg__getState(ctx);
-	nvgTransformIdentity(state->xform);
-}
-
-void nvgTranslate(NVGcontext* ctx, float x, float y)
-{
-	NVGstate* state = nvg__getState(ctx);
-	float t[6];
-	nvgTransformTranslate(t, x,y);
-	nvgTransformPremultiply(state->xform, t);
-}
-
-void nvgRotate(NVGcontext* ctx, float angle)
-{
-	NVGstate* state = nvg__getState(ctx);
-	float t[6];
-	nvgTransformRotate(t, angle);
-	nvgTransformPremultiply(state->xform, t);
-}
-
-void nvgSkewX(NVGcontext* ctx, float angle)
-{
-	NVGstate* state = nvg__getState(ctx);
-	float t[6];
-	nvgTransformSkewX(t, angle);
-	nvgTransformPremultiply(state->xform, t);
-}
-
-void nvgSkewY(NVGcontext* ctx, float angle)
-{
-	NVGstate* state = nvg__getState(ctx);
-	float t[6];
-	nvgTransformSkewY(t, angle);
-	nvgTransformPremultiply(state->xform, t);
-}
-
-void nvgScale(NVGcontext* ctx, float x, float y)
-{
-	NVGstate* state = nvg__getState(ctx);
-	float t[6];
-	nvgTransformScale(t, x,y);
-	nvgTransformPremultiply(state->xform, t);
-}
-
-void nvgCurrentTransform(NVGcontext* ctx, float* xform)
-{
-	NVGstate* state = nvg__getState(ctx);
-	if (xform == NULL) return;
-	memcpy(xform, state->xform, sizeof(float)*6);
-}
-
-void nvgStrokeColor(NVGcontext* ctx, NVGcolor color)
-{
-	NVGstate* state = nvg__getState(ctx);
-	nvg__setPaintColor(&state->stroke, color);
-}
-
-void nvgStrokePaint(NVGcontext* ctx, NVGpaint paint)
-{
-	NVGstate* state = nvg__getState(ctx);
-	state->stroke = paint;
-	nvgTransformMultiply(state->stroke.xform, state->xform);
-}
-
-void nvgFillColor(NVGcontext* ctx, NVGcolor color)
-{
-	NVGstate* state = nvg__getState(ctx);
-	nvg__setPaintColor(&state->fill, color);
-}
-
-void nvgFillPaint(NVGcontext* ctx, NVGpaint paint)
-{
-	NVGstate* state = nvg__getState(ctx);
-	state->fill = paint;
-	nvgTransformMultiply(state->fill.xform, state->xform);
-}
-
-int nvgCreateImage(NVGcontext* ctx, const char* filename, int imageFlags)
-{
-	int w, h, n, image;
-	unsigned char* img;
-	stbi_set_unpremultiply_on_load(1);
-	stbi_convert_iphone_png_to_rgb(1);
-	img = stbi_load(filename, &w, &h, &n, 4);
-	if (img == NULL) {
-//		printf("Failed to load %s - %s\n", filename, stbi_failure_reason());
-		return 0;
-	}
-	image = nvgCreateImageRGBA(ctx, w, h, imageFlags, img);
-	stbi_image_free(img);
-	return image;
-}
-
-int nvgCreateImageMem(NVGcontext* ctx, int imageFlags, unsigned char* data, int ndata)
-{
-	int w, h, n, image;
-	unsigned char* img = stbi_load_from_memory(data, ndata, &w, &h, &n, 4);
-	if (img == NULL) {
-//		printf("Failed to load %s - %s\n", filename, stbi_failure_reason());
-		return 0;
-	}
-	image = nvgCreateImageRGBA(ctx, w, h, imageFlags, img);
-	stbi_image_free(img);
-	return image;
-}
-
-int nvgCreateImageRGBA(NVGcontext* ctx, int w, int h, int imageFlags, const unsigned char* data)
-{
-	return ctx->params.renderCreateTexture(ctx->params.userPtr, NVG_TEXTURE_RGBA, w, h, imageFlags, data);
-}
-
-void nvgUpdateImage(NVGcontext* ctx, int image, const unsigned char* data)
-{
-	int w, h;
-	ctx->params.renderGetTextureSize(ctx->params.userPtr, image, &w, &h);
-	ctx->params.renderUpdateTexture(ctx->params.userPtr, image, 0,0, w,h, data);
-}
-
-void nvgImageSize(NVGcontext* ctx, int image, int* w, int* h)
-{
-	ctx->params.renderGetTextureSize(ctx->params.userPtr, image, w, h);
-}
-
-void nvgDeleteImage(NVGcontext* ctx, int image)
-{
-	ctx->params.renderDeleteTexture(ctx->params.userPtr, image);
-}
-
-NVGpaint nvgLinearGradient(NVGcontext* ctx,
-								  float sx, float sy, float ex, float ey,
-								  NVGcolor icol, NVGcolor ocol)
-{
-	NVGpaint p;
-	float dx, dy, d;
-	const float large = 1e5;
-	NVG_NOTUSED(ctx);
-	memset(&p, 0, sizeof(p));
-
-	// Calculate transform aligned to the line
-	dx = ex - sx;
-	dy = ey - sy;
-	d = sqrtf(dx*dx + dy*dy);
-	if (d > 0.0001f) {
-		dx /= d;
-		dy /= d;
-	} else {
-		dx = 0;
-		dy = 1;
-	}
-
-	p.xform[0] = dy; p.xform[1] = -dx;
-	p.xform[2] = dx; p.xform[3] = dy;
-	p.xform[4] = sx - dx*large; p.xform[5] = sy - dy*large;
-
-	p.extent[0] = large;
-	p.extent[1] = large + d*0.5f;
-
-	p.radius = 0.0f;
-
-	p.feather = nvg__maxf(1.0f, d);
-
-	p.innerColor = icol;
-	p.outerColor = ocol;
-
-	return p;
-}
-
-NVGpaint nvgRadialGradient(NVGcontext* ctx,
-								  float cx, float cy, float inr, float outr,
-								  NVGcolor icol, NVGcolor ocol)
-{
-	NVGpaint p;
-	float r = (inr+outr)*0.5f;
-	float f = (outr-inr);
-	NVG_NOTUSED(ctx);
-	memset(&p, 0, sizeof(p));
-
-	nvgTransformIdentity(p.xform);
-	p.xform[4] = cx;
-	p.xform[5] = cy;
-
-	p.extent[0] = r;
-	p.extent[1] = r;
-
-	p.radius = r;
-
-	p.feather = nvg__maxf(1.0f, f);
-
-	p.innerColor = icol;
-	p.outerColor = ocol;
-
-	return p;
-}
-
-NVGpaint nvgBoxGradient(NVGcontext* ctx,
-							   float x, float y, float w, float h, float r, float f,
-							   NVGcolor icol, NVGcolor ocol)
-{
-	NVGpaint p;
-	NVG_NOTUSED(ctx);
-	memset(&p, 0, sizeof(p));
-
-	nvgTransformIdentity(p.xform);
-	p.xform[4] = x+w*0.5f;
-	p.xform[5] = y+h*0.5f;
-
-	p.extent[0] = w*0.5f;
-	p.extent[1] = h*0.5f;
-
-	p.radius = r;
-
-	p.feather = nvg__maxf(1.0f, f);
-
-	p.innerColor = icol;
-	p.outerColor = ocol;
-
-	return p;
-}
-
-
-NVGpaint nvgImagePattern(NVGcontext* ctx,
-								float cx, float cy, float w, float h, float angle,
-								int image, float alpha)
-{
-	NVGpaint p;
-	NVG_NOTUSED(ctx);
-	memset(&p, 0, sizeof(p));
-
-	nvgTransformRotate(p.xform, angle);
-	p.xform[4] = cx;
-	p.xform[5] = cy;
-
-	p.extent[0] = w;
-	p.extent[1] = h;
-
-	p.image = image;
-
-	p.innerColor = p.outerColor = nvgRGBAf(1,1,1,alpha);
-
-	return p;
-}
-
-// Scissoring
-void nvgScissor(NVGcontext* ctx, float x, float y, float w, float h)
-{
-	NVGstate* state = nvg__getState(ctx);
-
-	w = nvg__maxf(0.0f, w);
-	h = nvg__maxf(0.0f, h);
-
-	nvgTransformIdentity(state->scissor.xform);
-	state->scissor.xform[4] = x+w*0.5f;
-	state->scissor.xform[5] = y+h*0.5f;
-	nvgTransformMultiply(state->scissor.xform, state->xform);
-
-	state->scissor.extent[0] = w*0.5f;
-	state->scissor.extent[1] = h*0.5f;
-}
-
-static void nvg__isectRects(float* dst,
-							float ax, float ay, float aw, float ah,
-							float bx, float by, float bw, float bh)
-{
-	float minx = nvg__maxf(ax, bx);
-	float miny = nvg__maxf(ay, by);
-	float maxx = nvg__minf(ax+aw, bx+bw);
-	float maxy = nvg__minf(ay+ah, by+bh);
-	dst[0] = minx;
-	dst[1] = miny;
-	dst[2] = nvg__maxf(0.0f, maxx - minx);
-	dst[3] = nvg__maxf(0.0f, maxy - miny);
-}
-
-void nvgIntersectScissor(NVGcontext* ctx, float x, float y, float w, float h)
-{
-	NVGstate* state = nvg__getState(ctx);
-	float pxform[6], invxorm[6];
-	float rect[4];
-	float ex, ey, tex, tey;
-
-	// If no previous scissor has been set, set the scissor as current scissor.
-	if (state->scissor.extent[0] < 0) {
-		nvgScissor(ctx, x, y, w, h);
-		return;
-	}
-
-	// Transform the current scissor rect into current transform space.
-	// If there is difference in rotation, this will be approximation.
-	memcpy(pxform, state->scissor.xform, sizeof(float)*6);
-	ex = state->scissor.extent[0];
-	ey = state->scissor.extent[1];
-	nvgTransformInverse(invxorm, state->xform);
-	nvgTransformMultiply(pxform, invxorm);
-	tex = ex*nvg__absf(pxform[0]) + ey*nvg__absf(pxform[2]);
-	tey = ex*nvg__absf(pxform[1]) + ey*nvg__absf(pxform[3]);
-
-	// Intersect rects.
-	nvg__isectRects(rect, pxform[4]-tex,pxform[5]-tey,tex*2,tey*2, x,y,w,h);
-
-	nvgScissor(ctx, rect[0], rect[1], rect[2], rect[3]);
-}
-
-void nvgResetScissor(NVGcontext* ctx)
-{
-	NVGstate* state = nvg__getState(ctx);
-	memset(state->scissor.xform, 0, sizeof(state->scissor.xform));
-	state->scissor.extent[0] = -1.0f;
-	state->scissor.extent[1] = -1.0f;
-}
-
-// Global composite operation.
-void nvgGlobalCompositeOperation(NVGcontext* ctx, int op)
-{
-	NVGstate* state = nvg__getState(ctx);
-	state->compositeOperation = nvg__compositeOperationState(op);
-}
-
-void nvgGlobalCompositeBlendFunc(NVGcontext* ctx, int sfactor, int dfactor)
-{
-	nvgGlobalCompositeBlendFuncSeparate(ctx, sfactor, dfactor, sfactor, dfactor);
-}
-
-void nvgGlobalCompositeBlendFuncSeparate(NVGcontext* ctx, int srcRGB, int dstRGB, int srcAlpha, int dstAlpha)
-{
-	NVGcompositeOperationState op;
-	op.srcRGB = srcRGB;
-	op.dstRGB = dstRGB;
-	op.srcAlpha = srcAlpha;
-	op.dstAlpha = dstAlpha;
-
-	NVGstate* state = nvg__getState(ctx);
-	state->compositeOperation = op;
-}
-
-static int nvg__ptEquals(float x1, float y1, float x2, float y2, float tol)
-{
-	float dx = x2 - x1;
-	float dy = y2 - y1;
-	return dx*dx + dy*dy < tol*tol;
-}
-
-static float nvg__distPtSeg(float x, float y, float px, float py, float qx, float qy)
-{
-	float pqx, pqy, dx, dy, d, t;
-	pqx = qx-px;
-	pqy = qy-py;
-	dx = x-px;
-	dy = y-py;
-	d = pqx*pqx + pqy*pqy;
-	t = pqx*dx + pqy*dy;
-	if (d > 0) t /= d;
-	if (t < 0) t = 0;
-	else if (t > 1) t = 1;
-	dx = px + t*pqx - x;
-	dy = py + t*pqy - y;
-	return dx*dx + dy*dy;
-}
-
-static void nvg__appendCommands(NVGcontext* ctx, float* vals, int nvals)
-{
-	NVGstate* state = nvg__getState(ctx);
-	int i;
-
-	if (ctx->ncommands+nvals > ctx->ccommands) {
-		float* commands;
-		int ccommands = ctx->ncommands+nvals + ctx->ccommands/2;
-		commands = (float*)realloc(ctx->commands, sizeof(float)*ccommands);
-		if (commands == NULL) return;
-		ctx->commands = commands;
-		ctx->ccommands = ccommands;
-	}
-
-	if ((int)vals[0] != NVG_CLOSE && (int)vals[0] != NVG_WINDING) {
-		ctx->commandx = vals[nvals-2];
-		ctx->commandy = vals[nvals-1];
-	}
-
-	// transform commands
-	i = 0;
-	while (i < nvals) {
-		int cmd = (int)vals[i];
-		switch (cmd) {
-		case NVG_MOVETO:
-			nvgTransformPoint(&vals[i+1],&vals[i+2], state->xform, vals[i+1],vals[i+2]);
-			i += 3;
-			break;
-		case NVG_LINETO:
-			nvgTransformPoint(&vals[i+1],&vals[i+2], state->xform, vals[i+1],vals[i+2]);
-			i += 3;
-			break;
-		case NVG_BEZIERTO:
-			nvgTransformPoint(&vals[i+1],&vals[i+2], state->xform, vals[i+1],vals[i+2]);
-			nvgTransformPoint(&vals[i+3],&vals[i+4], state->xform, vals[i+3],vals[i+4]);
-			nvgTransformPoint(&vals[i+5],&vals[i+6], state->xform, vals[i+5],vals[i+6]);
-			i += 7;
-			break;
-		case NVG_CLOSE:
-			i++;
-			break;
-		case NVG_WINDING:
-			i += 2;
-			break;
-		default:
-			i++;
-		}
-	}
-
-	memcpy(&ctx->commands[ctx->ncommands], vals, nvals*sizeof(float));
-
-	ctx->ncommands += nvals;
-}
-
-
-static void nvg__clearPathCache(NVGcontext* ctx)
-{
-	ctx->cache->npoints = 0;
-	ctx->cache->npaths = 0;
-}
-
-static NVGpath* nvg__lastPath(NVGcontext* ctx)
-{
-	if (ctx->cache->npaths > 0)
-		return &ctx->cache->paths[ctx->cache->npaths-1];
-	return NULL;
-}
-
-static void nvg__addPath(NVGcontext* ctx)
-{
-	NVGpath* path;
-	if (ctx->cache->npaths+1 > ctx->cache->cpaths) {
-		NVGpath* paths;
-		int cpaths = ctx->cache->npaths+1 + ctx->cache->cpaths/2;
-		paths = (NVGpath*)realloc(ctx->cache->paths, sizeof(NVGpath)*cpaths);
-		if (paths == NULL) return;
-		ctx->cache->paths = paths;
-		ctx->cache->cpaths = cpaths;
-	}
-	path = &ctx->cache->paths[ctx->cache->npaths];
-	memset(path, 0, sizeof(*path));
-	path->first = ctx->cache->npoints;
-	path->winding = NVG_CCW;
-
-	ctx->cache->npaths++;
-}
-
-static NVGpoint* nvg__lastPoint(NVGcontext* ctx)
-{
-	if (ctx->cache->npoints > 0)
-		return &ctx->cache->points[ctx->cache->npoints-1];
-	return NULL;
-}
-
-static void nvg__addPoint(NVGcontext* ctx, float x, float y, int flags)
-{
-	NVGpath* path = nvg__lastPath(ctx);
-	NVGpoint* pt;
-	if (path == NULL) return;
-
-	if (path->count > 0 && ctx->cache->npoints > 0) {
-		pt = nvg__lastPoint(ctx);
-		if (nvg__ptEquals(pt->x,pt->y, x,y, ctx->distTol)) {
-			pt->flags |= flags;
-			return;
-		}
-	}
-
-	if (ctx->cache->npoints+1 > ctx->cache->cpoints) {
-		NVGpoint* points;
-		int cpoints = ctx->cache->npoints+1 + ctx->cache->cpoints/2;
-		points = (NVGpoint*)realloc(ctx->cache->points, sizeof(NVGpoint)*cpoints);
-		if (points == NULL) return;
-		ctx->cache->points = points;
-		ctx->cache->cpoints = cpoints;
-	}
-
-	pt = &ctx->cache->points[ctx->cache->npoints];
-	memset(pt, 0, sizeof(*pt));
-	pt->x = x;
-	pt->y = y;
-	pt->flags = (unsigned char)flags;
-
-	ctx->cache->npoints++;
-	path->count++;
-}
-
-static void nvg__closePath(NVGcontext* ctx)
-{
-	NVGpath* path = nvg__lastPath(ctx);
-	if (path == NULL) return;
-	path->closed = 1;
-}
-
-static void nvg__pathWinding(NVGcontext* ctx, int winding)
-{
-	NVGpath* path = nvg__lastPath(ctx);
-	if (path == NULL) return;
-	path->winding = winding;
-}
-
-static float nvg__getAverageScale(float *t)
-{
-	float sx = sqrtf(t[0]*t[0] + t[2]*t[2]);
-	float sy = sqrtf(t[1]*t[1] + t[3]*t[3]);
-	return (sx + sy) * 0.5f;
-}
-
-static NVGvertex* nvg__allocTempVerts(NVGcontext* ctx, int nverts)
-{
-	if (nverts > ctx->cache->cverts) {
-		NVGvertex* verts;
-		int cverts = (nverts + 0xff) & ~0xff; // Round up to prevent allocations when things change just slightly.
-		verts = (NVGvertex*)realloc(ctx->cache->verts, sizeof(NVGvertex)*cverts);
-		if (verts == NULL) return NULL;
-		ctx->cache->verts = verts;
-		ctx->cache->cverts = cverts;
-	}
-
-	return ctx->cache->verts;
-}
-
-static float nvg__triarea2(float ax, float ay, float bx, float by, float cx, float cy)
-{
-	float abx = bx - ax;
-	float aby = by - ay;
-	float acx = cx - ax;
-	float acy = cy - ay;
-	return acx*aby - abx*acy;
-}
-
-static float nvg__polyArea(NVGpoint* pts, int npts)
-{
-	int i;
-	float area = 0;
-	for (i = 2; i < npts; i++) {
-		NVGpoint* a = &pts[0];
-		NVGpoint* b = &pts[i-1];
-		NVGpoint* c = &pts[i];
-		area += nvg__triarea2(a->x,a->y, b->x,b->y, c->x,c->y);
-	}
-	return area * 0.5f;
-}
-
-static void nvg__polyReverse(NVGpoint* pts, int npts)
-{
-	NVGpoint tmp;
-	int i = 0, j = npts-1;
-	while (i < j) {
-		tmp = pts[i];
-		pts[i] = pts[j];
-		pts[j] = tmp;
-		i++;
-		j--;
-	}
-}
-
-
-static void nvg__vset(NVGvertex* vtx, float x, float y, float u, float v)
-{
-	vtx->x = x;
-	vtx->y = y;
-	vtx->u = u;
-	vtx->v = v;
-}
-
-static void nvg__tesselateBezier(NVGcontext* ctx,
-								 float x1, float y1, float x2, float y2,
-								 float x3, float y3, float x4, float y4,
-								 int level, int type)
-{
-	float x12,y12,x23,y23,x34,y34,x123,y123,x234,y234,x1234,y1234;
-	float dx,dy,d2,d3;
-
-	if (level > 10) return;
-
-	x12 = (x1+x2)*0.5f;
-	y12 = (y1+y2)*0.5f;
-	x23 = (x2+x3)*0.5f;
-	y23 = (y2+y3)*0.5f;
-	x34 = (x3+x4)*0.5f;
-	y34 = (y3+y4)*0.5f;
-	x123 = (x12+x23)*0.5f;
-	y123 = (y12+y23)*0.5f;
-
-	dx = x4 - x1;
-	dy = y4 - y1;
-	d2 = nvg__absf(((x2 - x4) * dy - (y2 - y4) * dx));
-	d3 = nvg__absf(((x3 - x4) * dy - (y3 - y4) * dx));
-
-	if ((d2 + d3)*(d2 + d3) < ctx->tessTol * (dx*dx + dy*dy)) {
-		nvg__addPoint(ctx, x4, y4, type);
-		return;
-	}
-
-/*	if (nvg__absf(x1+x3-x2-x2) + nvg__absf(y1+y3-y2-y2) + nvg__absf(x2+x4-x3-x3) + nvg__absf(y2+y4-y3-y3) < ctx->tessTol) {
-		nvg__addPoint(ctx, x4, y4, type);
-		return;
-	}*/
-
-	x234 = (x23+x34)*0.5f;
-	y234 = (y23+y34)*0.5f;
-	x1234 = (x123+x234)*0.5f;
-	y1234 = (y123+y234)*0.5f;
-
-	nvg__tesselateBezier(ctx, x1,y1, x12,y12, x123,y123, x1234,y1234, level+1, 0);
-	nvg__tesselateBezier(ctx, x1234,y1234, x234,y234, x34,y34, x4,y4, level+1, type);
-}
-
-static void nvg__flattenPaths(NVGcontext* ctx)
-{
-	NVGpathCache* cache = ctx->cache;
-//	NVGstate* state = nvg__getState(ctx);
-	NVGpoint* last;
-	NVGpoint* p0;
-	NVGpoint* p1;
-	NVGpoint* pts;
-	NVGpath* path;
-	int i, j;
-	float* cp1;
-	float* cp2;
-	float* p;
-	float area;
-
-	if (cache->npaths > 0)
-		return;
-
-	// Flatten
-	i = 0;
-	while (i < ctx->ncommands) {
-		int cmd = (int)ctx->commands[i];
-		switch (cmd) {
-		case NVG_MOVETO:
-			nvg__addPath(ctx);
-			p = &ctx->commands[i+1];
-			nvg__addPoint(ctx, p[0], p[1], NVG_PT_CORNER);
-			i += 3;
-			break;
-		case NVG_LINETO:
-			p = &ctx->commands[i+1];
-			nvg__addPoint(ctx, p[0], p[1], NVG_PT_CORNER);
-			i += 3;
-			break;
-		case NVG_BEZIERTO:
-			last = nvg__lastPoint(ctx);
-			if (last != NULL) {
-				cp1 = &ctx->commands[i+1];
-				cp2 = &ctx->commands[i+3];
-				p = &ctx->commands[i+5];
-				nvg__tesselateBezier(ctx, last->x,last->y, cp1[0],cp1[1], cp2[0],cp2[1], p[0],p[1], 0, NVG_PT_CORNER);
-			}
-			i += 7;
-			break;
-		case NVG_CLOSE:
-			nvg__closePath(ctx);
-			i++;
-			break;
-		case NVG_WINDING:
-			nvg__pathWinding(ctx, (int)ctx->commands[i+1]);
-			i += 2;
-			break;
-		default:
-			i++;
-		}
-	}
-
-	cache->bounds[0] = cache->bounds[1] = 1e6f;
-	cache->bounds[2] = cache->bounds[3] = -1e6f;
-
-	// Calculate the direction and length of line segments.
-	for (j = 0; j < cache->npaths; j++) {
-		path = &cache->paths[j];
-		pts = &cache->points[path->first];
-
-		// If the first and last points are the same, remove the last, mark as closed path.
-		p0 = &pts[path->count-1];
-		p1 = &pts[0];
-		if (nvg__ptEquals(p0->x,p0->y, p1->x,p1->y, ctx->distTol)) {
-			path->count--;
-			p0 = &pts[path->count-1];
-			path->closed = 1;
-		}
-
-		// Enforce winding.
-		if (path->count > 2) {
-			area = nvg__polyArea(pts, path->count);
-			if (path->winding == NVG_CCW && area < 0.0f)
-				nvg__polyReverse(pts, path->count);
-			if (path->winding == NVG_CW && area > 0.0f)
-				nvg__polyReverse(pts, path->count);
-		}
-
-		for(i = 0; i < path->count; i++) {
-			// Calculate segment direction and length
-			p0->dx = p1->x - p0->x;
-			p0->dy = p1->y - p0->y;
-			p0->len = nvg__normalize(&p0->dx, &p0->dy);
-			// Update bounds
-			cache->bounds[0] = nvg__minf(cache->bounds[0], p0->x);
-			cache->bounds[1] = nvg__minf(cache->bounds[1], p0->y);
-			cache->bounds[2] = nvg__maxf(cache->bounds[2], p0->x);
-			cache->bounds[3] = nvg__maxf(cache->bounds[3], p0->y);
-			// Advance
-			p0 = p1++;
-		}
-	}
-}
-
-static int nvg__curveDivs(float r, float arc, float tol)
-{
-	float da = acosf(r / (r + tol)) * 2.0f;
-	return nvg__maxi(2, (int)ceilf(arc / da));
-}
-
-static void nvg__chooseBevel(int bevel, NVGpoint* p0, NVGpoint* p1, float w,
-							float* x0, float* y0, float* x1, float* y1)
-{
-	if (bevel) {
-		*x0 = p1->x + p0->dy * w;
-		*y0 = p1->y - p0->dx * w;
-		*x1 = p1->x + p1->dy * w;
-		*y1 = p1->y - p1->dx * w;
-	} else {
-		*x0 = p1->x + p1->dmx * w;
-		*y0 = p1->y + p1->dmy * w;
-		*x1 = p1->x + p1->dmx * w;
-		*y1 = p1->y + p1->dmy * w;
-	}
-}
-
-static NVGvertex* nvg__roundJoin(NVGvertex* dst, NVGpoint* p0, NVGpoint* p1,
-								 float lw, float rw, float lu, float ru, int ncap,
-								 float fringe)
-{
-	int i, n;
-	float dlx0 = p0->dy;
-	float dly0 = -p0->dx;
-	float dlx1 = p1->dy;
-	float dly1 = -p1->dx;
-	NVG_NOTUSED(fringe);
-
-	if (p1->flags & NVG_PT_LEFT) {
-		float lx0,ly0,lx1,ly1,a0,a1;
-		nvg__chooseBevel(p1->flags & NVG_PR_INNERBEVEL, p0, p1, lw, &lx0,&ly0, &lx1,&ly1);
-		a0 = atan2f(-dly0, -dlx0);
-		a1 = atan2f(-dly1, -dlx1);
-		if (a1 > a0) a1 -= NVG_PI*2;
-
-		nvg__vset(dst, lx0, ly0, lu,1); dst++;
-		nvg__vset(dst, p1->x - dlx0*rw, p1->y - dly0*rw, ru,1); dst++;
-
-		n = nvg__clampi((int)ceilf(((a0 - a1) / NVG_PI) * ncap), 2, ncap);
-		for (i = 0; i < n; i++) {
-			float u = i/(float)(n-1);
-			float a = a0 + u*(a1-a0);
-			float rx = p1->x + cosf(a) * rw;
-			float ry = p1->y + sinf(a) * rw;
-			nvg__vset(dst, p1->x, p1->y, 0.5f,1); dst++;
-			nvg__vset(dst, rx, ry, ru,1); dst++;
-		}
-
-		nvg__vset(dst, lx1, ly1, lu,1); dst++;
-		nvg__vset(dst, p1->x - dlx1*rw, p1->y - dly1*rw, ru,1); dst++;
-
-	} else {
-		float rx0,ry0,rx1,ry1,a0,a1;
-		nvg__chooseBevel(p1->flags & NVG_PR_INNERBEVEL, p0, p1, -rw, &rx0,&ry0, &rx1,&ry1);
-		a0 = atan2f(dly0, dlx0);
-		a1 = atan2f(dly1, dlx1);
-		if (a1 < a0) a1 += NVG_PI*2;
-
-		nvg__vset(dst, p1->x + dlx0*rw, p1->y + dly0*rw, lu,1); dst++;
-		nvg__vset(dst, rx0, ry0, ru,1); dst++;
-
-		n = nvg__clampi((int)ceilf(((a1 - a0) / NVG_PI) * ncap), 2, ncap);
-		for (i = 0; i < n; i++) {
-			float u = i/(float)(n-1);
-			float a = a0 + u*(a1-a0);
-			float lx = p1->x + cosf(a) * lw;
-			float ly = p1->y + sinf(a) * lw;
-			nvg__vset(dst, lx, ly, lu,1); dst++;
-			nvg__vset(dst, p1->x, p1->y, 0.5f,1); dst++;
-		}
-
-		nvg__vset(dst, p1->x + dlx1*rw, p1->y + dly1*rw, lu,1); dst++;
-		nvg__vset(dst, rx1, ry1, ru,1); dst++;
-
-	}
-	return dst;
-}
-
-static NVGvertex* nvg__bevelJoin(NVGvertex* dst, NVGpoint* p0, NVGpoint* p1,
-										float lw, float rw, float lu, float ru, float fringe)
-{
-	float rx0,ry0,rx1,ry1;
-	float lx0,ly0,lx1,ly1;
-	float dlx0 = p0->dy;
-	float dly0 = -p0->dx;
-	float dlx1 = p1->dy;
-	float dly1 = -p1->dx;
-	NVG_NOTUSED(fringe);
-
-	if (p1->flags & NVG_PT_LEFT) {
-		nvg__chooseBevel(p1->flags & NVG_PR_INNERBEVEL, p0, p1, lw, &lx0,&ly0, &lx1,&ly1);
-
-		nvg__vset(dst, lx0, ly0, lu,1); dst++;
-		nvg__vset(dst, p1->x - dlx0*rw, p1->y - dly0*rw, ru,1); dst++;
-
-		if (p1->flags & NVG_PT_BEVEL) {
-			nvg__vset(dst, lx0, ly0, lu,1); dst++;
-			nvg__vset(dst, p1->x - dlx0*rw, p1->y - dly0*rw, ru,1); dst++;
-
-			nvg__vset(dst, lx1, ly1, lu,1); dst++;
-			nvg__vset(dst, p1->x - dlx1*rw, p1->y - dly1*rw, ru,1); dst++;
-		} else {
-			rx0 = p1->x - p1->dmx * rw;
-			ry0 = p1->y - p1->dmy * rw;
-
-			nvg__vset(dst, p1->x, p1->y, 0.5f,1); dst++;
-			nvg__vset(dst, p1->x - dlx0*rw, p1->y - dly0*rw, ru,1); dst++;
-
-			nvg__vset(dst, rx0, ry0, ru,1); dst++;
-			nvg__vset(dst, rx0, ry0, ru,1); dst++;
-
-			nvg__vset(dst, p1->x, p1->y, 0.5f,1); dst++;
-			nvg__vset(dst, p1->x - dlx1*rw, p1->y - dly1*rw, ru,1); dst++;
-		}
-
-		nvg__vset(dst, lx1, ly1, lu,1); dst++;
-		nvg__vset(dst, p1->x - dlx1*rw, p1->y - dly1*rw, ru,1); dst++;
-
-	} else {
-		nvg__chooseBevel(p1->flags & NVG_PR_INNERBEVEL, p0, p1, -rw, &rx0,&ry0, &rx1,&ry1);
-
-		nvg__vset(dst, p1->x + dlx0*lw, p1->y + dly0*lw, lu,1); dst++;
-		nvg__vset(dst, rx0, ry0, ru,1); dst++;
-
-		if (p1->flags & NVG_PT_BEVEL) {
-			nvg__vset(dst, p1->x + dlx0*lw, p1->y + dly0*lw, lu,1); dst++;
-			nvg__vset(dst, rx0, ry0, ru,1); dst++;
-
-			nvg__vset(dst, p1->x + dlx1*lw, p1->y + dly1*lw, lu,1); dst++;
-			nvg__vset(dst, rx1, ry1, ru,1); dst++;
-		} else {
-			lx0 = p1->x + p1->dmx * lw;
-			ly0 = p1->y + p1->dmy * lw;
-
-			nvg__vset(dst, p1->x + dlx0*lw, p1->y + dly0*lw, lu,1); dst++;
-			nvg__vset(dst, p1->x, p1->y, 0.5f,1); dst++;
-
-			nvg__vset(dst, lx0, ly0, lu,1); dst++;
-			nvg__vset(dst, lx0, ly0, lu,1); dst++;
-
-			nvg__vset(dst, p1->x + dlx1*lw, p1->y + dly1*lw, lu,1); dst++;
-			nvg__vset(dst, p1->x, p1->y, 0.5f,1); dst++;
-		}
-
-		nvg__vset(dst, p1->x + dlx1*lw, p1->y + dly1*lw, lu,1); dst++;
-		nvg__vset(dst, rx1, ry1, ru,1); dst++;
-	}
-
-	return dst;
-}
-
-static NVGvertex* nvg__buttCapStart(NVGvertex* dst, NVGpoint* p,
-									float dx, float dy, float w, float d,
-									float aa, float u0, float u1)
-{
-	float px = p->x - dx*d;
-	float py = p->y - dy*d;
-	float dlx = dy;
-	float dly = -dx;
-	nvg__vset(dst, px + dlx*w - dx*aa, py + dly*w - dy*aa, u0,0); dst++;
-	nvg__vset(dst, px - dlx*w - dx*aa, py - dly*w - dy*aa, u1,0); dst++;
-	nvg__vset(dst, px + dlx*w, py + dly*w, u0,1); dst++;
-	nvg__vset(dst, px - dlx*w, py - dly*w, u1,1); dst++;
-	return dst;
-}
-
-static NVGvertex* nvg__buttCapEnd(NVGvertex* dst, NVGpoint* p,
-								  float dx, float dy, float w, float d,
-								  float aa, float u0, float u1)
-{
-	float px = p->x + dx*d;
-	float py = p->y + dy*d;
-	float dlx = dy;
-	float dly = -dx;
-	nvg__vset(dst, px + dlx*w, py + dly*w, u0,1); dst++;
-	nvg__vset(dst, px - dlx*w, py - dly*w, u1,1); dst++;
-	nvg__vset(dst, px + dlx*w + dx*aa, py + dly*w + dy*aa, u0,0); dst++;
-	nvg__vset(dst, px - dlx*w + dx*aa, py - dly*w + dy*aa, u1,0); dst++;
-	return dst;
-}
-
-
-static NVGvertex* nvg__roundCapStart(NVGvertex* dst, NVGpoint* p,
-									 float dx, float dy, float w, int ncap,
-									 float aa, float u0, float u1)
-{
-	int i;
-	float px = p->x;
-	float py = p->y;
-	float dlx = dy;
-	float dly = -dx;
-	NVG_NOTUSED(aa);
-	for (i = 0; i < ncap; i++) {
-		float a = i/(float)(ncap-1)*NVG_PI;
-		float ax = cosf(a) * w, ay = sinf(a) * w;
-		nvg__vset(dst, px - dlx*ax - dx*ay, py - dly*ax - dy*ay, u0,1); dst++;
-		nvg__vset(dst, px, py, 0.5f,1); dst++;
-	}
-	nvg__vset(dst, px + dlx*w, py + dly*w, u0,1); dst++;
-	nvg__vset(dst, px - dlx*w, py - dly*w, u1,1); dst++;
-	return dst;
-}
-
-static NVGvertex* nvg__roundCapEnd(NVGvertex* dst, NVGpoint* p,
-								   float dx, float dy, float w, int ncap,
-								   float aa, float u0, float u1)
-{
-	int i;
-	float px = p->x;
-	float py = p->y;
-	float dlx = dy;
-	float dly = -dx;
-	NVG_NOTUSED(aa);
-	nvg__vset(dst, px + dlx*w, py + dly*w, u0,1); dst++;
-	nvg__vset(dst, px - dlx*w, py - dly*w, u1,1); dst++;
-	for (i = 0; i < ncap; i++) {
-		float a = i/(float)(ncap-1)*NVG_PI;
-		float ax = cosf(a) * w, ay = sinf(a) * w;
-		nvg__vset(dst, px, py, 0.5f,1); dst++;
-		nvg__vset(dst, px - dlx*ax + dx*ay, py - dly*ax + dy*ay, u0,1); dst++;
-	}
-	return dst;
-}
-
-
-static void nvg__calculateJoins(NVGcontext* ctx, float w, int lineJoin, float miterLimit)
-{
-	NVGpathCache* cache = ctx->cache;
-	int i, j;
-	float iw = 0.0f;
-
-	if (w > 0.0f) iw = 1.0f / w;
-
-	// Calculate which joins needs extra vertices to append, and gather vertex count.
-	for (i = 0; i < cache->npaths; i++) {
-		NVGpath* path = &cache->paths[i];
-		NVGpoint* pts = &cache->points[path->first];
-		NVGpoint* p0 = &pts[path->count-1];
-		NVGpoint* p1 = &pts[0];
-		int nleft = 0;
-
-		path->nbevel = 0;
-
-		for (j = 0; j < path->count; j++) {
-			float dlx0, dly0, dlx1, dly1, dmr2, cross, limit;
-			dlx0 = p0->dy;
-			dly0 = -p0->dx;
-			dlx1 = p1->dy;
-			dly1 = -p1->dx;
-			// Calculate extrusions
-			p1->dmx = (dlx0 + dlx1) * 0.5f;
-			p1->dmy = (dly0 + dly1) * 0.5f;
-			dmr2 = p1->dmx*p1->dmx + p1->dmy*p1->dmy;
-			if (dmr2 > 0.000001f) {
-				float scale = 1.0f / dmr2;
-				if (scale > 600.0f) {
-					scale = 600.0f;
-				}
-				p1->dmx *= scale;
-				p1->dmy *= scale;
-			}
-
-			// Clear flags, but keep the corner.
-			p1->flags = (p1->flags & NVG_PT_CORNER) ? NVG_PT_CORNER : 0;
-
-			// Keep track of left turns.
-			cross = p1->dx * p0->dy - p0->dx * p1->dy;
-			if (cross > 0.0f) {
-				nleft++;
-				p1->flags |= NVG_PT_LEFT;
-			}
-
-			// Calculate if we should use bevel or miter for inner join.
-			limit = nvg__maxf(1.01f, nvg__minf(p0->len, p1->len) * iw);
-			if ((dmr2 * limit*limit) < 1.0f)
-				p1->flags |= NVG_PR_INNERBEVEL;
-
-			// Check to see if the corner needs to be beveled.
-			if (p1->flags & NVG_PT_CORNER) {
-				if ((dmr2 * miterLimit*miterLimit) < 1.0f || lineJoin == NVG_BEVEL || lineJoin == NVG_ROUND) {
-					p1->flags |= NVG_PT_BEVEL;
-				}
-			}
-
-			if ((p1->flags & (NVG_PT_BEVEL | NVG_PR_INNERBEVEL)) != 0)
-				path->nbevel++;
-
-			p0 = p1++;
-		}
-
-		path->convex = (nleft == path->count) ? 1 : 0;
-	}
-}
-
-
-static int nvg__expandStroke(NVGcontext* ctx, float w, float fringe, int lineCap, int lineJoin, float miterLimit)
-{
-	NVGpathCache* cache = ctx->cache;
-	NVGvertex* verts;
-	NVGvertex* dst;
-	int cverts, i, j;
-	float aa = fringe;//ctx->fringeWidth;
-	float u0 = 0.0f, u1 = 1.0f;
-	int ncap = nvg__curveDivs(w, NVG_PI, ctx->tessTol);	// Calculate divisions per half circle.
-
-	w += aa * 0.5f;
-
-	// Disable the gradient used for antialiasing when antialiasing is not used.
-	if (aa == 0.0f) {
-		u0 = 0.5f;
-		u1 = 0.5f;
-	}
-
-	nvg__calculateJoins(ctx, w, lineJoin, miterLimit);
-
-	// Calculate max vertex usage.
-	cverts = 0;
-	for (i = 0; i < cache->npaths; i++) {
-		NVGpath* path = &cache->paths[i];
-		int loop = (path->closed == 0) ? 0 : 1;
-		if (lineJoin == NVG_ROUND)
-			cverts += (path->count + path->nbevel*(ncap+2) + 1) * 2; // plus one for loop
-		else
-			cverts += (path->count + path->nbevel*5 + 1) * 2; // plus one for loop
-		if (loop == 0) {
-			// space for caps
-			if (lineCap == NVG_ROUND) {
-				cverts += (ncap*2 + 2)*2;
-			} else {
-				cverts += (3+3)*2;
-			}
-		}
-	}
-
-	verts = nvg__allocTempVerts(ctx, cverts);
-	if (verts == NULL) return 0;
-
-	for (i = 0; i < cache->npaths; i++) {
-		NVGpath* path = &cache->paths[i];
-		NVGpoint* pts = &cache->points[path->first];
-		NVGpoint* p0;
-		NVGpoint* p1;
-		int s, e, loop;
-		float dx, dy;
-
-		path->fill = 0;
-		path->nfill = 0;
-
-		// Calculate fringe or stroke
-		loop = (path->closed == 0) ? 0 : 1;
-		dst = verts;
-		path->stroke = dst;
-
-		if (loop) {
-			// Looping
-			p0 = &pts[path->count-1];
-			p1 = &pts[0];
-			s = 0;
-			e = path->count;
-		} else {
-			// Add cap
-			p0 = &pts[0];
-			p1 = &pts[1];
-			s = 1;
-			e = path->count-1;
-		}
-
-		if (loop == 0) {
-			// Add cap
-			dx = p1->x - p0->x;
-			dy = p1->y - p0->y;
-			nvg__normalize(&dx, &dy);
-			if (lineCap == NVG_BUTT)
-				dst = nvg__buttCapStart(dst, p0, dx, dy, w, -aa*0.5f, aa, u0, u1);
-			else if (lineCap == NVG_BUTT || lineCap == NVG_SQUARE)
-				dst = nvg__buttCapStart(dst, p0, dx, dy, w, w-aa, aa, u0, u1);
-			else if (lineCap == NVG_ROUND)
-				dst = nvg__roundCapStart(dst, p0, dx, dy, w, ncap, aa, u0, u1);
-		}
-
-		for (j = s; j < e; ++j) {
-			if ((p1->flags & (NVG_PT_BEVEL | NVG_PR_INNERBEVEL)) != 0) {
-				if (lineJoin == NVG_ROUND) {
-					dst = nvg__roundJoin(dst, p0, p1, w, w, u0, u1, ncap, aa);
-				} else {
-					dst = nvg__bevelJoin(dst, p0, p1, w, w, u0, u1, aa);
-				}
-			} else {
-				nvg__vset(dst, p1->x + (p1->dmx * w), p1->y + (p1->dmy * w), u0,1); dst++;
-				nvg__vset(dst, p1->x - (p1->dmx * w), p1->y - (p1->dmy * w), u1,1); dst++;
-			}
-			p0 = p1++;
-		}
-
-		if (loop) {
-			// Loop it
-			nvg__vset(dst, verts[0].x, verts[0].y, u0,1); dst++;
-			nvg__vset(dst, verts[1].x, verts[1].y, u1,1); dst++;
-		} else {
-			// Add cap
-			dx = p1->x - p0->x;
-			dy = p1->y - p0->y;
-			nvg__normalize(&dx, &dy);
-			if (lineCap == NVG_BUTT)
-				dst = nvg__buttCapEnd(dst, p1, dx, dy, w, -aa*0.5f, aa, u0, u1);
-			else if (lineCap == NVG_BUTT || lineCap == NVG_SQUARE)
-				dst = nvg__buttCapEnd(dst, p1, dx, dy, w, w-aa, aa, u0, u1);
-			else if (lineCap == NVG_ROUND)
-				dst = nvg__roundCapEnd(dst, p1, dx, dy, w, ncap, aa, u0, u1);
-		}
-
-		path->nstroke = (int)(dst - verts);
-
-		verts = dst;
-	}
-
-	return 1;
-}
-
-static int nvg__expandFill(NVGcontext* ctx, float w, int lineJoin, float miterLimit)
-{
-	NVGpathCache* cache = ctx->cache;
-	NVGvertex* verts;
-	NVGvertex* dst;
-	int cverts, convex, i, j;
-	float aa = ctx->fringeWidth;
-	int fringe = w > 0.0f;
-
-	nvg__calculateJoins(ctx, w, lineJoin, miterLimit);
-
-	// Calculate max vertex usage.
-	cverts = 0;
-	for (i = 0; i < cache->npaths; i++) {
-		NVGpath* path = &cache->paths[i];
-		cverts += path->count + path->nbevel + 1;
-		if (fringe)
-			cverts += (path->count + path->nbevel*5 + 1) * 2; // plus one for loop
-	}
-
-	verts = nvg__allocTempVerts(ctx, cverts);
-	if (verts == NULL) return 0;
-
-	convex = cache->npaths == 1 && cache->paths[0].convex;
-
-	for (i = 0; i < cache->npaths; i++) {
-		NVGpath* path = &cache->paths[i];
-		NVGpoint* pts = &cache->points[path->first];
-		NVGpoint* p0;
-		NVGpoint* p1;
-		float rw, lw, woff;
-		float ru, lu;
-
-		// Calculate shape vertices.
-		woff = 0.5f*aa;
-		dst = verts;
-		path->fill = dst;
-
-		if (fringe) {
-			// Looping
-			p0 = &pts[path->count-1];
-			p1 = &pts[0];
-			for (j = 0; j < path->count; ++j) {
-				if (p1->flags & NVG_PT_BEVEL) {
-					float dlx0 = p0->dy;
-					float dly0 = -p0->dx;
-					float dlx1 = p1->dy;
-					float dly1 = -p1->dx;
-					if (p1->flags & NVG_PT_LEFT) {
-						float lx = p1->x + p1->dmx * woff;
-						float ly = p1->y + p1->dmy * woff;
-						nvg__vset(dst, lx, ly, 0.5f,1); dst++;
-					} else {
-						float lx0 = p1->x + dlx0 * woff;
-						float ly0 = p1->y + dly0 * woff;
-						float lx1 = p1->x + dlx1 * woff;
-						float ly1 = p1->y + dly1 * woff;
-						nvg__vset(dst, lx0, ly0, 0.5f,1); dst++;
-						nvg__vset(dst, lx1, ly1, 0.5f,1); dst++;
-					}
-				} else {
-					nvg__vset(dst, p1->x + (p1->dmx * woff), p1->y + (p1->dmy * woff), 0.5f,1); dst++;
-				}
-				p0 = p1++;
-			}
-		} else {
-			for (j = 0; j < path->count; ++j) {
-				nvg__vset(dst, pts[j].x, pts[j].y, 0.5f,1);
-				dst++;
-			}
-		}
-
-		path->nfill = (int)(dst - verts);
-		verts = dst;
-
-		// Calculate fringe
-		if (fringe) {
-			lw = w + woff;
-			rw = w - woff;
-			lu = 0;
-			ru = 1;
-			dst = verts;
-			path->stroke = dst;
-
-			// Create only half a fringe for convex shapes so that
-			// the shape can be rendered without stenciling.
-			if (convex) {
-				lw = woff;	// This should generate the same vertex as fill inset above.
-				lu = 0.5f;	// Set outline fade at middle.
-			}
-
-			// Looping
-			p0 = &pts[path->count-1];
-			p1 = &pts[0];
-
-			for (j = 0; j < path->count; ++j) {
-				if ((p1->flags & (NVG_PT_BEVEL | NVG_PR_INNERBEVEL)) != 0) {
-					dst = nvg__bevelJoin(dst, p0, p1, lw, rw, lu, ru, ctx->fringeWidth);
-				} else {
-					nvg__vset(dst, p1->x + (p1->dmx * lw), p1->y + (p1->dmy * lw), lu,1); dst++;
-					nvg__vset(dst, p1->x - (p1->dmx * rw), p1->y - (p1->dmy * rw), ru,1); dst++;
-				}
-				p0 = p1++;
-			}
-
-			// Loop it
-			nvg__vset(dst, verts[0].x, verts[0].y, lu,1); dst++;
-			nvg__vset(dst, verts[1].x, verts[1].y, ru,1); dst++;
-
-			path->nstroke = (int)(dst - verts);
-			verts = dst;
-		} else {
-			path->stroke = NULL;
-			path->nstroke = 0;
-		}
-	}
-
-	return 1;
-}
-
-
-// Draw
-void nvgBeginPath(NVGcontext* ctx)
-{
-	ctx->ncommands = 0;
-	nvg__clearPathCache(ctx);
-}
-
-void nvgMoveTo(NVGcontext* ctx, float x, float y)
-{
-	float vals[] = { NVG_MOVETO, x, y };
-	nvg__appendCommands(ctx, vals, NVG_COUNTOF(vals));
-}
-
-void nvgLineTo(NVGcontext* ctx, float x, float y)
-{
-	float vals[] = { NVG_LINETO, x, y };
-	nvg__appendCommands(ctx, vals, NVG_COUNTOF(vals));
-}
-
-void nvgBezierTo(NVGcontext* ctx, float c1x, float c1y, float c2x, float c2y, float x, float y)
-{
-	float vals[] = { NVG_BEZIERTO, c1x, c1y, c2x, c2y, x, y };
-	nvg__appendCommands(ctx, vals, NVG_COUNTOF(vals));
-}
-
-void nvgQuadTo(NVGcontext* ctx, float cx, float cy, float x, float y)
-{
-    float x0 = ctx->commandx;
-    float y0 = ctx->commandy;
-    float vals[] = { NVG_BEZIERTO,
-        x0 + 2.0f/3.0f*(cx - x0), y0 + 2.0f/3.0f*(cy - y0),
-        x + 2.0f/3.0f*(cx - x), y + 2.0f/3.0f*(cy - y),
-        x, y };
-    nvg__appendCommands(ctx, vals, NVG_COUNTOF(vals));
-}
-
-void nvgArcTo(NVGcontext* ctx, float x1, float y1, float x2, float y2, float radius)
-{
-	float x0 = ctx->commandx;
-	float y0 = ctx->commandy;
-	float dx0,dy0, dx1,dy1, a, d, cx,cy, a0,a1;
-	int dir;
-
-	if (ctx->ncommands == 0) {
-		return;
-	}
-
-	// Handle degenerate cases.
-	if (nvg__ptEquals(x0,y0, x1,y1, ctx->distTol) ||
-		nvg__ptEquals(x1,y1, x2,y2, ctx->distTol) ||
-		nvg__distPtSeg(x1,y1, x0,y0, x2,y2) < ctx->distTol*ctx->distTol ||
-		radius < ctx->distTol) {
-		nvgLineTo(ctx, x1,y1);
-		return;
-	}
-
-	// Calculate tangential circle to lines (x0,y0)-(x1,y1) and (x1,y1)-(x2,y2).
-	dx0 = x0-x1;
-	dy0 = y0-y1;
-	dx1 = x2-x1;
-	dy1 = y2-y1;
-	nvg__normalize(&dx0,&dy0);
-	nvg__normalize(&dx1,&dy1);
-	a = nvg__acosf(dx0*dx1 + dy0*dy1);
-	d = radius / nvg__tanf(a/2.0f);
-
-//	printf("a=%f° d=%f\n", a/NVG_PI*180.0f, d);
-
-	if (d > 10000.0f) {
-		nvgLineTo(ctx, x1,y1);
-		return;
-	}
-
-	if (nvg__cross(dx0,dy0, dx1,dy1) > 0.0f) {
-		cx = x1 + dx0*d + dy0*radius;
-		cy = y1 + dy0*d + -dx0*radius;
-		a0 = nvg__atan2f(dx0, -dy0);
-		a1 = nvg__atan2f(-dx1, dy1);
-		dir = NVG_CW;
-//		printf("CW c=(%f, %f) a0=%f° a1=%f°\n", cx, cy, a0/NVG_PI*180.0f, a1/NVG_PI*180.0f);
-	} else {
-		cx = x1 + dx0*d + -dy0*radius;
-		cy = y1 + dy0*d + dx0*radius;
-		a0 = nvg__atan2f(-dx0, dy0);
-		a1 = nvg__atan2f(dx1, -dy1);
-		dir = NVG_CCW;
-//		printf("CCW c=(%f, %f) a0=%f° a1=%f°\n", cx, cy, a0/NVG_PI*180.0f, a1/NVG_PI*180.0f);
-	}
-
-	nvgArc(ctx, cx, cy, radius, a0, a1, dir);
-}
-
-void nvgClosePath(NVGcontext* ctx)
-{
-	float vals[] = { NVG_CLOSE };
-	nvg__appendCommands(ctx, vals, NVG_COUNTOF(vals));
-}
-
-void nvgPathWinding(NVGcontext* ctx, int dir)
-{
-	float vals[] = { NVG_WINDING, (float)dir };
-	nvg__appendCommands(ctx, vals, NVG_COUNTOF(vals));
-}
-
-void nvgArc(NVGcontext* ctx, float cx, float cy, float r, float a0, float a1, int dir)
-{
-	float a = 0, da = 0, hda = 0, kappa = 0;
-	float dx = 0, dy = 0, x = 0, y = 0, tanx = 0, tany = 0;
-	float px = 0, py = 0, ptanx = 0, ptany = 0;
-	float vals[3 + 5*7 + 100];
-	int i, ndivs, nvals;
-	int move = ctx->ncommands > 0 ? NVG_LINETO : NVG_MOVETO;
-
-	// Clamp angles
-	da = a1 - a0;
-	if (dir == NVG_CW) {
-		if (nvg__absf(da) >= NVG_PI*2) {
-			da = NVG_PI*2;
-		} else {
-			while (da < 0.0f) da += NVG_PI*2;
-		}
-	} else {
-		if (nvg__absf(da) >= NVG_PI*2) {
-			da = -NVG_PI*2;
-		} else {
-			while (da > 0.0f) da -= NVG_PI*2;
-		}
-	}
-
-	// Split arc into max 90 degree segments.
-	ndivs = nvg__maxi(1, nvg__mini((int)(nvg__absf(da) / (NVG_PI*0.5f) + 0.5f), 5));
-	hda = (da / (float)ndivs) / 2.0f;
-	kappa = nvg__absf(4.0f / 3.0f * (1.0f - nvg__cosf(hda)) / nvg__sinf(hda));
-
-	if (dir == NVG_CCW)
-		kappa = -kappa;
-
-	nvals = 0;
-	for (i = 0; i <= ndivs; i++) {
-		a = a0 + da * (i/(float)ndivs);
-		dx = nvg__cosf(a);
-		dy = nvg__sinf(a);
-		x = cx + dx*r;
-		y = cy + dy*r;
-		tanx = -dy*r*kappa;
-		tany = dx*r*kappa;
-
-		if (i == 0) {
-			vals[nvals++] = (float)move;
-			vals[nvals++] = x;
-			vals[nvals++] = y;
-		} else {
-			vals[nvals++] = NVG_BEZIERTO;
-			vals[nvals++] = px+ptanx;
-			vals[nvals++] = py+ptany;
-			vals[nvals++] = x-tanx;
-			vals[nvals++] = y-tany;
-			vals[nvals++] = x;
-			vals[nvals++] = y;
-		}
-		px = x;
-		py = y;
-		ptanx = tanx;
-		ptany = tany;
-	}
-
-	nvg__appendCommands(ctx, vals, nvals);
-}
-
-void nvgRect(NVGcontext* ctx, float x, float y, float w, float h)
-{
-	float vals[] = {
-		NVG_MOVETO, x,y,
-		NVG_LINETO, x,y+h,
-		NVG_LINETO, x+w,y+h,
-		NVG_LINETO, x+w,y,
-		NVG_CLOSE
-	};
-	nvg__appendCommands(ctx, vals, NVG_COUNTOF(vals));
-}
-
-void nvgRoundedRect(NVGcontext* ctx, float x, float y, float w, float h, float r)
-{
-	nvgRoundedRectVarying(ctx, x, y, w, h, r, r, r, r);
-}
-
-void nvgRoundedRectVarying(NVGcontext* ctx, float x, float y, float w, float h, float radTopLeft, float radTopRight, float radBottomRight, float radBottomLeft)
-{
-	if(radTopLeft < 0.1f && radTopRight < 0.1f && radBottomRight < 0.1f && radBottomLeft < 0.1f) {
-		nvgRect(ctx, x, y, w, h);
-		return;
-	} else {
-		float halfw = nvg__absf(w)*0.5f;
-		float halfh = nvg__absf(h)*0.5f;
-		float rxBL = nvg__minf(radBottomLeft, halfw) * nvg__signf(w), ryBL = nvg__minf(radBottomLeft, halfh) * nvg__signf(h);
-		float rxBR = nvg__minf(radBottomRight, halfw) * nvg__signf(w), ryBR = nvg__minf(radBottomRight, halfh) * nvg__signf(h);
-		float rxTR = nvg__minf(radTopRight, halfw) * nvg__signf(w), ryTR = nvg__minf(radTopRight, halfh) * nvg__signf(h);
-		float rxTL = nvg__minf(radTopLeft, halfw) * nvg__signf(w), ryTL = nvg__minf(radTopLeft, halfh) * nvg__signf(h);
-		float vals[] = {
-			NVG_MOVETO, x, y + ryTL,
-			NVG_LINETO, x, y + h - ryBL,
-			NVG_BEZIERTO, x, y + h - ryBL*(1 - NVG_KAPPA90), x + rxBL*(1 - NVG_KAPPA90), y + h, x + rxBL, y + h,
-			NVG_LINETO, x + w - rxBR, y + h,
-			NVG_BEZIERTO, x + w - rxBR*(1 - NVG_KAPPA90), y + h, x + w, y + h - ryBR*(1 - NVG_KAPPA90), x + w, y + h - ryBR,
-			NVG_LINETO, x + w, y + ryTR,
-			NVG_BEZIERTO, x + w, y + ryTR*(1 - NVG_KAPPA90), x + w - rxTR*(1 - NVG_KAPPA90), y, x + w - rxTR, y,
-			NVG_LINETO, x + rxTL, y,
-			NVG_BEZIERTO, x + rxTL*(1 - NVG_KAPPA90), y, x, y + ryTL*(1 - NVG_KAPPA90), x, y + ryTL,
-			NVG_CLOSE
-		};
-		nvg__appendCommands(ctx, vals, NVG_COUNTOF(vals));
-	}
-}
-
-void nvgEllipse(NVGcontext* ctx, float cx, float cy, float rx, float ry)
-{
-	float vals[] = {
-		NVG_MOVETO, cx-rx, cy,
-		NVG_BEZIERTO, cx-rx, cy+ry*NVG_KAPPA90, cx-rx*NVG_KAPPA90, cy+ry, cx, cy+ry,
-		NVG_BEZIERTO, cx+rx*NVG_KAPPA90, cy+ry, cx+rx, cy+ry*NVG_KAPPA90, cx+rx, cy,
-		NVG_BEZIERTO, cx+rx, cy-ry*NVG_KAPPA90, cx+rx*NVG_KAPPA90, cy-ry, cx, cy-ry,
-		NVG_BEZIERTO, cx-rx*NVG_KAPPA90, cy-ry, cx-rx, cy-ry*NVG_KAPPA90, cx-rx, cy,
-		NVG_CLOSE
-	};
-	nvg__appendCommands(ctx, vals, NVG_COUNTOF(vals));
-}
-
-void nvgCircle(NVGcontext* ctx, float cx, float cy, float r)
-{
-	nvgEllipse(ctx, cx,cy, r,r);
-}
-
-void nvgDebugDumpPathCache(NVGcontext* ctx)
-{
-	const NVGpath* path;
-	int i, j;
-
-	printf("Dumping %d cached paths\n", ctx->cache->npaths);
-	for (i = 0; i < ctx->cache->npaths; i++) {
-		path = &ctx->cache->paths[i];
-		printf(" - Path %d\n", i);
-		if (path->nfill) {
-			printf("   - fill: %d\n", path->nfill);
-			for (j = 0; j < path->nfill; j++)
-				printf("%f\t%f\n", path->fill[j].x, path->fill[j].y);
-		}
-		if (path->nstroke) {
-			printf("   - stroke: %d\n", path->nstroke);
-			for (j = 0; j < path->nstroke; j++)
-				printf("%f\t%f\n", path->stroke[j].x, path->stroke[j].y);
-		}
-	}
-}
-
-void nvgFill(NVGcontext* ctx)
-{
-	NVGstate* state = nvg__getState(ctx);
-	const NVGpath* path;
-	NVGpaint fillPaint = state->fill;
-	int i;
-
-	nvg__flattenPaths(ctx);
-	if (ctx->params.edgeAntiAlias && state->shapeAntiAlias)
-		nvg__expandFill(ctx, ctx->fringeWidth, NVG_MITER, 2.4f);
-	else
-		nvg__expandFill(ctx, 0.0f, NVG_MITER, 2.4f);
-
-	// Apply global alpha
-	fillPaint.innerColor.a *= state->alpha;
-	fillPaint.outerColor.a *= state->alpha;
-
-	ctx->params.renderFill(ctx->params.userPtr, &fillPaint, state->compositeOperation, &state->scissor, ctx->fringeWidth,
-						   ctx->cache->bounds, ctx->cache->paths, ctx->cache->npaths);
-
-	// Count triangles
-	for (i = 0; i < ctx->cache->npaths; i++) {
-		path = &ctx->cache->paths[i];
-		ctx->fillTriCount += path->nfill-2;
-		ctx->fillTriCount += path->nstroke-2;
-		ctx->drawCallCount += 2;
-	}
-}
-
-void nvgStroke(NVGcontext* ctx)
-{
-	NVGstate* state = nvg__getState(ctx);
-	float scale = nvg__getAverageScale(state->xform);
-	float strokeWidth = nvg__clampf(state->strokeWidth * scale, 0.0f, 200.0f);
-	NVGpaint strokePaint = state->stroke;
-	const NVGpath* path;
-	int i;
-
-
-	if (strokeWidth < ctx->fringeWidth) {
-		// If the stroke width is less than pixel size, use alpha to emulate coverage.
-		// Since coverage is area, scale by alpha*alpha.
-		float alpha = nvg__clampf(strokeWidth / ctx->fringeWidth, 0.0f, 1.0f);
-		strokePaint.innerColor.a *= alpha*alpha;
-		strokePaint.outerColor.a *= alpha*alpha;
-		strokeWidth = ctx->fringeWidth;
-	}
-
-	// Apply global alpha
-	strokePaint.innerColor.a *= state->alpha;
-	strokePaint.outerColor.a *= state->alpha;
-
-	nvg__flattenPaths(ctx);
-
-	if (ctx->params.edgeAntiAlias && state->shapeAntiAlias)
-		nvg__expandStroke(ctx, strokeWidth*0.5f, ctx->fringeWidth, state->lineCap, state->lineJoin, state->miterLimit);
-	else
-		nvg__expandStroke(ctx, strokeWidth*0.5f, 0.0f, state->lineCap, state->lineJoin, state->miterLimit);
-
-	ctx->params.renderStroke(ctx->params.userPtr, &strokePaint, state->compositeOperation, &state->scissor, ctx->fringeWidth,
-							 strokeWidth, ctx->cache->paths, ctx->cache->npaths);
-
-	// Count triangles
-	for (i = 0; i < ctx->cache->npaths; i++) {
-		path = &ctx->cache->paths[i];
-		ctx->strokeTriCount += path->nstroke-2;
-		ctx->drawCallCount++;
-	}
-}
-
-// Add fonts
-int nvgCreateFont(NVGcontext* ctx, const char* name, const char* path)
-{
-	return fonsAddFont(ctx->fs, name, path);
-}
-
-int nvgCreateFontMem(NVGcontext* ctx, const char* name, unsigned char* data, int ndata, int freeData)
-{
-	return fonsAddFontMem(ctx->fs, name, data, ndata, freeData);
-}
-
-int nvgFindFont(NVGcontext* ctx, const char* name)
-{
-	if (name == NULL) return -1;
-	return fonsGetFontByName(ctx->fs, name);
-}
-
-
-int nvgAddFallbackFontId(NVGcontext* ctx, int baseFont, int fallbackFont)
-{
-	if(baseFont == -1 || fallbackFont == -1) return 0;
-	return fonsAddFallbackFont(ctx->fs, baseFont, fallbackFont);
-}
-
-int nvgAddFallbackFont(NVGcontext* ctx, const char* baseFont, const char* fallbackFont)
-{
-	return nvgAddFallbackFontId(ctx, nvgFindFont(ctx, baseFont), nvgFindFont(ctx, fallbackFont));
-}
-
-// State setting
-void nvgFontSize(NVGcontext* ctx, float size)
-{
-	NVGstate* state = nvg__getState(ctx);
-	state->fontSize = size;
-}
-
-void nvgFontBlur(NVGcontext* ctx, float blur)
-{
-	NVGstate* state = nvg__getState(ctx);
-	state->fontBlur = blur;
-}
-
-void nvgTextLetterSpacing(NVGcontext* ctx, float spacing)
-{
-	NVGstate* state = nvg__getState(ctx);
-	state->letterSpacing = spacing;
-}
-
-void nvgTextLineHeight(NVGcontext* ctx, float lineHeight)
-{
-	NVGstate* state = nvg__getState(ctx);
-	state->lineHeight = lineHeight;
-}
-
-void nvgTextAlign(NVGcontext* ctx, int align)
-{
-	NVGstate* state = nvg__getState(ctx);
-	state->textAlign = align;
-}
-
-void nvgFontFaceId(NVGcontext* ctx, int font)
-{
-	NVGstate* state = nvg__getState(ctx);
-	state->fontId = font;
-}
-
-void nvgFontFace(NVGcontext* ctx, const char* font)
-{
-	NVGstate* state = nvg__getState(ctx);
-	state->fontId = fonsGetFontByName(ctx->fs, font);
-}
-
-static float nvg__quantize(float a, float d)
-{
-	return ((int)(a / d + 0.5f)) * d;
-}
-
-static float nvg__getFontScale(NVGstate* state)
-{
-	return nvg__minf(nvg__quantize(nvg__getAverageScale(state->xform), 0.01f), 4.0f);
-}
-
-static void nvg__flushTextTexture(NVGcontext* ctx)
-{
-	int dirty[4];
-
-	if (fonsValidateTexture(ctx->fs, dirty)) {
-		int fontImage = ctx->fontImages[ctx->fontImageIdx];
-		// Update texture
-		if (fontImage != 0) {
-			int iw, ih;
-			const unsigned char* data = fonsGetTextureData(ctx->fs, &iw, &ih);
-			int x = dirty[0];
-			int y = dirty[1];
-			int w = dirty[2] - dirty[0];
-			int h = dirty[3] - dirty[1];
-			ctx->params.renderUpdateTexture(ctx->params.userPtr, fontImage, x,y, w,h, data);
-		}
-	}
-}
-
-static int nvg__allocTextAtlas(NVGcontext* ctx)
-{
-	int iw, ih;
-	nvg__flushTextTexture(ctx);
-	if (ctx->fontImageIdx >= NVG_MAX_FONTIMAGES-1)
-		return 0;
-	// if next fontImage already have a texture
-	if (ctx->fontImages[ctx->fontImageIdx+1] != 0)
-		nvgImageSize(ctx, ctx->fontImages[ctx->fontImageIdx+1], &iw, &ih);
-	else { // calculate the new font image size and create it.
-		nvgImageSize(ctx, ctx->fontImages[ctx->fontImageIdx], &iw, &ih);
-		if (iw > ih)
-			ih *= 2;
-		else
-			iw *= 2;
-		if (iw > NVG_MAX_FONTIMAGE_SIZE || ih > NVG_MAX_FONTIMAGE_SIZE)
-			iw = ih = NVG_MAX_FONTIMAGE_SIZE;
-		ctx->fontImages[ctx->fontImageIdx+1] = ctx->params.renderCreateTexture(ctx->params.userPtr, NVG_TEXTURE_ALPHA, iw, ih, 0, NULL);
-	}
-	++ctx->fontImageIdx;
-	fonsResetAtlas(ctx->fs, iw, ih);
-	return 1;
-}
-
-static void nvg__renderText(NVGcontext* ctx, NVGvertex* verts, int nverts)
-{
-	NVGstate* state = nvg__getState(ctx);
-	NVGpaint paint = state->fill;
-
-	// Render triangles.
-	paint.image = ctx->fontImages[ctx->fontImageIdx];
-
-	// Apply global alpha
-	paint.innerColor.a *= state->alpha;
-	paint.outerColor.a *= state->alpha;
-
-	ctx->params.renderTriangles(ctx->params.userPtr, &paint, state->compositeOperation, &state->scissor, verts, nverts);
-
-	ctx->drawCallCount++;
-	ctx->textTriCount += nverts/3;
-}
-
-float nvgText(NVGcontext* ctx, float x, float y, const char* string, const char* end)
-{
-	NVGstate* state = nvg__getState(ctx);
-	FONStextIter iter, prevIter;
-	FONSquad q;
-	NVGvertex* verts;
-	float scale = nvg__getFontScale(state) * ctx->devicePxRatio;
-	float invscale = 1.0f / scale;
-	int cverts = 0;
-	int nverts = 0;
-
-	if (end == NULL)
-		end = string + strlen(string);
-
-	if (state->fontId == FONS_INVALID) return x;
-
-	fonsSetSize(ctx->fs, state->fontSize*scale);
-	fonsSetSpacing(ctx->fs, state->letterSpacing*scale);
-	fonsSetBlur(ctx->fs, state->fontBlur*scale);
-	fonsSetAlign(ctx->fs, state->textAlign);
-	fonsSetFont(ctx->fs, state->fontId);
-
-	cverts = nvg__maxi(2, (int)(end - string)) * 6; // conservative estimate.
-	verts = nvg__allocTempVerts(ctx, cverts);
-	if (verts == NULL) return x;
-
-	fonsTextIterInit(ctx->fs, &iter, x*scale, y*scale, string, end, FONS_GLYPH_BITMAP_REQUIRED);
-	prevIter = iter;
-	while (fonsTextIterNext(ctx->fs, &iter, &q)) {
-		float c[4*2];
-		if (iter.prevGlyphIndex == -1) { // can not retrieve glyph?
-			if (nverts != 0) {
-				nvg__renderText(ctx, verts, nverts);
-				nverts = 0;
-			}
-			if (!nvg__allocTextAtlas(ctx))
-				break; // no memory :(
-			iter = prevIter;
-			fonsTextIterNext(ctx->fs, &iter, &q); // try again
-			if (iter.prevGlyphIndex == -1) // still can not find glyph?
-				break;
-		}
-		prevIter = iter;
-		// Transform corners.
-		nvgTransformPoint(&c[0],&c[1], state->xform, q.x0*invscale, q.y0*invscale);
-		nvgTransformPoint(&c[2],&c[3], state->xform, q.x1*invscale, q.y0*invscale);
-		nvgTransformPoint(&c[4],&c[5], state->xform, q.x1*invscale, q.y1*invscale);
-		nvgTransformPoint(&c[6],&c[7], state->xform, q.x0*invscale, q.y1*invscale);
-		// Create triangles
-		if (nverts+6 <= cverts) {
-			nvg__vset(&verts[nverts], c[0], c[1], q.s0, q.t0); nverts++;
-			nvg__vset(&verts[nverts], c[4], c[5], q.s1, q.t1); nverts++;
-			nvg__vset(&verts[nverts], c[2], c[3], q.s1, q.t0); nverts++;
-			nvg__vset(&verts[nverts], c[0], c[1], q.s0, q.t0); nverts++;
-			nvg__vset(&verts[nverts], c[6], c[7], q.s0, q.t1); nverts++;
-			nvg__vset(&verts[nverts], c[4], c[5], q.s1, q.t1); nverts++;
-		}
-	}
-
-	// TODO: add back-end bit to do this just once per frame.
-	nvg__flushTextTexture(ctx);
-
-	nvg__renderText(ctx, verts, nverts);
-
-	return iter.nextx / scale;
-}
-
-void nvgTextBox(NVGcontext* ctx, float x, float y, float breakRowWidth, const char* string, const char* end)
-{
-	NVGstate* state = nvg__getState(ctx);
-	NVGtextRow rows[2];
-	int nrows = 0, i;
-	int oldAlign = state->textAlign;
-	int haling = state->textAlign & (NVG_ALIGN_LEFT | NVG_ALIGN_CENTER | NVG_ALIGN_RIGHT);
-	int valign = state->textAlign & (NVG_ALIGN_TOP | NVG_ALIGN_MIDDLE | NVG_ALIGN_BOTTOM | NVG_ALIGN_BASELINE);
-	float lineh = 0;
-
-	if (state->fontId == FONS_INVALID) return;
-
-	nvgTextMetrics(ctx, NULL, NULL, &lineh);
-
-	state->textAlign = NVG_ALIGN_LEFT | valign;
-
-	while ((nrows = nvgTextBreakLines(ctx, string, end, breakRowWidth, rows, 2))) {
-		for (i = 0; i < nrows; i++) {
-			NVGtextRow* row = &rows[i];
-			if (haling & NVG_ALIGN_LEFT)
-				nvgText(ctx, x, y, row->start, row->end);
-			else if (haling & NVG_ALIGN_CENTER)
-				nvgText(ctx, x + breakRowWidth*0.5f - row->width*0.5f, y, row->start, row->end);
-			else if (haling & NVG_ALIGN_RIGHT)
-				nvgText(ctx, x + breakRowWidth - row->width, y, row->start, row->end);
-			y += lineh * state->lineHeight;
-		}
-		string = rows[nrows-1].next;
-	}
-
-	state->textAlign = oldAlign;
-}
-
-int nvgTextGlyphPositions(NVGcontext* ctx, float x, float y, const char* string, const char* end, NVGglyphPosition* positions, int maxPositions)
-{
-	NVGstate* state = nvg__getState(ctx);
-	float scale = nvg__getFontScale(state) * ctx->devicePxRatio;
-	float invscale = 1.0f / scale;
-	FONStextIter iter, prevIter;
-	FONSquad q;
-	int npos = 0;
-
-	if (state->fontId == FONS_INVALID) return 0;
-
-	if (end == NULL)
-		end = string + strlen(string);
-
-	if (string == end)
-		return 0;
-
-	fonsSetSize(ctx->fs, state->fontSize*scale);
-	fonsSetSpacing(ctx->fs, state->letterSpacing*scale);
-	fonsSetBlur(ctx->fs, state->fontBlur*scale);
-	fonsSetAlign(ctx->fs, state->textAlign);
-	fonsSetFont(ctx->fs, state->fontId);
-
-	fonsTextIterInit(ctx->fs, &iter, x*scale, y*scale, string, end, FONS_GLYPH_BITMAP_OPTIONAL);
-	prevIter = iter;
-	while (fonsTextIterNext(ctx->fs, &iter, &q)) {
-		if (iter.prevGlyphIndex < 0 && nvg__allocTextAtlas(ctx)) { // can not retrieve glyph?
-			iter = prevIter;
-			fonsTextIterNext(ctx->fs, &iter, &q); // try again
-		}
-		prevIter = iter;
-		positions[npos].str = iter.str;
-		positions[npos].x = iter.x * invscale;
-		positions[npos].minx = nvg__minf(iter.x, q.x0) * invscale;
-		positions[npos].maxx = nvg__maxf(iter.nextx, q.x1) * invscale;
-		npos++;
-		if (npos >= maxPositions)
-			break;
-	}
-
-	return npos;
-}
-
-enum NVGcodepointType {
-	NVG_SPACE,
-	NVG_NEWLINE,
-	NVG_CHAR,
-	NVG_CJK_CHAR,
-};
-
-int nvgTextBreakLines(NVGcontext* ctx, const char* string, const char* end, float breakRowWidth, NVGtextRow* rows, int maxRows)
-{
-	NVGstate* state = nvg__getState(ctx);
-	float scale = nvg__getFontScale(state) * ctx->devicePxRatio;
-	float invscale = 1.0f / scale;
-	FONStextIter iter, prevIter;
-	FONSquad q;
-	int nrows = 0;
-	float rowStartX = 0;
-	float rowWidth = 0;
-	float rowMinX = 0;
-	float rowMaxX = 0;
-	const char* rowStart = NULL;
-	const char* rowEnd = NULL;
-	const char* wordStart = NULL;
-	float wordStartX = 0;
-	float wordMinX = 0;
-	const char* breakEnd = NULL;
-	float breakWidth = 0;
-	float breakMaxX = 0;
-	int type = NVG_SPACE, ptype = NVG_SPACE;
-	unsigned int pcodepoint = 0;
-
-	if (maxRows == 0) return 0;
-	if (state->fontId == FONS_INVALID) return 0;
-
-	if (end == NULL)
-		end = string + strlen(string);
-
-	if (string == end) return 0;
-
-	fonsSetSize(ctx->fs, state->fontSize*scale);
-	fonsSetSpacing(ctx->fs, state->letterSpacing*scale);
-	fonsSetBlur(ctx->fs, state->fontBlur*scale);
-	fonsSetAlign(ctx->fs, state->textAlign);
-	fonsSetFont(ctx->fs, state->fontId);
-
-	breakRowWidth *= scale;
-
-	fonsTextIterInit(ctx->fs, &iter, 0, 0, string, end, FONS_GLYPH_BITMAP_OPTIONAL);
-	prevIter = iter;
-	while (fonsTextIterNext(ctx->fs, &iter, &q)) {
-		if (iter.prevGlyphIndex < 0 && nvg__allocTextAtlas(ctx)) { // can not retrieve glyph?
-			iter = prevIter;
-			fonsTextIterNext(ctx->fs, &iter, &q); // try again
-		}
-		prevIter = iter;
-		switch (iter.codepoint) {
-			case 9:			// \t
-			case 11:		// \v
-			case 12:		// \f
-			case 32:		// space
-			case 0x00a0:	// NBSP
-				type = NVG_SPACE;
-				break;
-			case 10:		// \n
-				type = pcodepoint == 13 ? NVG_SPACE : NVG_NEWLINE;
-				break;
-			case 13:		// \r
-				type = pcodepoint == 10 ? NVG_SPACE : NVG_NEWLINE;
-				break;
-			case 0x0085:	// NEL
-				type = NVG_NEWLINE;
-				break;
-			default:
-				if ((iter.codepoint >= 0x4E00 && iter.codepoint <= 0x9FFF) ||
-					(iter.codepoint >= 0x3000 && iter.codepoint <= 0x30FF) ||
-					(iter.codepoint >= 0xFF00 && iter.codepoint <= 0xFFEF) ||
-					(iter.codepoint >= 0x1100 && iter.codepoint <= 0x11FF) ||
-					(iter.codepoint >= 0x3130 && iter.codepoint <= 0x318F) ||
-					(iter.codepoint >= 0xAC00 && iter.codepoint <= 0xD7AF))
-					type = NVG_CJK_CHAR;
-				else
-					type = NVG_CHAR;
-				break;
-		}
-
-		if (type == NVG_NEWLINE) {
-			// Always handle new lines.
-			rows[nrows].start = rowStart != NULL ? rowStart : iter.str;
-			rows[nrows].end = rowEnd != NULL ? rowEnd : iter.str;
-			rows[nrows].width = rowWidth * invscale;
-			rows[nrows].minx = rowMinX * invscale;
-			rows[nrows].maxx = rowMaxX * invscale;
-			rows[nrows].next = iter.next;
-			nrows++;
-			if (nrows >= maxRows)
-				return nrows;
-			// Set null break point
-			breakEnd = rowStart;
-			breakWidth = 0.0;
-			breakMaxX = 0.0;
-			// Indicate to skip the white space at the beginning of the row.
-			rowStart = NULL;
-			rowEnd = NULL;
-			rowWidth = 0;
-			rowMinX = rowMaxX = 0;
-		} else {
-			if (rowStart == NULL) {
-				// Skip white space until the beginning of the line
-				if (type == NVG_CHAR || type == NVG_CJK_CHAR) {
-					// The current char is the row so far
-					rowStartX = iter.x;
-					rowStart = iter.str;
-					rowEnd = iter.next;
-					rowWidth = iter.nextx - rowStartX; // q.x1 - rowStartX;
-					rowMinX = q.x0 - rowStartX;
-					rowMaxX = q.x1 - rowStartX;
-					wordStart = iter.str;
-					wordStartX = iter.x;
-					wordMinX = q.x0 - rowStartX;
-					// Set null break point
-					breakEnd = rowStart;
-					breakWidth = 0.0;
-					breakMaxX = 0.0;
-				}
-			} else {
-				float nextWidth = iter.nextx - rowStartX;
-
-				// track last non-white space character
-				if (type == NVG_CHAR || type == NVG_CJK_CHAR) {
-					rowEnd = iter.next;
-					rowWidth = iter.nextx - rowStartX;
-					rowMaxX = q.x1 - rowStartX;
-				}
-				// track last end of a word
-				if (((ptype == NVG_CHAR || ptype == NVG_CJK_CHAR) && type == NVG_SPACE) || type == NVG_CJK_CHAR) {
-					breakEnd = iter.str;
-					breakWidth = rowWidth;
-					breakMaxX = rowMaxX;
-				}
-				// track last beginning of a word
-				if ((ptype == NVG_SPACE && (type == NVG_CHAR || type == NVG_CJK_CHAR)) || type == NVG_CJK_CHAR) {
-					wordStart = iter.str;
-					wordStartX = iter.x;
-					wordMinX = q.x0 - rowStartX;
-				}
-
-				// Break to new line when a character is beyond break width.
-				if ((type == NVG_CHAR || type == NVG_CJK_CHAR) && nextWidth > breakRowWidth) {
-					// The run length is too long, need to break to new line.
-					if (breakEnd == rowStart) {
-						// The current word is longer than the row length, just break it from here.
-						rows[nrows].start = rowStart;
-						rows[nrows].end = iter.str;
-						rows[nrows].width = rowWidth * invscale;
-						rows[nrows].minx = rowMinX * invscale;
-						rows[nrows].maxx = rowMaxX * invscale;
-						rows[nrows].next = iter.str;
-						nrows++;
-						if (nrows >= maxRows)
-							return nrows;
-						rowStartX = iter.x;
-						rowStart = iter.str;
-						rowEnd = iter.next;
-						rowWidth = iter.nextx - rowStartX;
-						rowMinX = q.x0 - rowStartX;
-						rowMaxX = q.x1 - rowStartX;
-						wordStart = iter.str;
-						wordStartX = iter.x;
-						wordMinX = q.x0 - rowStartX;
-					} else {
-						// Break the line from the end of the last word, and start new line from the beginning of the new.
-						rows[nrows].start = rowStart;
-						rows[nrows].end = breakEnd;
-						rows[nrows].width = breakWidth * invscale;
-						rows[nrows].minx = rowMinX * invscale;
-						rows[nrows].maxx = breakMaxX * invscale;
-						rows[nrows].next = wordStart;
-						nrows++;
-						if (nrows >= maxRows)
-							return nrows;
-						rowStartX = wordStartX;
-						rowStart = wordStart;
-						rowEnd = iter.next;
-						rowWidth = iter.nextx - rowStartX;
-						rowMinX = wordMinX;
-						rowMaxX = q.x1 - rowStartX;
-						// No change to the word start
-					}
-					// Set null break point
-					breakEnd = rowStart;
-					breakWidth = 0.0;
-					breakMaxX = 0.0;
-				}
-			}
-		}
-
-		pcodepoint = iter.codepoint;
-		ptype = type;
-	}
-
-	// Break the line from the end of the last word, and start new line from the beginning of the new.
-	if (rowStart != NULL) {
-		rows[nrows].start = rowStart;
-		rows[nrows].end = rowEnd;
-		rows[nrows].width = rowWidth * invscale;
-		rows[nrows].minx = rowMinX * invscale;
-		rows[nrows].maxx = rowMaxX * invscale;
-		rows[nrows].next = end;
-		nrows++;
-	}
-
-	return nrows;
-}
-
-float nvgTextBounds(NVGcontext* ctx, float x, float y, const char* string, const char* end, float* bounds)
-{
-	NVGstate* state = nvg__getState(ctx);
-	float scale = nvg__getFontScale(state) * ctx->devicePxRatio;
-	float invscale = 1.0f / scale;
-	float width;
-
-	if (state->fontId == FONS_INVALID) return 0;
-
-	fonsSetSize(ctx->fs, state->fontSize*scale);
-	fonsSetSpacing(ctx->fs, state->letterSpacing*scale);
-	fonsSetBlur(ctx->fs, state->fontBlur*scale);
-	fonsSetAlign(ctx->fs, state->textAlign);
-	fonsSetFont(ctx->fs, state->fontId);
-
-	width = fonsTextBounds(ctx->fs, x*scale, y*scale, string, end, bounds);
-	if (bounds != NULL) {
-		// Use line bounds for height.
-		fonsLineBounds(ctx->fs, y*scale, &bounds[1], &bounds[3]);
-		bounds[0] *= invscale;
-		bounds[1] *= invscale;
-		bounds[2] *= invscale;
-		bounds[3] *= invscale;
-	}
-	return width * invscale;
-}
-
-void nvgTextBoxBounds(NVGcontext* ctx, float x, float y, float breakRowWidth, const char* string, const char* end, float* bounds)
-{
-	NVGstate* state = nvg__getState(ctx);
-	NVGtextRow rows[2];
-	float scale = nvg__getFontScale(state) * ctx->devicePxRatio;
-	float invscale = 1.0f / scale;
-	int nrows = 0, i;
-	int oldAlign = state->textAlign;
-	int haling = state->textAlign & (NVG_ALIGN_LEFT | NVG_ALIGN_CENTER | NVG_ALIGN_RIGHT);
-	int valign = state->textAlign & (NVG_ALIGN_TOP | NVG_ALIGN_MIDDLE | NVG_ALIGN_BOTTOM | NVG_ALIGN_BASELINE);
-	float lineh = 0, rminy = 0, rmaxy = 0;
-	float minx, miny, maxx, maxy;
-
-	if (state->fontId == FONS_INVALID) {
-		if (bounds != NULL)
-			bounds[0] = bounds[1] = bounds[2] = bounds[3] = 0.0f;
-		return;
-	}
-
-	nvgTextMetrics(ctx, NULL, NULL, &lineh);
-
-	state->textAlign = NVG_ALIGN_LEFT | valign;
-
-	minx = maxx = x;
-	miny = maxy = y;
-
-	fonsSetSize(ctx->fs, state->fontSize*scale);
-	fonsSetSpacing(ctx->fs, state->letterSpacing*scale);
-	fonsSetBlur(ctx->fs, state->fontBlur*scale);
-	fonsSetAlign(ctx->fs, state->textAlign);
-	fonsSetFont(ctx->fs, state->fontId);
-	fonsLineBounds(ctx->fs, 0, &rminy, &rmaxy);
-	rminy *= invscale;
-	rmaxy *= invscale;
-
-	while ((nrows = nvgTextBreakLines(ctx, string, end, breakRowWidth, rows, 2))) {
-		for (i = 0; i < nrows; i++) {
-			NVGtextRow* row = &rows[i];
-			float rminx, rmaxx, dx = 0;
-			// Horizontal bounds
-			if (haling & NVG_ALIGN_LEFT)
-				dx = 0;
-			else if (haling & NVG_ALIGN_CENTER)
-				dx = breakRowWidth*0.5f - row->width*0.5f;
-			else if (haling & NVG_ALIGN_RIGHT)
-				dx = breakRowWidth - row->width;
-			rminx = x + row->minx + dx;
-			rmaxx = x + row->maxx + dx;
-			minx = nvg__minf(minx, rminx);
-			maxx = nvg__maxf(maxx, rmaxx);
-			// Vertical bounds.
-			miny = nvg__minf(miny, y + rminy);
-			maxy = nvg__maxf(maxy, y + rmaxy);
-
-			y += lineh * state->lineHeight;
-		}
-		string = rows[nrows-1].next;
-	}
-
-	state->textAlign = oldAlign;
-
-	if (bounds != NULL) {
-		bounds[0] = minx;
-		bounds[1] = miny;
-		bounds[2] = maxx;
-		bounds[3] = maxy;
-	}
-}
-
-void nvgTextMetrics(NVGcontext* ctx, float* ascender, float* descender, float* lineh)
-{
-	NVGstate* state = nvg__getState(ctx);
-	float scale = nvg__getFontScale(state) * ctx->devicePxRatio;
-	float invscale = 1.0f / scale;
-
-	if (state->fontId == FONS_INVALID) return;
-
-	fonsSetSize(ctx->fs, state->fontSize*scale);
-	fonsSetSpacing(ctx->fs, state->letterSpacing*scale);
-	fonsSetBlur(ctx->fs, state->fontBlur*scale);
-	fonsSetAlign(ctx->fs, state->textAlign);
-	fonsSetFont(ctx->fs, state->fontId);
-
-	fonsVertMetrics(ctx->fs, ascender, descender, lineh);
-	if (ascender != NULL)
-		*ascender *= invscale;
-	if (descender != NULL)
-		*descender *= invscale;
-	if (lineh != NULL)
-		*lineh *= invscale;
-}
-// vim: ft=c nu noet ts=4
diff --git a/Source/sys-clk/manager/lib/borealis/library/lib/header.cpp b/Source/sys-clk/manager/lib/borealis/library/lib/header.cpp
deleted file mode 100644
index d578eea8..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/lib/header.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
-    Borealis, a Nintendo Switch UI Library
-    Copyright (C) 2019  natinusala
-    Copyright (C) 2019  p-sam
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include <borealis/application.hpp>
-#include <borealis/header.hpp>
-
-namespace brls
-{
-
-Header::Header(std::string label, bool separator, std::string sublabel)
-    : label(label)
-    , sublabel(sublabel)
-    , separator(separator)
-{
-    Style* style = Application::getStyle();
-    this->setHeight(style->Header.height);
-}
-
-void Header::draw(NVGcontext* vg, int x, int y, unsigned width, unsigned height, Style* style, FrameContext* ctx)
-{
-    unsigned padding = style->Header.padding;
-
-    // Rectangle
-    nvgBeginPath(vg);
-    nvgFillColor(vg, a(ctx->theme->headerRectangleColor));
-    nvgRect(vg, x, y + padding, style->Header.rectangleWidth, height - padding * 2);
-    nvgFill(vg);
-
-    // Label
-    nvgBeginPath(vg);
-    nvgFontFaceId(vg, ctx->fontStash->regular);
-    nvgFontSize(vg, style->Header.fontSize);
-    nvgFillColor(vg, a(ctx->theme->textColor));
-    nvgTextAlign(vg, NVG_ALIGN_LEFT | NVG_ALIGN_MIDDLE);
-    nvgText(vg, x + style->Header.rectangleWidth + padding, y + height / 2, this->label.c_str(), nullptr);
-
-    // Sublabel
-    if (this->sublabel != "")
-    {
-        nvgBeginPath(vg);
-        nvgFontFaceId(vg, ctx->fontStash->regular);
-        nvgFontSize(vg, style->Header.fontSize);
-        nvgFillColor(vg, a(ctx->theme->descriptionColor));
-        nvgTextAlign(vg, NVG_ALIGN_RIGHT | NVG_ALIGN_MIDDLE);
-        nvgText(vg, x + width - style->Header.rectangleWidth - padding, y + height / 2, this->sublabel.c_str(), nullptr);
-    }
-
-    // Separator
-    if (this->separator)
-    {
-        nvgBeginPath(vg);
-        nvgFillColor(vg, a(ctx->theme->listItemSeparatorColor));
-        nvgRect(vg, x, y + height, width, 1);
-        nvgFill(vg);
-    }
-}
-
-} // namespace brls
diff --git a/Source/sys-clk/manager/lib/borealis/library/lib/hint.cpp b/Source/sys-clk/manager/lib/borealis/library/lib/hint.cpp
deleted file mode 100644
index 784bb28c..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/lib/hint.cpp
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
-    Borealis, a Nintendo Switch UI Library
-    Copyright (C) 2020  WerWolv
-    Copyright (C) 2020  natinusala
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include <borealis/actions.hpp>
-#include <borealis/application.hpp>
-#include <borealis/hint.hpp>
-#include <borealis/label.hpp>
-#include <set>
-
-namespace brls
-{
-
-Hint::Hint(bool animate)
-    : BoxLayout(BoxLayoutOrientation::HORIZONTAL)
-    , animate(animate)
-{
-    Style* style = Application::getStyle();
-
-    this->setGravity(BoxLayoutGravity::RIGHT);
-    this->setHeight(style->AppletFrame.footerHeight);
-    this->setSpacing(style->AppletFrame.footerTextSpacing);
-
-    // Subscribe to all events
-    this->globalFocusEventSubscriptor = Application::getGlobalFocusChangeEvent()->subscribe([this](View* newFocus) {
-        this->rebuildHints();
-    });
-
-    this->globalHintsUpdateEventSubscriptor = Application::getGlobalHintsUpdateEvent()->subscribe([this]() {
-        this->rebuildHints();
-    });
-}
-
-bool actionsSortFunc(Action a, Action b)
-{
-    // From left to right:
-    //  - first +
-    //  - then all hints that are not B and A
-    //  - finally B and A
-
-    // + is before all others
-    if (a.key == Key::PLUS)
-        return true;
-
-    // A is after all others
-    if (b.key == Key::A)
-        return true;
-
-    // B is after all others but A
-    if (b.key == Key::B && a.key != Key::A)
-        return true;
-
-    // Keep original order for the rest
-    return false;
-}
-
-void Hint::rebuildHints()
-{
-    // Check if the focused element is still a child of the same parent as the hint view's
-    {
-        View* focusParent    = Application::getCurrentFocus();
-        View* hintBaseParent = this;
-
-        while (focusParent != nullptr)
-        {
-            if (focusParent->getParent() == nullptr)
-                break;
-            focusParent = focusParent->getParent();
-        }
-
-        while (hintBaseParent != nullptr)
-        {
-            if (hintBaseParent->getParent() == nullptr)
-                break;
-            hintBaseParent = hintBaseParent->getParent();
-        }
-
-        if (focusParent != hintBaseParent)
-            return;
-    }
-
-    // Empty the layout and re-populate it with new Labels
-    this->clear(true);
-
-    std::set<Key> addedKeys; // we only ever want one action per key
-    View* focusParent = Application::getCurrentFocus();
-
-    // Iterate over the view tree to find all the actions to display
-    std::vector<Action> actions;
-
-    while (focusParent != nullptr)
-    {
-        for (auto& action : focusParent->getActions())
-        {
-            if (action.hidden)
-                continue;
-
-            if (addedKeys.find(action.key) != addedKeys.end())
-                continue;
-
-            addedKeys.insert(action.key);
-            actions.push_back(action);
-        }
-
-        focusParent = focusParent->getParent();
-    }
-
-    // Sort the actions
-    std::stable_sort(actions.begin(), actions.end(), actionsSortFunc);
-
-    // Populate the layout with labels
-    for (Action action : actions)
-    {
-        std::string hintText = Hint::getKeyIcon(action.key) + "  " + action.hintText;
-
-        Label* label = new Label(LabelStyle::HINT, hintText);
-        this->addView(label);
-    }
-}
-
-Hint::~Hint()
-{
-    // Unregister all events
-    Application::getGlobalFocusChangeEvent()->unsubscribe(this->globalFocusEventSubscriptor);
-    Application::getGlobalHintsUpdateEvent()->unsubscribe(this->globalHintsUpdateEventSubscriptor);
-}
-
-std::string Hint::getKeyIcon(Key key)
-{
-    switch (key)
-    {
-        case Key::A:
-            return "\uE0E0";
-        case Key::B:
-            return "\uE0E1";
-        case Key::X:
-            return "\uE0E2";
-        case Key::Y:
-            return "\uE0E3";
-        case Key::LSTICK:
-            return "\uE104";
-        case Key::RSTICK:
-            return "\uE105";
-        case Key::L:
-            return "\uE0E4";
-        case Key::R:
-            return "\uE0E5";
-        case Key::PLUS:
-            return "\uE0EF";
-        case Key::MINUS:
-            return "\uE0F0";
-        case Key::DLEFT:
-            return "\uE0ED";
-        case Key::DUP:
-            return "\uE0EB";
-        case Key::DRIGHT:
-            return "\uE0EF";
-        case Key::DDOWN:
-            return "\uE0EC";
-        default:
-            return "\uE152";
-    }
-}
-
-void Hint::willAppear(bool resetState)
-{
-    // Push ourself to hide other hints
-    // We assume that we are the top-most hint
-    Hint::pushHint(this);
-}
-
-void Hint::willDisappear(bool resetState)
-{
-    // Pop ourself to show other hints
-    Hint::popHint(this);
-}
-
-void Hint::pushHint(Hint* hint)
-{
-    // If the hint is already in the stack, remove it and put it back on top
-    Hint::globalHintStack.erase(std::remove(Hint::globalHintStack.begin(), Hint::globalHintStack.end(), hint), Hint::globalHintStack.end());
-    Hint::globalHintStack.push_back(hint);
-
-    //Trigger animation
-    Hint::animateHints();
-}
-
-void Hint::popHint(Hint* hint)
-{
-    Hint::globalHintStack.erase(std::remove(Hint::globalHintStack.begin(), Hint::globalHintStack.end(), hint), Hint::globalHintStack.end());
-    Hint::animateHints();
-
-    // animateHints() won't call hide() on the hint since it's been removed from the stack
-    // but it doesn't matter since it is getting destroyed anyay
-}
-
-void Hint::animateHints()
-{
-    for (size_t i = 0; i < Hint::globalHintStack.size(); i++)
-    {
-        // Last one = top one: show
-        if (i == Hint::globalHintStack.size() - 1)
-            Hint::globalHintStack[i]->show([]() {}, false);
-        else
-            Hint::globalHintStack[i]->hide([]() {}, false);
-    }
-}
-
-} // namespace brls
diff --git a/Source/sys-clk/manager/lib/borealis/library/lib/image.cpp b/Source/sys-clk/manager/lib/borealis/library/lib/image.cpp
deleted file mode 100644
index e461a2ec..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/lib/image.cpp
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
-    Borealis, a Nintendo Switch UI Library
-    Copyright (C) 2019  WerWolv
-    Copyright (C) 2019  p-sam
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include <borealis/application.hpp>
-#include <borealis/image.hpp>
-#include <cstring>
-
-namespace brls
-{
-
-Image::Image(std::string imagePath)
-{
-    this->setImage(imagePath);
-    this->setOpacity(1.0F);
-}
-
-Image::Image(unsigned char* buffer, size_t bufferSize)
-{
-    this->setImage(buffer, bufferSize);
-    this->setOpacity(1.0F);
-}
-
-Image::~Image()
-{
-    if (this->imageBuffer != nullptr)
-        delete[] this->imageBuffer;
-
-    if (this->texture != -1)
-        nvgDeleteImage(Application::getNVGContext(), this->texture);
-}
-
-void Image::draw(NVGcontext* vg, int x, int y, unsigned width, unsigned height, Style* style, FrameContext* ctx)
-{
-    nvgSave(vg);
-
-    if (this->texture != -1)
-    {
-        nvgBeginPath(vg);
-        nvgRoundedRect(vg, x + this->imageX, y + this->imageY, this->imageWidth, this->imageHeight, this->cornerRadius);
-        nvgFillPaint(vg, a(this->imgPaint));
-        nvgFill(vg);
-    }
-
-    nvgRestore(vg);
-}
-
-void Image::reloadTexture()
-{
-    NVGcontext* vg = Application::getNVGContext();
-
-    if (this->texture != -1)
-        nvgDeleteImage(vg, this->texture);
-
-    if (!this->imagePath.empty())
-        this->texture = nvgCreateImage(vg, this->imagePath.c_str(), 0);
-    else if (this->imageBuffer != nullptr)
-        this->texture = nvgCreateImageMem(vg, 0, this->imageBuffer, this->imageBufferSize);
-}
-
-void Image::layout(NVGcontext* vg, Style* style, FontStash* stash)
-{
-    if (this->origViewWidth == 0 || this->origViewHeight == 0)
-    {
-        this->origViewWidth  = this->getWidth();
-        this->origViewHeight = this->getHeight();
-    }
-
-    nvgImageSize(vg, this->texture, &this->imageWidth, &this->imageHeight);
-
-    this->setWidth(this->origViewWidth);
-    this->setHeight(this->origViewHeight);
-
-    this->imageX = 0;
-    this->imageY = 0;
-
-    float viewAspectRatio  = static_cast<float>(this->getWidth()) / static_cast<float>(this->getHeight());
-    float imageAspectRatio = static_cast<float>(this->imageWidth) / static_cast<float>(this->imageHeight);
-
-    switch (imageScaleType)
-    {
-        case ImageScaleType::NO_RESIZE:
-            this->imageX = (this->origViewWidth - this->imageWidth) / 2.0F;
-            this->imageY = (this->origViewHeight - this->imageHeight) / 2.0F;
-            break;
-        case ImageScaleType::FIT:
-            if (viewAspectRatio >= imageAspectRatio)
-            {
-                this->imageHeight = this->getHeight();
-                this->imageWidth  = this->imageHeight * imageAspectRatio;
-                this->imageX      = (this->origViewWidth - this->imageWidth) / 2.0F;
-            }
-            else
-            {
-                this->imageWidth  = this->getWidth();
-                this->imageHeight = this->imageWidth * imageAspectRatio;
-                this->imageY      = (this->origViewHeight - this->imageHeight) / 2.0F;
-            }
-            break;
-        case ImageScaleType::CROP:
-            if (viewAspectRatio < imageAspectRatio)
-            {
-                this->imageHeight = this->getHeight();
-                this->imageWidth  = this->imageHeight * imageAspectRatio;
-                this->imageX      = (this->origViewWidth - this->imageWidth) / 2.0F;
-            }
-            else
-            {
-                this->imageWidth  = this->getWidth();
-                this->imageHeight = this->imageWidth * imageAspectRatio;
-                this->imageY      = (this->origViewHeight - this->imageHeight) / 2.0F;
-            }
-            break;
-        case ImageScaleType::SCALE:
-            this->imageWidth  = this->getWidth();
-            this->imageHeight = this->getHeight();
-            break;
-        case ImageScaleType::VIEW_RESIZE:
-            this->setWidth(this->imageWidth);
-            this->setHeight(this->imageHeight);
-            break;
-    }
-
-    this->imgPaint = nvgImagePattern(vg, getX() + this->imageX, getY() + this->imageY, this->imageWidth, this->imageHeight, 0, this->texture, this->alpha);
-}
-
-void Image::setImage(unsigned char* buffer, size_t bufferSize)
-{
-    if (this->imageBuffer != nullptr)
-        delete[] this->imageBuffer;
-
-    this->imagePath = "";
-
-    this->imageBuffer = new unsigned char[bufferSize];
-    std::memcpy(this->imageBuffer, buffer, bufferSize);
-    this->imageBufferSize = bufferSize;
-
-    this->reloadTexture();
-    this->invalidate();
-}
-
-void Image::setImage(std::string imagePath)
-{
-    this->imagePath = imagePath;
-
-    if (this->imageBuffer != nullptr)
-        delete[] this->imageBuffer;
-
-    this->imageBuffer = nullptr;
-
-    this->reloadTexture();
-
-    this->invalidate();
-}
-
-void Image::setOpacity(float opacity)
-{
-    this->alpha = opacity;
-    this->invalidate();
-}
-
-void Image::setScaleType(ImageScaleType imageScaleType)
-{
-    this->imageScaleType = imageScaleType;
-    this->invalidate();
-}
-
-} // namespace brls
diff --git a/Source/sys-clk/manager/lib/borealis/library/lib/label.cpp b/Source/sys-clk/manager/lib/borealis/library/lib/label.cpp
deleted file mode 100644
index 52f931c1..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/lib/label.cpp
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
-    Borealis, a Nintendo Switch UI Library
-    Copyright (C) 2019-2020  natinusala
-    Copyright (C) 2019  p-sam
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include <borealis/application.hpp>
-#include <borealis/label.hpp>
-
-namespace brls
-{
-
-Label::Label(LabelStyle labelStyle, std::string text, bool multiline)
-    : text(text)
-    , multiline(multiline)
-    , labelStyle(labelStyle)
-{
-    Style* style     = Application::getStyle();
-    this->lineHeight = style->Label.lineHeight;
-
-    switch (labelStyle)
-    {
-        case LabelStyle::REGULAR:
-            this->fontSize = style->Label.regularFontSize;
-            break;
-        case LabelStyle::MEDIUM:
-            this->fontSize = style->Label.mediumFontSize;
-            break;
-        case LabelStyle::SMALL:
-            this->fontSize = style->Label.smallFontSize;
-            break;
-        case LabelStyle::DESCRIPTION:
-            this->fontSize = style->Label.descriptionFontSize;
-            break;
-        case LabelStyle::CRASH:
-            this->fontSize = style->Label.crashFontSize;
-            break;
-        case LabelStyle::BUTTON_PLAIN_DISABLED:
-        case LabelStyle::BUTTON_PLAIN:
-        case LabelStyle::BUTTON_BORDERLESS:
-        case LabelStyle::BUTTON_DIALOG:
-            this->fontSize = style->Label.buttonFontSize;
-            break;
-        case LabelStyle::LIST_ITEM:
-            this->fontSize = style->Label.listItemFontSize;
-            break;
-        case LabelStyle::NOTIFICATION:
-            this->fontSize   = style->Label.notificationFontSize;
-            this->lineHeight = style->Label.notificationLineHeight;
-            break;
-        case LabelStyle::DIALOG:
-            this->fontSize = style->Label.dialogFontSize;
-            break;
-        case LabelStyle::HINT:
-            this->fontSize = style->Label.hintFontSize;
-    }
-}
-
-void Label::setHorizontalAlign(NVGalign align)
-{
-    this->horizontalAlign = align;
-}
-
-void Label::setVerticalAlign(NVGalign align)
-{
-    this->verticalAlign = align;
-}
-
-void Label::setFontSize(unsigned size)
-{
-    this->fontSize = size;
-
-    if (this->getParent())
-        this->getParent()->invalidate();
-}
-
-void Label::setText(std::string text)
-{
-    this->text = text;
-
-    if (this->hasParent())
-        this->getParent()->invalidate();
-}
-
-void Label::setStyle(LabelStyle style)
-{
-    this->labelStyle = style;
-}
-
-void Label::layout(NVGcontext* vg, Style* style, FontStash* stash)
-{
-    nvgSave(vg);
-    nvgReset(vg);
-
-    nvgFontSize(vg, this->fontSize);
-    nvgTextAlign(vg, this->horizontalAlign | NVG_ALIGN_TOP);
-    nvgFontFaceId(vg, this->getFont(stash));
-    nvgTextLineHeight(vg, this->lineHeight);
-
-    float bounds[4];
-
-    // Update width or height to text bounds
-    if (this->multiline)
-    {
-        nvgTextBoxBounds(vg, this->x, this->y, this->width, this->text.c_str(), nullptr, bounds);
-
-        this->height = bounds[3] - bounds[1]; // ymax - ymin
-    }
-    else
-    {
-        nvgTextBounds(vg, this->x, this->y, this->text.c_str(), nullptr, bounds);
-
-        unsigned oldWidth = this->width;
-        this->width       = bounds[2] - bounds[0]; // xmax - xmin
-
-        // offset the position to compensate the width change
-        // and keep right alignment
-        if (this->horizontalAlign == NVG_ALIGN_RIGHT)
-            this->x += oldWidth - this->width;
-    }
-
-    nvgRestore(vg);
-}
-
-void Label::draw(NVGcontext* vg, int x, int y, unsigned width, unsigned height, Style* style, FrameContext* ctx)
-{
-    nvgFillColor(vg, this->getColor(ctx->theme));
-
-    // Draw
-    nvgFontSize(vg, this->fontSize);
-    nvgFontFaceId(vg, this->getFont(ctx->fontStash));
-
-    if (this->multiline)
-    {
-        nvgTextLineHeight(vg, this->lineHeight);
-        nvgTextAlign(vg, this->horizontalAlign | NVG_ALIGN_TOP);
-        nvgBeginPath(vg);
-
-        nvgTextBox(vg, x, y, width, this->text.c_str(), nullptr);
-    }
-    else
-    {
-        nvgTextLineHeight(vg, 1.0f);
-        nvgTextAlign(vg, this->horizontalAlign | this->verticalAlign);
-        nvgBeginPath(vg);
-
-        if (this->horizontalAlign == NVG_ALIGN_RIGHT)
-            x += width;
-        else if (this->horizontalAlign == NVG_ALIGN_CENTER)
-            x += width / 2;
-
-        // TODO: Ticker
-
-        if (this->verticalAlign == NVG_ALIGN_BOTTOM)
-            nvgText(vg, x, y + height, this->text.c_str(), nullptr);
-        else
-            nvgText(vg, x, y + height / 2, this->text.c_str(), nullptr);
-    }
-}
-
-void Label::setColor(NVGcolor color)
-{
-    this->customColor    = color;
-    this->useCustomColor = true;
-}
-
-void Label::unsetColor()
-{
-    this->useCustomColor = false;
-}
-
-NVGcolor Label::getColor(ThemeValues* theme)
-{
-    // Use custom color if any
-    if (this->useCustomColor)
-        return a(this->customColor);
-
-    switch (this->labelStyle)
-    {
-        case LabelStyle::DESCRIPTION:
-            return a(theme->descriptionColor);
-        case LabelStyle::CRASH:
-            return RGB(255, 255, 255);
-        case LabelStyle::BUTTON_PLAIN:
-            return a(theme->buttonPlainEnabledTextColor);
-        case LabelStyle::BUTTON_PLAIN_DISABLED:
-            return a(theme->buttonPlainDisabledTextColor);
-        case LabelStyle::NOTIFICATION:
-            return a(theme->notificationTextColor);
-        case LabelStyle::BUTTON_DIALOG:
-            return a(theme->dialogButtonColor);
-        default:
-            return a(theme->textColor);
-    }
-}
-
-void Label::setFont(int font)
-{
-    this->customFont    = font;
-    this->useCustomFont = true;
-}
-
-void Label::unsetFont()
-{
-    this->useCustomFont = false;
-}
-
-int Label::getFont(FontStash* stash)
-{
-    if (this->useCustomFont)
-        return this->customFont;
-
-    return stash->regular;
-}
-
-} // namespace brls
diff --git a/Source/sys-clk/manager/lib/borealis/library/lib/layer_view.cpp b/Source/sys-clk/manager/lib/borealis/library/lib/layer_view.cpp
deleted file mode 100644
index f7f81fdb..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/lib/layer_view.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
-    Borealis, a Nintendo Switch UI Library
-    Copyright (C) 2019  WerWolv
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include <borealis/application.hpp>
-#include <borealis/layer_view.hpp>
-
-namespace brls
-{
-
-LayerView::LayerView()
-{
-}
-
-LayerView::~LayerView()
-{
-    for (unsigned int i = 0; i < this->layers.size(); i++)
-        delete this->layers[i];
-
-    this->layers.clear();
-}
-
-void LayerView::addLayer(View* view)
-{
-    if (view)
-    {
-        view->setParent(this);
-        this->layers.push_back(view);
-    }
-}
-
-void LayerView::changeLayer(int index, bool focus)
-{
-    if (index >= 0 && index < static_cast<int>(this->layers.size()))
-    {
-        Application::blockInputs();
-
-        if (this->selectedIndex >= 0)
-        {
-            this->layers[this->selectedIndex]->willDisappear(true);
-            this->layers[this->selectedIndex]->hide([]() {});
-        }
-
-        this->selectedIndex = index;
-        this->layers[this->selectedIndex]->willAppear(true);
-        this->layers[this->selectedIndex]->show([=]() {
-            if (focus)
-                Application::giveFocus(this->layers[this->selectedIndex]->getDefaultFocus());
-            Application::unblockInputs();
-        });
-
-        this->layers[index]->invalidate();
-    }
-
-    if (index == -1)
-    {
-        if (this->selectedIndex > 0)
-        {
-            this->layers[this->selectedIndex]->willDisappear(true);
-            this->layers[this->selectedIndex]->hide([]() {});
-        }
-
-        this->selectedIndex = index;
-    }
-}
-
-int LayerView::getLayerIndex()
-{
-    return this->selectedIndex;
-}
-
-View* LayerView::getDefaultFocus()
-{
-    if (this->selectedIndex >= 0 && this->selectedIndex < static_cast<int>(this->layers.size()))
-    {
-        View* newFocus = this->layers[this->selectedIndex]->getDefaultFocus();
-        if (newFocus)
-        {
-            return newFocus;
-        }
-    }
-
-    return nullptr;
-}
-
-void LayerView::draw(NVGcontext* vg, int x, int y, unsigned width, unsigned height, Style* style, FrameContext* ctx)
-{
-    if (this->selectedIndex >= 0 && this->selectedIndex < static_cast<int>(this->layers.size()))
-        this->layers[this->selectedIndex]->frame(ctx);
-}
-
-void LayerView::layout(NVGcontext* vg, Style* style, FontStash* stash)
-{
-    if (this->selectedIndex >= 0 && this->selectedIndex < static_cast<int>(this->layers.size()))
-    {
-        this->layers[this->selectedIndex]->setBoundaries(this->getX(), this->getY(), this->getWidth(), this->getHeight());
-        this->layers[this->selectedIndex]->invalidate();
-    }
-}
-
-void LayerView::willAppear(bool resetState)
-{
-    if (this->selectedIndex >= 0 && this->selectedIndex < static_cast<int>(this->layers.size()))
-        this->layers[this->selectedIndex]->willAppear(true);
-}
-
-void LayerView::willDisappear(bool resetState)
-{
-    if (this->selectedIndex >= 0 && this->selectedIndex < static_cast<int>(this->layers.size()))
-        this->layers[this->selectedIndex]->willDisappear(true);
-}
-
-}
diff --git a/Source/sys-clk/manager/lib/borealis/library/lib/list.cpp b/Source/sys-clk/manager/lib/borealis/library/lib/list.cpp
deleted file mode 100644
index 05a8658b..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/lib/list.cpp
+++ /dev/null
@@ -1,618 +0,0 @@
-/*
-    Borealis, a Nintendo Switch UI Library
-    Copyright (C) 2019-2020  natinusala
-    Copyright (C) 2019  p-sam
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include <math.h>
-
-#include <borealis/animations.hpp>
-#include <borealis/application.hpp>
-#include <borealis/dropdown.hpp>
-#include <borealis/header.hpp>
-#include <borealis/list.hpp>
-#include <borealis/logger.hpp>
-#include <borealis/swkbd.hpp>
-#include <borealis/table.hpp>
-
-// TODO: Scrollbar
-
-namespace brls
-{
-
-ListContentView::ListContentView(List* list, size_t defaultFocus)
-    : BoxLayout(BoxLayoutOrientation::VERTICAL, defaultFocus)
-    , list(list)
-{
-    Style* style = Application::getStyle();
-    this->setMargins(style->List.marginTopBottom, style->List.marginLeftRight, style->List.marginTopBottom, style->List.marginLeftRight);
-    this->setSpacing(style->List.spacing);
-    this->setRememberFocus(true);
-}
-
-void ListContentView::customSpacing(View* current, View* next, int* spacing)
-{
-    // Don't add spacing to the first list item
-    // if it doesn't have a description and the second one is a
-    // list item too
-    // Or if the next item is a ListItemGroupSpacing
-    if (ListItem* currentItem = dynamic_cast<ListItem*>(current))
-    {
-        if (currentItem->getReduceDescriptionSpacing())
-        {
-            if (next != nullptr)
-                *spacing /= 2;
-        }
-        else if (ListItem* nextItem = dynamic_cast<ListItem*>(next))
-        {
-            if (!currentItem->hasDescription())
-            {
-                *spacing = 2;
-
-                nextItem->setDrawTopSeparator(currentItem->isCollapsed());
-            }
-        }
-        else if (dynamic_cast<ListItemGroupSpacing*>(next))
-        {
-            *spacing = 0;
-        }
-        else if (dynamic_cast<Table*>(next))
-        {
-            *spacing /= 2;
-        }
-    }
-    // Table custom spacing
-    else if (dynamic_cast<Table*>(current))
-    {
-        *spacing /= 2;
-    }
-    // ListItemGroupSpacing custom spacing
-    else if (dynamic_cast<ListItemGroupSpacing*>(current))
-    {
-        *spacing /= 2;
-    }
-    // Header custom spacing
-    else if (dynamic_cast<Header*>(current) || dynamic_cast<Header*>(next))
-    {
-        if (dynamic_cast<Header*>(current) && dynamic_cast<ListItem*>(next))
-        {
-            *spacing = 1;
-        }
-        else if (dynamic_cast<Label*>(current) && dynamic_cast<Header*>(next))
-        {
-            // Keep default spacing
-        }
-        else
-        {
-            Style* style = Application::getStyle();
-            *spacing     = style->Header.padding;
-        }
-    }
-
-    // Call list custom spacing
-    if (this->list)
-        this->list->customSpacing(current, next, spacing);
-}
-
-ListItem::ListItem(std::string label, std::string description, std::string subLabel)
-    : label(label)
-    , subLabel(subLabel)
-{
-    Style* style = Application::getStyle();
-
-    this->setHeight(subLabel != "" ? style->List.Item.heightWithSubLabel : style->List.Item.height);
-    this->setTextSize(style->Label.listItemFontSize);
-
-    if (description != "")
-    {
-        this->descriptionView = new Label(LabelStyle::DESCRIPTION, description, true);
-        this->descriptionView->setParent(this);
-    }
-
-    this->registerAction("OK", Key::A, [this] { return this->onClick(); });
-}
-
-void ListItem::setThumbnail(Image* image)
-{
-    if (this->thumbnailView)
-        delete this->thumbnailView;
-    if (image != NULL)
-    {
-        this->thumbnailView = image;
-        this->thumbnailView->setParent(this);
-        this->invalidate();
-    }
-}
-
-void ListItem::setThumbnail(std::string imagePath)
-{
-    if (this->thumbnailView)
-        this->thumbnailView->setImage(imagePath);
-    else
-        this->thumbnailView = new Image(imagePath);
-
-    this->thumbnailView->setParent(this);
-    this->thumbnailView->setScaleType(ImageScaleType::FIT);
-    this->invalidate();
-}
-
-void ListItem::setThumbnail(unsigned char* buffer, size_t bufferSize)
-{
-    if (this->thumbnailView)
-        this->thumbnailView->setImage(buffer, bufferSize);
-    else
-        this->thumbnailView = new Image(buffer, bufferSize);
-
-    this->thumbnailView->setParent(this);
-    this->thumbnailView->setScaleType(ImageScaleType::FIT);
-    this->invalidate();
-}
-
-bool ListItem::getReduceDescriptionSpacing()
-{
-    return this->reduceDescriptionSpacing;
-}
-
-void ListItem::setReduceDescriptionSpacing(bool value)
-{
-    this->reduceDescriptionSpacing = value;
-}
-
-void ListItem::setIndented(bool indented)
-{
-    this->indented = indented;
-}
-
-void ListItem::setTextSize(unsigned textSize)
-{
-    this->textSize = textSize;
-}
-
-void ListItem::setChecked(bool checked)
-{
-    this->checked = checked;
-}
-
-bool ListItem::onClick()
-{
-    return this->clickEvent.fire(this);
-}
-
-GenericEvent* ListItem::getClickEvent()
-{
-    return &this->clickEvent;
-}
-
-void ListItem::layout(NVGcontext* vg, Style* style, FontStash* stash)
-{
-    // Description
-    if (this->descriptionView)
-    {
-        unsigned indent = style->List.Item.descriptionIndent;
-
-        if (this->indented)
-            indent += style->List.Item.indent;
-
-        this->height = style->List.Item.height;
-        this->descriptionView->setBoundaries(this->x + indent, this->y + this->height + style->List.Item.descriptionSpacing, this->width - indent * 2, 0);
-        this->descriptionView->invalidate(true); // we must call layout directly
-        this->height += this->descriptionView->getHeight() + style->List.Item.descriptionSpacing;
-    }
-
-    // Thumbnail
-    if (this->thumbnailView)
-    {
-        Style* style           = Application::getStyle();
-        unsigned thumbnailSize = height - style->List.Item.thumbnailPadding * 2;
-
-        this->thumbnailView->setBoundaries(
-            x + style->List.Item.thumbnailPadding,
-            y + style->List.Item.thumbnailPadding,
-            thumbnailSize,
-            thumbnailSize);
-        this->thumbnailView->invalidate();
-    }
-}
-
-void ListItem::getHighlightInsets(unsigned* top, unsigned* right, unsigned* bottom, unsigned* left)
-{
-    Style* style = Application::getStyle();
-    View::getHighlightInsets(top, right, bottom, left);
-
-    if (descriptionView)
-        *bottom = -(descriptionView->getHeight() + style->List.Item.descriptionSpacing);
-
-    if (indented)
-        *left = -style->List.Item.indent;
-}
-
-void ListItem::resetValueAnimation()
-{
-    this->valueAnimation = 0.0f;
-
-    menu_animation_ctx_tag tag = (uintptr_t) & this->valueAnimation;
-    menu_animation_kill_by_tag(&tag);
-}
-
-void ListItem::setValue(std::string value, bool faint, bool animate)
-{
-    this->oldValue      = this->value;
-    this->oldValueFaint = this->valueFaint;
-
-    this->value      = value;
-    this->valueFaint = faint;
-
-    this->resetValueAnimation();
-
-    if (animate && this->oldValue != "")
-    {
-        Style* style = Application::getStyle();
-
-        menu_animation_ctx_tag tag = (uintptr_t) & this->valueAnimation;
-        menu_animation_ctx_entry_t entry;
-
-        entry.cb           = [this](void* userdata) { this->resetValueAnimation(); };
-        entry.duration     = style->AnimationDuration.highlight;
-        entry.easing_enum  = EASING_IN_OUT_QUAD;
-        entry.subject      = &this->valueAnimation;
-        entry.tag          = tag;
-        entry.target_value = 1.0f;
-        entry.tick         = [](void* userdata) {};
-        entry.userdata     = nullptr;
-
-        menu_animation_push(&entry);
-    }
-}
-
-std::string ListItem::getValue()
-{
-    return this->value;
-}
-
-void ListItem::setDrawTopSeparator(bool draw)
-{
-    this->drawTopSeparator = draw;
-}
-
-View* ListItem::getDefaultFocus()
-{
-    if (this->collapseState != 1.0f)
-        return nullptr;
-
-    return this;
-}
-
-void ListItem::draw(NVGcontext* vg, int x, int y, unsigned width, unsigned height, Style* style, FrameContext* ctx)
-{
-    unsigned baseHeight = this->height;
-    bool hasSubLabel    = this->subLabel != "";
-    bool hasThumbnail   = this->thumbnailView;
-
-    unsigned leftPadding = hasThumbnail ? this->thumbnailView->getWidth() + style->List.Item.thumbnailPadding * 2 : style->List.Item.padding;
-
-    if (this->indented)
-    {
-        x += style->List.Item.indent;
-        width -= style->List.Item.indent;
-    }
-
-    // Description
-    if (this->descriptionView)
-    {
-        // Don't count description as part of list item
-        baseHeight -= this->descriptionView->getHeight() + style->List.Item.descriptionSpacing;
-        this->descriptionView->frame(ctx);
-    }
-
-    // Value
-    unsigned valueX = x + width - style->List.Item.padding;
-    unsigned valueY = y + (hasSubLabel ? baseHeight - baseHeight / 3 : baseHeight / 2);
-
-    nvgTextAlign(vg, NVG_ALIGN_RIGHT | (hasSubLabel ? NVG_ALIGN_TOP : NVG_ALIGN_MIDDLE));
-    nvgFontFaceId(vg, ctx->fontStash->regular);
-    if (this->valueAnimation != 0.0f)
-    {
-        //Old value
-        NVGcolor valueColor = a(this->oldValueFaint ? ctx->theme->listItemFaintValueColor : ctx->theme->listItemValueColor);
-        valueColor.a *= (1.0f - this->valueAnimation);
-        nvgFillColor(vg, valueColor);
-        nvgFontSize(vg, style->List.Item.valueSize * (1.0f - this->valueAnimation));
-        nvgBeginPath(vg);
-        nvgText(vg, valueX, valueY, this->oldValue.c_str(), nullptr);
-
-        //New value
-        valueColor = a(this->valueFaint ? ctx->theme->listItemFaintValueColor : ctx->theme->listItemValueColor);
-        valueColor.a *= this->valueAnimation;
-        nvgFillColor(vg, valueColor);
-        nvgFontSize(vg, style->List.Item.valueSize * this->valueAnimation);
-        nvgBeginPath(vg);
-        nvgText(vg, valueX, valueY, this->value.c_str(), nullptr);
-    }
-    else
-    {
-        nvgFillColor(vg, a(this->valueFaint ? ctx->theme->listItemFaintValueColor : ctx->theme->listItemValueColor));
-        nvgFontSize(vg, style->List.Item.valueSize);
-        nvgFontFaceId(vg, ctx->fontStash->regular);
-        nvgBeginPath(vg);
-        nvgText(vg, valueX, valueY, this->value.c_str(), nullptr);
-    }
-
-    // Checked marker
-    if (this->checked)
-    {
-        unsigned radius  = style->List.Item.selectRadius;
-        unsigned centerX = x + width - radius - style->List.Item.padding;
-        unsigned centerY = y + baseHeight / 2;
-
-        float radiusf = (float)radius;
-
-        int thickness = roundf(radiusf * 0.10f);
-
-        // Background
-        nvgFillColor(vg, a(ctx->theme->listItemValueColor));
-        nvgBeginPath(vg);
-        nvgCircle(vg, centerX, centerY, radiusf);
-        nvgFill(vg);
-
-        // Check mark
-        nvgFillColor(vg, a(ctx->theme->backgroundColorRGB));
-
-        // Long stroke
-        nvgSave(vg);
-        nvgTranslate(vg, centerX, centerY);
-        nvgRotate(vg, -NVG_PI / 4.0f);
-
-        nvgBeginPath(vg);
-        nvgRect(vg, -(radiusf * 0.55f), 0, radiusf * 1.3f, thickness);
-        nvgFill(vg);
-        nvgRestore(vg);
-
-        // Short stroke
-        nvgSave(vg);
-        nvgTranslate(vg, centerX - (radiusf * 0.65f), centerY);
-        nvgRotate(vg, NVG_PI / 4.0f);
-
-        nvgBeginPath(vg);
-        nvgRect(vg, 0, -(thickness / 2), radiusf * 0.53f, thickness);
-        nvgFill(vg);
-
-        nvgRestore(vg);
-    }
-
-    // Label
-    nvgFillColor(vg, a(ctx->theme->textColor));
-    nvgFontSize(vg, this->textSize);
-    nvgTextAlign(vg, NVG_ALIGN_LEFT | NVG_ALIGN_MIDDLE);
-    nvgFontFaceId(vg, ctx->fontStash->regular);
-    nvgBeginPath(vg);
-    nvgText(vg, x + leftPadding, y + baseHeight / (hasSubLabel ? 3 : 2), this->label.c_str(), nullptr);
-
-    // Sub Label
-    if (hasSubLabel)
-    {
-        nvgFillColor(vg, a(ctx->theme->descriptionColor));
-        nvgFontSize(vg, style->Label.descriptionFontSize);
-        nvgTextAlign(vg, NVG_ALIGN_LEFT | NVG_ALIGN_TOP);
-        nvgFontFaceId(vg, ctx->fontStash->regular);
-        nvgBeginPath(vg);
-        nvgText(vg, x + leftPadding, y + baseHeight - baseHeight / 3, this->subLabel.c_str(), nullptr);
-    }
-
-    // Thumbnail
-    if (hasThumbnail)
-        this->thumbnailView->frame(ctx);
-
-    // Separators
-    // Offset by one to be hidden by highlight
-    nvgFillColor(vg, a(ctx->theme->listItemSeparatorColor));
-
-    // Top
-    if (this->drawTopSeparator)
-    {
-        nvgBeginPath(vg);
-        nvgRect(vg, x, y - 1, width, 1);
-        nvgFill(vg);
-    }
-
-    // Bottom
-    nvgBeginPath(vg);
-    nvgRect(vg, x, y + 1 + baseHeight, width, 1);
-    nvgFill(vg);
-}
-
-bool ListItem::hasDescription()
-{
-    return this->descriptionView;
-}
-
-std::string ListItem::getLabel()
-{
-    return this->label;
-}
-
-ListItem::~ListItem()
-{
-    if (this->descriptionView)
-        delete this->descriptionView;
-
-    if (this->thumbnailView)
-        delete this->thumbnailView;
-
-    this->resetValueAnimation();
-}
-
-ToggleListItem::ToggleListItem(std::string label, bool initialValue, std::string description, std::string onValue, std::string offValue)
-    : ListItem(label, description)
-    , toggleState(initialValue)
-    , onValue(onValue)
-    , offValue(offValue)
-{
-    this->updateValue();
-}
-
-void ToggleListItem::updateValue()
-{
-    if (this->toggleState)
-        this->setValue(this->onValue, false);
-    else
-        this->setValue(this->offValue, true);
-}
-
-bool ToggleListItem::onClick()
-{
-    this->toggleState = !this->toggleState;
-    this->updateValue();
-
-    ListItem::onClick();
-    return true;
-}
-
-bool ToggleListItem::getToggleState()
-{
-    return this->toggleState;
-}
-
-InputListItem::InputListItem(std::string label, std::string initialValue, std::string helpText, std::string description, int maxInputLength)
-    : ListItem(label, description)
-    , helpText(helpText)
-    , maxInputLength(maxInputLength)
-{
-    this->setValue(initialValue, false);
-}
-
-bool InputListItem::onClick()
-{
-    Swkbd::openForText([&](std::string text) {
-        this->setValue(text, false);
-    },
-        this->helpText, "", this->maxInputLength, this->getValue());
-
-    ListItem::onClick();
-    return true;
-}
-
-IntegerInputListItem::IntegerInputListItem(std::string label, int initialValue, std::string helpText, std::string description, int maxInputLength)
-    : InputListItem(label, std::to_string(initialValue), helpText, description, maxInputLength)
-{
-}
-
-bool IntegerInputListItem::onClick()
-{
-    Swkbd::openForNumber([&](int number) {
-        this->setValue(std::to_string(number), false);
-    },
-        this->helpText, "", this->maxInputLength, this->getValue());
-
-    ListItem::onClick();
-    return true;
-}
-
-ListItemGroupSpacing::ListItemGroupSpacing(bool separator)
-    : Rectangle(nvgRGBA(0, 0, 0, 0))
-{
-    ThemeValues* theme = Application::getThemeValues();
-
-    if (separator)
-        this->setColor(theme->listItemSeparatorColor);
-}
-
-SelectListItem::SelectListItem(std::string label, std::vector<std::string> values, unsigned selectedValue)
-    : ListItem(label, "")
-    , values(values)
-    , selectedValue(selectedValue)
-{
-    this->setValue(values[selectedValue], false, false);
-
-    this->getClickEvent()->subscribe([this](View* view) {
-        ValueSelectedEvent::Callback valueCallback = [this](int result) {
-            if (result == -1)
-                return;
-
-            this->setValue(this->values[result], false, false);
-            this->selectedValue = result;
-
-            this->valueEvent.fire(result);
-        };
-        Dropdown::open(this->getLabel(), this->values, valueCallback, this->selectedValue);
-    });
-}
-
-void SelectListItem::setSelectedValue(unsigned value)
-{
-    if (value >= 0 && value < this->values.size())
-    {
-        this->selectedValue = value;
-        this->setValue(this->values[value], false, false);
-    }
-}
-
-ValueSelectedEvent* SelectListItem::getValueSelectedEvent()
-{
-    return &this->valueEvent;
-}
-
-List::List(size_t defaultFocus)
-{
-    this->layout = new ListContentView(this, defaultFocus);
-
-    this->layout->setResize(true);
-    this->layout->setParent(this);
-
-    this->setContentView(this->layout);
-}
-
-// Wrapped BoxLayout methods
-
-void List::addView(View* view, bool fill)
-{
-    this->layout->addView(view, fill);
-}
-
-void List::setMargins(unsigned top, unsigned right, unsigned bottom, unsigned left)
-{
-    this->layout->setMargins(
-        top,
-        right,
-        bottom,
-        left);
-}
-
-void List::setSpacing(unsigned spacing)
-{
-    this->layout->setSpacing(spacing);
-}
-
-unsigned List::getSpacing()
-{
-    return this->layout->getSpacing();
-}
-
-void List::setMarginBottom(unsigned bottom)
-{
-    this->layout->setMarginBottom(bottom);
-}
-
-void List::customSpacing(View* current, View* next, int* spacing)
-{
-    // Nothing to do by default
-}
-
-List::~List()
-{
-    // ScrollView already deletes the content view
-}
-
-} // namespace brls
diff --git a/Source/sys-clk/manager/lib/borealis/library/lib/logger.cpp b/Source/sys-clk/manager/lib/borealis/library/lib/logger.cpp
deleted file mode 100644
index 7c450499..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/lib/logger.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
-    Borealis, a Nintendo Switch UI Library
-    Copyright (C) 2019  natinusala
-    Copyright (C) 2019  p-sam
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include <stdarg.h>
-#include <stdio.h>
-
-#include <borealis/logger.hpp>
-
-namespace brls
-{
-
-static LogLevel g_logLevel = LogLevel::INFO;
-
-void Logger::setLogLevel(LogLevel newLogLevel)
-{
-    g_logLevel = newLogLevel;
-}
-
-void Logger::log(LogLevel logLevel, const char* prefix, const char* color, const char* format, va_list ap)
-{
-    if (g_logLevel < logLevel)
-        return;
-
-    printf("\033%s[%s]\033[0m ", color, prefix);
-    vprintf(format, ap);
-    printf("\n");
-
-#ifdef __MINGW32__
-    fflush(0);
-#endif
-}
-
-void Logger::error(const char* format, ...)
-{
-    va_list ap;
-    va_start(ap, format);
-    Logger::log(LogLevel::ERROR, "ERROR", "[0;31m", format, ap);
-    va_end(ap);
-}
-
-void Logger::info(const char* format, ...)
-{
-    va_list ap;
-    va_start(ap, format);
-    Logger::log(LogLevel::INFO, "INFO", "[0;34m", format, ap);
-    va_end(ap);
-}
-
-void Logger::debug(const char* format, ...)
-{
-    va_list ap;
-    va_start(ap, format);
-    Logger::log(LogLevel::DEBUG, "DEBUG", "[0;32m", format, ap);
-    va_end(ap);
-}
-
-} // namespace brls
diff --git a/Source/sys-clk/manager/lib/borealis/library/lib/material_icon.cpp b/Source/sys-clk/manager/lib/borealis/library/lib/material_icon.cpp
deleted file mode 100644
index d5be9e93..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/lib/material_icon.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
-    Borealis, a Nintendo Switch UI Library
-    Copyright (C) 2019  natinusala
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include <borealis/material_icon.hpp>
-
-namespace brls
-{
-
-MaterialIcon::MaterialIcon(std::string icon)
-    : icon(icon)
-{
-}
-
-void MaterialIcon::draw(NVGcontext* vg, int x, int y, unsigned width, unsigned height, Style* style, FrameContext* ctx)
-{
-    NVGcolor color = a(ctx->theme->textColor);
-
-    nvgTextLineHeight(vg, 1.0f);
-    nvgFillColor(vg, color);
-    nvgFontSize(vg, height);
-    nvgFontFaceId(vg, ctx->fontStash->material);
-    nvgTextAlign(vg, NVG_ALIGN_CENTER | NVG_ALIGN_MIDDLE);
-    nvgBeginPath(vg);
-    nvgText(vg, this->middleX, this->middleY, this->icon.c_str(), nullptr);
-}
-
-void MaterialIcon::layout(NVGcontext* vg, Style* style, FontStash* stash)
-{
-    this->middleX = this->getX() + this->getWidth() / 2;
-    this->middleY = this->getY() + this->getHeight() / 2;
-}
-
-}; // namespace brls
diff --git a/Source/sys-clk/manager/lib/borealis/library/lib/notification_manager.cpp b/Source/sys-clk/manager/lib/borealis/library/lib/notification_manager.cpp
deleted file mode 100644
index 4de1cff9..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/lib/notification_manager.cpp
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
-    Borealis, a Nintendo Switch UI Library
-    Copyright (C) 2019  natinusala
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include <borealis/application.hpp>
-#include <borealis/logger.hpp>
-#include <borealis/notification_manager.hpp>
-#include <cstring>
-
-// TODO: add a timeout duration enum for longer notifications
-
-namespace brls
-{
-
-NotificationManager::NotificationManager()
-{
-    std::memset(this->notifications, 0, sizeof(Notification*) * BRLS_NOTIFICATIONS_MAX);
-}
-
-void NotificationManager::draw(NVGcontext* vg, int x, int y, unsigned width, unsigned height, Style* style, FrameContext* ctx)
-{
-    for (size_t i = 0; i < BRLS_NOTIFICATIONS_MAX; i++)
-    {
-        if (this->notifications[i])
-        {
-            Notification* notification = this->notifications[i];
-
-            float alpha       = notification->getAlpha();
-            float translation = 0.0f;
-
-            if (alpha != 1.0f)
-            {
-                translation = (1.0f - alpha) * (float)style->Notification.slideAnimation;
-                nvgTranslate(vg, translation, 0);
-            }
-
-            this->notifications[i]->frame(ctx);
-
-            if (alpha != 1.0f)
-                nvgTranslate(vg, -translation, 0);
-        }
-    }
-}
-
-void NotificationManager::notify(std::string text)
-{
-    // Find the first available notification slot
-    bool found = false;
-    size_t i   = 0;
-    for (i = 0; i < BRLS_NOTIFICATIONS_MAX; i++)
-    {
-        if (!this->notifications[i])
-        {
-            found = true;
-            break;
-        }
-    }
-
-    if (!found)
-    {
-        brls::Logger::info("Discarding notification \"%s\"", text.c_str());
-        return;
-    }
-
-    // Create the notification
-    brls::Logger::info("Showing notification \"%s\"", text.c_str());
-
-    Notification* notification = new Notification(text);
-    notification->setParent(this);
-    notification->show([]() {});
-
-    // Timeout timer
-    menu_timer_ctx_entry_t entry;
-
-    entry.duration = Application::getStyle()->AnimationDuration.notificationTimeout;
-    entry.tick     = [](void*) {};
-    entry.userdata = nullptr;
-    entry.cb       = [this, notification, i](void* userdata) {
-        notification->hide([this, notification, i]() {
-            delete notification;
-            this->notifications[i] = nullptr;
-        });
-    };
-
-    menu_timer_start(&notification->timeoutTimer, &entry);
-
-    this->notifications[i] = notification;
-
-    // Layout the notification
-    this->layoutNotification(i);
-}
-
-void NotificationManager::layoutNotification(size_t index)
-{
-    Notification* notification = this->notifications[index];
-
-    if (!notification)
-        return;
-
-    Style* style = Application::getStyle();
-
-    // Get the position of the last notification
-    Notification* lastNotification = nullptr;
-    for (size_t i = 0; i < index; i++)
-    {
-        if (this->notifications[i])
-            lastNotification = this->notifications[i];
-    }
-
-    unsigned y = lastNotification ? (lastNotification->getY() + lastNotification->getHeight()) : 0;
-
-    // Layout the notification
-    unsigned width = style->Notification.width;
-    notification->setBoundaries(
-        this->getX() + this->getWidth() - width,
-        this->getY() + y,
-        width,
-        0 // height is dynamic
-    );
-
-    notification->invalidate(); // TODO: call layout directly to fix posting multiple notifications in one frame
-}
-
-void NotificationManager::layout(NVGcontext* vg, Style* style, FontStash* stash)
-{
-    for (size_t i = 0; i < BRLS_NOTIFICATIONS_MAX; i++)
-    {
-        if (this->notifications[i])
-            this->layoutNotification(i);
-    }
-}
-
-NotificationManager::~NotificationManager()
-{
-    for (size_t i = 0; i < BRLS_NOTIFICATIONS_MAX; i++)
-    {
-        if (this->notifications[i])
-            delete this->notifications[i];
-    }
-}
-
-Notification::Notification(std::string text)
-{
-    this->setBackground(Background::BACKDROP);
-
-    this->label = new Label(LabelStyle::NOTIFICATION, text, true);
-    label->setParent(this);
-}
-
-Notification::~Notification()
-{
-    delete this->label;
-}
-
-void Notification::draw(NVGcontext* vg, int x, int y, unsigned width, unsigned height, Style* style, FrameContext* ctx)
-{
-    this->label->frame(ctx);
-}
-
-void Notification::layout(NVGcontext* vg, Style* style, FontStash* stash)
-{
-    unsigned padding  = style->Notification.padding;
-    unsigned fontSize = style->Label.notificationFontSize;
-    float lineHeight  = style->Label.notificationLineHeight;
-
-    // Layout the label
-    this->label->setWidth(this->getWidth() - padding * 2);
-    this->label->setHeight(0); // height is dynamic
-
-    this->label->invalidate(true); // layout directly to update height
-
-    unsigned minLabelHeight = (unsigned int)(lineHeight * fontSize) + fontSize; // 2 lines
-    unsigned labelYAdvance  = padding;
-    if (this->label->getHeight() < minLabelHeight)
-    {
-        labelYAdvance += (minLabelHeight - this->label->getHeight()) / 2;
-    }
-
-    this->label->setBoundaries(
-        this->getX() + padding,
-        this->getY() + labelYAdvance,
-        this->label->getWidth(),
-        this->label->getHeight());
-
-    // Update our own height
-    this->setHeight(std::max(
-        this->label->getHeight() + padding * 2,
-        minLabelHeight + padding * 2));
-}
-
-}; // namespace brls
diff --git a/Source/sys-clk/manager/lib/borealis/library/lib/popup_frame.cpp b/Source/sys-clk/manager/lib/borealis/library/lib/popup_frame.cpp
deleted file mode 100644
index efcc9bcd..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/lib/popup_frame.cpp
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
-    Borealis, a Nintendo Switch UI Library
-    Copyright (C) 2019  natinusala
-    Copyright (C) 2019  WerWolv
-    Copyright (C) 2019  p-sam
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include <borealis/animations.hpp>
-#include <borealis/application.hpp>
-#include <borealis/logger.hpp>
-#include <borealis/popup_frame.hpp>
-
-namespace brls
-{
-
-PopupFrame::PopupFrame(std::string title, unsigned char* imageBuffer, size_t imageBufferSize, AppletFrame* contentView, std::string subTitleLeft, std::string subTitleRight)
-    : contentView(contentView)
-{
-    if (this->contentView)
-    {
-        this->contentView->setParent(this);
-        this->contentView->setHeaderStyle(HeaderStyle::POPUP);
-        this->contentView->setTitle(title);
-        this->contentView->setSubtitle(subTitleLeft, subTitleRight);
-        this->contentView->setIcon(imageBuffer, imageBufferSize);
-        this->contentView->invalidate();
-    }
-
-    contentView->setAnimateHint(true);
-    this->registerAction("Back", Key::B, [this] { return this->onCancel(); });
-}
-
-PopupFrame::PopupFrame(std::string title, std::string imagePath, AppletFrame* contentView, std::string subTitleLeft, std::string subTitleRight)
-    : contentView(contentView)
-{
-    if (this->contentView)
-    {
-        this->contentView->setParent(this);
-        this->contentView->setHeaderStyle(HeaderStyle::POPUP);
-        this->contentView->setTitle(title);
-        this->contentView->setSubtitle(subTitleLeft, subTitleRight);
-        this->contentView->setIcon(imagePath);
-        this->contentView->invalidate();
-    }
-
-    contentView->setAnimateHint(true);
-    this->registerAction("Back", Key::B, [this] { return this->onCancel(); });
-}
-
-PopupFrame::PopupFrame(std::string title, AppletFrame* contentView, std::string subTitleLeft, std::string subTitleRight)
-    : contentView(contentView)
-{
-    if (this->contentView)
-    {
-        this->contentView->setParent(this);
-        this->contentView->setHeaderStyle(HeaderStyle::POPUP);
-        this->contentView->setTitle(title);
-        this->contentView->setSubtitle(subTitleLeft, subTitleRight);
-        this->contentView->invalidate();
-    }
-
-    contentView->setAnimateHint(true);
-    this->registerAction("Back", Key::B, [this] { return this->onCancel(); });
-}
-
-void PopupFrame::draw(NVGcontext* vg, int x, int y, unsigned width, unsigned height, Style* style, FrameContext* ctx)
-{
-    // Backdrop
-    nvgFillColor(vg, a(ctx->theme->dropdownBackgroundColor));
-    nvgBeginPath(vg);
-    nvgRect(vg, 0, y, width, height);
-    nvgFill(vg);
-
-    // Background
-    nvgFillColor(vg, a(ctx->theme->backgroundColorRGB));
-    nvgBeginPath(vg);
-    nvgRect(vg, style->PopupFrame.edgePadding, y, width - style->PopupFrame.edgePadding * 2, height);
-    nvgFill(vg);
-
-    // TODO: Shadow
-
-    // Content view
-    nvgSave(vg);
-    nvgScissor(vg, style->PopupFrame.edgePadding, 0, style->PopupFrame.contentWidth, height);
-
-    this->contentView->frame(ctx);
-
-    nvgRestore(vg);
-}
-
-bool PopupFrame::onCancel()
-{
-    Application::popView();
-    return true;
-}
-
-unsigned PopupFrame::getShowAnimationDuration(ViewAnimation animation)
-{
-    return View::getShowAnimationDuration(animation) / 2;
-}
-
-void PopupFrame::layout(NVGcontext* vg, Style* style, FontStash* stash)
-{
-    this->contentView->setBoundaries(style->PopupFrame.edgePadding, 0, style->PopupFrame.contentWidth, this->getHeight());
-    this->contentView->invalidate();
-}
-
-View* PopupFrame::getDefaultFocus()
-{
-    if (this->contentView)
-        return this->contentView->getDefaultFocus();
-
-    return nullptr;
-}
-
-void PopupFrame::open(std::string title, unsigned char* imageBuffer, size_t imageBufferSize, AppletFrame* contentView, std::string subTitleLeft, std::string subTitleRight)
-{
-    PopupFrame* popupFrame = new PopupFrame(title, imageBuffer, imageBufferSize, contentView, subTitleLeft, subTitleRight);
-    Application::pushView(popupFrame);
-}
-
-void PopupFrame::open(std::string title, std::string imagePath, AppletFrame* contentView, std::string subTitleLeft, std::string subTitleRight)
-{
-    PopupFrame* popupFrame = new PopupFrame(title, imagePath, contentView, subTitleLeft, subTitleRight);
-    Application::pushView(popupFrame);
-}
-
-void PopupFrame::open(std::string title, AppletFrame* contentView, std::string subTitleLeft, std::string subTitleRight)
-{
-    PopupFrame* popupFrame = new PopupFrame(title, contentView, subTitleLeft, subTitleRight);
-    Application::pushView(popupFrame);
-}
-
-void PopupFrame::willAppear(bool resetState)
-{
-    this->contentView->willAppear(resetState);
-}
-
-void PopupFrame::willDisappear(bool resetState)
-{
-    this->contentView->willDisappear(resetState);
-}
-
-PopupFrame::~PopupFrame()
-{
-    if (this->contentView)
-        delete this->contentView;
-}
-
-} // namespace brls
diff --git a/Source/sys-clk/manager/lib/borealis/library/lib/progress_display.cpp b/Source/sys-clk/manager/lib/borealis/library/lib/progress_display.cpp
deleted file mode 100644
index 8394e4ec..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/lib/progress_display.cpp
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
-    Borealis, a Nintendo Switch UI Library
-    Copyright (C) 2019  Billy Laws
-    Copyright (C) 2019  p-sam
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include <borealis/application.hpp>
-#include <borealis/progress_display.hpp>
-
-namespace brls
-{
-
-ProgressDisplay::ProgressDisplay(ProgressDisplayFlags progressFlags)
-{
-    if (progressFlags & ProgressDisplayFlags::PERCENTAGE)
-        this->label = new Label(LabelStyle::DIALOG, "0%", false);
-    if (progressFlags & ProgressDisplayFlags::SPINNER)
-        this->spinner = new ProgressSpinner();
-}
-
-void ProgressDisplay::setProgress(int current, int max)
-{
-    if (current > max)
-        return;
-
-    this->progressPercentage = ((current * 100) / max);
-
-    if (!this->label)
-        return;
-
-    std::string labelText = std::to_string((unsigned)this->progressPercentage);
-    labelText += "%";
-    this->label->setText(labelText);
-}
-
-void ProgressDisplay::layout(NVGcontext* vg, Style* style, FontStash* stash)
-{
-    if (this->label)
-    {
-        this->label->setWidth(style->ProgressDisplay.percentageLabelWidth);
-        this->label->invalidate(true);
-        this->label->setBoundaries(
-            this->x + this->width - this->label->getWidth() / 2,
-            this->y + this->height / 2 - this->label->getHeight() / 2,
-            this->label->getWidth(),
-            this->label->getHeight());
-    }
-
-    if (this->spinner)
-    {
-        this->spinner->setWidth(this->height);
-        this->spinner->setHeight(this->height);
-        this->spinner->setBoundaries(
-            this->x,
-            this->y,
-            this->spinner->getWidth(),
-            this->spinner->getHeight());
-    }
-}
-
-void ProgressDisplay::draw(NVGcontext* vg, int x, int y, unsigned width, unsigned height, Style* style, FrameContext* ctx)
-{
-    unsigned progressBarWidth = width;
-    unsigned progressBarX     = x;
-
-    if (this->label)
-    {
-        progressBarWidth -= this->label->getWidth();
-        this->label->frame(ctx);
-    }
-
-    if (this->spinner)
-    {
-        // 1.25 accounts for the extra width of the curve on sides of progress bar
-        progressBarWidth -= this->spinner->getWidth() * 1.25f;
-        progressBarX += this->spinner->getWidth() * 1.25f;
-        this->spinner->frame(ctx);
-    }
-
-    nvgBeginPath(vg);
-    nvgMoveTo(vg, progressBarX, y + height / 2);
-    nvgLineTo(vg, progressBarX + progressBarWidth, y + height / 2);
-    nvgStrokeColor(vg, a(ctx->theme->listItemSeparatorColor));
-    nvgStrokeWidth(vg, height / 3);
-    nvgLineCap(vg, NVG_ROUND);
-    nvgStroke(vg);
-
-    if (this->progressPercentage > 0.0f)
-    {
-        nvgBeginPath(vg);
-        nvgMoveTo(vg, progressBarX, y + height / 2);
-        nvgLineTo(vg, progressBarX + ((float)progressBarWidth * this->progressPercentage) / 100, y + height / 2);
-        nvgStrokeColor(vg, a(ctx->theme->listItemValueColor));
-        nvgStrokeWidth(vg, height / 3);
-        nvgLineCap(vg, NVG_ROUND);
-        nvgStroke(vg);
-    }
-}
-
-void ProgressDisplay::willAppear(bool resetState)
-{
-    if (this->spinner)
-        this->spinner->willAppear(resetState);
-}
-
-void ProgressDisplay::willDisappear(bool resetState)
-{
-    if (this->spinner)
-        this->spinner->willDisappear(resetState);
-}
-
-ProgressDisplay::~ProgressDisplay()
-{
-    if (this->spinner)
-        delete this->spinner;
-
-    if (this->label)
-        delete this->label;
-}
-
-} // namespace brls
diff --git a/Source/sys-clk/manager/lib/borealis/library/lib/progress_spinner.cpp b/Source/sys-clk/manager/lib/borealis/library/lib/progress_spinner.cpp
deleted file mode 100644
index b4f5a089..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/lib/progress_spinner.cpp
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
-    Borealis, a Nintendo Switch UI Library
-    Copyright (C) 2019  Billy Laws
-    Copyright (C) 2019  p-sam
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include <math.h>
-
-#include <borealis/animations.hpp>
-#include <borealis/application.hpp>
-#include <borealis/progress_spinner.hpp>
-
-namespace brls
-{
-
-ProgressSpinner::ProgressSpinner() {}
-
-void ProgressSpinner::restartAnimation()
-{
-    Style* style = Application::getStyle();
-
-    menu_animation_ctx_tag tag = (uintptr_t) & this->animationValue;
-    menu_animation_ctx_entry_t entry;
-
-    this->animationValue = 0.0f;
-
-    menu_animation_kill_by_tag(&tag);
-
-    entry.cb           = [this](void* userdata) { this->restartAnimation(); };
-    entry.duration     = style->AnimationDuration.progress;
-    entry.easing_enum  = EASING_LINEAR;
-    entry.subject      = &this->animationValue;
-    entry.tag          = tag;
-    entry.target_value = 8.0f;
-    entry.tick         = [](void* userdata) {};
-    entry.userdata     = nullptr;
-
-    menu_animation_push(&entry);
-}
-
-void ProgressSpinner::layout(NVGcontext* vg, Style* style, FontStash* stash)
-{
-    this->height = std::min(this->width, this->height);
-    this->width  = this->height;
-}
-
-void ProgressSpinner::draw(NVGcontext* vg, int x, int y, unsigned width, unsigned height, Style* style, FrameContext* ctx)
-{
-    NVGcolor barColor = a(ctx->theme->spinnerBarColor);
-
-    // Each bar of the spinner
-    for (int i = 0 + animationValue; i < 8 + animationValue; i++)
-    {
-        barColor.a = fmax((i - animationValue) / 8.0f, a(ctx->theme->spinnerBarColor).a);
-        nvgSave(vg);
-        nvgTranslate(vg, x + width / 2, y + height / 2);
-        nvgRotate(vg, nvgDegToRad(i * 45)); // Internal angle of octagon
-        nvgBeginPath(vg);
-        nvgMoveTo(vg, height * style->ProgressSpinner.centerGapMultiplier, 0);
-        nvgLineTo(vg, height / 2 - height * style->ProgressSpinner.centerGapMultiplier, 0);
-        nvgStrokeColor(vg, barColor);
-        nvgStrokeWidth(vg, height * style->ProgressSpinner.barWidthMultiplier);
-        nvgLineCap(vg, NVG_SQUARE);
-        nvgStroke(vg);
-        nvgRestore(vg);
-    }
-}
-
-void ProgressSpinner::willAppear(bool resetState)
-{
-    this->restartAnimation();
-}
-
-void ProgressSpinner::willDisappear(bool resetState)
-{
-    menu_animation_ctx_tag tag = (uintptr_t) & this->animationValue;
-
-    this->animationValue = 0.0f;
-
-    menu_animation_kill_by_tag(&tag);
-}
-
-} // namespace brls
diff --git a/Source/sys-clk/manager/lib/borealis/library/lib/rectangle.cpp b/Source/sys-clk/manager/lib/borealis/library/lib/rectangle.cpp
deleted file mode 100644
index 6b22c84e..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/lib/rectangle.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-    Borealis, a Nintendo Switch UI Library
-    Copyright (C) 2019  natinusala
-    Copyright (C) 2019  p-sam
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include <borealis/logger.hpp>
-#include <borealis/rectangle.hpp>
-
-namespace brls
-{
-
-Rectangle::Rectangle(NVGcolor color)
-{
-    this->setColor(color);
-}
-
-void Rectangle::draw(NVGcontext* vg, int x, int y, unsigned width, unsigned height, Style* style, FrameContext* ctx)
-{
-    NVGcolor color = a(this->color);
-
-    if (color.a == 0.0f)
-        return;
-
-    nvgFillColor(vg, color);
-
-    nvgBeginPath(vg);
-    nvgRect(vg, x, y, width, height);
-    nvgFill(vg);
-}
-
-void Rectangle::setColor(NVGcolor color)
-{
-    this->color = color;
-}
-
-void Rectangle::layout(NVGcontext* vg, Style* style, FontStash* stash)
-{
-    // Nothing to do
-}
-
-} // namespace brls
diff --git a/Source/sys-clk/manager/lib/borealis/library/lib/repeating_task.cpp b/Source/sys-clk/manager/lib/borealis/library/lib/repeating_task.cpp
deleted file mode 100644
index 5024ea3e..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/lib/repeating_task.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
-    Borealis, a Nintendo Switch UI Library
-    Copyright (C) 2019  natinusala
-    Copyright (C) 2019  p-sam
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include <borealis/application.hpp>
-#include <borealis/repeating_task.hpp>
-
-namespace brls
-{
-
-RepeatingTask::RepeatingTask(retro_time_t interval)
-    : interval(interval)
-{
-    Application::getTaskManager()->registerRepeatingTask(this);
-}
-
-void RepeatingTask::run(retro_time_t currentTime)
-{
-    this->lastRun = currentTime;
-}
-
-void RepeatingTask::start()
-{
-    this->onStart();
-    this->running = true;
-}
-
-void RepeatingTask::pause()
-{
-    this->running = false;
-}
-
-void RepeatingTask::stop()
-{
-    this->pause();
-    this->stopRequested = true;
-}
-
-void RepeatingTask::fireNow()
-{
-    if (!this->isRunning())
-        return;
-
-    retro_time_t currentTime = cpu_features_get_time_usec() / 1000;
-    this->run(currentTime);
-}
-
-retro_time_t RepeatingTask::getInterval()
-{
-    return this->interval;
-}
-
-retro_time_t RepeatingTask::getLastRun()
-{
-    return this->lastRun;
-}
-
-bool RepeatingTask::isRunning()
-{
-    return this->running;
-}
-
-bool RepeatingTask::isStopRequested()
-{
-    return this->stopRequested;
-}
-
-RepeatingTask::~RepeatingTask()
-{
-    // Nothing to do here, only the Task Manager is supposed to free tasks
-}
-
-} // namespace brls
diff --git a/Source/sys-clk/manager/lib/borealis/library/lib/scroll_view.cpp b/Source/sys-clk/manager/lib/borealis/library/lib/scroll_view.cpp
deleted file mode 100644
index 06a0e973..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/lib/scroll_view.cpp
+++ /dev/null
@@ -1,236 +0,0 @@
-/*
-    Borealis, a Nintendo Switch UI Library
-    Copyright (C) 2020  natinusala
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include <math.h>
-
-#include <borealis/application.hpp>
-#include <borealis/scroll_view.hpp>
-
-namespace brls
-{
-
-void ScrollView::draw(NVGcontext* vg, int x, int y, unsigned width, unsigned height, Style* style, FrameContext* ctx)
-{
-    if (!this->contentView)
-        return;
-
-    // Update scrolling if needed - try until it works
-    if (this->updateScrollingOnNextFrame && this->updateScrolling(false))
-        this->updateScrollingOnNextFrame = false;
-
-    // Enable scissoring
-    nvgSave(vg);
-    nvgScissor(vg, x, y, this->width, this->height);
-
-    // Draw content view
-    this->contentView->frame(ctx);
-
-    //Disable scissoring
-    nvgRestore(vg);
-}
-
-unsigned ScrollView::getYCenter(View* view)
-{
-    return view->getY() + view->getHeight() / 2;
-}
-
-void ScrollView::layout(NVGcontext* vg, Style* style, FontStash* stash)
-{
-    this->prebakeScrolling();
-
-    // Update scrolling if needed
-    if (this->updateScrollingOnNextLayout)
-    {
-        this->updateScrollingOnNextLayout = false;
-        this->updateScrolling(false);
-    }
-
-    // Layout content view
-    if (this->contentView)
-    {
-        unsigned contentHeight = this->contentView->getHeight();
-        this->contentView->setBoundaries(
-            this->getX(),
-            this->getY() - roundf(this->scrollY * (float)contentHeight),
-            this->getWidth(),
-            contentHeight);
-        this->contentView->invalidate();
-    }
-
-    this->ready = true;
-}
-
-void ScrollView::willAppear(bool resetState)
-{
-    this->prebakeScrolling();
-
-    // First scroll all the way to the top
-    // then wait for the first frame to scroll
-    // to the selected view if needed (only known then)
-    if (resetState)
-    {
-        this->startScrolling(false, 0.0f);
-        this->updateScrollingOnNextFrame = true; // focus may have changed since
-    }
-
-    if (this->contentView)
-        this->contentView->willAppear(resetState);
-}
-
-void ScrollView::willDisappear(bool resetState)
-{
-    // Send event to content view
-    if (this->contentView)
-        this->contentView->willDisappear(resetState);
-}
-
-View* ScrollView::getDefaultFocus()
-{
-    return this->contentView;
-}
-
-void ScrollView::setContentView(View* view)
-{
-    this->contentView = view;
-
-    if (this->contentView)
-    {
-        this->contentView->setParent(this);
-        this->contentView->willAppear(true);
-    }
-
-    this->invalidate();
-}
-
-View* ScrollView::getContentView()
-{
-    return this->contentView;
-}
-
-void ScrollView::prebakeScrolling()
-{
-    // Prebaked values for scrolling
-    this->middleY = this->y + this->height / 2;
-    this->bottomY = this->y + this->height;
-}
-
-bool ScrollView::updateScrolling(bool animated)
-{
-    // Don't scroll if layout hasn't been called yet
-    if (!this->ready || !this->contentView)
-        return false;
-
-    float contentHeight = (float)this->contentView->getHeight();
-
-    // Ensure content is laid out too
-    if (contentHeight == 0)
-        return false;
-
-    View* focusedView                  = Application::getCurrentFocus();
-    int currentSelectionMiddleOnScreen = focusedView->getY() + focusedView->getHeight() / 2;
-    float newScroll                    = -(this->scrollY * contentHeight) - ((float)currentSelectionMiddleOnScreen - (float)this->middleY);
-
-    // Bottom boundary
-    if ((float)this->y + newScroll + contentHeight < (float)this->bottomY)
-        newScroll = (float)this->height - contentHeight;
-
-    // Top boundary
-    if (newScroll > 0.0f)
-        newScroll = 0.0f;
-
-    // Apply 0.0f -> 1.0f scale
-    newScroll = abs(newScroll) / contentHeight;
-
-    //Start animation
-    this->startScrolling(animated, newScroll);
-
-    return true;
-}
-
-void ScrollView::startScrolling(bool animated, float newScroll)
-{
-    if (newScroll == this->scrollY)
-        return;
-
-    menu_animation_ctx_tag tag = (uintptr_t) & this->scrollY;
-    menu_animation_kill_by_tag(&tag);
-
-    if (animated)
-    {
-        Style* style = Application::getStyle();
-
-        menu_animation_ctx_entry_t entry;
-        entry.cb           = [](void* userdata) {};
-        entry.duration     = style->AnimationDuration.highlight;
-        entry.easing_enum  = EASING_OUT_QUAD;
-        entry.subject      = &this->scrollY;
-        entry.tag          = tag;
-        entry.target_value = newScroll;
-        entry.tick         = [this](void* userdata) { this->scrollAnimationTick(); };
-        entry.userdata     = nullptr;
-
-        menu_animation_push(&entry);
-    }
-    else
-    {
-        this->scrollY = newScroll;
-    }
-
-    this->invalidate(!animated); // layout immediately if not animated
-}
-
-void ScrollView::scrollAnimationTick()
-{
-    this->invalidate();
-}
-
-void ScrollView::onChildFocusGained(View* child)
-{
-    // layout hasn't been called yet, don't scroll
-    if (!this->ready)
-        return;
-
-    // Safety check to ensure that we don't have
-    // two children (setContentView called twice)
-    if (child != this->contentView)
-        return;
-
-    // Start scrolling
-    this->updateScrolling(true);
-
-    View::onChildFocusGained(child);
-}
-
-void ScrollView::onWindowSizeChanged()
-{
-    this->updateScrollingOnNextLayout = true;
-
-    if (this->contentView)
-        this->contentView->onWindowSizeChanged();
-}
-
-ScrollView::~ScrollView()
-{
-    if (this->contentView)
-    {
-        this->contentView->willDisappear(true);
-        delete this->contentView;
-    }
-}
-
-} // namespace brls
diff --git a/Source/sys-clk/manager/lib/borealis/library/lib/sidebar.cpp b/Source/sys-clk/manager/lib/borealis/library/lib/sidebar.cpp
deleted file mode 100644
index 06578aab..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/lib/sidebar.cpp
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
-    Borealis, a Nintendo Switch UI Library
-    Copyright (C) 2019  natinusala
-    Copyright (C) 2019  WerWolv
-    Copyright (C) 2019  p-sam
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include <borealis/application.hpp>
-#include <borealis/sidebar.hpp>
-
-namespace brls
-{
-
-Sidebar::Sidebar()
-    : BoxLayout(BoxLayoutOrientation::VERTICAL)
-{
-    Style* style = Application::getStyle();
-
-    this->setWidth(style->Sidebar.width);
-    this->setSpacing(style->Sidebar.spacing);
-    this->setMargins(style->Sidebar.marginTop, style->Sidebar.marginRight, style->Sidebar.marginBottom, style->Sidebar.marginLeft);
-    this->setBackground(Background::SIDEBAR);
-}
-
-View* Sidebar::getDefaultFocus()
-{
-    // Sanity check
-    if (this->lastFocus >= this->children.size())
-        this->lastFocus = 0;
-
-    // Try to focus last focused one
-    View* toFocus = this->children[this->lastFocus]->view->getDefaultFocus();
-    if (toFocus)
-        return toFocus;
-
-    // Otherwise just get the first available item
-    return BoxLayout::getDefaultFocus();
-}
-
-void Sidebar::onChildFocusGained(View* child)
-{
-    size_t position = *((size_t*)child->getParentUserData());
-
-    this->lastFocus = position;
-
-    BoxLayout::onChildFocusGained(child);
-}
-
-SidebarItem* Sidebar::addItem(std::string label, View* view)
-{
-    SidebarItem* item = new SidebarItem(label, this);
-    item->setAssociatedView(view);
-
-    if (this->isEmpty())
-        setActive(item);
-
-    this->addView(item);
-
-    return item;
-}
-
-void Sidebar::addSeparator()
-{
-    SidebarSeparator* separator = new SidebarSeparator();
-    this->addView(separator);
-}
-
-void Sidebar::setActive(SidebarItem* active)
-{
-    if (currentActive)
-        currentActive->setActive(false);
-
-    currentActive = active;
-    active->setActive(true);
-}
-
-SidebarItem::SidebarItem(std::string label, Sidebar* sidebar)
-    : label(label)
-    , sidebar(sidebar)
-{
-    Style* style = Application::getStyle();
-    this->setHeight(style->Sidebar.Item.height);
-
-    this->registerAction("OK", Key::A, [this] { return this->onClick(); });
-}
-
-void SidebarItem::draw(NVGcontext* vg, int x, int y, unsigned width, unsigned height, Style* style, FrameContext* ctx)
-{
-    // Label
-    nvgFillColor(vg, a(this->active ? ctx->theme->activeTabColor : ctx->theme->textColor));
-    nvgFontSize(vg, style->Sidebar.Item.textSize);
-    nvgTextAlign(vg, NVG_ALIGN_LEFT | NVG_ALIGN_MIDDLE);
-    nvgFontFaceId(vg, ctx->fontStash->regular);
-    nvgBeginPath(vg);
-    nvgText(vg, x + style->Sidebar.Item.textOffsetX + style->Sidebar.Item.padding, y + height / 2, this->label.c_str(), nullptr);
-
-    // Active marker
-    if (this->active)
-    {
-        nvgFillColor(vg, a(ctx->theme->activeTabColor));
-        nvgBeginPath(vg);
-        nvgRect(vg, x + style->Sidebar.Item.padding, y + style->Sidebar.Item.padding, style->Sidebar.Item.activeMarkerWidth, style->Sidebar.Item.height - style->Sidebar.Item.padding * 2);
-        nvgFill(vg);
-    }
-}
-
-bool SidebarItem::onClick()
-{
-    Application::onGamepadButtonPressed(GLFW_GAMEPAD_BUTTON_DPAD_RIGHT, false);
-    return true;
-}
-
-void SidebarItem::setActive(bool active)
-{
-    this->active = active;
-}
-
-SidebarSeparator::SidebarSeparator()
-{
-    Style* style = Application::getStyle();
-    this->setHeight(style->Sidebar.Separator.height);
-}
-
-void SidebarSeparator::draw(NVGcontext* vg, int x, int y, unsigned width, unsigned height, Style* style, FrameContext* ctx)
-{
-    nvgFillColor(vg, a(ctx->theme->sidebarSeparatorColor));
-    nvgBeginPath(vg);
-    nvgRect(vg, x, y + height / 2, width, 1);
-    nvgFill(vg);
-}
-
-void SidebarItem::setAssociatedView(View* view)
-{
-    this->associatedView = view;
-}
-
-bool SidebarItem::isActive()
-{
-    return this->active;
-}
-
-void SidebarItem::onFocusGained()
-{
-    this->sidebar->setActive(this);
-    View::onFocusGained();
-}
-
-View* SidebarItem::getAssociatedView()
-{
-    return this->associatedView;
-}
-
-SidebarItem::~SidebarItem()
-{
-    if (this->associatedView)
-        delete this->associatedView;
-}
-
-} // namespace brls
diff --git a/Source/sys-clk/manager/lib/borealis/library/lib/staged_applet_frame.cpp b/Source/sys-clk/manager/lib/borealis/library/lib/staged_applet_frame.cpp
deleted file mode 100644
index 05a0dea6..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/lib/staged_applet_frame.cpp
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
-    Borealis, a Nintendo Switch UI Library
-    Copyright (C) 2019  Billy Laws
-    Copyright (C) 2019  p-sam
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include <borealis/application.hpp>
-#include <borealis/logger.hpp>
-#include <borealis/staged_applet_frame.hpp>
-#include <borealis/style.hpp>
-#include <borealis/theme.hpp>
-
-namespace brls
-{
-
-StagedAppletFrame::StagedAppletFrame()
-    : AppletFrame(true, true)
-{
-}
-
-void StagedAppletFrame::addStage(View* view)
-{
-    stageViews.push_back(view);
-
-    if (!currentStage)
-        enterStage(0, false);
-}
-
-void StagedAppletFrame::nextStage()
-{
-    enterStage((int)currentStage + 1, true);
-}
-
-void StagedAppletFrame::previousStage()
-{
-    enterStage((int)currentStage - 1, true);
-}
-
-// TODO: Add animation to bullets when changing stage
-// TODO: Add left/right and right/left animations for views when changing stage (use show/hide with the animation)
-void StagedAppletFrame::enterStage(int index, bool requestFocus)
-{
-    if ((size_t)index >= stageViews.size())
-        return;
-
-    if (this->hasContentView())
-        stageViews[currentStage]->willDisappear(true);
-
-    currentStage = (size_t)index;
-
-    this->setContentView(stageViews[currentStage]); // calls willAppear
-
-    if (requestFocus)
-        Application::giveFocus(this->getDefaultFocus());
-}
-
-void StagedAppletFrame::draw(NVGcontext* vg, int x, int y, unsigned width, unsigned height, Style* style, FrameContext* ctx)
-{
-    AppletFrame::draw(vg, x, y, width, height, style, ctx);
-
-    if (stageViews.empty())
-        return;
-
-    for (size_t i = 0; i < stageViews.size(); i++)
-    {
-        bool current = (i == (stageViews.size() - 1) - currentStage);
-
-        // Border color for next stages
-        NVGcolor borderColor = ctx->theme->nextStageBulletColor;
-
-        nvgBeginPath(vg);
-        nvgCircle(vg, x + width - style->AppletFrame.separatorSpacing * (style->StagedAppletFrame.progressIndicatorSpacing + i) + style->AppletFrame.separatorSpacing + style->AppletFrame.separatorSpacing / 2,
-            y + style->AppletFrame.headerHeightRegular / 2, current ? style->StagedAppletFrame.progressIndicatorRadiusSelected : style->StagedAppletFrame.progressIndicatorRadiusUnselected);
-
-        // Current stage
-        if (current)
-        {
-            nvgFillColor(vg, a(ctx->theme->listItemValueColor));
-            nvgFill(vg);
-        }
-        // Previous stages
-        else if (i > (stageViews.size() - 1) - currentStage)
-        {
-            borderColor = ctx->theme->separatorColor;
-            nvgFillColor(vg, a(ctx->theme->textColor));
-            nvgFill(vg);
-        }
-
-        if (!current)
-        {
-            nvgStrokeColor(vg, a(borderColor));
-            nvgStrokeWidth(vg, style->StagedAppletFrame.progressIndicatorBorderWidth);
-            nvgStroke(vg);
-        }
-    }
-}
-
-unsigned StagedAppletFrame::getStagesCount()
-{
-    return this->stageViews.size();
-}
-
-unsigned StagedAppletFrame::getCurrentStage()
-{
-    return this->currentStage;
-}
-
-unsigned StagedAppletFrame::isLastStage()
-{
-    return this->currentStage == this->stageViews.size() - 1;
-}
-
-StagedAppletFrame::~StagedAppletFrame()
-{
-    for (View* view : this->stageViews)
-        delete view;
-
-    this->stageViews.clear();
-
-    this->setContentView(nullptr); // so that ~AppletFrame() doesn't free it twice
-}
-
-} // namespace brls
diff --git a/Source/sys-clk/manager/lib/borealis/library/lib/style.cpp b/Source/sys-clk/manager/lib/borealis/library/lib/style.cpp
deleted file mode 100644
index 1b412826..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/lib/style.cpp
+++ /dev/null
@@ -1,270 +0,0 @@
-/*
-    Borealis, a Nintendo Switch UI Library
-    Copyright (C) 2019  natinusala
-    Copyright (C) 2019  WerWolv
-    Copyright (C) 2019  p-sam
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include <borealis/style.hpp>
-
-namespace brls
-{
-
-Style Style::horizon()
-{
-    Style style = Style();
-
-    style.AppletFrame = {
-        .headerHeightRegular = 88,
-        .headerHeightPopup   = 129,
-        .footerHeight        = 73,
-
-        .imageLeftPadding = 64,
-        .imageTopPadding  = 20,
-        .imageSize        = 52,
-        .separatorSpacing = 30,
-
-        .titleSize   = 28,
-        .titleStart  = 130,
-        .titleOffset = 5,
-
-        .footerTextSize    = 22,
-        .footerTextSpacing = 30,
-
-        .slideAnimation = 20
-    };
-
-    style.Highlight = {
-        .strokeWidth  = 5,
-        .cornerRadius = 0.5f,
-
-        .shadowWidth   = 2,
-        .shadowOffset  = 10,
-        .shadowFeather = 10,
-        .shadowOpacity = 128
-    };
-
-    style.Background = {
-        .sidebarBorderHeight = 16
-    };
-
-    style.Sidebar = {
-        .width   = 410,
-        .spacing = 0,
-
-        .marginLeft   = 88,
-        .marginRight  = 30,
-        .marginTop    = 40,
-        .marginBottom = 40,
-
-        .Item = {
-            .height   = 70,
-            .textSize = 22,
-            .padding  = 9,
-
-            .textOffsetX       = 14,
-            .activeMarkerWidth = 4,
-        },
-
-        .Separator = { .height = 28 }
-    };
-
-    style.List = {
-        .marginLeftRight = 60,
-        .marginTopBottom = 42,
-        .spacing         = 61,
-
-        .Item = {
-            .height             = 69, // offset by 1 to have the highlight hide the separator
-            .heightWithSubLabel = 99,
-            .valueSize          = 20,
-            .padding            = 15,
-            .thumbnailPadding   = 11,
-
-            .descriptionIndent  = 20,
-            .descriptionSpacing = 16,
-
-            .indent = 40,
-
-            .selectRadius = 15 }
-    };
-
-    style.Label = {
-        .regularFontSize      = 20,
-        .mediumFontSize       = 18,
-        .smallFontSize        = 16,
-        .descriptionFontSize  = 16,
-        .crashFontSize        = 24,
-        .buttonFontSize       = 24,
-        .listItemFontSize     = 24,
-        .notificationFontSize = 18,
-        .dialogFontSize       = 24,
-        .hintFontSize         = 22,
-
-        .lineHeight             = 1.65f,
-        .notificationLineHeight = 1.35f
-    };
-
-    style.CrashFrame = {
-        .labelWidth     = 0.60f,
-        .boxStrokeWidth = 5,
-        .boxSize        = 64,
-        .boxSpacing     = 90,
-        .buttonWidth    = 356,
-        .buttonHeight   = 60,
-        .buttonSpacing  = 47
-    };
-
-    style.Button = {
-        .cornerRadius = 5.0f,
-
-        .highlightInset = 2,
-
-        .shadowWidth   = 2.0f,
-        .shadowFeather = 10.0f,
-        .shadowOpacity = 63.75f,
-        .shadowOffset  = 10.0f
-    };
-
-    style.TableRow = {
-        .headerHeight   = 60,
-        .headerTextSize = 22,
-
-        .bodyHeight   = 38,
-        .bodyIndent   = 40,
-        .bodyTextSize = 18,
-
-        .padding = 15
-    };
-
-    style.Dropdown = {
-        .listWidth   = 720,
-        .listPadding = 40,
-
-        .listItemHeight   = 60,
-        .listItemTextSize = 20,
-
-        .headerHeight   = 71,
-        .headerFontSize = 24,
-        .headerPadding  = 70
-    };
-
-    style.PopupFrame = {
-        .edgePadding      = 120,
-        .separatorSpacing = 30,
-        .footerHeight     = 73,
-        .imageLeftPadding = 60,
-        .imageTopPadding  = 17,
-        .imageSize        = 100,
-        .contentWidth     = 1040,
-        .contentHeight    = 518,
-
-        .headerTextLeftPadding = 180,
-        .headerTextTopPadding  = 64,
-
-        .subTitleLeftPadding = 182,
-        .subTitleTopPadding  = 95,
-        .subTitleSpacing     = 20,
-
-        .subTitleSeparatorLeftPadding = 280,
-        .subTitleSeparatorTopPadding  = 92,
-        .subTitleSeparatorHeight      = 20,
-
-        .headerFontSize   = 28,
-        .subTitleFontSize = 16
-    };
-
-    style.StagedAppletFrame = {
-        .progressIndicatorSpacing          = 4,
-        .progressIndicatorRadiusUnselected = 5 - 1, // minus half of border width
-        .progressIndicatorRadiusSelected   = 8,
-        .progressIndicatorBorderWidth      = 2
-    };
-
-    style.ProgressSpinner = {
-        .centerGapMultiplier = 0.2f,
-        .barWidthMultiplier  = 0.06f
-    };
-
-    style.ProgressDisplay = {
-        .percentageLabelWidth = 70
-    };
-
-    style.Header = {
-        .height  = 44,
-        .padding = 11,
-
-        .rectangleWidth = 5,
-
-        .fontSize = 18
-    };
-
-    style.FramerateCounter = {
-        .width  = 125,
-        .height = 26
-    };
-
-    style.ThumbnailSidebar = {
-        .marginLeftRight = 109, // used for the image only = (410 - 192) / 2, image size is 192*192 with a 410px wide sidebar
-        .marginTopBottom = 47,
-
-        .buttonHeight = 70,
-        .buttonMargin = 60
-    };
-
-    style.AnimationDuration = {
-        .show      = 250,
-        .showSlide = 125,
-
-        .highlight = 100,
-        .shake     = 15,
-
-        .collapse = 100,
-
-        .progress = 1000,
-
-        .notificationTimeout = 4000
-    };
-
-    style.Notification = {
-        .width   = 280,
-        .padding = 16,
-
-        .slideAnimation = 40
-    };
-
-    style.Dialog = {
-        .width  = 770,
-        .height = 220,
-
-        .paddingTopBottom = 65,
-        .paddingLeftRight = 115,
-
-        .cornerRadius = 5.0f,
-
-        .buttonHeight          = 72,
-        .buttonSeparatorHeight = 2,
-
-        .shadowWidth   = 2.0f,
-        .shadowFeather = 10.0f,
-        .shadowOpacity = 63.75f,
-        .shadowOffset  = 10.0f
-    };
-
-    return style;
-}
-
-} // namespace brls
diff --git a/Source/sys-clk/manager/lib/borealis/library/lib/switch_wrapper.c b/Source/sys-clk/manager/lib/borealis/library/lib/switch_wrapper.c
deleted file mode 100644
index df7a17e8..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/lib/switch_wrapper.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-    Borealis, a Nintendo Switch UI Library
-    Copyright (C) 2019  natinusala
-    Copyright (C) 2019  WerWolv
-    Copyright (C) 2019  p-sam
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include <switch.h>
-#include <unistd.h>
-
-static int nxlink_sock = -1;
-
-void userAppInit()
-{
-    romfsInit();
-    socketInitializeDefault();
-    nxlink_sock = nxlinkStdio();
-    plInitialize(PlServiceType_User);
-    setsysInitialize();
-}
-
-void userAppExit()
-{
-    if (nxlink_sock != -1)
-        close(nxlink_sock);
-    socketExit();
-    romfsExit();
-    plExit();
-    setsysExit();
-}
diff --git a/Source/sys-clk/manager/lib/borealis/library/lib/swkbd.cpp b/Source/sys-clk/manager/lib/borealis/library/lib/swkbd.cpp
deleted file mode 100644
index 22900070..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/lib/swkbd.cpp
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
-    Borealis, a Nintendo Switch UI Library
-    Copyright (C) 2019  WerWolv
-    Copyright (C) 2019  p-sam
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include <borealis/logger.hpp>
-#include <borealis/swkbd.hpp>
-#include <cstring>
-#include <iostream>
-
-#ifdef __SWITCH__
-#include <switch.h>
-#endif
-
-namespace brls
-{
-
-#ifdef __SWITCH__
-static SwkbdConfig createSwkbdBaseConfig(std::string headerText, std::string subText, int maxStringLength, std::string initialText)
-{
-    SwkbdConfig config;
-
-    swkbdCreate(&config, 0);
-
-    swkbdConfigMakePresetDefault(&config);
-    swkbdConfigSetHeaderText(&config, headerText.c_str());
-    swkbdConfigSetSubText(&config, subText.c_str());
-    swkbdConfigSetStringLenMax(&config, maxStringLength);
-    swkbdConfigSetInitialText(&config, initialText.c_str());
-    swkbdConfigSetStringLenMin(&config, 1);
-    swkbdConfigSetBlurBackground(&config, true);
-
-    return config;
-}
-#else
-static std::string terminalInput(std::string text)
-{
-    printf("\033[0;94m[INPUT] \033[0;36m%s\033[0m: ", text.c_str());
-    std::string line;
-    std::getline(std::cin, line);
-    return line;
-}
-#endif
-
-bool Swkbd::openForText(std::function<void(std::string)> f, std::string headerText, std::string subText, int maxStringLength, std::string initialText)
-{
-#ifdef __SWITCH__
-    SwkbdConfig config = createSwkbdBaseConfig(headerText, subText, maxStringLength, initialText);
-
-    swkbdConfigSetType(&config, SwkbdType_Normal);
-    swkbdConfigSetKeySetDisableBitmask(&config, SwkbdKeyDisableBitmask_At | SwkbdKeyDisableBitmask_Percent | SwkbdKeyDisableBitmask_ForwardSlash | SwkbdKeyDisableBitmask_Backslash);
-
-    char buffer[0x100];
-
-    if (R_SUCCEEDED(swkbdShow(&config, buffer, 0x100)) && strcmp(buffer, "") != 0)
-    {
-        f(buffer);
-
-        swkbdClose(&config);
-        return true;
-    }
-
-    swkbdClose(&config);
-
-    return false;
-#else
-    std::string line = terminalInput(headerText);
-    f(line);
-    return true;
-#endif
-}
-
-bool Swkbd::openForNumber(std::function<void(int)> f, std::string headerText, std::string subText, int maxStringLength, std::string initialText, std::string leftButton, std::string rightButton)
-{
-#ifdef __SWITCH__
-    SwkbdConfig config = createSwkbdBaseConfig(headerText, subText, maxStringLength, initialText);
-
-    swkbdConfigSetType(&config, SwkbdType_NumPad);
-    swkbdConfigSetLeftOptionalSymbolKey(&config, leftButton.c_str());
-    swkbdConfigSetRightOptionalSymbolKey(&config, rightButton.c_str());
-    swkbdConfigSetKeySetDisableBitmask(&config, SwkbdKeyDisableBitmask_At | SwkbdKeyDisableBitmask_Percent | SwkbdKeyDisableBitmask_ForwardSlash | SwkbdKeyDisableBitmask_Backslash);
-
-    char buffer[0x100];
-
-    if (R_SUCCEEDED(swkbdShow(&config, buffer, 0x100)) && strcmp(buffer, "") != 0)
-    {
-        f(std::stol(buffer));
-
-        swkbdClose(&config);
-        return true;
-    }
-
-    swkbdClose(&config);
-
-    return false;
-#else
-    std::string line = terminalInput(headerText);
-
-    try
-    {
-        f(stol(line));
-        return true;
-    }
-    catch (const std::exception& e)
-    {
-        Logger::error("Could not parse input, did you enter a valid integer?");
-        return false;
-    }
-#endif
-}
-
-} // namespace brls
diff --git a/Source/sys-clk/manager/lib/borealis/library/lib/tab_frame.cpp b/Source/sys-clk/manager/lib/borealis/library/lib/tab_frame.cpp
deleted file mode 100644
index 7a5efded..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/lib/tab_frame.cpp
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
-    Borealis, a Nintendo Switch UI Library
-    Copyright (C) 2019-2020  natinusala
-    Copyright (C) 2019  WerWolv
-    Copyright (C) 2019  p-sam
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include <borealis/application.hpp>
-#include <borealis/box_layout.hpp>
-#include <borealis/rectangle.hpp>
-#include <borealis/sidebar.hpp>
-#include <borealis/tab_frame.hpp>
-
-namespace brls
-{
-
-TabFrame::TabFrame()
-    : AppletFrame(false, true)
-{
-    //Create sidebar
-    this->sidebar = new Sidebar();
-
-    // Setup content view
-    this->layout = new BoxLayout(BoxLayoutOrientation::HORIZONTAL);
-    layout->addView(sidebar);
-
-    this->setContentView(layout);
-}
-
-bool TabFrame::onCancel()
-{
-    // Go back to sidebar if not already focused
-    if (!this->sidebar->isChildFocused())
-    {
-        Application::onGamepadButtonPressed(GLFW_GAMEPAD_BUTTON_DPAD_LEFT, false);
-        return true;
-    }
-
-    return AppletFrame::onCancel();
-}
-
-void TabFrame::switchToView(View* view)
-{
-    if (this->rightPane == view)
-        return;
-
-    if (this->layout->getViewsCount() > 1)
-    {
-        if (this->rightPane)
-            this->rightPane->willDisappear(true);
-        this->layout->removeView(1, false);
-    }
-
-    if (view != nullptr)
-    {
-        this->layout->addView(view, true, true); // addView() calls willAppear()
-        this->rightPane = view;
-    }
-}
-
-void TabFrame::addTab(std::string label, View* view)
-{
-    SidebarItem* item = this->sidebar->addItem(label, view);
-    item->getFocusEvent()->subscribe([this](View* view) {
-        if (SidebarItem* item = dynamic_cast<SidebarItem*>(view))
-            this->switchToView(item->getAssociatedView());
-    });
-
-    // Switch to first one as soon as we add it
-    if (!this->rightPane)
-    {
-        Logger::debug("Switching to the first tab");
-        this->switchToView(view);
-    }
-}
-
-void TabFrame::addSeparator()
-{
-    this->sidebar->addSeparator();
-}
-
-View* TabFrame::getDefaultFocus()
-{
-    // Try to focus the right pane
-    if (this->layout->getViewsCount() > 1)
-    {
-        View* newFocus = this->rightPane->getDefaultFocus();
-
-        if (newFocus)
-            return newFocus;
-    }
-
-    // Otherwise focus sidebar
-    return this->sidebar->getDefaultFocus();
-}
-
-TabFrame::~TabFrame()
-{
-    switchToView(nullptr);
-
-    // Content view is freed by ~AppletFrame()
-}
-
-} // namespace brls
diff --git a/Source/sys-clk/manager/lib/borealis/library/lib/table.cpp b/Source/sys-clk/manager/lib/borealis/library/lib/table.cpp
deleted file mode 100644
index ac9c5e64..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/lib/table.cpp
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
-    Borealis, a Nintendo Switch UI Library
-    Copyright (C) 2019  natinusala
-    Copyright (C) 2019  p-sam
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include <borealis/table.hpp>
-
-namespace brls
-{
-
-TableRow* Table::addRow(TableRowType type, std::string label, std::string value)
-{
-    TableRow* row = new TableRow(type, label, value);
-    this->rows.push_back(row);
-    return row;
-}
-
-void Table::draw(NVGcontext* vg, int x, int y, unsigned width, unsigned height, Style* style, FrameContext* ctx)
-{
-    ThemeValues* theme = ctx->theme;
-    unsigned yAdvance  = 0;
-
-    for (size_t i = 0; i < this->rows.size(); i++)
-    {
-        bool even     = i % 2 == 0;
-        TableRow* row = this->rows[i];
-
-        // Get appearance
-        unsigned indent   = 0;
-        unsigned height   = 0;
-        unsigned fontSize = 0;
-        NVGcolor backgroundColor;
-        NVGcolor textColor;
-
-        switch (row->getType())
-        {
-            case TableRowType::HEADER:
-                indent    = 0;
-                height    = style->TableRow.headerHeight;
-                textColor = theme->textColor;
-                fontSize  = style->TableRow.headerTextSize;
-                break;
-            case TableRowType::BODY:
-                indent    = style->TableRow.bodyIndent;
-                height    = style->TableRow.bodyHeight;
-                textColor = theme->tableBodyTextColor;
-                fontSize  = style->TableRow.bodyTextSize;
-                break;
-        }
-
-        backgroundColor = even ? theme->tableEvenBackgroundColor : transparent;
-
-        // Background
-        nvgFillColor(vg, a(backgroundColor));
-        nvgBeginPath(vg);
-        nvgRect(vg, x + indent, y + yAdvance, width - indent, height);
-        nvgFill(vg);
-
-        // Text
-        nvgFillColor(vg, a(textColor));
-        nvgFontFaceId(vg, ctx->fontStash->regular);
-        nvgFontSize(vg, fontSize);
-
-        // Label
-        nvgTextAlign(vg, NVG_ALIGN_LEFT | NVG_ALIGN_MIDDLE);
-        nvgBeginPath(vg);
-        nvgText(vg, x + indent + style->TableRow.padding, y + yAdvance + height / 2, row->getLabel()->c_str(), nullptr);
-
-        // Value
-        nvgTextAlign(vg, NVG_ALIGN_RIGHT | NVG_ALIGN_MIDDLE);
-        nvgBeginPath(vg);
-        nvgText(vg, x + width - style->TableRow.padding, y + yAdvance + height / 2, row->getValue()->c_str(), nullptr);
-
-        yAdvance += height;
-    }
-}
-
-void Table::layout(NVGcontext* vg, Style* style, FontStash* stash)
-{
-    unsigned height = 0;
-
-    for (TableRow* row : this->rows)
-    {
-        switch (row->getType())
-        {
-            case TableRowType::HEADER:
-                height += style->TableRow.headerHeight;
-                break;
-            case TableRowType::BODY:
-                height += style->TableRow.bodyHeight;
-                break;
-        }
-    }
-
-    this->setHeight(height);
-}
-
-Table::~Table()
-{
-    for (TableRow* row : this->rows)
-    {
-        delete row;
-    }
-}
-
-TableRow::TableRow(TableRowType type, std::string label, std::string value)
-    : type(type)
-    , label(label)
-    , value(value)
-{
-}
-
-std::string* TableRow::getLabel()
-{
-    return &this->label;
-}
-
-std::string* TableRow::getValue()
-{
-    return &this->value;
-}
-
-void TableRow::setValue(std::string value)
-{
-    this->value = value;
-}
-
-TableRowType TableRow::getType()
-{
-    return this->type;
-}
-
-} // namespace brls
diff --git a/Source/sys-clk/manager/lib/borealis/library/lib/task_manager.cpp b/Source/sys-clk/manager/lib/borealis/library/lib/task_manager.cpp
deleted file mode 100644
index 1ae42333..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/lib/task_manager.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
-    Borealis, a Nintendo Switch UI Library
-    Copyright (C) 2019  natinusala
-    Copyright (C) 2019  p-sam
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include <features/features_cpu.h>
-
-#include <borealis/task_manager.hpp>
-
-namespace brls
-{
-
-void TaskManager::frame()
-{
-    // Repeating tasks
-    retro_time_t currentTime = cpu_features_get_time_usec() / 1000;
-    for (auto i = this->repeatingTasks.begin(); i != this->repeatingTasks.end(); i++)
-    {
-        RepeatingTask* task = *i;
-
-        // Stop the task if needed
-        if (task->isStopRequested())
-        {
-            this->stopRepeatingTask(task);
-            this->repeatingTasks.erase(i--);
-        }
-        // Fire it
-        else if (task->isRunning() && currentTime - task->getLastRun() > task->getInterval())
-        {
-            task->run(currentTime);
-        }
-    }
-}
-
-void TaskManager::registerRepeatingTask(RepeatingTask* task)
-{
-    this->repeatingTasks.push_back(task);
-}
-
-void TaskManager::stopRepeatingTask(RepeatingTask* task)
-{
-    task->onStop();
-    delete task;
-}
-
-TaskManager::~TaskManager()
-{
-    // Stop all repeating tasks
-    for (RepeatingTask* task : this->repeatingTasks)
-        this->stopRepeatingTask(task);
-
-    this->repeatingTasks.clear();
-}
-
-} // namespace brls
diff --git a/Source/sys-clk/manager/lib/borealis/library/lib/theme.cpp b/Source/sys-clk/manager/lib/borealis/library/lib/theme.cpp
deleted file mode 100644
index 41c50d91..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/lib/theme.cpp
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
-    Borealis, a Nintendo Switch UI Library
-    Copyright (C) 2019  natinusala
-    Copyright (C) 2019  p-sam
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include <borealis/theme.hpp>
-
-#define DARK theme.colors[ThemeVariant_DARK]
-#define LIGHT theme.colors[ThemeVariant_LIGHT]
-
-namespace brls
-{
-
-// Default colors
-Theme Theme::horizon()
-{
-    Theme theme = Theme();
-
-    // Light variant
-    LIGHT.backgroundColor[0] = 0.922f;
-    LIGHT.backgroundColor[1] = 0.922f;
-    LIGHT.backgroundColor[2] = 0.922f;
-    LIGHT.backgroundColorRGB = nvgRGB(235, 235, 235);
-
-    LIGHT.textColor        = nvgRGB(51, 51, 51);
-    LIGHT.descriptionColor = nvgRGB(140, 140, 140);
-
-    LIGHT.notificationTextColor = nvgRGB(255, 255, 255);
-    LIGHT.backdropColor         = nvgRGBA(0, 0, 0, 178);
-
-    LIGHT.separatorColor = nvgRGB(45, 45, 45);
-
-    LIGHT.sidebarColor          = nvgRGB(240, 240, 240);
-    LIGHT.activeTabColor        = nvgRGB(49, 79, 235);
-    LIGHT.sidebarSeparatorColor = nvgRGB(208, 208, 208);
-
-    LIGHT.highlightBackgroundColor = nvgRGB(252, 255, 248);
-    LIGHT.highlightColor1          = nvgRGB(13, 182, 213);
-    LIGHT.highlightColor2          = nvgRGB(80, 239, 217);
-
-    LIGHT.listItemSeparatorColor  = nvgRGB(207, 207, 207);
-    LIGHT.listItemValueColor      = nvgRGB(43, 81, 226);
-    LIGHT.listItemFaintValueColor = nvgRGB(181, 184, 191);
-
-    LIGHT.tableEvenBackgroundColor = nvgRGB(240, 240, 240);
-    LIGHT.tableBodyTextColor       = nvgRGB(131, 131, 131);
-
-    LIGHT.dropdownBackgroundColor = nvgRGBA(0, 0, 0, 178);
-
-    LIGHT.nextStageBulletColor = nvgRGB(165, 165, 165);
-
-    LIGHT.spinnerBarColor = nvgRGBA(131, 131, 131, 102);
-
-    LIGHT.headerRectangleColor = nvgRGB(127, 127, 127);
-
-    LIGHT.buttonPlainEnabledBackgroundColor  = nvgRGB(50, 79, 241);
-    LIGHT.buttonPlainDisabledBackgroundColor = nvgRGB(201, 201, 209);
-    LIGHT.buttonPlainEnabledTextColor        = nvgRGB(255, 255, 255);
-    LIGHT.buttonPlainDisabledTextColor       = nvgRGB(220, 220, 228);
-
-    LIGHT.dialogColor                = nvgRGB(240, 240, 240);
-    LIGHT.dialogBackdrop             = nvgRGBA(0, 0, 0, 100);
-    LIGHT.dialogButtonColor          = nvgRGB(46, 78, 255);
-    LIGHT.dialogButtonSeparatorColor = nvgRGB(210, 210, 210);
-
-    // Dark variant
-    DARK.backgroundColor[0] = 0.176f;
-    DARK.backgroundColor[1] = 0.176f;
-    DARK.backgroundColor[2] = 0.176f;
-    DARK.backgroundColorRGB = nvgRGB(45, 45, 45);
-
-    DARK.textColor        = nvgRGB(255, 255, 255);
-    DARK.descriptionColor = nvgRGB(163, 163, 163);
-
-    DARK.notificationTextColor = nvgRGB(255, 255, 255);
-    DARK.backdropColor         = nvgRGBA(0, 0, 0, 178);
-
-    DARK.separatorColor = nvgRGB(255, 255, 255);
-
-    DARK.sidebarColor          = nvgRGB(50, 50, 50);
-    DARK.activeTabColor        = nvgRGB(0, 255, 204);
-    DARK.sidebarSeparatorColor = nvgRGB(81, 81, 81);
-
-    DARK.highlightBackgroundColor = nvgRGB(31, 34, 39);
-    DARK.highlightColor1          = nvgRGB(25, 138, 198);
-    DARK.highlightColor2          = nvgRGB(137, 241, 242);
-
-    DARK.listItemSeparatorColor  = nvgRGB(78, 78, 78);
-    DARK.listItemValueColor      = nvgRGB(88, 195, 169);
-    DARK.listItemFaintValueColor = nvgRGB(93, 103, 105);
-
-    DARK.tableEvenBackgroundColor = nvgRGB(57, 58, 60);
-    DARK.tableBodyTextColor       = nvgRGB(155, 157, 156);
-
-    DARK.dropdownBackgroundColor = nvgRGBA(0, 0, 0, 178); // TODO: 178 may be too much for dark theme
-
-    DARK.nextStageBulletColor = nvgRGB(165, 165, 165);
-
-    DARK.spinnerBarColor = nvgRGBA(131, 131, 131, 102); // TODO: get this right
-
-    DARK.headerRectangleColor = nvgRGB(160, 160, 160);
-
-    DARK.buttonPlainEnabledBackgroundColor  = nvgRGB(1, 255, 201);
-    DARK.buttonPlainDisabledBackgroundColor = nvgRGB(83, 87, 86);
-    DARK.buttonPlainEnabledTextColor        = nvgRGB(52, 41, 55);
-    DARK.buttonPlainDisabledTextColor       = nvgRGB(71, 75, 74);
-
-    DARK.dialogColor                = nvgRGB(70, 70, 70);
-    DARK.dialogBackdrop             = nvgRGBA(0, 0, 0, 100);
-    DARK.dialogButtonColor          = nvgRGB(3, 251, 199);
-    DARK.dialogButtonSeparatorColor = nvgRGB(103, 103, 103);
-
-    return theme;
-}
-
-} // namespace brls
diff --git a/Source/sys-clk/manager/lib/borealis/library/lib/thumbnail_frame.cpp b/Source/sys-clk/manager/lib/borealis/library/lib/thumbnail_frame.cpp
deleted file mode 100644
index 2f61ddb1..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/lib/thumbnail_frame.cpp
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
-    Borealis, a Nintendo Switch UI Library
-    Copyright (C) 2019  natinusala
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include <borealis/application.hpp>
-#include <borealis/thumbnail_frame.hpp>
-
-namespace brls
-{
-
-ThumbnailFrame::ThumbnailFrame()
-    : AppletFrame(true, false)
-{
-    // Create the ThumbnailSidebar
-    this->sidebar = new ThumbnailSidebar();
-
-    // Setup content view
-    this->boxLayout = new BoxLayout(BoxLayoutOrientation::HORIZONTAL);
-    AppletFrame::setContentView(this->boxLayout);
-}
-
-void ThumbnailFrame::setContentView(View* view)
-{
-    this->thumbnailContentView = view;
-
-    // Clear the layout
-    this->boxLayout->clear();
-
-    // Add the views
-    this->boxLayout->addView(view);
-    this->boxLayout->addView(this->sidebar);
-
-    // Invalidate
-    this->invalidate();
-}
-
-void ThumbnailFrame::layout(NVGcontext* vg, Style* style, FontStash* stash)
-{
-    // Resize content view
-    if (this->thumbnailContentView)
-    {
-        unsigned sidebarWidth = this->sidebar->getWidth();
-        this->thumbnailContentView->setWidth(this->getWidth() - sidebarWidth - this->leftPadding - this->rightPadding);
-    }
-
-    // Layout the rest
-    AppletFrame::layout(vg, style, stash);
-}
-
-ThumbnailSidebar* ThumbnailFrame::getSidebar()
-{
-    return this->sidebar;
-}
-
-ThumbnailFrame::~ThumbnailFrame()
-{
-    // If content view wasn't set, free the sidebar manually
-    if (!this->thumbnailContentView)
-        delete this->sidebar;
-}
-
-ThumbnailSidebar::ThumbnailSidebar()
-{
-    Style* style = Application::getStyle();
-
-    this->setBackground(Background::SIDEBAR);
-    this->setWidth(style->Sidebar.width);
-
-    this->button = (new Button(ButtonStyle::PLAIN))->setLabel("Save");
-    this->button->setParent(this);
-}
-
-Button* ThumbnailSidebar::getButton()
-{
-    return this->button;
-}
-
-void ThumbnailSidebar::draw(NVGcontext* vg, int x, int y, unsigned width, unsigned height, Style* style, FrameContext* ctx)
-{
-    if (this->image)
-        this->image->frame(ctx);
-
-    if (this->title)
-        this->title->frame(ctx);
-
-    if (this->subTitle)
-        this->subTitle->frame(ctx);
-
-    this->button->frame(ctx);
-}
-
-void ThumbnailSidebar::layout(NVGcontext* vg, Style* style, FontStash* stash)
-{
-    unsigned sidebarWidth = getWidth() - style->AppletFrame.separatorSpacing;
-    unsigned yAdvance     = getY() + style->ThumbnailSidebar.marginTopBottom;
-    unsigned titleX       = getX() + style->ThumbnailSidebar.marginLeftRight / 2;
-    unsigned titleWidth   = sidebarWidth - style->ThumbnailSidebar.marginLeftRight;
-
-    // Image
-    if (this->image)
-    {
-        unsigned imageX     = getX() + style->ThumbnailSidebar.marginLeftRight;
-        unsigned imageWidth = sidebarWidth - style->ThumbnailSidebar.marginLeftRight * 2;
-
-        this->image->setBoundaries(
-            imageX,
-            yAdvance,
-            imageWidth,
-            imageWidth);
-
-        yAdvance += this->image->getHeight() + style->ThumbnailSidebar.marginTopBottom;
-    }
-
-    // Title
-    if (this->title)
-    {
-        this->title->setBoundaries(
-            titleX,
-            yAdvance,
-            titleWidth,
-            0 // height is dynamic
-        );
-
-        // Call layout directly to update height
-        this->title->invalidate(true);
-
-        yAdvance += this->title->getHeight() + style->ThumbnailSidebar.marginTopBottom / 2;
-    }
-
-    // Subtitle
-    if (this->subTitle)
-    {
-        this->subTitle->setBoundaries(
-            titleX,
-            yAdvance,
-            titleWidth,
-            0 // height doesn't matter
-        );
-
-        this->subTitle->invalidate();
-    }
-
-    //Button
-    unsigned buttonWidth  = sidebarWidth - style->ThumbnailSidebar.buttonMargin * 2;
-    unsigned buttonHeight = style->ThumbnailSidebar.buttonHeight;
-
-    this->button->setBoundaries(
-        getX() + style->ThumbnailSidebar.buttonMargin,
-        getY() + getHeight() - style->ThumbnailSidebar.marginTopBottom - buttonHeight,
-        buttonWidth,
-        buttonHeight);
-}
-
-View* ThumbnailSidebar::getDefaultFocus()
-{
-    return this->button->getDefaultFocus();
-}
-
-void ThumbnailSidebar::setThumbnail(std::string imagePath)
-{
-    if (this->image)
-    {
-        this->image->setImage(imagePath);
-    }
-    else
-    {
-        this->image = new Image(imagePath);
-        this->image->setParent(this);
-        this->invalidate();
-    }
-}
-
-void ThumbnailSidebar::setThumbnail(unsigned char* buffer, size_t bufferSize)
-{
-    if (this->image)
-    {
-        this->image->setImage(buffer, bufferSize);
-    }
-    else
-    {
-        this->image = new Image(buffer, bufferSize);
-        this->image->setParent(this);
-        this->invalidate();
-    }
-}
-
-void ThumbnailSidebar::setSubtitle(std::string subTitle)
-{
-    if (!this->subTitle)
-    {
-        this->subTitle = new Label(LabelStyle::DESCRIPTION, "");
-        this->subTitle->setParent(this);
-    }
-
-    this->subTitle->setText(subTitle);
-
-    this->invalidate();
-}
-
-// TODO: Add ellipsis if the title exceeds three lines
-void ThumbnailSidebar::setTitle(std::string title)
-{
-    if (!this->title)
-    {
-        this->title = new Label(LabelStyle::REGULAR, "", true);
-        this->title->setParent(this);
-    }
-
-    this->title->setText(title);
-
-    this->invalidate();
-}
-
-ThumbnailSidebar::~ThumbnailSidebar()
-{
-    if (this->image)
-        delete this->image;
-
-    if (this->title)
-        delete this->title;
-
-    if (this->subTitle)
-        delete this->subTitle;
-
-    delete this->button;
-}
-
-} // namespace brls
diff --git a/Source/sys-clk/manager/lib/borealis/library/lib/view.cpp b/Source/sys-clk/manager/lib/borealis/library/lib/view.cpp
deleted file mode 100644
index c93e45e4..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/lib/view.cpp
+++ /dev/null
@@ -1,630 +0,0 @@
-/*
-    Borealis, a Nintendo Switch UI Library
-    Copyright (C) 2019-2020  natinusala
-    Copyright (C) 2019  p-sam
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include <math.h>
-
-#include <algorithm>
-#include <borealis/animations.hpp>
-#include <borealis/application.hpp>
-#include <borealis/view.hpp>
-
-namespace brls
-{
-
-NVGcolor transparent = nvgRGBA(0, 0, 0, 0);
-
-static int shakeAnimation(float t, float a) // a = amplitude
-{
-    // Damped sine wave
-    float w = 0.8f; // period
-    float c = 0.35f; // damp factor
-    return roundf(a * exp(-(c * t)) * sin(w * t));
-}
-
-void View::shakeHighlight(FocusDirection direction)
-{
-    this->highlightShaking        = true;
-    this->highlightShakeStart     = cpu_features_get_time_usec() / 1000;
-    this->highlightShakeDirection = direction;
-    this->highlightShakeAmplitude = std::rand() % 15 + 10;
-}
-
-float View::getAlpha(bool child)
-{
-    return this->alpha * (this->parent ? this->parent->getAlpha(true) : 1.0f);
-}
-
-NVGcolor View::a(NVGcolor color)
-{
-    NVGcolor newColor = color;
-    newColor.a *= this->getAlpha();
-    return newColor;
-}
-
-NVGpaint View::a(NVGpaint paint)
-{
-    NVGpaint newPaint = paint;
-    newPaint.innerColor.a *= this->getAlpha();
-    newPaint.outerColor.a *= this->getAlpha();
-    return newPaint;
-}
-
-// TODO: Only draw views that are onscreen (w/ some margins)
-void View::frame(FrameContext* ctx)
-{
-    Style* style          = Application::getStyle();
-    ThemeValues* oldTheme = ctx->theme;
-
-    nvgSave(ctx->vg);
-
-    // Theme override
-    if (this->themeOverride)
-        ctx->theme = themeOverride;
-
-    // Layout if needed
-    if (this->dirty)
-    {
-        this->invalidate(true);
-        this->dirty = false;
-    }
-
-    if (this->alpha > 0.0f && this->collapseState != 0.0f)
-    {
-        // Draw background
-        this->drawBackground(ctx->vg, ctx, style);
-
-        // Draw highlight background
-        if (this->highlightAlpha > 0.0f && this->isHighlightBackgroundEnabled())
-            this->drawHighlight(ctx->vg, ctx->theme, this->highlightAlpha, style, true);
-
-        // Collapse clipping
-        if (this->collapseState < 1.0f)
-        {
-            nvgSave(ctx->vg);
-            nvgIntersectScissor(ctx->vg, x, y, this->width, this->height * this->collapseState);
-        }
-
-        // Draw the view
-        this->draw(ctx->vg, this->x, this->y, this->width, this->height, style, ctx);
-
-        // Draw highlight
-        if (this->highlightAlpha > 0.0f)
-            this->drawHighlight(ctx->vg, ctx->theme, this->highlightAlpha, style, false);
-
-        //Reset clipping
-        if (this->collapseState < 1.0f)
-            nvgRestore(ctx->vg);
-    }
-
-    // Cleanup
-    if (this->themeOverride)
-        ctx->theme = oldTheme;
-
-    nvgRestore(ctx->vg);
-}
-
-void View::collapse(bool animated)
-{
-    menu_animation_ctx_tag tag = (uintptr_t) & this->collapseState;
-    menu_animation_kill_by_tag(&tag);
-
-    if (animated)
-    {
-        Style* style = Application::getStyle();
-
-        menu_animation_ctx_entry_t entry;
-
-        entry.cb           = [](void* userdata) {};
-        entry.duration     = style->AnimationDuration.collapse;
-        entry.easing_enum  = EASING_OUT_QUAD;
-        entry.subject      = &this->collapseState;
-        entry.tag          = tag;
-        entry.target_value = 0.0f;
-        entry.tick         = [this](void* userdata) { if (this->hasParent()) this->getParent()->invalidate(); };
-        entry.userdata     = nullptr;
-
-        menu_animation_push(&entry);
-    }
-    else
-    {
-        this->collapseState = 0.0f;
-    }
-}
-
-bool View::isCollapsed()
-{
-    return this->collapseState < 1.0f;
-}
-
-void View::expand(bool animated)
-{
-    menu_animation_ctx_tag tag = (uintptr_t) & this->collapseState;
-    menu_animation_kill_by_tag(&tag);
-
-    if (animated)
-    {
-        Style* style = Application::getStyle();
-
-        menu_animation_ctx_entry_t entry;
-
-        entry.cb           = [](void* userdata) {};
-        entry.duration     = style->AnimationDuration.collapse;
-        entry.easing_enum  = EASING_OUT_QUAD;
-        entry.subject      = &this->collapseState;
-        entry.tag          = tag;
-        entry.target_value = 1.0f;
-        entry.tick         = [this](void* userdata) { if (this->hasParent()) this->getParent()->invalidate(); };
-        entry.userdata     = nullptr;
-
-        menu_animation_push(&entry);
-    }
-    else
-    {
-        this->collapseState = 1.0f;
-    }
-}
-
-// TODO: Slight glow all around
-void View::drawHighlight(NVGcontext* vg, ThemeValues* theme, float alpha, Style* style, bool background)
-{
-    nvgSave(vg);
-    nvgResetScissor(vg);
-
-    unsigned insetTop, insetRight, insetBottom, insetLeft;
-    this->getHighlightInsets(&insetTop, &insetRight, &insetBottom, &insetLeft);
-
-    float cornerRadius;
-    this->getHighlightMetrics(style, &cornerRadius);
-
-    unsigned x      = this->x - insetLeft - style->Highlight.strokeWidth / 2;
-    unsigned y      = this->y - insetTop - style->Highlight.strokeWidth / 2;
-    unsigned width  = this->width + insetLeft + insetRight + style->Highlight.strokeWidth;
-    unsigned height = this->height + insetTop + insetBottom + style->Highlight.strokeWidth;
-
-    // Shake animation
-    if (this->highlightShaking)
-    {
-        retro_time_t curTime = cpu_features_get_time_usec() / 1000;
-        retro_time_t t       = (curTime - highlightShakeStart) / 10;
-
-        if (t >= style->AnimationDuration.shake)
-        {
-            this->highlightShaking = false;
-        }
-        else
-        {
-            switch (this->highlightShakeDirection)
-            {
-                case FocusDirection::RIGHT:
-                    x += shakeAnimation(t, this->highlightShakeAmplitude);
-                    break;
-                case FocusDirection::LEFT:
-                    x -= shakeAnimation(t, this->highlightShakeAmplitude);
-                    break;
-                case FocusDirection::DOWN:
-                    y += shakeAnimation(t, this->highlightShakeAmplitude);
-                    break;
-                case FocusDirection::UP:
-                    y -= shakeAnimation(t, this->highlightShakeAmplitude);
-                    break;
-                default:
-                    break;
-            }
-        }
-    }
-
-    // Draw
-    if (background)
-    {
-        // Background
-        nvgFillColor(vg, RGBAf(theme->highlightBackgroundColor.r, theme->highlightBackgroundColor.g, theme->highlightBackgroundColor.b, this->highlightAlpha));
-        nvgBeginPath(vg);
-        nvgRoundedRect(vg, x, y, width, height, cornerRadius);
-        nvgFill(vg);
-    }
-    else
-    {
-        // Shadow
-        NVGpaint shadowPaint = nvgBoxGradient(vg,
-            x, y + style->Highlight.shadowWidth,
-            width, height,
-            cornerRadius * 2, style->Highlight.shadowFeather,
-            RGBA(0, 0, 0, style->Highlight.shadowOpacity * alpha), transparent);
-
-        nvgBeginPath(vg);
-        nvgRect(vg, x - style->Highlight.shadowOffset, y - style->Highlight.shadowOffset,
-            width + style->Highlight.shadowOffset * 2, height + style->Highlight.shadowOffset * 3);
-        nvgRoundedRect(vg, x, y, width, height, cornerRadius);
-        nvgPathWinding(vg, NVG_HOLE);
-        nvgFillPaint(vg, shadowPaint);
-        nvgFill(vg);
-
-        // Border
-        float gradientX, gradientY, color;
-        menu_animation_get_highlight(&gradientX, &gradientY, &color);
-
-        NVGcolor pulsationColor = RGBAf((color * theme->highlightColor1.r) + (1 - color) * theme->highlightColor2.r,
-            (color * theme->highlightColor1.g) + (1 - color) * theme->highlightColor2.g,
-            (color * theme->highlightColor1.b) + (1 - color) * theme->highlightColor2.b,
-            alpha);
-
-        NVGcolor borderColor = theme->highlightColor2;
-        borderColor.a        = 0.5f * alpha * this->getAlpha();
-
-        NVGpaint border1Paint = nvgRadialGradient(vg,
-            x + gradientX * width, y + gradientY * height,
-            style->Highlight.strokeWidth * 10, style->Highlight.strokeWidth * 40,
-            borderColor, transparent);
-
-        NVGpaint border2Paint = nvgRadialGradient(vg,
-            x + (1 - gradientX) * width, y + (1 - gradientY) * height,
-            style->Highlight.strokeWidth * 10, style->Highlight.strokeWidth * 40,
-            borderColor, transparent);
-
-        nvgBeginPath(vg);
-        nvgStrokeColor(vg, pulsationColor);
-        nvgStrokeWidth(vg, style->Highlight.strokeWidth);
-        nvgRoundedRect(vg, x, y, width, height, cornerRadius);
-        nvgStroke(vg);
-
-        nvgBeginPath(vg);
-        nvgStrokePaint(vg, border1Paint);
-        nvgStrokeWidth(vg, style->Highlight.strokeWidth);
-        nvgRoundedRect(vg, x, y, width, height, cornerRadius);
-        nvgStroke(vg);
-
-        nvgBeginPath(vg);
-        nvgStrokePaint(vg, border2Paint);
-        nvgStrokeWidth(vg, style->Highlight.strokeWidth);
-        nvgRoundedRect(vg, x, y, width, height, cornerRadius);
-        nvgStroke(vg);
-    }
-
-    nvgRestore(vg);
-}
-
-void View::setBackground(Background background)
-{
-    this->background = background;
-}
-
-void View::drawBackground(NVGcontext* vg, FrameContext* ctx, Style* style)
-{
-    switch (this->background)
-    {
-        case Background::SIDEBAR:
-        {
-            unsigned backdropHeight = style->Background.sidebarBorderHeight;
-
-            // Solid color
-            nvgBeginPath(vg);
-            nvgFillColor(vg, a(ctx->theme->sidebarColor));
-            nvgRect(vg, this->x, this->y + backdropHeight, this->width, this->height - backdropHeight * 2);
-            nvgFill(vg);
-
-            //Borders gradient
-            // Top
-            NVGpaint topGradient = nvgLinearGradient(vg, this->x, this->y + backdropHeight, this->x, this->y, a(ctx->theme->sidebarColor), transparent);
-            nvgBeginPath(vg);
-            nvgFillPaint(vg, topGradient);
-            nvgRect(vg, this->x, this->y, this->width, backdropHeight);
-            nvgFill(vg);
-
-            // Bottom
-            NVGpaint bottomGradient = nvgLinearGradient(vg, this->x, this->y + this->height - backdropHeight, this->x, this->y + this->height, a(ctx->theme->sidebarColor), transparent);
-            nvgBeginPath(vg);
-            nvgFillPaint(vg, bottomGradient);
-            nvgRect(vg, this->x, this->y + this->height - backdropHeight, this->width, backdropHeight);
-            nvgFill(vg);
-            break;
-        }
-        case Background::DEBUG:
-        {
-            nvgFillColor(vg, RGB(255, 0, 0));
-            nvgBeginPath(vg);
-            nvgRect(vg, this->x, this->y, this->width, this->height);
-            nvgFill(vg);
-            break;
-        }
-        case Background::BACKDROP:
-        {
-            nvgFillColor(vg, a(ctx->theme->backdropColor));
-            nvgBeginPath(vg);
-            nvgRect(vg, this->x, this->y, this->width, this->height);
-            nvgFill(vg);
-        }
-        case Background::NONE:
-            break;
-    }
-}
-
-void View::registerAction(std::string hintText, Key key, ActionListener actionListener, bool hidden)
-{
-    if (auto it = std::find(this->actions.begin(), this->actions.end(), key); it != this->actions.end())
-        *it = { key, hintText, true, hidden, actionListener };
-    else
-        this->actions.push_back({ key, hintText, true, hidden, actionListener });
-}
-
-void View::updateActionHint(Key key, std::string hintText)
-{
-    if (auto it = std::find(this->actions.begin(), this->actions.end(), key); it != this->actions.end())
-        it->hintText = hintText;
-
-    Application::getGlobalHintsUpdateEvent()->fire();
-}
-
-void View::setActionAvailable(Key key, bool available)
-{
-    if (auto it = std::find(this->actions.begin(), this->actions.end(), key); it != this->actions.end())
-        it->available = available;
-}
-
-void View::setBoundaries(int x, int y, unsigned width, unsigned height)
-{
-    this->x      = x;
-    this->y      = y;
-    this->width  = width;
-    this->height = height;
-}
-
-void View::setParent(View* parent, void* parentUserdata)
-{
-    this->parent         = parent;
-    this->parentUserdata = parentUserdata;
-}
-
-void* View::getParentUserData()
-{
-    return this->parentUserdata;
-}
-
-bool View::isFocused()
-{
-    return this->focused;
-}
-
-View* View::getParent()
-{
-    return this->parent;
-}
-
-bool View::hasParent()
-{
-    return this->parent;
-}
-
-void View::setWidth(unsigned width)
-{
-    this->width = width;
-}
-
-void View::setHeight(unsigned height)
-{
-    this->height = height;
-}
-
-int View::getX()
-{
-    return this->x;
-}
-
-int View::getY()
-{
-    return this->y;
-}
-
-unsigned View::getHeight(bool includeCollapse)
-{
-    return this->height * (includeCollapse ? this->collapseState : 1.0f);
-}
-
-unsigned View::getWidth()
-{
-    return this->width;
-}
-
-void View::onFocusGained()
-{
-    this->focused = true;
-
-    Style* style = Application::getStyle();
-
-    menu_animation_ctx_tag tag = (uintptr_t)this->highlightAlpha;
-
-    menu_animation_ctx_entry_t entry;
-    entry.cb           = [](void* userdata) {};
-    entry.duration     = style->AnimationDuration.highlight;
-    entry.easing_enum  = EASING_OUT_QUAD;
-    entry.subject      = &this->highlightAlpha;
-    entry.tag          = tag;
-    entry.target_value = 1.0f;
-    entry.tick         = [](void* userdata) {};
-    entry.userdata     = nullptr;
-
-    menu_animation_push(&entry);
-
-    this->focusEvent.fire(this);
-
-    if (this->hasParent())
-        this->getParent()->onChildFocusGained(this);
-}
-
-GenericEvent* View::getFocusEvent()
-{
-    return &this->focusEvent;
-}
-
-/**
- * Fired when focus is lost
- */
-void View::onFocusLost()
-{
-    this->focused = false;
-
-    Style* style = Application::getStyle();
-
-    menu_animation_ctx_tag tag = (uintptr_t)this->highlightAlpha;
-
-    menu_animation_ctx_entry_t entry;
-    entry.cb           = [](void* userdata) {};
-    entry.duration     = style->AnimationDuration.highlight;
-    entry.easing_enum  = EASING_OUT_QUAD;
-    entry.subject      = &this->highlightAlpha;
-    entry.tag          = tag;
-    entry.target_value = 0.0f;
-    entry.tick         = [](void* userdata) {};
-    entry.userdata     = nullptr;
-
-    menu_animation_push(&entry);
-
-    if (this->hasParent())
-        this->getParent()->onChildFocusLost(this);
-}
-
-void View::setForceTranslucent(bool translucent)
-{
-    this->forceTranslucent = translucent;
-}
-
-unsigned View::getShowAnimationDuration(ViewAnimation animation)
-{
-    Style* style = Application::getStyle();
-
-    if (animation == ViewAnimation::SLIDE_LEFT || animation == ViewAnimation::SLIDE_RIGHT)
-        return style->AnimationDuration.showSlide;
-
-    return style->AnimationDuration.show;
-}
-
-void View::show(std::function<void(void)> cb, bool animate, ViewAnimation animation)
-{
-    brls::Logger::debug("Showing %s with animation %d", this->describe().c_str(), animation);
-
-    this->hidden = false;
-
-    menu_animation_ctx_tag tag = (uintptr_t) & this->alpha;
-    menu_animation_kill_by_tag(&tag);
-
-    this->fadeIn = true;
-
-    if (animate)
-    {
-        this->alpha = 0.0f;
-
-        menu_animation_ctx_entry_t entry;
-        entry.cb = [this, cb](void* userdata) {
-            this->fadeIn = false;
-            this->onShowAnimationEnd();
-            cb();
-        };
-        entry.duration     = this->getShowAnimationDuration(animation);
-        entry.easing_enum  = EASING_OUT_QUAD;
-        entry.subject      = &this->alpha;
-        entry.tag          = tag;
-        entry.target_value = 1.0f;
-        entry.tick         = [](void* userdata) {};
-        entry.userdata     = nullptr;
-
-        menu_animation_push(&entry);
-    }
-    else
-    {
-        this->alpha  = 1.0f;
-        this->fadeIn = false;
-        this->onShowAnimationEnd();
-        cb();
-    }
-}
-
-void View::hide(std::function<void(void)> cb, bool animated, ViewAnimation animation)
-{
-    brls::Logger::debug("Hiding %s with animation %d", this->describe().c_str(), animation);
-
-    this->hidden = true;
-    this->fadeIn = false;
-
-    menu_animation_ctx_tag tag = (uintptr_t) & this->alpha;
-    menu_animation_kill_by_tag(&tag);
-
-    if (animated)
-    {
-        this->alpha = 1.0f;
-
-        menu_animation_ctx_entry_t entry;
-        entry.cb           = [cb](void* userdata) { cb(); };
-        entry.duration     = this->getShowAnimationDuration(animation);
-        entry.easing_enum  = EASING_OUT_QUAD;
-        entry.subject      = &this->alpha;
-        entry.tag          = tag;
-        entry.target_value = 0.0f;
-        entry.tick         = [](void* userdata) {};
-        entry.userdata     = nullptr;
-
-        menu_animation_push(&entry);
-    }
-    else
-    {
-        this->alpha = 0.0f;
-        cb();
-    }
-}
-
-bool View::isHidden()
-{
-    return this->hidden;
-}
-
-void View::overrideThemeVariant(ThemeValues* theme)
-{
-    this->themeOverride = theme;
-}
-
-View::~View()
-{
-    menu_animation_ctx_tag alphaTag = (uintptr_t) & this->alpha;
-    menu_animation_kill_by_tag(&alphaTag);
-
-    menu_animation_ctx_tag highlightTag = (uintptr_t) & this->highlightAlpha;
-    menu_animation_kill_by_tag(&highlightTag);
-
-    menu_animation_ctx_tag collapseTag = (uintptr_t) & this->collapseState;
-    menu_animation_kill_by_tag(&collapseTag);
-
-    // Parent userdata
-    if (this->parentUserdata)
-    {
-        free(this->parentUserdata);
-        this->parentUserdata = nullptr;
-    }
-
-    // Focus sanity check
-    if (Application::getCurrentFocus() == this)
-        Application::giveFocus(nullptr);
-}
-
-void View::invalidate(bool immediate)
-{
-    if (immediate)
-        this->layout(Application::getNVGContext(), Application::getStyle(), Application::getFontStash());
-    else
-        this->dirty = true;
-}
-
-} // namespace brls
diff --git a/Source/sys-clk/manager/lib/borealis/library/meson.build b/Source/sys-clk/manager/lib/borealis/library/meson.build
deleted file mode 100644
index 81448127..00000000
--- a/Source/sys-clk/manager/lib/borealis/library/meson.build
+++ /dev/null
@@ -1,52 +0,0 @@
-dep_glfw3 = dependency('glfw3', version : '>=3.3')
-dep_glm   = dependency('glm', version : '>=0.9.8')
-
-borealis_files = files(
-    'lib/extern/glad/glad.c',
-    'lib/extern/nanovg/nanovg.c',
-
-    'lib/extern/libretro-common/compat/compat_strl.c',
-    'lib/extern/libretro-common/features/features_cpu.c',
-    'lib/extern/libretro-common/encodings/encoding_utf.c',
-
-    'lib/application.cpp',
-    'lib/view.cpp',
-    'lib/applet_frame.cpp',
-    'lib/theme.cpp',
-    'lib/tab_frame.cpp',
-    'lib/rectangle.cpp',
-    'lib/box_layout.cpp',
-    'lib/sidebar.cpp',
-    'lib/animations.cpp',
-    'lib/style.cpp',
-    'lib/list.cpp',
-    'lib/label.cpp',
-    'lib/crash_frame.cpp',
-    'lib/button.cpp',
-    'lib/table.cpp',
-    'lib/dropdown.cpp',
-    'lib/logger.cpp',
-    'lib/staged_applet_frame.cpp',
-    'lib/progress_display.cpp',
-    'lib/progress_spinner.cpp',
-    'lib/image.cpp',
-    'lib/header.cpp',
-    'lib/popup_frame.cpp',
-    'lib/thumbnail_frame.cpp',
-    'lib/layer_view.cpp',
-    'lib/dialog.cpp',
-    'lib/material_icon.cpp',
-    'lib/hint.cpp',
-    'lib/scroll_view.cpp',
-
-    'lib/task_manager.cpp',
-    'lib/notification_manager.cpp',
-
-    'lib/repeating_task.cpp',
-
-    'lib/swkbd.cpp'
-)
-
-borealis_include = include_directories('include', 'include/borealis/extern/glad', 'include/borealis/extern/nanovg', 'include/borealis/extern/libretro-common')
-
-borealis_dependencies = [ dep_glfw3, dep_glm ]
diff --git a/Source/sys-clk/manager/lib/borealis/meson.build b/Source/sys-clk/manager/lib/borealis/meson.build
deleted file mode 100644
index bd4168b2..00000000
--- a/Source/sys-clk/manager/lib/borealis/meson.build
+++ /dev/null
@@ -1,21 +0,0 @@
-project('borealis_example', ['c', 'cpp'],
-    version: '1.0.0',
-    default_options: [ 'buildtype=release', 'strip=true', 'b_ndebug=if-release', 'cpp_std=c++1z' ],
-)
-
-subdir('library')
-
-example_files = files(
-    'example/main.cpp',
-    'example/sample_installer_page.cpp',
-    'example/sample_loading_page.cpp'
-)
-
-borealis_example = executable(
-    'borealis_example',
-    [ example_files, borealis_files ],
-    dependencies : borealis_dependencies,
-    install: true,
-    include_directories: [ borealis_include, include_directories('example')],
-    cpp_args: [ '-g', '-O2', '-DBOREALIS_RESOURCES="./resources/"' ]
-)
diff --git a/Source/sys-clk/manager/lib/borealis/resources/.gitignore b/Source/sys-clk/manager/lib/borealis/resources/.gitignore
deleted file mode 100644
index 17dfebae..00000000
--- a/Source/sys-clk/manager/lib/borealis/resources/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Illegal-Font.ttf
-Wingdings.ttf
diff --git a/Source/sys-clk/manager/lib/borealis/resources/icon/borealis.jpg b/Source/sys-clk/manager/lib/borealis/resources/icon/borealis.jpg
deleted file mode 100644
index ce90b206..00000000
Binary files a/Source/sys-clk/manager/lib/borealis/resources/icon/borealis.jpg and /dev/null differ
diff --git a/Source/sys-clk/manager/lib/borealis/resources/inter/Inter-Switch.ttf b/Source/sys-clk/manager/lib/borealis/resources/inter/Inter-Switch.ttf
deleted file mode 100644
index d73ca673..00000000
Binary files a/Source/sys-clk/manager/lib/borealis/resources/inter/Inter-Switch.ttf and /dev/null differ
diff --git a/Source/sys-clk/manager/lib/borealis/resources/inter/LICENSE.txt b/Source/sys-clk/manager/lib/borealis/resources/inter/LICENSE.txt
deleted file mode 100644
index 39830805..00000000
--- a/Source/sys-clk/manager/lib/borealis/resources/inter/LICENSE.txt
+++ /dev/null
@@ -1,92 +0,0 @@
-Copyright (c) 2016-2018 The Inter Project Authors (me@rsms.me)
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded,
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION AND CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/Source/sys-clk/manager/lib/borealis/resources/material/LICENSE.txt b/Source/sys-clk/manager/lib/borealis/resources/material/LICENSE.txt
deleted file mode 100644
index 7a4a3ea2..00000000
--- a/Source/sys-clk/manager/lib/borealis/resources/material/LICENSE.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
\ No newline at end of file
diff --git a/Source/sys-clk/manager/lib/borealis/resources/material/MaterialIcons-Regular.ttf b/Source/sys-clk/manager/lib/borealis/resources/material/MaterialIcons-Regular.ttf
deleted file mode 100644
index 7015564a..00000000
Binary files a/Source/sys-clk/manager/lib/borealis/resources/material/MaterialIcons-Regular.ttf and /dev/null differ
diff --git a/Source/sys-clk/manager/lib/borealis/scripts/format.sh b/Source/sys-clk/manager/lib/borealis/scripts/format.sh
deleted file mode 100644
index 0bb92d07..00000000
--- a/Source/sys-clk/manager/lib/borealis/scripts/format.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-
-cd "$( dirname "${BASH_SOURCE[0]}" )/.."
-
-FIX=""
-COLOR="auto"
-
-for v in "$@"; do
-    if [[ "$v" == "--no-ansi" ]] || [[ "$v" == "-n" ]]; then
-        COLOR="never"
-    fi
-    if [[ "$v" == "--fix" ]] || [[ "$v" == "-f" ]]; then
-        FIX="1"
-    fi
-done
-
-function clang_format_run() {
-    python ./scripts/run-clang-format.py -r \
-        --clang-format-executable="clang-format-8" \
-        --color="$COLOR" \
-        --exclude ./library/include/borealis/extern \
-        --exclude ./library/lib/extern \
-        ./library ./example
-}
-
-if [[ -z "$FIX" ]]; then
-    clang_format_run
-else
-    clang_format_run | patch -p1 -N -r -
-fi
diff --git a/Source/sys-clk/manager/lib/borealis/scripts/run-clang-format.py b/Source/sys-clk/manager/lib/borealis/scripts/run-clang-format.py
deleted file mode 100644
index 9158e3d1..00000000
--- a/Source/sys-clk/manager/lib/borealis/scripts/run-clang-format.py
+++ /dev/null
@@ -1,357 +0,0 @@
-#!/usr/bin/env python
-"""A wrapper script around clang-format, suitable for linting multiple files
-and to use for continuous integration.
-
-This is an alternative API for the clang-format command line.
-It runs over multiple files and directories in parallel.
-A diff output is produced and a sensible exit code is returned.
-
-https://github.com/Sarcasm/run-clang-format/blob/master/run-clang-format.py
-
-"""
-
-from __future__ import print_function, unicode_literals
-
-import argparse
-import codecs
-import difflib
-import fnmatch
-import io
-import multiprocessing
-import os
-import signal
-import subprocess
-import sys
-import traceback
-
-from functools import partial
-
-try:
-    from subprocess import DEVNULL  # py3k
-except ImportError:
-    DEVNULL = open(os.devnull, "wb")
-
-
-DEFAULT_EXTENSIONS = 'c,h,C,H,cpp,hpp,cc,hh,c++,h++,cxx,hxx'
-
-
-class ExitStatus:
-    SUCCESS = 0
-    DIFF = 1
-    TROUBLE = 2
-
-
-def list_files(files, recursive=False, extensions=None, exclude=None):
-    if extensions is None:
-        extensions = []
-    if exclude is None:
-        exclude = []
-
-    out = []
-    for file in files:
-        if recursive and os.path.isdir(file):
-            for dirpath, dnames, fnames in os.walk(file):
-                fpaths = [os.path.join(dirpath, fname) for fname in fnames]
-                for pattern in exclude:
-                    # os.walk() supports trimming down the dnames list
-                    # by modifying it in-place,
-                    # to avoid unnecessary directory listings.
-                    dnames[:] = [
-                        x for x in dnames
-                        if
-                        not fnmatch.fnmatch(os.path.join(dirpath, x), pattern)
-                    ]
-                    fpaths = [
-                        x for x in fpaths if not fnmatch.fnmatch(x, pattern)
-                    ]
-                for f in fpaths:
-                    ext = os.path.splitext(f)[1][1:]
-                    if ext in extensions:
-                        out.append(f)
-        else:
-            out.append(file)
-    return out
-
-
-def make_diff(file, original, reformatted):
-    return list(
-        difflib.unified_diff(
-            original,
-            reformatted,
-            fromfile='{}\t(original)'.format(file),
-            tofile='{}\t(reformatted)'.format(file),
-            n=3))
-
-
-class DiffError(Exception):
-    def __init__(self, message, errs=None):
-        super(DiffError, self).__init__(message)
-        self.errs = errs or []
-
-
-class UnexpectedError(Exception):
-    def __init__(self, message, exc=None):
-        super(UnexpectedError, self).__init__(message)
-        self.formatted_traceback = traceback.format_exc()
-        self.exc = exc
-
-
-def run_clang_format_diff_wrapper(args, file):
-    try:
-        ret = run_clang_format_diff(args, file)
-        return ret
-    except DiffError:
-        raise
-    except Exception as e:
-        raise UnexpectedError('{}: {}: {}'.format(file, e.__class__.__name__,
-                                                  e), e)
-
-
-def run_clang_format_diff(args, file):
-    try:
-        with io.open(file, 'r', encoding='utf-8') as f:
-            original = f.readlines()
-    except IOError as exc:
-        raise DiffError(str(exc))
-    invocation = [args.clang_format_executable, file]
-
-    # Use of utf-8 to decode the process output.
-    #
-    # Hopefully, this is the correct thing to do.
-    #
-    # It's done due to the following assumptions (which may be incorrect):
-    # - clang-format will returns the bytes read from the files as-is,
-    #   without conversion, and it is already assumed that the files use utf-8.
-    # - if the diagnostics were internationalized, they would use utf-8:
-    #   > Adding Translations to Clang
-    #   >
-    #   > Not possible yet!
-    #   > Diagnostic strings should be written in UTF-8,
-    #   > the client can translate to the relevant code page if needed.
-    #   > Each translation completely replaces the format string
-    #   > for the diagnostic.
-    #   > -- http://clang.llvm.org/docs/InternalsManual.html#internals-diag-translation
-    #
-    # It's not pretty, due to Python 2 & 3 compatibility.
-    encoding_py3 = {}
-    if sys.version_info[0] >= 3:
-        encoding_py3['encoding'] = 'utf-8'
-
-    try:
-        proc = subprocess.Popen(
-            invocation,
-            stdout=subprocess.PIPE,
-            stderr=subprocess.PIPE,
-            universal_newlines=True,
-            **encoding_py3)
-    except OSError as exc:
-        raise DiffError(
-            "Command '{}' failed to start: {}".format(
-                subprocess.list2cmdline(invocation), exc
-            )
-        )
-    proc_stdout = proc.stdout
-    proc_stderr = proc.stderr
-    if sys.version_info[0] < 3:
-        # make the pipes compatible with Python 3,
-        # reading lines should output unicode
-        encoding = 'utf-8'
-        proc_stdout = codecs.getreader(encoding)(proc_stdout)
-        proc_stderr = codecs.getreader(encoding)(proc_stderr)
-    # hopefully the stderr pipe won't get full and block the process
-    outs = list(proc_stdout.readlines())
-    errs = list(proc_stderr.readlines())
-    proc.wait()
-    if proc.returncode:
-        raise DiffError(
-            "Command '{}' returned non-zero exit status {}".format(
-                subprocess.list2cmdline(invocation), proc.returncode
-            ),
-            errs,
-        )
-    return make_diff(file, original, outs), errs
-
-
-def bold_red(s):
-    return '\x1b[1m\x1b[31m' + s + '\x1b[0m'
-
-
-def colorize(diff_lines):
-    def bold(s):
-        return '\x1b[1m' + s + '\x1b[0m'
-
-    def cyan(s):
-        return '\x1b[36m' + s + '\x1b[0m'
-
-    def green(s):
-        return '\x1b[32m' + s + '\x1b[0m'
-
-    def red(s):
-        return '\x1b[31m' + s + '\x1b[0m'
-
-    for line in diff_lines:
-        if line[:4] in ['--- ', '+++ ']:
-            yield bold(line)
-        elif line.startswith('@@ '):
-            yield cyan(line)
-        elif line.startswith('+'):
-            yield green(line)
-        elif line.startswith('-'):
-            yield red(line)
-        else:
-            yield line
-
-
-def print_diff(diff_lines, use_color):
-    if use_color:
-        diff_lines = colorize(diff_lines)
-    if sys.version_info[0] < 3:
-        sys.stdout.writelines((l.encode('utf-8') for l in diff_lines))
-    else:
-        sys.stdout.writelines(diff_lines)
-
-
-def print_trouble(prog, message, use_colors):
-    error_text = 'error:'
-    if use_colors:
-        error_text = bold_red(error_text)
-    print("{}: {} {}".format(prog, error_text, message), file=sys.stderr)
-
-
-def main():
-    parser = argparse.ArgumentParser(description=__doc__)
-    parser.add_argument(
-        '--clang-format-executable',
-        metavar='EXECUTABLE',
-        help='path to the clang-format executable',
-        default='clang-format')
-    parser.add_argument(
-        '--extensions',
-        help='comma separated list of file extensions (default: {})'.format(
-            DEFAULT_EXTENSIONS),
-        default=DEFAULT_EXTENSIONS)
-    parser.add_argument(
-        '-r',
-        '--recursive',
-        action='store_true',
-        help='run recursively over directories')
-    parser.add_argument('files', metavar='file', nargs='+')
-    parser.add_argument(
-        '-q',
-        '--quiet',
-        action='store_true')
-    parser.add_argument(
-        '-j',
-        metavar='N',
-        type=int,
-        default=0,
-        help='run N clang-format jobs in parallel'
-        ' (default number of cpus + 1)')
-    parser.add_argument(
-        '--color',
-        default='auto',
-        choices=['auto', 'always', 'never'],
-        help='show colored diff (default: auto)')
-    parser.add_argument(
-        '-e',
-        '--exclude',
-        metavar='PATTERN',
-        action='append',
-        default=[],
-        help='exclude paths matching the given glob-like pattern(s)'
-        ' from recursive search')
-
-    args = parser.parse_args()
-
-    # use default signal handling, like diff return SIGINT value on ^C
-    # https://bugs.python.org/issue14229#msg156446
-    signal.signal(signal.SIGINT, signal.SIG_DFL)
-    try:
-        signal.SIGPIPE
-    except AttributeError:
-        # compatibility, SIGPIPE does not exist on Windows
-        pass
-    else:
-        signal.signal(signal.SIGPIPE, signal.SIG_DFL)
-
-    colored_stdout = False
-    colored_stderr = False
-    if args.color == 'always':
-        colored_stdout = True
-        colored_stderr = True
-    elif args.color == 'auto':
-        colored_stdout = sys.stdout.isatty()
-        colored_stderr = sys.stderr.isatty()
-
-    version_invocation = [args.clang_format_executable, str("--version")]
-    try:
-        subprocess.check_call(version_invocation, stdout=DEVNULL)
-    except subprocess.CalledProcessError as e:
-        print_trouble(parser.prog, str(e), use_colors=colored_stderr)
-        return ExitStatus.TROUBLE
-    except OSError as e:
-        print_trouble(
-            parser.prog,
-            "Command '{}' failed to start: {}".format(
-                subprocess.list2cmdline(version_invocation), e
-            ),
-            use_colors=colored_stderr,
-        )
-        return ExitStatus.TROUBLE
-
-    retcode = ExitStatus.SUCCESS
-    files = list_files(
-        args.files,
-        recursive=args.recursive,
-        exclude=args.exclude,
-        extensions=args.extensions.split(','))
-
-    if not files:
-        return
-
-    njobs = args.j
-    if njobs == 0:
-        njobs = multiprocessing.cpu_count() + 1
-    njobs = min(len(files), njobs)
-
-    if njobs == 1:
-        # execute directly instead of in a pool,
-        # less overhead, simpler stacktraces
-        it = (run_clang_format_diff_wrapper(args, file) for file in files)
-        pool = None
-    else:
-        pool = multiprocessing.Pool(njobs)
-        it = pool.imap_unordered(
-            partial(run_clang_format_diff_wrapper, args), files)
-    while True:
-        try:
-            outs, errs = next(it)
-        except StopIteration:
-            break
-        except DiffError as e:
-            print_trouble(parser.prog, str(e), use_colors=colored_stderr)
-            retcode = ExitStatus.TROUBLE
-            sys.stderr.writelines(e.errs)
-        except UnexpectedError as e:
-            print_trouble(parser.prog, str(e), use_colors=colored_stderr)
-            sys.stderr.write(e.formatted_traceback)
-            retcode = ExitStatus.TROUBLE
-            # stop at the first unexpected error,
-            # something could be very wrong,
-            # don't process all files unnecessarily
-            if pool:
-                pool.terminate()
-            break
-        else:
-            sys.stderr.writelines(errs)
-            if outs == []:
-                continue
-            if not args.quiet:
-                print_diff(outs, use_color=colored_stdout)
-            if retcode == ExitStatus.SUCCESS:
-                retcode = ExitStatus.DIFF
-    return retcode
-
-
-if __name__ == '__main__':
-    sys.exit(main())
diff --git a/Source/sys-clk/manager/meson.build b/Source/sys-clk/manager/meson.build
deleted file mode 100644
index 79a6714a..00000000
--- a/Source/sys-clk/manager/meson.build
+++ /dev/null
@@ -1,42 +0,0 @@
-project('sys-clk-manager', ['c', 'cpp'],
-    version: '1.0.0',
-    default_options: [ 'buildtype=release', 'strip=true', 'b_ndebug=if-release', 'cpp_std=c++1z' ],
-)
-
-add_global_arguments('-DAPP_TITLE="sys-clk manager"', language : 'cpp')
-
-subdir('lib/borealis/library')
-
-source_files = files(
-    'src/main.cpp',
-    'src/utils.cpp',
-    'src/refresh_task.cpp',
-
-    'src/main_frame.cpp',
-    'src/logo.cpp',
-
-    'src/status_tab.cpp',
-    'src/advanced_settings_tab.cpp',
-    'src/app_profiles_tab.cpp',
-    'src/app_profile_frame.cpp',
-    'src/cheat_sheet_tab.cpp',
-    'src/about_tab.cpp'
-)
-
-ipc_files = files(
-    'src/ipc/pc_shim/client.cpp',
-    'src/ipc/pc_shim/ns.cpp'
-)
-
-manager_include = include_directories(
-    '../common/include'
-)
-
-sys_clk_manager = executable(
-    'sys-clk-manager',
-    [ source_files, borealis_files, ipc_files ],
-    dependencies : borealis_dependencies,
-    install: true,
-    include_directories: [borealis_include, manager_include],
-    cpp_args: [ '-g', '-O2', '-DBOREALIS_RESOURCES="./lib/borealis/resources/"',  '-DAPP_RESOURCES="./resources/"']
-)
diff --git a/Source/sys-clk/manager/resources/fira/FiraSans-Medium-rnx.ttf b/Source/sys-clk/manager/resources/fira/FiraSans-Medium-rnx.ttf
deleted file mode 100644
index ef4a25a5..00000000
Binary files a/Source/sys-clk/manager/resources/fira/FiraSans-Medium-rnx.ttf and /dev/null differ
diff --git a/Source/sys-clk/manager/resources/fira/LICENSE.txt b/Source/sys-clk/manager/resources/fira/LICENSE.txt
deleted file mode 100644
index 5e4608f2..00000000
--- a/Source/sys-clk/manager/resources/fira/LICENSE.txt
+++ /dev/null
@@ -1,93 +0,0 @@
-Digitized data copyright (c) 2012-2015, The Mozilla Foundation and Telefonica S.A.
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded, 
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/Source/sys-clk/manager/src/about_tab.cpp b/Source/sys-clk/manager/src/about_tab.cpp
deleted file mode 100644
index 7d163fe5..00000000
--- a/Source/sys-clk/manager/src/about_tab.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
-    sys-clk manager, a sys-clk frontend homebrew
-    Copyright (C) 2019-2020  natinusala
-    Copyright (C) 2019  p-sam
-    Copyright (C) 2019  m4xw
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include "about_tab.h"
-
-#include "logo.h"
-#include "ipc/ipc.h"
-#include "ipc/client.h"
-
-#include <borealis.hpp>
-
-AboutTab::AboutTab()
-{
-    this->addView(new Logo(LogoStyle::ABOUT));
-
-    // Subtitle
-    brls::Label *subTitle = new brls::Label(
-        brls::LabelStyle::REGULAR,
-        "Nintendo Switch overclocking / underclocking system module and frontend app by the RetroNX Team", 
-        true
-    );
-    subTitle->setHorizontalAlign(NVG_ALIGN_CENTER);
-    this->addView(subTitle);
-
-    // Copyright
-    brls::Label *copyright = new brls::Label(
-        brls::LabelStyle::DESCRIPTION,
-        "System module licensed under the Beerware license\n" \
-        "Frontend app licensed under GPL-3.0\n" \
-        "\u00A9 2019 - 2020 natinusala, p-sam, m4xw",
-        true
-    );
-    copyright->setHorizontalAlign(NVG_ALIGN_CENTER);
-    this->addView(copyright);
-
-    // Links
-    this->addView(new brls::Header("Links and Resources"));
-    brls::Label *links = new brls::Label(
-        brls::LabelStyle::SMALL,
-        "\uE016  User guide and code source can be found on our GitHub repository\n" \
-        "\uE016  The sys-clk manager is powered by Borealis, an hardware accelerated UI library\n" \
-        "\uE016  Join the RetroNX Discord server for support, to request features or just hang out!",
-        true
-    );
-    this->addView(links);
-}
diff --git a/Source/sys-clk/manager/src/about_tab.h b/Source/sys-clk/manager/src/about_tab.h
deleted file mode 100644
index 9094de1f..00000000
--- a/Source/sys-clk/manager/src/about_tab.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-    sys-clk manager, a sys-clk frontend homebrew
-    Copyright (C) 2019-2020  natinusala
-    Copyright (C) 2019  p-sam
-    Copyright (C) 2019  m4xw
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include <borealis.hpp>
-
-class AboutTab : public brls::List
-{
-    public:
-        AboutTab();
-
-        View* getDefaultFocus() override
-        {
-            return nullptr;
-        }
-};
diff --git a/Source/sys-clk/manager/src/advanced_settings_tab.cpp b/Source/sys-clk/manager/src/advanced_settings_tab.cpp
deleted file mode 100644
index 4c56f503..00000000
--- a/Source/sys-clk/manager/src/advanced_settings_tab.cpp
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
-    sys-clk manager, a sys-clk frontend homebrew
-    Copyright (C) 2019  natinusala
-    Copyright (C) 2019  p-sam
-    Copyright (C) 2019  m4xw
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include "advanced_settings_tab.h"
-
-#include "utils.h"
-
-#include <sysclk.h>
-
-AdvancedSettingsTab::AdvancedSettingsTab()
-{
-    // Get context
-    SysClkContext context;
-    Result rc = sysclkIpcGetCurrentContext(&context);
-
-    if (R_FAILED(rc))
-    {
-        brls::Logger::error("Unable to get context");
-        errorResult("sysclkIpcGetCurrentContext", rc);
-        brls::Application::crash("Could not get the current sys-clk context, please check that it is correctly installed and enabled.");
-        return;
-    }
-
-    // Create UI
-
-    // Disclaimer
-    this->addView(new brls::Label(brls::LabelStyle::REGULAR, "\uE140  Please only alter these settings if you know what you are doing.", true));
-
-    // Temporary overrides
-    this->addView(new brls::Header("Temporary overrides"));
-
-    // CPU
-    brls::SelectListItem *cpuFreqListItem = createFreqListItem(SysClkModule_CPU, context.overrideFreqs[SysClkModule_CPU] / 1000000);
-    cpuFreqListItem->getValueSelectedEvent()->subscribe([](int result){
-        Result rc = result == 0 ?
-            sysclkIpcRemoveOverride(SysClkModule_CPU) :
-            sysclkIpcSetOverride(SysClkModule_CPU, g_freq_table_hz[SysClkModule_CPU][result]);
-
-        if (R_FAILED(rc))
-        {
-            brls::Logger::error("Unable to update CPU Override");
-            errorResult(result == 0 ? "sysclkIpcRemoveOverride" : "sysclkIpcSetOverride",  rc);
-            // TODO: Reset selected value
-        }
-    });
-
-    // GPU
-    brls::SelectListItem *gpuFreqListItem = createFreqListItem(SysClkModule_GPU, context.overrideFreqs[SysClkModule_GPU] / 1000000);
-    gpuFreqListItem->getValueSelectedEvent()->subscribe([](int result){
-        Result rc = result == 0 ?
-            sysclkIpcRemoveOverride(SysClkModule_GPU) :
-            sysclkIpcSetOverride(SysClkModule_GPU, g_freq_table_hz[SysClkModule_GPU][result]);
-
-        if (R_FAILED(rc))
-        {
-            brls::Logger::error("Unable to update GPU Override");
-            errorResult(result == 0 ? "sysclkIpcRemoveOverride" : "sysclkIpcSetOverride",  rc);
-            // TODO: Reset selected value
-        }
-    });
-
-    // MEM
-    brls::SelectListItem *memFreqListItem = createFreqListItem(SysClkModule_MEM, context.overrideFreqs[SysClkModule_MEM] / 1000000);
-    memFreqListItem->getValueSelectedEvent()->subscribe([](int result)
-    {
-        Result rc = result == 0 ?
-            sysclkIpcRemoveOverride(SysClkModule_MEM) :
-            sysclkIpcSetOverride(SysClkModule_MEM, g_freq_table_hz[SysClkModule_MEM][result]);
-
-        if (R_FAILED(rc))
-        {
-            brls::Logger::error("Unable to update MEM Override");
-            errorResult(result == 0 ? "sysclkIpcRemoveOverride" : "sysclkIpcSetOverride",  rc);
-            // TODO: Reset selected value
-        }
-    });
-
-    this->addView(cpuFreqListItem);
-    this->addView(gpuFreqListItem);
-    this->addView(memFreqListItem);
-
-    // Config
-    this->addView(new brls::Header("Configuration"));
-
-    // Logging
-    // TODO: add a logger view and put the button to enter it here
-
-    // Config entries
-    // TODO: add constraints to the swkbd if possible (min / max)
-
-    sysclkIpcGetConfigValues(&this->configValues);
-
-    for (int i = 0; i < SysClkConfigValue_EnumMax; i++)
-    {
-        SysClkConfigValue config = (SysClkConfigValue) i;
-
-        std::string label       = std::string(sysclkFormatConfigValue(config, true));
-        std::string description = this->getDescriptionForConfig(config);
-        uint64_t defaultValue   = this->configValues.values[config];
-
-        brls::IntegerInputListItem* configItem = new brls::IntegerInputListItem(label, defaultValue, label, description);
-
-        configItem->setReduceDescriptionSpacing(true);
-
-        configItem->getClickEvent()->subscribe([this, configItem, config](View* view)
-        {
-            try
-            {
-                int value = std::stoi(configItem->getValue());
-
-                // Validate the value
-                if (value < 0)
-                {
-                    brls::Application::notify("\uE5CD Couldn't save configuration: invalid value (is negative)");
-                    configItem->setValue(std::to_string(this->configValues.values[config]));
-                    return;
-                }
-
-                uint64_t uvalue = (uint64_t) value;
-
-                if (!sysclkValidConfigValue(config, uvalue))
-                {
-                    brls::Application::notify("\uE5CD Couldn't save configuration: invalid value");
-                    configItem->setValue(std::to_string(this->configValues.values[config]));
-                    return;
-                }
-
-                // Save the config
-                this->configValues.values[config] = uvalue;
-                sysclkIpcSetConfigValues(&this->configValues);
-
-                brls::Application::notify("\uE14B Configuration saved");
-            }
-            catch(const std::exception& e)
-            {
-                brls::Logger::error("Unable to parse config value %s: %s", configItem->getValue().c_str(), e.what());
-            }
-        });
-
-        this->addView(configItem);
-    }
-}
-
-std::string AdvancedSettingsTab::getDescriptionForConfig(SysClkConfigValue config)
-{
-    switch (config)
-    {
-        case SysClkConfigValue_CsvWriteIntervalMs:
-            return "How often to update /config/sys-clk/context.csv (in milliseconds)\n\uE016  Use 0 to disable";
-        case SysClkConfigValue_TempLogIntervalMs:
-            return "How often to log temperatures (in milliseconds)\n\uE016  Use 0 to disable";
-        case SysClkConfigValue_FreqLogIntervalMs:
-            return "How often to log real frequencies (in milliseconds)\n\uE016  Use 0 to disable";
-        case SysClkConfigValue_PowerLogIntervalMs:
-            return "How often to log power consumption (in milliseconds)\n\uE016  Use 0 to disable";
-        case SysClkConfigValue_PollingIntervalMs:
-            return "How fast to check and apply profiles (in milliseconds)";
-        default:
-            return "";
-    }
-}
-
diff --git a/Source/sys-clk/manager/src/advanced_settings_tab.h b/Source/sys-clk/manager/src/advanced_settings_tab.h
deleted file mode 100644
index 7bcc431a..00000000
--- a/Source/sys-clk/manager/src/advanced_settings_tab.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-    sys-clk manager, a sys-clk frontend homebrew
-    Copyright (C) 2019  natinusala
-    Copyright (C) 2019  p-sam
-    Copyright (C) 2019  m4xw
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include <borealis.hpp>
-
-#include "ipc/client.h"
-
-class AdvancedSettingsTab : public brls::List
-{
-    public:
-        AdvancedSettingsTab();
-
-    private:
-        std::string getDescriptionForConfig(SysClkConfigValue config);
-
-        bool isLoggingEnabled();
-        void setLoggingEnabled(bool value);
-
-        SysClkConfigValueList configValues;
-};
diff --git a/Source/sys-clk/manager/src/app_profile_frame.cpp b/Source/sys-clk/manager/src/app_profile_frame.cpp
deleted file mode 100644
index 46a866ac..00000000
--- a/Source/sys-clk/manager/src/app_profile_frame.cpp
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
-    sys-clk manager, a sys-clk frontend homebrew
-    Copyright (C) 2019  natinusala
-    Copyright (C) 2019  p-sam
-    Copyright (C) 2019  m4xw
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include "app_profile_frame.h"
-
-#include <borealis.hpp>
-
-#include "utils.h"
-
-#include "ipc/client.h"
-
-#include <cstring>
-
-AppProfileFrame::AppProfileFrame(Title* title) : ThumbnailFrame(), title(title)
-{
-    this->setTitle("Edit application profile");
-    this->setIcon(new brls::MaterialIcon("\uE315"));
-
-    // Get the freqs
-    Result rc = sysclkIpcGetProfiles(title->tid, &this->profiles);
-
-    if (R_FAILED(rc))
-        errorResult("sysclkIpcGetProfiles", rc);
-
-    // Setup the right sidebar
-    this->getSidebar()->setThumbnail(title->icon, sizeof(title->icon));
-    this->getSidebar()->setTitle(std::string(title->name));
-    this->getSidebar()->setSubtitle(formatTid(title->tid));
-    this->getSidebar()->getButton()->setState(brls::ButtonState::DISABLED);
-
-    this->getSidebar()->getButton()->getClickEvent()->subscribe([this, title](brls::View* view)
-    {
-        SysClkTitleProfileList profiles;
-        memcpy(&profiles, &this->profiles, sizeof(SysClkTitleProfileList));
-
-        for (int p = 0; p < SysClkProfile_EnumMax; p++)
-        {
-            for (int m = 0; m < SysClkModule_EnumMax; m++)
-                profiles.mhzMap[p][m] /= 1000000;
-        }
-
-        Result rc = sysclkIpcSetProfiles(title->tid, &profiles);
-
-        if (R_SUCCEEDED(rc))
-        {
-            // TODO: set the tick mark color to blue/green once borealis has rich text support
-            brls::Application::notify("\uE14B Profile saved");
-            brls::Application::popView(brls::ViewAnimation::SLIDE_RIGHT);
-        }
-        else
-        {
-            errorResult("sysclkIpcSetProfiles", rc);
-            brls::Application::notify("An error occured while saving the profile - see logs for more details");
-        }
-    });
-
-    // Setup the list
-    brls::List* list = new brls::List();
-
-    this->addFreqs(list, SysClkProfile_Docked);
-    this->addFreqs(list, SysClkProfile_Handheld);
-
-    this->addFreqs(list, SysClkProfile_HandheldCharging);
-    this->addFreqs(list, SysClkProfile_HandheldChargingOfficial);
-    this->addFreqs(list, SysClkProfile_HandheldChargingUSB);
-
-    this->setContentView(list);
-}
-
-void AppProfileFrame::addFreqs(brls::List* list, SysClkProfile profile)
-{
-    // Get the freqs
-    list->addView(new brls::Header(std::string(sysclkFormatProfile(profile, true))));
-
-    // CPU
-    brls::SelectListItem* cpuListItem = createFreqListItem(SysClkModule_CPU, this->profiles.mhzMap[profile][SysClkModule_CPU]);
-
-    this->profiles.mhzMap[profile][SysClkModule_CPU] *= 1000000;
-
-    cpuListItem->getValueSelectedEvent()->subscribe([this, profile](int result) {
-        this->onProfileChanged();
-        this->profiles.mhzMap[profile][SysClkModule_CPU] = result == 0 ? result : g_freq_table_hz[SysClkModule_CPU][result];
-
-        brls::Logger::debug("Caching freq for module %d and profile %d to %" PRIu32, SysClkModule_CPU, profile, this->profiles.mhzMap[profile][SysClkModule_CPU]);
-    });
-    list->addView(cpuListItem);
-
-    // GPU
-    brls::SelectListItem* gpuListItem = createFreqListItem(SysClkModule_GPU, this->profiles.mhzMap[profile][SysClkModule_GPU]);
-
-    this->profiles.mhzMap[profile][SysClkModule_GPU] *= 1000000;
-
-    gpuListItem->getValueSelectedEvent()->subscribe([this, profile](int result) {
-        this->onProfileChanged();
-        this->profiles.mhzMap[profile][SysClkModule_GPU] = result == 0 ? result : g_freq_table_hz[SysClkModule_GPU][result];
-
-        brls::Logger::debug("Caching freq for module %d and profile %d to %" PRIu32, SysClkModule_GPU, profile, this->profiles.mhzMap[profile][SysClkModule_GPU]);
-    });
-    list->addView(gpuListItem);
-
-    // MEM
-    brls::SelectListItem* memListItem = createFreqListItem(SysClkModule_MEM, this->profiles.mhzMap[profile][SysClkModule_MEM]);
-
-    this->profiles.mhzMap[profile][SysClkModule_MEM] *= 1000000;
-
-    memListItem->getValueSelectedEvent()->subscribe([this, profile](int result) {
-        this->onProfileChanged();
-        this->profiles.mhzMap[profile][SysClkModule_MEM] = result == 0 ? result : g_freq_table_hz[SysClkModule_MEM][result];
-
-        brls::Logger::debug("Caching freq for module %d and profile %d to %" PRIu32, SysClkModule_MEM, profile, this->profiles.mhzMap[profile][SysClkModule_MEM]);
-    });
-    list->addView(memListItem);
-}
-
-void AppProfileFrame::onProfileChanged()
-{
-    this->getSidebar()->getButton()->setState(brls::ButtonState::ENABLED);
-    this->updateActionHint(brls::Key::B, "Cancel");
-}
-
-bool AppProfileFrame::onCancel()
-{
-    if (this->hasProfileChanged())
-    {
-        brls::Dialog* dialog = new brls::Dialog("You have unsaved changes to this profile!\nAre you sure you want to discard them?");
-
-        dialog->addButton("No", [dialog](brls::View* view){
-            dialog->close();
-        });
-
-        dialog->addButton("Yes", [dialog](brls::View* view){
-            dialog->close([](){
-                brls::Application::popView(brls::ViewAnimation::SLIDE_RIGHT);
-            });
-        });
-
-        dialog->open();
-    }
-    else
-    {
-        brls::Application::popView(brls::ViewAnimation::SLIDE_RIGHT);
-    }
-    return true;
-}
-
-bool AppProfileFrame::hasProfileChanged()
-{
-    return this->getSidebar()->getButton()->getState() == brls::ButtonState::ENABLED;
-}
diff --git a/Source/sys-clk/manager/src/app_profile_frame.h b/Source/sys-clk/manager/src/app_profile_frame.h
deleted file mode 100644
index 275eae1d..00000000
--- a/Source/sys-clk/manager/src/app_profile_frame.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-    sys-clk manager, a sys-clk frontend homebrew
-    Copyright (C) 2019  natinusala
-    Copyright (C) 2019  p-sam
-    Copyright (C) 2019  m4xw
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include <borealis.hpp>
-
-#include <sysclk.h>
-
-#include "app_profiles_tab.h"
-
-class AppProfileFrame : public brls::ThumbnailFrame
-{
-    public:
-        AppProfileFrame(Title* title);
-
-        bool onCancel() override;
-
-    private:
-        Title* title;
-
-        SysClkTitleProfileList profiles;
-
-        bool hasProfileChanged();
-
-        void addFreqs(brls::List* list, SysClkProfile profile);
-
-        void onProfileChanged();
-};
diff --git a/Source/sys-clk/manager/src/app_profiles_tab.cpp b/Source/sys-clk/manager/src/app_profiles_tab.cpp
deleted file mode 100644
index e36100b4..00000000
--- a/Source/sys-clk/manager/src/app_profiles_tab.cpp
+++ /dev/null
@@ -1,244 +0,0 @@
-/*
-    sys-clk manager, a sys-clk frontend homebrew
-    Copyright (C) 2019  natinusala
-    Copyright (C) 2019  p-sam
-    Copyright (C) 2019  m4xw
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include "app_profiles_tab.h"
-
-#include "app_profile_frame.h"
-
-#include "ipc/client.h"
-#include "ipc/ipc.h"
-
-#include <cstring>
-
-#include "utils.h"
-
-#define PROFILE_BADGE "\uE3E0"
-
-AppProfilesTab::AppProfilesTab()
-{
-    // Filter toggle
-    this->filterListItem = new brls::ToggleListItem("Show applications with no profile", this->showEmptyProfiles, "", "Yes", "No");
-    filterListItem->getClickEvent()->subscribe([this](View* v)
-    {
-        this->refreshFilter();
-    });
-    this->addView(filterListItem);
-
-    // Spacing
-    this->addView(new brls::ListItemGroupSpacing());
-
-    // Applications list
-    NsApplicationRecord record;
-    uint64_t tid;
-    NsApplicationControlData controlData;
-    NacpLanguageEntry* langEntry = NULL;
-
-    Result rc;
-    size_t i            = 0;
-    int recordCount     = 0;
-    size_t controlSize  = 0;
-
-    while (true)
-    {
-        // Record
-        rc = nsListApplicationRecord(&record, sizeof(record), i, &recordCount);
-        if (R_FAILED(rc))
-        {
-            errorResult("nsListApplicationRecord", rc);
-            break;
-        }
-
-        if(recordCount <= 0)
-            break;
-
-        tid = record.application_id;
-
-        // Control data
-        rc = nsGetApplicationControlData(NsApplicationControlSource_Storage, tid, &controlData, sizeof(controlData), &controlSize);
-        if (R_FAILED(rc))
-        {
-            errorResult("nsGetApplicationControlData", rc);
-            break;
-        }
-
-        // Language entry
-        rc = nacpGetLanguageEntry(&controlData.nacp, &langEntry);
-        if (R_FAILED(rc))
-        {
-            errorResult("nacpGetLanguageEntry", rc);
-            break;
-        }
-
-        // Name
-        // if (!langEntry->name)
-        // {
-        //     i++;
-        //     continue;
-        // }
-
-        Title* title = (Title*) malloc(sizeof(Title));
-        title->tid = tid;
-
-        memset(title->name, 0, sizeof(title->name));
-        strncpy(title->name, langEntry->name, sizeof(title->name)-1);
-
-        memcpy(title->icon, controlData.icon, sizeof(title->icon));
-
-        // Profile
-        rc = sysclkIpcGetProfileCount(tid, &title->profileCount);
-        if (R_FAILED(rc))
-        {
-            errorResult("sysclkIpcGetProfileCount", rc);
-            free(title);
-            break;
-        }
-
-        // Add the ListItem
-        brls::ListItem *listItem = new brls::ListItem(formatListItemTitle(std::string(title->name)), "", formatTid(title->tid));
-
-        title->listItem = listItem;
-
-        this->items.push_back(listItem);
-
-        if (title->profileCount > 0)
-        {
-            listItem->setValue(PROFILE_BADGE);
-            this->profilesItems.push_back(listItem);
-        }
-        else
-        {
-            this->emptyProfilesItems.push_back(listItem);
-
-            if (!this->showEmptyProfiles)
-                listItem->collapse(false);
-        }
-
-        listItem->setThumbnail(title->icon, sizeof(title->icon));
-
-        listItem->getClickEvent()->subscribe([this, title](View* view) {
-            this->editingTitle = title;
-            AppProfileFrame* profileFrame = new AppProfileFrame(title);
-            brls::Application::pushView(profileFrame, brls::ViewAnimation::SLIDE_LEFT);
-        });
-
-        this->addView(listItem);
-        this->titles.push_back(title);
-
-        i++;
-    }
-
-    // Empty list message
-    this->emptyListLabel = new brls::Label(brls::LabelStyle::REGULAR, "", true);
-    this->addView(emptyListLabel);
-    this->updateEmptyListLabel(false);
-}
-
-void AppProfilesTab::updateEmptyListLabel(bool animate)
-{
-    if (this->items.empty())
-    {
-        this->emptyListLabel->setText("\uE140  You don't have any application installed on your Nintendo Switch.");
-        this->emptyListLabel->show([](){}, animate);
-    }
-    else if (!this->showEmptyProfiles && this->profilesItems.empty())
-    {
-        this->emptyListLabel->setText("\uE140  You don't have any application with a defined profile at the moment.");
-        this->emptyListLabel->show([](){}, animate);
-    }
-    else
-    {
-        this->emptyListLabel->hide([](){}, animate);
-    }
-}
-
-AppProfilesTab::~AppProfilesTab()
-{
-    for (Title* title : this->titles)
-        free(title);
-
-    this->titles.clear();
-}
-
-
-void AppProfilesTab::willAppear(bool resetState)
-{
-    if (this->editingTitle != nullptr)
-    {
-        bool hadProfiles = this->editingTitle->profileCount > 0;
-
-        Result rc = sysclkIpcGetProfileCount(this->editingTitle->tid, &this->editingTitle->profileCount);
-
-        bool hasProfiles = this->editingTitle->profileCount > 0;
-
-        if (R_FAILED(rc))
-        {
-            errorResult("sysclkIpcGetProfileCount", rc);
-            this->editingTitle = nullptr;
-            return;
-        }
-
-        // Update the profile badge
-        if (hasProfiles)
-            this->editingTitle->listItem->setValue(PROFILE_BADGE);
-        else
-            this->editingTitle->listItem->setValue("");
-
-        // Update lists
-
-        // Remove from emptyProfilesItems if it didn't have a profile
-        // but has one now
-        // Add to profilesItems
-        if (!hadProfiles && hasProfiles)
-        {
-            this->emptyProfilesItems.erase(std::remove(this->emptyProfilesItems.begin(), this->emptyProfilesItems.end(), this->editingTitle->listItem), this->emptyProfilesItems.end());
-            this->profilesItems.push_back(this->editingTitle->listItem);
-        }
-
-        // Add to emptyProfilesItems if it had a profile but doesn't
-        // has one now
-        // Remove from profilesItems
-        if (hadProfiles && !hasProfiles)
-        {
-            this->emptyProfilesItems.push_back(this->editingTitle->listItem);
-            this->profilesItems.erase(std::remove(this->profilesItems.begin(), this->profilesItems.end(), this->editingTitle->listItem), this->profilesItems.end());
-        }
-
-        // Refresh the filter
-        this->refreshFilter();
-
-        // Cleanup
-        this->editingTitle = nullptr;
-    }
-}
-
-void AppProfilesTab::refreshFilter()
-{
-    this->showEmptyProfiles = this->filterListItem->getToggleState();
-
-    for (brls::ListItem *listItem : this->emptyProfilesItems)
-    {
-        if (this->showEmptyProfiles)
-            listItem->expand();
-        else
-            listItem->collapse();
-
-        this->updateEmptyListLabel();
-    }
-}
diff --git a/Source/sys-clk/manager/src/app_profiles_tab.h b/Source/sys-clk/manager/src/app_profiles_tab.h
deleted file mode 100644
index ef9a4850..00000000
--- a/Source/sys-clk/manager/src/app_profiles_tab.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
-    sys-clk manager, a sys-clk frontend homebrew
-    Copyright (C) 2019  natinusala
-    Copyright (C) 2019  p-sam
-    Copyright (C) 2019  m4xw
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include <borealis.hpp>
-
-#include "ipc/ipc.h"
-
-typedef struct
-{
-    uint64_t tid;
-    NsApplicationName name;
-    NsApplicationIcon icon;
-    uint8_t profileCount;
-
-    brls::ListItem* listItem;
-} Title;
-
-class AppProfilesTab : public brls::List
-{
-    private:
-        bool showEmptyProfiles = true;
-
-        std::vector<Title*> titles;
-
-        std::vector<brls::ListItem*> items;
-        std::vector<brls::ListItem*> emptyProfilesItems;
-        std::vector<brls::ListItem*> profilesItems;
-
-        brls::Label *emptyListLabel;
-        brls::ToggleListItem *filterListItem;
-
-        void updateEmptyListLabel(bool animate = true);
-
-        Title* editingTitle = nullptr;
-
-        void refreshFilter();
-
-    public:
-        AppProfilesTab();
-        ~AppProfilesTab();
-
-        void willAppear(bool resetState) override;
-};
diff --git a/Source/sys-clk/manager/src/cheat_sheet_tab.cpp b/Source/sys-clk/manager/src/cheat_sheet_tab.cpp
deleted file mode 100644
index 7e492770..00000000
--- a/Source/sys-clk/manager/src/cheat_sheet_tab.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
-    sys-clk manager, a sys-clk frontend homebrew
-    Copyright (C) 2019-2020  natinusala
-    Copyright (C) 2019  p-sam
-    Copyright (C) 2019  m4xw
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include "cheat_sheet_tab.h"
-
-#include <borealis.hpp>
-
-CheatSheetTab::CheatSheetTab()
-{
-    // CPU
-    this->addView(new brls::Header("CPU Clocks"));
-    brls::Table *cpuTable = new brls::Table();
-
-    cpuTable->addRow(brls::TableRowType::BODY, "Maximum", "1785 MHz");
-    cpuTable->addRow(brls::TableRowType::BODY, "Official Docked and Handheld", "1020 MHz");
-
-    this->addView(cpuTable);
-
-    // GPU
-    this->addView(new brls::Header("GPU Clocks"));
-    brls::Table *gpuTable = new brls::Table();
-
-    gpuTable->addRow(brls::TableRowType::BODY, "Maximum", "921 MHz");
-    gpuTable->addRow(brls::TableRowType::BODY, "Official Docked", "768 MHz");
-    gpuTable->addRow(brls::TableRowType::BODY, "Maximum Mariko Handheld", "614 MHz");
-    gpuTable->addRow(brls::TableRowType::BODY, "Maximum Erista Handheld", "460 MHz");
-    gpuTable->addRow(brls::TableRowType::BODY, "Official Handheld", "384 MHz");
-
-    this->addView(gpuTable);
-
-    // MEM
-    this->addView(new brls::Header("MEM Clocks"));
-    brls::Table *memTable = new brls::Table();
-
-    memTable->addRow(brls::TableRowType::BODY, "Maximum, Official Docked", "1600 MHz");
-    memTable->addRow(brls::TableRowType::BODY, "Official Handheld", "1331 MHz");
-
-    this->addView(memTable);
-}
-
-void CheatSheetTab::customSpacing(brls::View* current, brls::View* next, int* spacing)
-{
-    if (dynamic_cast<brls::Table*>(current))
-        *spacing = 0;
-    else
-        List::customSpacing(current, next, spacing);
-}
diff --git a/Source/sys-clk/manager/src/cheat_sheet_tab.h b/Source/sys-clk/manager/src/cheat_sheet_tab.h
deleted file mode 100644
index 6ac9529b..00000000
--- a/Source/sys-clk/manager/src/cheat_sheet_tab.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-    sys-clk manager, a sys-clk frontend homebrew
-    Copyright (C) 2019-2020  natinusala
-    Copyright (C) 2019  p-sam
-    Copyright (C) 2019  m4xw
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include <borealis.hpp>
-
-class CheatSheetTab : public brls::List
-{
-    public:
-        CheatSheetTab();
-
-        void customSpacing(brls::View* current, brls::View* next, int* spacing) override;
-
-        View* getDefaultFocus() override
-        {
-            return nullptr;
-        }
-};
diff --git a/Source/sys-clk/manager/src/ipc/client.h b/Source/sys-clk/manager/src/ipc/client.h
deleted file mode 100644
index 0c73d214..00000000
--- a/Source/sys-clk/manager/src/ipc/client.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-    sys-clk manager, a sys-clk frontend homebrew
-    Copyright (C) 2019  natinusala
-    Copyright (C) 2019  p-sam
-    Copyright (C) 2019  m4xw
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "ipc.h"
-
-#if defined(__SWITCH__) && defined(__cplusplus)
-#include "cpp_util.hpp"
-extern "C" {
-#endif
-
-#include <sysclk.h>
-#include <sysclk/client/ipc.h>
-
-#if defined(__SWITCH__) && defined(__cplusplus)
-}
-#endif
diff --git a/Source/sys-clk/manager/src/ipc/ipc.h b/Source/sys-clk/manager/src/ipc/ipc.h
deleted file mode 100644
index 8e067c73..00000000
--- a/Source/sys-clk/manager/src/ipc/ipc.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-    sys-clk manager, a sys-clk frontend homebrew
-    Copyright (C) 2019  natinusala
-    Copyright (C) 2019  p-sam
-    Copyright (C) 2019  m4xw
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "types.h"
-
-#ifdef __SWITCH__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <switch.h>
-
-#ifdef __cplusplus
-}
-#endif
-
-#else
-
-#include "pc_shim/nacp.h"
-#include "pc_shim/ns.h"
-#include "pc_shim/types.h"
-
-#endif
diff --git a/Source/sys-clk/manager/src/ipc/pc_shim/client.cpp b/Source/sys-clk/manager/src/ipc/pc_shim/client.cpp
deleted file mode 100644
index e4f089c2..00000000
--- a/Source/sys-clk/manager/src/ipc/pc_shim/client.cpp
+++ /dev/null
@@ -1,400 +0,0 @@
-/*
-    sys-clk manager, a sys-clk frontend homebrew
-    Copyright (C) 2019  natinusala
-    Copyright (C) 2019  p-sam
-    Copyright (C) 2019  m4xw
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include "client.h"
-
-#include <string.h>
-#include <stdlib.h>
-
-static SysClkShimServer* g_server = NULL;
-
-bool sysclkIpcRunning()
-{
-    return true;
-}
-
-Result sysclkIpcInitialize()
-{
-    if(!g_server)
-    {
-        g_server = new SysClkShimServer();
-
-        g_server->SetContextApplicationId(0x0100000000001000ULL);
-        g_server->SetContextHz(SysClkModule_CPU, 1020000000);
-        g_server->SetContextHz(SysClkModule_GPU, 307200000);
-        g_server->SetContextHz(SysClkModule_MEM, 1065600000);
-        g_server->SetContextTemp(SysClkThermalSensor_PCB, 45700);
-        g_server->SetContextTemp(SysClkThermalSensor_SOC, 48200);
-        g_server->SetContextEnabled(true);
-
-        g_server->SetProfile(0x010000000000F002, SysClkModule_CPU, SysClkProfile_Docked, 1224);
-        g_server->SetProfile(0x010000000000F002, SysClkModule_GPU, SysClkProfile_Docked, 921);
-        g_server->SetProfile(0x010000000000F002, SysClkModule_MEM, SysClkProfile_Docked, 1600);
-
-        g_server->SetProfile(0x010000000000F002, SysClkModule_CPU, SysClkProfile_Handheld, 1224);
-        g_server->SetProfile(0x010000000000F002, SysClkModule_MEM, SysClkProfile_Handheld, 1600);
-
-        g_server->SetConfigValue(SysClkConfigValue_CsvWriteIntervalMs, 5000);
-
-        g_server->AddFreq(SysClkModule_MEM, 665600000);
-        g_server->AddFreq(SysClkModule_MEM, 800000000);
-        g_server->AddFreq(SysClkModule_MEM, 1065600000);
-        g_server->AddFreq(SysClkModule_MEM, 1331200000);
-        g_server->AddFreq(SysClkModule_MEM, 1600000000);
-
-        // g_server->AddFreq(SysClkModule_CPU, 204000000);
-        // g_server->AddFreq(SysClkModule_CPU, 306000000);
-        // g_server->AddFreq(SysClkModule_CPU, 408000000);
-        // g_server->AddFreq(SysClkModule_CPU, 510000000);
-        g_server->AddFreq(SysClkModule_CPU, 612000000);
-        g_server->AddFreq(SysClkModule_CPU, 714000000);
-        g_server->AddFreq(SysClkModule_CPU, 816000000);
-        g_server->AddFreq(SysClkModule_CPU, 918000000);
-        g_server->AddFreq(SysClkModule_CPU, 1020000000);
-        g_server->AddFreq(SysClkModule_CPU, 1122000000);
-        g_server->AddFreq(SysClkModule_CPU, 1224000000);
-        g_server->AddFreq(SysClkModule_CPU, 1326000000);
-        g_server->AddFreq(SysClkModule_CPU, 1428000000);
-        g_server->AddFreq(SysClkModule_CPU, 1581000000);
-        g_server->AddFreq(SysClkModule_CPU, 1683000000);
-        g_server->AddFreq(SysClkModule_CPU, 1785000000);
-
-        g_server->AddFreq(SysClkModule_GPU, 76800000);
-        g_server->AddFreq(SysClkModule_GPU, 153600000);
-        g_server->AddFreq(SysClkModule_GPU, 230400000);
-        g_server->AddFreq(SysClkModule_GPU, 307200000);
-        g_server->AddFreq(SysClkModule_GPU, 384000000);
-        g_server->AddFreq(SysClkModule_GPU, 460800000);
-        g_server->AddFreq(SysClkModule_GPU, 537600000);
-        g_server->AddFreq(SysClkModule_GPU, 614400000);
-        g_server->AddFreq(SysClkModule_GPU, 691200000);
-        g_server->AddFreq(SysClkModule_GPU, 768000000);
-        g_server->AddFreq(SysClkModule_GPU, 844800000);
-        g_server->AddFreq(SysClkModule_GPU, 921600000);
-    }
-
-    return 0;
-}
-
-void sysclkIpcExit()
-{
-    if(g_server)
-        delete g_server;
-}
-
-Result sysclkIpcGetAPIVersion(u32* out_ver)
-{
-    *out_ver = SYSCLK_IPC_API_VERSION;
-    return 0;
-}
-
-Result sysclkIpcGetVersionString(char* out, size_t len)
-{
-    strncpy(out, "- shim server -", len-1);
-    return 0;
-}
-
-Result sysclkIpcGetCurrentContext(SysClkContext* out_context)
-{
-    g_server->CopyContext(out_context);
-    return 0;
-}
-
-Result sysclkIpcGetProfileCount(u64 tid, u8* out_count)
-{
-    *out_count = g_server->CountProfiles(tid);
-    return 0;
-}
-
-Result sysclkIpcGetProfiles(u64 tid, SysClkTitleProfileList* out_profiles)
-{
-    g_server->GetProfiles(tid, out_profiles);
-    return 0;
-}
-
-Result sysclkIpcSetProfiles(u64 tid, SysClkTitleProfileList* profiles)
-{
-    g_server->SetProfiles(tid, profiles);
-    return 0;
-}
-
-Result sysclkIpcSetEnabled(bool enabled)
-{
-    g_server->SetContextEnabled(enabled);
-
-    if(enabled)
-    {
-        g_server->SetContextTemp(SysClkThermalSensor_PCB, 45700);
-        g_server->SetContextTemp(SysClkThermalSensor_SOC, 48200);
-    }
-    else
-    {
-        g_server->SetContextTemp(SysClkThermalSensor_PCB, 34200);
-        g_server->SetContextTemp(SysClkThermalSensor_SOC, 42800);
-    }
-
-    return 0;
-}
-
-Result sysclkIpcExitCmd()
-{
-    return 0;
-}
-
-Result sysclkIpcSetOverride(SysClkModule module, u32 hz)
-{
-    g_server->SetContextOverride(module, hz);
-    return 0;
-}
-
-Result sysclkIpcGetConfigValues(SysClkConfigValueList* out_configValues)
-{
-    g_server->GetConfigValues(out_configValues);
-    return 0;
-}
-
-Result sysclkIpcSetConfigValues(SysClkConfigValueList* configValues)
-{
-    g_server->SetConfigValues(configValues);
-    return 0;
-}
-
-
-Result sysclkIpcGetFreqList(SysClkModule module, u32* list, u32 maxCount, u32* outCount)
-{
-    g_server->GetFreqList(module, list, maxCount, outCount);
-    return 0;
-}
-
-SysClkShimServer::SysClkShimServer()
-{
-    this->store = std::map<std::tuple<u64, SysClkModule, SysClkProfile>, u32>();
-    this->SetContextApplicationId(0);
-    this->SetContextHz(SysClkModule_CPU, 0);
-    this->SetContextHz(SysClkModule_GPU, 0);
-    this->SetContextHz(SysClkModule_MEM, 0);
-    this->SetContextRealHz(SysClkModule_CPU, 0);
-    this->SetContextRealHz(SysClkModule_GPU, 0);
-    this->SetContextRealHz(SysClkModule_MEM, 0);
-    this->SetContextOverride(SysClkModule_CPU, 0);
-    this->SetContextOverride(SysClkModule_GPU, 0);
-    this->SetContextOverride(SysClkModule_MEM, 0);
-    this->SetContextTemp(SysClkThermalSensor_PCB, 0);
-    this->SetContextTemp(SysClkThermalSensor_SOC, 0);
-    this->SetContextProfile(SysClkProfile_Handheld);
-    this->SetContextEnabled(false);
-
-    for(int kval = 0; kval < SysClkConfigValue_EnumMax; kval++)
-    {
-        this->configValues[kval] = sysclkDefaultConfigValue((SysClkConfigValue)kval);
-    }
-}
-
-void SysClkShimServer::SetContextApplicationId(u64 tid)
-{
-    this->context.applicationId = tid;
-}
-
-void SysClkShimServer::SetContextHz(SysClkModule module, u32 hz)
-{
-    if(module < SysClkModule_EnumMax)
-    {
-        this->context.freqs[module] = hz;
-    }
-}
-
-void SysClkShimServer::SetContextRealHz(SysClkModule module, u32 hz)
-{
-    if(module < SysClkModule_EnumMax)
-    {
-        this->context.realFreqs[module] = hz;
-    }
-}
-
-void SysClkShimServer::SetContextTemp(SysClkThermalSensor sensor, u32 temp)
-{
-    if(sensor < SysClkThermalSensor_EnumMax)
-    {
-        this->context.temps[sensor] = temp;
-    }
-}
-
-void SysClkShimServer::CopyContext(SysClkContext* out_context)
-{
-    memcpy(out_context, &this->context, sizeof(SysClkContext));
-}
-
-void SysClkShimServer::SetContextProfile(SysClkProfile profile)
-{
-    if(profile < SysClkProfile_EnumMax)
-    {
-        this->context.profile = profile;
-    }
-}
-
-void SysClkShimServer::SetContextEnabled(bool enabled)
-{
-    this->context.enabled = enabled;
-}
-
-void SysClkShimServer::SetProfile(uint64_t applicationId, SysClkModule module, SysClkProfile profile, u32 mhz)
-{
-    std::tuple<u64, SysClkModule, SysClkProfile> key = std::make_tuple(applicationId, module, profile);
-
-    if(mhz > 0)
-    {
-        this->store[key] = mhz;
-    }
-    else
-    {
-        this->store.erase(key);
-    }
-}
-
-u32 SysClkShimServer::GetProfileMHz(uint64_t applicationId, SysClkModule module, SysClkProfile profile)
-{
-    std::tuple<u64, SysClkModule, SysClkProfile> key = std::make_tuple(applicationId, module, profile);
-    std::map<std::tuple<u64, SysClkModule, SysClkProfile>, u32>::iterator it = this->store.find(key);
-
-    if(it != this->store.end())
-    {
-        return it->second;
-    }
-    return 0;
-}
-
-void SysClkShimServer::GetProfiles(u64 applicationId, SysClkTitleProfileList* out_profiles)
-{
-    for(unsigned int profile = 0; profile < SysClkProfile_EnumMax; profile++)
-    {
-        for(unsigned int module = 0; module < SysClkModule_EnumMax; module++)
-        {
-            out_profiles->mhzMap[profile][module] = this->GetProfileMHz(applicationId, (SysClkModule)module, (SysClkProfile)profile);
-        }
-    }
-}
-
-void SysClkShimServer::SetProfiles(u64 applicationId, SysClkTitleProfileList* profiles)
-{
-    for(unsigned int profile = 0; profile < SysClkProfile_EnumMax; profile++)
-    {
-        for(unsigned int module = 0; module < SysClkModule_EnumMax; module++)
-        {
-            this->SetProfile(applicationId, (SysClkModule)module, (SysClkProfile)profile, profiles->mhzMap[profile][module]);
-        }
-    }
-}
-
-u8 SysClkShimServer::CountProfiles(u64 applicationId)
-{
-    return std::accumulate(
-        std::begin(this->store),
-        std::end(this->store),
-        0,
-        [applicationId] (u8 value, const std::map<std::tuple<u64, SysClkModule, SysClkProfile>, u32>::value_type& p)
-        {
-            if(std::get<0>(p.first) == applicationId)
-            {
-                value++;
-            }
-            return value;
-        }
-    );
-}
-
-void SysClkShimServer::SetContextOverride(SysClkModule module, u32 hz)
-{
-    if(SYSCLK_ENUM_VALID(SysClkModule, module))
-    {
-        this->context.overrideFreqs[module] = hz;
-    }
-}
-
-u64 SysClkShimServer::GetConfigValue(SysClkConfigValue kval)
-{
-    if(SYSCLK_ENUM_VALID(SysClkConfigValue, kval))
-    {
-        return this->configValues[kval];
-    }
-    return 0;
-}
-
-void SysClkShimServer::SetConfigValue(SysClkConfigValue kval, u64 val)
-{
-    if(SYSCLK_ENUM_VALID(SysClkConfigValue, kval))
-    {
-        if(sysclkValidConfigValue(kval, this->configValues[kval]))
-        {
-            this->configValues[kval] = val;
-        }
-        else
-        {
-            this->configValues[kval] = sysclkDefaultConfigValue(kval);
-        }
-    }
-}
-
-void SysClkShimServer::GetConfigValues(SysClkConfigValueList* out_configValues)
-{
-    for(unsigned int kval = 0; kval < SysClkConfigValue_EnumMax; kval++)
-    {
-        out_configValues->values[kval] = this->GetConfigValue((SysClkConfigValue)kval);
-    }
-}
-
-void SysClkShimServer::SetConfigValues(SysClkConfigValueList* configValues)
-{
-    for(unsigned int kval = 0; kval < SysClkConfigValue_EnumMax; kval++)
-    {
-        this->SetConfigValue((SysClkConfigValue)kval, configValues->values[kval]);
-    }
-}
-
-void SysClkShimServer::AddFreq(SysClkModule module, u32 hz)
-{
-    if(SYSCLK_ENUM_VALID(SysClkModule, module))
-    {
-        this->freqs[module].push_back(hz);
-    }
-}
-
-
-void SysClkShimServer::GetFreqList(SysClkModule module, u32* list, u32 maxCount, u32* outCount)
-{
-    u32 count = 0;
-
-    if(SYSCLK_ENUM_VALID(SysClkModule, module))
-    {
-        std::vector<u32>::iterator iter = this->freqs[module].begin();
-
-        while(iter < this->freqs[module].end() && *outCount < maxCount)
-        {
-            *list = *iter;
-            list++;
-            iter++;
-            count++;
-        }
-    }
-
-    if(outCount)
-    {
-        *outCount = count;
-    }
-}
\ No newline at end of file
diff --git a/Source/sys-clk/manager/src/ipc/pc_shim/client.h b/Source/sys-clk/manager/src/ipc/pc_shim/client.h
deleted file mode 100644
index eb8290b4..00000000
--- a/Source/sys-clk/manager/src/ipc/pc_shim/client.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-    sys-clk manager, a sys-clk frontend homebrew
-    Copyright (C) 2019  natinusala
-    Copyright (C) 2019  p-sam
-    Copyright (C) 2019  m4xw
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include <map>
-#include <vector>
-#include <numeric>
-#include "../client.h"
-
-class SysClkShimServer
-{
-    public:
-        SysClkShimServer();
-        void SetContextApplicationId(u64 tid);
-        void SetContextHz(SysClkModule module, u32 hz);
-        void SetContextRealHz(SysClkModule module, u32 hz);
-        void SetContextTemp(SysClkThermalSensor sensor, u32 temp);
-        void SetContextProfile(SysClkProfile profile);
-        void SetContextEnabled(bool enabled);
-        void SetContextOverride(SysClkModule module, u32 hz);
-        void CopyContext(SysClkContext* out_context);
-        void SetProfile(uint64_t applicationId, SysClkModule module, SysClkProfile profile, u32 mhz);
-        u32 GetProfileMHz(uint64_t applicationId, SysClkModule module, SysClkProfile profile);
-        void GetProfiles(u64 applicationId, SysClkTitleProfileList* out_profiles);
-        void SetProfiles(u64 applicationId, SysClkTitleProfileList* profiles);
-        u8 CountProfiles(u64 applicationId);
-        u64 GetConfigValue(SysClkConfigValue kval);
-        void SetConfigValue(SysClkConfigValue kval, u64 val);
-        void GetConfigValues(SysClkConfigValueList* out_configValues);
-        void SetConfigValues(SysClkConfigValueList* configValues);
-        void AddFreq(SysClkModule module, u32 hz);
-        void GetFreqList(SysClkModule module, u32* list, u32 maxCount, u32* outCount);
-
-    protected:
-        SysClkContext context;
-        std::vector<u32> freqs[SysClkModule_EnumMax];
-        std::map<std::tuple<u64, SysClkModule, SysClkProfile>, u32> store;
-        u64 configValues[SysClkConfigValue_EnumMax];
-};
diff --git a/Source/sys-clk/manager/src/ipc/pc_shim/game.jpg b/Source/sys-clk/manager/src/ipc/pc_shim/game.jpg
deleted file mode 100644
index ace1ed53..00000000
Binary files a/Source/sys-clk/manager/src/ipc/pc_shim/game.jpg and /dev/null differ
diff --git a/Source/sys-clk/manager/src/ipc/pc_shim/nacp.h b/Source/sys-clk/manager/src/ipc/pc_shim/nacp.h
deleted file mode 100644
index 0b1138dc..00000000
--- a/Source/sys-clk/manager/src/ipc/pc_shim/nacp.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-    sys-clk manager, a sys-clk frontend homebrew
-    Copyright (C) 2019  natinusala
-    Copyright (C) 2019  p-sam
-    Copyright (C) 2019  m4xw
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "types.h"
-
-typedef struct
-{
-    char name[0x200];
-} NacpLanguageEntry;
-
-
-typedef struct
-{
-    NacpLanguageEntry entry;
-} NacpStruct;
-
-static inline Result nacpGetLanguageEntry(NacpStruct* nacp, NacpLanguageEntry** langentry)
-{
-    if(nacp && langentry)
-    {
-        *langentry = &nacp->entry;
-        return 0;
-    }
-    return 0xBAD;
-}
diff --git a/Source/sys-clk/manager/src/ipc/pc_shim/ns.cpp b/Source/sys-clk/manager/src/ipc/pc_shim/ns.cpp
deleted file mode 100644
index 78599c51..00000000
--- a/Source/sys-clk/manager/src/ipc/pc_shim/ns.cpp
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
-    sys-clk manager, a sys-clk frontend homebrew
-    Copyright (C) 2019  natinusala
-    Copyright (C) 2019  p-sam
-    Copyright (C) 2019  m4xw
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include "ns.h"
-#include "types.h"
-
-#include <string.h>
-#include <stdlib.h>
-
-#define GAME_ICON_PATH "src/ipc/pc_shim/game.jpg"
-
-static NsShimStore* g_store = NULL;
-
-Result nsInitialize()
-{
-    if(!g_store)
-    {
-        g_store = new NsShimStore();
-        g_store->AddRecord(0x010000000000F001ULL, "Secret Maryo Chronicles", GAME_ICON_PATH);
-        g_store->AddRecord(0x010000000000F002ULL, "Zelda: Mystery of Solarus", GAME_ICON_PATH);
-        g_store->AddRecord(0x010000000000F003ULL, "AM2R", GAME_ICON_PATH);
-        g_store->AddRecord(0x010000000000F004ULL, "Mother 4", GAME_ICON_PATH);
-        g_store->AddRecord(0x01007EF00011E000ULL, "Wrath of the Wild", GAME_ICON_PATH);
-    }
-    return 0;
-}
-
-void nsExit()
-{
-    if(g_store)
-        delete g_store;
-}
-
-Result nsListApplicationRecord(NsApplicationRecord* out_records, s32 size, s32 offset, s32* out_count)
-{
-    return g_store->ListRecord(out_records, size, offset, out_count) ? 0 : 0xBAD;
-}
-
-Result nsGetApplicationControlData(NsApplicationControlSource flag, u64 titleID, NsApplicationControlData* out_data, size_t size, u64* out_size)
-{
-    return g_store->GetControlData(out_data, size, titleID, out_size) ? 0 : 0xBAD;
-}
-
-NsShimStore::NsShimStore()
-{
-    this->store = std::map<u64, std::pair<std::string, std::string>>();
-}
-
-void NsShimStore::AddRecord(u64 titleID, std::string name, std::string iconPath)
-{
-    this->store[titleID] = std::make_pair(name, iconPath);
-}
-
-bool NsShimStore::ListRecord(NsApplicationRecord* out_records, s32 size, s32 offset, s32* out_count) 
-{
-    if(!out_records || !out_count)
-    {
-        return false;
-    }
-
-    size_t left = size;
-    size_t count = 0;
-    std::map<u64, std::pair<std::string, std::string>>::iterator it = this->store.begin();
-    std::advance(it, offset);
-    while(left >= sizeof(NsApplicationRecord) && it != this->store.end())
-    {
-        out_records->application_id = it->first;
-        left -= sizeof(NsApplicationRecord);
-        out_records++;
-        count++;
-        std::advance(it, 1);
-    }
-
-    *out_count = count;
-
-    return true;
-}
-
-bool NsShimStore::GetControlData(NsApplicationControlData* out_data, size_t size, u64 tid, size_t* out_size)
-{
-    if(!out_data || !out_size || size != sizeof(NsApplicationControlData))
-    {
-        return false;
-    }
-
-    std::map<u64, std::pair<std::string, std::string>>::iterator it = this->store.find(tid);
-    if(it == this->store.end())
-    {
-        return false;
-    }
-
-    memset(out_data, 0, size);
-    strncpy(out_data->nacp.entry.name, it->second.first.c_str(), sizeof(out_data->nacp.entry.name)-1);
-    FILE* f = fopen(it->second.second.c_str(), "rb");
-    if(!f)
-    {
-        printf("[NsShimStore] Could not open file '%s'\n", it->second.second.c_str());
-        return false;
-    }
-    *out_size = fread(out_data->icon, sizeof(out_data->icon), 1, f);
-    fclose(f);
-    return true;
-}
diff --git a/Source/sys-clk/manager/src/ipc/pc_shim/ns.h b/Source/sys-clk/manager/src/ipc/pc_shim/ns.h
deleted file mode 100644
index 3614e99c..00000000
--- a/Source/sys-clk/manager/src/ipc/pc_shim/ns.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-    sys-clk manager, a sys-clk frontend homebrew
-    Copyright (C) 2019  natinusala
-    Copyright (C) 2019  p-sam
-    Copyright (C) 2019  m4xw
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include <map>
-#include <string>
-#include "../types.h"
-#include "types.h"
-#include "nacp.h"
-
-typedef enum
-{
-    NsApplicationControlSource_Storage = 1
-} NsApplicationControlSource;
-
-typedef struct
-{
-    u64 application_id;
-} NsApplicationRecord;
-
-typedef struct
-{
-    NacpStruct nacp;
-    NsApplicationIcon icon;
-} NsApplicationControlData;
-
-Result nsInitialize();
-Result nsListApplicationRecord(NsApplicationRecord* out_records, s32 size, s32 offset, s32* out_count);
-Result nsGetApplicationControlData(NsApplicationControlSource flag, u64 titleID, NsApplicationControlData* out_data, size_t size, u64* out_size);
-void nsExit();
-
-class NsShimStore
-{
-    public:
-        NsShimStore();
-        void AddRecord(u64 titleID, std::string name, std::string iconPath);
-        bool ListRecord(NsApplicationRecord* out_records, s32 size, s32 offset, s32* out_count);
-        bool GetControlData(NsApplicationControlData* out_data, size_t size, u64 titleID, size_t* out_size);
-
-    protected:
-        std::map<u64, std::pair<std::string, std::string>> store;
-};
diff --git a/Source/sys-clk/manager/src/ipc/pc_shim/types.h b/Source/sys-clk/manager/src/ipc/pc_shim/types.h
deleted file mode 100644
index d7695324..00000000
--- a/Source/sys-clk/manager/src/ipc/pc_shim/types.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-    sys-clk manager, a sys-clk frontend homebrew
-    Copyright (C) 2019  natinusala
-    Copyright (C) 2019  p-sam
-    Copyright (C) 2019  m4xw
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include <cstdint>
-
-#define R_FAILED(res) ((res) != 0)
-#define R_SUCCEEDED(res) ((res) == 0)
-
-typedef std::uint32_t Result;
-typedef std::uint32_t u32;
-typedef std::int32_t s32;
-typedef std::uint64_t u64;
-typedef std::uint8_t u8;
diff --git a/Source/sys-clk/manager/src/ipc/types.h b/Source/sys-clk/manager/src/ipc/types.h
deleted file mode 100644
index 9cf9bb03..00000000
--- a/Source/sys-clk/manager/src/ipc/types.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-    sys-clk manager, a sys-clk frontend homebrew
-    Copyright (C) 2019  natinusala
-    Copyright (C) 2019  p-sam
-    Copyright (C) 2019  m4xw
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include <stdint.h>
-
-typedef char NsApplicationName[0x201];
-typedef uint8_t NsApplicationIcon[0x20000];
diff --git a/Source/sys-clk/manager/src/logo.cpp b/Source/sys-clk/manager/src/logo.cpp
deleted file mode 100644
index 5f4e0c02..00000000
--- a/Source/sys-clk/manager/src/logo.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
-    sys-clk manager, a sys-clk frontend homebrew
-    Copyright (C) 2019  natinusala
-    Copyright (C) 2019-2020 p-sam
-    Copyright (C) 2019  m4xw
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include "logo.h"
-
-Logo::Logo(LogoStyle style) {
-    this->logoLabel = new brls::Label(brls::LabelStyle::LIST_ITEM, "sys-clk", style == LogoStyle::ABOUT);
-    this->logoLabel->setParent(this);
-
-    int logoFont = brls::Application::findFont(LOGO_FONT_NAME);
-    if (logoFont >= 0)
-    {
-        this->logoLabel->setFont(logoFont);
-    }
-
-    if (style == LogoStyle::ABOUT)
-    {
-        this->logoLabel->setFontSize(LOGO_ABOUT_FONT_SIZE);
-        this->logoLabel->setHorizontalAlign(NVG_ALIGN_CENTER);
-    }
-
-    if (style == LogoStyle::HEADER)
-    {
-        this->logoLabel->setFontSize(LOGO_HEADER_FONT_SIZE);
-        this->descLabel = new brls::Label(brls::LabelStyle::LIST_ITEM, "manager");
-        this->descLabel->setParent(this);
-        this->descLabel->setFontSize(LOGO_DESC_FONT_SIZE);
-    }
-
-}
-
-Logo::~Logo() {
-    delete this->logoLabel;
-
-    if (this->descLabel)
-        delete this->descLabel;
-}
-
-void Logo::draw(NVGcontext* vg, int x, int y, unsigned width, unsigned height, brls::Style* style, brls::FrameContext* ctx)
-{
-    this->logoLabel->frame(ctx);
-
-    if (this->descLabel)
-        this->descLabel->frame(ctx);
-}
-
-void Logo::layout(NVGcontext* vg, brls::Style* style, brls::FontStash* stash)
-{
-    this->logoLabel->setBoundaries(this->x, this->y + LOGO_OFFSET, this->width, this->height);
-    this->logoLabel->layout(vg, style, stash);
-    this->height = this->logoLabel->getHeight();
-
-    if (this->descLabel)
-    {
-        this->descLabel->layout(vg, style, stash);
-        this->descLabel->setBoundaries(this->x + LOGO_HEADER_SPACING + this->logoLabel->getWidth(), this->y + style->AppletFrame.titleOffset - 1, this->descLabel->getWidth(), height);
-    }
-}
diff --git a/Source/sys-clk/manager/src/logo.h b/Source/sys-clk/manager/src/logo.h
deleted file mode 100644
index 5a46a0ea..00000000
--- a/Source/sys-clk/manager/src/logo.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-    sys-clk manager, a sys-clk frontend homebrew
-    Copyright (C) 2019  natinusala
-    Copyright (C) 2019-2020 p-sam
-    Copyright (C) 2019  m4xw
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include <borealis.hpp>
-
-#include "utils.h"
-
-enum class LogoStyle
-{
-    HEADER = 0,
-    ABOUT
-};
-
-#define LOGO_FONT_NAME "logo"
-#define LOGO_FONT_PATH APP_ASSET("fira/FiraSans-Medium-rnx.ttf")
-
-#define LOGO_HEADER_FONT_SIZE 45
-#define LOGO_HEADER_SPACING 12
-#define LOGO_ABOUT_FONT_SIZE 55
-#define LOGO_DESC_FONT_SIZE 28
-#define LOGO_OFFSET 2
-
-class Logo : public brls::View
-{
-    protected:
-        brls::Label* logoLabel = nullptr;
-        brls::Label* descLabel = nullptr;
-        void layout(NVGcontext* vg, brls::Style* style, brls::FontStash* stash);
-        void draw(NVGcontext* vg, int x, int y, unsigned width, unsigned height, brls::Style* style, brls::FrameContext* ctx) override;
-    public:
-        Logo(LogoStyle style);
-        virtual ~Logo();
-};
diff --git a/Source/sys-clk/manager/src/main.cpp b/Source/sys-clk/manager/src/main.cpp
deleted file mode 100644
index 426f0f6a..00000000
--- a/Source/sys-clk/manager/src/main.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
-    sys-clk manager, a sys-clk frontend homebrew
-    Copyright (C) 2019  natinusala
-    Copyright (C) 2019  p-sam
-    Copyright (C) 2019  m4xw
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string>
-
-#include <borealis.hpp>
-
-#include "main_frame.h"
-#include "logo.h"
-
-#include "ipc/client.h"
-#include "ipc/ipc.h"
-
-int main(int argc, char* argv[])
-{
-    // Init the app
-    if (!brls::Application::init(APP_TITLE))
-    {
-        brls::Logger::error("Unable to init Borealis application");
-        return EXIT_FAILURE;
-    }
-
-    // Setup verbose logging on PC
-#ifndef __SWITCH__
-    brls::Logger::setLogLevel(brls::LogLevel::DEBUG);
-#endif
-
-    if (brls::Application::loadFont(LOGO_FONT_NAME, LOGO_FONT_PATH) < 0)
-    {
-        brls::Logger::error("failed to load logo font");
-    }
-
-    uint32_t apiVersion;
-
-    // Check that sys-clk is running
-    if (!sysclkIpcRunning())
-    {
-        brls::Logger::error("sys-clk is not running");
-        brls::Application::crash("sys-clk does not seem to be running, please check that it is correctly installed and enabled.");
-    }
-    // Initialize sys-clk IPC client
-    else if (R_FAILED(sysclkIpcInitialize()) || R_FAILED(sysclkIpcGetAPIVersion(&apiVersion)))
-    {
-        brls::Logger::error("Unable to initialize sys-clk IPC client");
-        brls::Application::crash("Could not connect to sys-clk, please check that it is correctly installed and enabled.");
-    }
-    else if (SYSCLK_IPC_API_VERSION != apiVersion)
-    {
-        brls::Logger::error("sys-clk IPC API version mismatch (expected: %u; actual: %u)", SYSCLK_IPC_API_VERSION, apiVersion);
-        brls::Application::crash("The manager is not compatible with the currently running sysmodule of sys-clk, please check that you have correctly installed the latest version (reboot?).");
-    }
-    else if (R_FAILED(cacheFreqList()))
-    {
-        brls::Logger::error("Failed to get the freq list from sys-clk");
-        brls::Application::crash("Failed to get the freq list from sys-clk, please check that you have correctly installed the latest version (reboot?).");
-    }
-    else
-    {
-        // Set version string
-        char version[0x100] = {0};
-        Result rc = sysclkIpcGetVersionString(version, sizeof(version));
-        if (R_SUCCEEDED(rc))
-        {
-            brls::Application::setCommonFooter(std::string(version));
-        }
-        else
-        {
-            brls::Logger::error("Unable to get sys-clk version string");
-            brls::Application::setCommonFooter("[unknown]");
-        }
-
-
-        // Initialize services with a PC shim
-        nsInitialize();
-
-        // Create root view
-        MainFrame *mainFrame = new MainFrame();
-
-        // Add the root view to the stack
-        brls::Application::pushView(mainFrame);
-    }
-
-    // Run the app
-    while (brls::Application::mainLoop());
-
-    // Exit
-    nsExit();
-    sysclkIpcExit();
-    return EXIT_SUCCESS;
-}
diff --git a/Source/sys-clk/manager/src/main_frame.cpp b/Source/sys-clk/manager/src/main_frame.cpp
deleted file mode 100644
index cfec1743..00000000
--- a/Source/sys-clk/manager/src/main_frame.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-    sys-clk manager, a sys-clk frontend homebrew
-    Copyright (C) 2019-2020  natinusala
-    Copyright (C) 2019  p-sam
-    Copyright (C) 2019  m4xw
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include "main_frame.h"
-
-#include "status_tab.h"
-#include "advanced_settings_tab.h"
-#include "app_profiles_tab.h"
-#include "cheat_sheet_tab.h"
-#include "about_tab.h"
-#include "logo.h"
-
-#include "ipc/client.h"
-
-MainFrame::MainFrame() : TabFrame()
-{
-    // Start refresh task
-    this->refreshTask = new RefreshTask();
-    this->refreshTask->start();
-
-    // Load UI
-    this->setIcon(new Logo(LogoStyle::HEADER));
-
-    AppProfilesTab *tab = new AppProfilesTab();
-
-    this->addTab("Status", new StatusTab(this->refreshTask));
-    this->addTab("Application Profiles", tab);
-    this->addTab("Advanced Settings", new AdvancedSettingsTab());
-
-    this->addSeparator();
-
-    this->addTab("Cheat Sheet", new CheatSheetTab());
-    this->addTab("About", new AboutTab());
-}
-
-MainFrame::~MainFrame()
-{
-    this->refreshTask->stop();
-}
diff --git a/Source/sys-clk/manager/src/main_frame.h b/Source/sys-clk/manager/src/main_frame.h
deleted file mode 100644
index ae95c522..00000000
--- a/Source/sys-clk/manager/src/main_frame.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-    sys-clk manager, a sys-clk frontend homebrew
-    Copyright (C) 2019  natinusala
-    Copyright (C) 2019  p-sam
-    Copyright (C) 2019  m4xw
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include <borealis.hpp>
-
-#include "refresh_task.h"
-
-class MainFrame : public brls::TabFrame
-{
-    private:
-        RefreshTask *refreshTask;
-
-    public:
-        MainFrame();
-        ~MainFrame();
-};
diff --git a/Source/sys-clk/manager/src/refresh_task.cpp b/Source/sys-clk/manager/src/refresh_task.cpp
deleted file mode 100644
index 882ecc87..00000000
--- a/Source/sys-clk/manager/src/refresh_task.cpp
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
-    sys-clk manager, a sys-clk frontend homebrew
-    Copyright (C) 2019  natinusala
-    Copyright (C) 2019  p-sam
-    Copyright (C) 2019  m4xw
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include "refresh_task.h"
-
-#include "utils.h"
-
-#define REFRESH_INTERVAL 400
-
-RefreshTask::RefreshTask() : RepeatingTask(REFRESH_INTERVAL)
-{
-
-}
-
-void RefreshTask::onStart()
-{
-    Result rc = sysclkIpcGetCurrentContext(&this->oldContext);
-    if (R_FAILED(rc))
-    {
-        brls::Logger::error("Unable to get context");
-        errorResult("sysclkIpcGetCurrentContext", rc);
-    }
-}
-
-void RefreshTask::run(retro_time_t currentTime)
-{
-    RepeatingTask::run(currentTime);
-
-    // Get new context
-    SysClkContext context;
-    if (R_SUCCEEDED(sysclkIpcGetCurrentContext(&context)))
-    {
-        // CPU Freq
-        if (context.freqs[SysClkModule_CPU] != this->oldContext.freqs[SysClkModule_CPU])
-            this->freqUpdateEvent.fire(SysClkModule_CPU, context.freqs[SysClkModule_CPU]);
-
-        // GPU Freq
-        if (context.freqs[SysClkModule_GPU] != this->oldContext.freqs[SysClkModule_GPU])
-            this->freqUpdateEvent.fire(SysClkModule_GPU, context.freqs[SysClkModule_GPU]);
-
-        // MEM Freq
-        if (context.freqs[SysClkModule_MEM] != this->oldContext.freqs[SysClkModule_MEM])
-            this->freqUpdateEvent.fire(SysClkModule_MEM, context.freqs[SysClkModule_MEM]);
-
-        // Real CPU Freq
-        if (context.realFreqs[SysClkModule_CPU] != this->oldContext.realFreqs[SysClkModule_CPU])
-            this->realFreqUpdateEvent.fire(SysClkModule_CPU, context.realFreqs[SysClkModule_CPU]);
-
-        // Real GPU Freq
-        if (context.realFreqs[SysClkModule_GPU] != this->oldContext.realFreqs[SysClkModule_GPU])
-            this->realFreqUpdateEvent.fire(SysClkModule_GPU, context.realFreqs[SysClkModule_GPU]);
-
-        // Real MEM Freq
-        if (context.realFreqs[SysClkModule_MEM] != this->oldContext.realFreqs[SysClkModule_MEM])
-            this->realFreqUpdateEvent.fire(SysClkModule_MEM, context.realFreqs[SysClkModule_MEM]);
-
-        // Application ID
-        if (context.applicationId != this->oldContext.applicationId)
-            this->appIdUpdateEvent.fire(context.applicationId);
-
-        // Profile
-        if (context.profile != this->oldContext.profile)
-            this->profileUpdateEvent.fire(context.profile);
-
-        // Only notify temp changes every other tick
-        if (this->shouldNotifyTempChange)
-        {
-            // PCB Temp
-            if (context.temps[SysClkThermalSensor_PCB] != this->oldContext.temps[SysClkThermalSensor_PCB])
-                this->tempUpdateEvent.fire(SysClkThermalSensor_PCB, context.temps[SysClkThermalSensor_PCB]);
-
-            //SoC Temp
-            if (context.temps[SysClkThermalSensor_SOC] != this->oldContext.temps[SysClkThermalSensor_SOC])
-                this->tempUpdateEvent.fire(SysClkThermalSensor_SOC, context.temps[SysClkThermalSensor_SOC]);
-
-            //Skin Temp
-            if (context.temps[SysClkThermalSensor_Skin] != this->oldContext.temps[SysClkThermalSensor_Skin])
-                this->tempUpdateEvent.fire(SysClkThermalSensor_Skin, context.temps[SysClkThermalSensor_Skin]);
-        }
-
-        this->shouldNotifyTempChange = !this->shouldNotifyTempChange;
-        this->oldContext = context;
-    }
-    else
-    {
-        brls::Logger::error("Unable to refresh context");
-    }
-}
diff --git a/Source/sys-clk/manager/src/refresh_task.h b/Source/sys-clk/manager/src/refresh_task.h
deleted file mode 100644
index 629b3322..00000000
--- a/Source/sys-clk/manager/src/refresh_task.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
-    sys-clk manager, a sys-clk frontend homebrew
-    Copyright (C) 2019  natinusala
-    Copyright (C) 2019  p-sam
-    Copyright (C) 2019  m4xw
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include <borealis.hpp>
-
-#include "ipc/client.h"
-
-#include <functional>
-
-typedef brls::Event<SysClkModule, uint32_t> FreqUpdateEvent;
-typedef brls::Event<uint64_t> AppIdUpdateEvent;
-typedef brls::Event<SysClkProfile> ProfileUpdateEvent;
-typedef brls::Event<SysClkThermalSensor, uint32_t> TempUpdateEvent;
-
-class RefreshTask : public brls::RepeatingTask
-{
-    private:
-        SysClkContext oldContext;
-
-        FreqUpdateEvent freqUpdateEvent;
-        FreqUpdateEvent realFreqUpdateEvent;
-        AppIdUpdateEvent appIdUpdateEvent;
-        ProfileUpdateEvent profileUpdateEvent;
-        TempUpdateEvent tempUpdateEvent;
-
-        bool shouldNotifyTempChange = true;
-
-    public:
-        RefreshTask();
-        ~RefreshTask() {}
-
-        void onStart() override;
-        void run(retro_time_t currentTime) override;
-
-        inline FreqUpdateEvent::Subscription registerFreqListener(FreqUpdateEvent::Callback cb) {
-            return this->freqUpdateEvent.subscribe(cb);
-        }
-        inline void unregisterFreqListener(FreqUpdateEvent::Subscription subscription) {
-            this->freqUpdateEvent.unsubscribe(subscription);
-        }
-
-        inline FreqUpdateEvent::Subscription registerRealFreqListener(FreqUpdateEvent::Callback cb) {
-            return this->realFreqUpdateEvent.subscribe(cb);
-        }
-        inline void unregisterRealFreqListener(FreqUpdateEvent::Subscription subscription) {
-            this->realFreqUpdateEvent.unsubscribe(subscription);
-        }
-
-        inline AppIdUpdateEvent::Subscription registerAppIdListener(AppIdUpdateEvent::Callback cb) {
-            return this->appIdUpdateEvent.subscribe(cb);
-        }
-        inline void unregisterAppIdListener(AppIdUpdateEvent::Subscription subscription) {
-            this->appIdUpdateEvent.unsubscribe(subscription);
-        }
-
-        inline ProfileUpdateEvent::Subscription registerProfileListener(ProfileUpdateEvent::Callback cb) {
-            return this->profileUpdateEvent.subscribe(cb);
-        }
-        inline void unregisterProfileListener(ProfileUpdateEvent::Subscription subscription) {
-            this->profileUpdateEvent.unsubscribe(subscription);
-        }
-
-        inline TempUpdateEvent::Subscription registerTempListener(TempUpdateEvent::Callback cb) {
-            return this->tempUpdateEvent.subscribe(cb);
-        }
-        inline void unregisterTempListener(TempUpdateEvent::Subscription subscription) {
-            this->tempUpdateEvent.unsubscribe(subscription);
-        }
-};
diff --git a/Source/sys-clk/manager/src/status_tab.cpp b/Source/sys-clk/manager/src/status_tab.cpp
deleted file mode 100644
index d095127a..00000000
--- a/Source/sys-clk/manager/src/status_tab.cpp
+++ /dev/null
@@ -1,337 +0,0 @@
-/*
-    sys-clk manager, a sys-clk frontend homebrew
-    Copyright (C) 2019  natinusala
-    Copyright (C) 2019  p-sam
-    Copyright (C) 2019  m4xw
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include "status_tab.h"
-
-#include "ipc/client.h"
-
-#include "utils.h"
-
-#define DANGEROUS_TEMP_THRESHOLD    84000
-#define DANGEROUS_TEMP_COLOR        nvgRGB(255, 85, 0)
-
-StatusTab::StatusTab(RefreshTask *refreshTask) :
-    brls::List(),
-    refreshTask(refreshTask)
-{
-    // Get context
-    SysClkContext context;
-    Result rc = sysclkIpcGetCurrentContext(&context);
-
-    if (R_FAILED(rc))
-    {
-        brls::Logger::error("Unable to get context");
-        errorResult("sysclkIpcGetCurrentContext", rc);
-        brls::Application::crash("Could not get the current sys-clk context, please check that it is correctly installed and enabled.");
-        return;
-    }
-
-    // Customize list
-    this->setSpacing(10);
-    this->setMarginBottom(0);
-
-    // Enabled option
-    brls::ToggleListItem *serviceEnabledListItem = new brls::ToggleListItem("Enable service", context.enabled, "", "Yes", "No");
-
-    serviceEnabledListItem->getClickEvent()->subscribe([this, serviceEnabledListItem](View* view)
-    {
-        bool enabled = serviceEnabledListItem->getToggleState();
-        brls::Logger::info("New service state = %d", enabled);
-
-        Result rc = sysclkIpcSetEnabled(enabled);
-
-        if (R_FAILED(rc))
-        {
-            brls::Logger::error("Unable to set enabled state");
-            errorResult("sysclkIpcSetEnabled", rc);
-            // TODO: Put it back to on / off
-        }
-
-        this->refreshTask->fireNow();
-    });
-
-    this->addView(serviceEnabledListItem);
-
-    // Frequencies
-    brls::Header *freqsHeader = new brls::Header("Frequencies");
-    this->addView(freqsHeader);
-
-    brls::BoxLayout *freqsBox = new brls::BoxLayout(brls::BoxLayoutOrientation::VERTICAL);
-    freqsBox->setSpacing(0);
-    freqsBox->setHeight(60);
-    this->addView(freqsBox);
-
-    StatusGrid *freqsLayout = new StatusGrid();
-    freqsLayout->setSpacing(22);
-    freqsLayout->setHeight(40);
-
-    this->cpuFreqCell = new StatusCell("CPU", formatFreq(context.freqs[SysClkModule_CPU]));
-    this->gpuFreqCell = new StatusCell("GPU", formatFreq(context.freqs[SysClkModule_GPU]));
-    this->memFreqCell = new StatusCell("MEM", formatFreq(context.freqs[SysClkModule_MEM]));
-
-    freqsLayout->addView(this->cpuFreqCell);
-    freqsLayout->addView(this->gpuFreqCell);
-    freqsLayout->addView(this->memFreqCell);
-
-    freqsBox->addView(freqsLayout);
-
-    StatusGrid *realFreqsLayout = new StatusGrid();
-    realFreqsLayout->setSpacing(22);
-    realFreqsLayout->setHeight(24);
-
-    this->realCpuFreqCell = new StatusCell("\uE090", formatFreq(context.realFreqs[SysClkModule_CPU]));
-    this->realGpuFreqCell = new StatusCell("\uE090", formatFreq(context.realFreqs[SysClkModule_GPU]));
-    this->realMemFreqCell = new StatusCell("\uE090", formatFreq(context.realFreqs[SysClkModule_MEM]));
-
-    realFreqsLayout->addView(this->realCpuFreqCell);
-    realFreqsLayout->addView(this->realGpuFreqCell);
-    realFreqsLayout->addView(this->realMemFreqCell);
-
-    freqsBox->addView(realFreqsLayout);
-
-    // Temperatures
-    brls::Header *temperaturesHeader = new brls::Header("Temperatures");
-    this->addView(temperaturesHeader);
-    StatusGrid *tempsLayout = new StatusGrid();
-    tempsLayout->setSpacing(22);
-    tempsLayout->setHeight(40);
-
-    this->skinTempCell = new StatusCell("Skin", formatTemp(context.temps[SysClkThermalSensor_Skin]));
-    this->socTempCell = new StatusCell("SOC", formatTemp(context.temps[SysClkThermalSensor_SOC]));
-    this->pcbTempCell = new StatusCell("PCB", formatTemp(context.temps[SysClkThermalSensor_PCB]));
-
-    if (context.temps[SysClkThermalSensor_SOC] > DANGEROUS_TEMP_THRESHOLD)
-        this->socTempCell->setValueColor(DANGEROUS_TEMP_COLOR);
-
-    if (context.temps[SysClkThermalSensor_PCB] > DANGEROUS_TEMP_THRESHOLD)
-        this->pcbTempCell->setValueColor(DANGEROUS_TEMP_COLOR);
-
-    if (context.temps[SysClkThermalSensor_Skin] > DANGEROUS_TEMP_THRESHOLD)
-        this->skinTempCell->setValueColor(DANGEROUS_TEMP_COLOR);
-
-    tempsLayout->addView(this->socTempCell);
-    tempsLayout->addView(this->pcbTempCell);
-    tempsLayout->addView(this->skinTempCell);
-
-    this->addView(tempsLayout);
-
-    // Power
-    brls::Header *powerHeader = new brls::Header("Power");
-    this->addView(powerHeader);
-    StatusGrid *powerLayout = new StatusGrid();
-    powerLayout->setSpacing(22);
-    powerLayout->setHeight(40);
-
-    this->nowPowerCell = new StatusCell("Now", formatPower(context.power[SysClkPowerSensor_Now]));
-    this->avgPowerCell = new StatusCell("Avg", formatPower(context.power[SysClkPowerSensor_Avg]));
-
-    powerLayout->addView(new StatusCell("", ""));
-    powerLayout->addView(this->nowPowerCell);
-    powerLayout->addView(this->avgPowerCell);
-
-    this->addView(powerLayout);
-
-    // Info
-    brls::Header *systemHeader = new brls::Header("System");
-    this->addView(systemHeader);
-
-    InfoGrid *infoLayout = new InfoGrid();
-    infoLayout->setSpacing(22);
-    infoLayout->setHeight(40);
-
-    this->profileCell   = new StatusCell("Profile", formatProfile(context.profile));
-    this->tidCell       = new StatusCell("Application ID", formatTid(context.applicationId));
-
-    infoLayout->addView(this->profileCell);
-    infoLayout->addView(this->tidCell);
-
-    this->addView(infoLayout);
-
-    // Setup refresh task
-    this->freqListenerSub = refreshTask->registerFreqListener([this](SysClkModule module, uint32_t freq) {
-        switch(module)
-        {
-            case SysClkModule_CPU:
-                this->cpuFreqCell->setValue(formatFreq(freq));
-                break;
-            case SysClkModule_GPU:
-                this->gpuFreqCell->setValue(formatFreq(freq));
-                break;
-            case SysClkModule_MEM:
-                this->memFreqCell->setValue(formatFreq(freq));
-                break;
-            default:
-                break;
-        }
-    });
-
-    this->realFreqListenerSub = refreshTask->registerFreqListener([this](SysClkModule module, uint32_t freq) {
-        switch(module)
-        {
-            case SysClkModule_CPU:
-                this->realCpuFreqCell->setValue(formatFreq(freq));
-                break;
-            case SysClkModule_GPU:
-                this->realGpuFreqCell->setValue(formatFreq(freq));
-                break;
-            case SysClkModule_MEM:
-                this->realMemFreqCell->setValue(formatFreq(freq));
-                break;
-            default:
-                break;
-        }
-    });
-
-    this->appIdListenerSub = refreshTask->registerAppIdListener([this](uint64_t tid) {
-        this->tidCell->setValue(formatTid(tid));
-    });
-
-    this->profileListenerSub = refreshTask->registerProfileListener([this](SysClkProfile profile) {
-        this->profileCell->setValue(formatProfile(profile));
-    });
-
-    this->tempListenerSub = refreshTask->registerTempListener([this](SysClkThermalSensor sensor, uint32_t temp) {
-        switch (sensor)
-        {
-            case SysClkThermalSensor_PCB:
-                this->pcbTempCell->setValue(formatTemp(temp));
-
-                if (temp > DANGEROUS_TEMP_THRESHOLD)
-                    this->pcbTempCell->setValueColor(DANGEROUS_TEMP_COLOR);
-                else
-                    this->pcbTempCell->resetValueColor();
-                break;
-            case SysClkThermalSensor_SOC:
-                this->socTempCell->setValue(formatTemp(temp));
-
-                if (temp > DANGEROUS_TEMP_THRESHOLD)
-                    this->socTempCell->setValueColor(DANGEROUS_TEMP_COLOR);
-                else
-                    this->socTempCell->resetValueColor();
-
-                break;
-            case SysClkThermalSensor_Skin:
-                this->skinTempCell->setValue(formatTemp(temp));
-
-                if (temp > DANGEROUS_TEMP_THRESHOLD)
-                    this->skinTempCell->setValueColor(DANGEROUS_TEMP_COLOR);
-                else
-                    this->skinTempCell->resetValueColor();
-                break;
-            default:
-                break;
-        }
-    });
-}
-
-StatusTab::~StatusTab()
-{
-    refreshTask->unregisterFreqListener(this->freqListenerSub);
-    refreshTask->unregisterRealFreqListener(this->realFreqListenerSub);
-    refreshTask->unregisterAppIdListener(this->appIdListenerSub);
-    refreshTask->unregisterProfileListener(this->profileListenerSub);
-    refreshTask->unregisterTempListener(this->tempListenerSub);
-}
-
-StatusGrid::StatusGrid() 
-    : BoxLayout(brls::BoxLayoutOrientation::HORIZONTAL)
-{
-
-}
-
-void StatusGrid::layout(NVGcontext* vg, brls::Style *style, brls::FontStash *stash)
-{
-    // Distribute space equally between children
-    if (!this->children.empty())
-    {
-        size_t size     = this->children.size();
-        unsigned width  = (this->getWidth()- this->marginLeft - this->marginRight - this->getSpacing() * (size - 1)) / size;
-
-        for (brls::BoxLayoutChild *child : this->children)
-        {
-            if (!child->fill)
-                child->view->setWidth(width);
-        }
-    }
-
-    // Layout normally
-    BoxLayout::layout(vg, style, stash);
-}
-
-InfoGrid::InfoGrid() : BoxLayout(brls::BoxLayoutOrientation::HORIZONTAL)
-{
-
-}
-
-void InfoGrid::layout(NVGcontext* vg, brls::Style *style, brls::FontStash *stash)
-{
-    // Give first child one third of the view, give second child the rest
-    if (this->children.size() >= 2)
-    {
-        size_t size             = 3;
-        unsigned firstWidth     = (this->getWidth()- this->marginLeft - this->marginRight - this->getSpacing() * (size - 1)) / size;
-        unsigned secondWidth    = firstWidth * 2 + this->getSpacing();
-
-        this->children[0]->view->setWidth(firstWidth);
-        this->children[1]->view->setWidth(secondWidth);
-    }
-
-    // Layout normally
-    BoxLayout::layout(vg, style, stash);
-}
-
-StatusCell::StatusCell(std::string label, std::string value) : label(label), value(value)
-{
-    this->resetValueColor();
-}
-
-void StatusCell::setValue(std::string value)
-{
-    this->value = value;
-}
-
-void StatusCell::draw(NVGcontext *vg, int x, int y, unsigned width, unsigned height, brls::Style *style, brls::FrameContext *ctx)
-{
-    unsigned padding = 5;
-
-    // Label
-    nvgBeginPath(vg);
-    nvgFillColor(vg, a(ctx->theme->tableBodyTextColor));
-    nvgFontSize(vg, 16);
-    nvgTextAlign(vg, NVG_ALIGN_LEFT | NVG_ALIGN_BASELINE);
-    nvgText(vg, x + padding, y + height / 2, this->label.c_str(), nullptr);
-
-    // Value
-    nvgBeginPath(vg);
-    nvgFillColor(vg, a(this->valueColor));
-    nvgFontSize(vg, 20);
-    nvgTextAlign(vg, NVG_ALIGN_RIGHT | NVG_ALIGN_BASELINE);
-    nvgText(vg, x + width - padding, y + height / 2, this->value.c_str(), nullptr);
-}
-
-void StatusCell::setValueColor(NVGcolor color)
-{
-    this->valueColor = color;
-}
-
-void StatusCell::resetValueColor()
-{
-    this->valueColor = brls::Application::getThemeValues()->textColor;
-}
diff --git a/Source/sys-clk/manager/src/status_tab.h b/Source/sys-clk/manager/src/status_tab.h
deleted file mode 100644
index a51538d8..00000000
--- a/Source/sys-clk/manager/src/status_tab.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
-    sys-clk manager, a sys-clk frontend homebrew
-    Copyright (C) 2019  natinusala
-    Copyright (C) 2019  p-sam
-    Copyright (C) 2019  m4xw
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include <borealis.hpp>
-
-#include "refresh_task.h"
-
-class StatusCell : public brls::View
-{
-    private:
-        std::string label;
-        std::string value;
-
-        NVGcolor valueColor;
-
-    public:
-        StatusCell(std::string label, std::string value);
-
-        void draw(NVGcontext *vg, int x, int y, unsigned width, unsigned height, brls::Style *style, brls::FrameContext *ctx) override;
-
-        void setValue(std::string value);
-        void setValueColor(NVGcolor color);
-        void resetValueColor();
-};
-
-class InfoGrid : public brls::BoxLayout
-{
-    public:
-        InfoGrid();
-
-        void layout(NVGcontext* vg, brls::Style *style, brls::FontStash *stash) override;
-};
-
-class StatusGrid : public brls::BoxLayout
-{
-    public:
-        StatusGrid();
-
-        void layout(NVGcontext* vg, brls::Style *style, brls::FontStash *stash) override;
-};
-
-class StatusTab : public brls::List
-{
-    private:
-        RefreshTask *refreshTask;
-
-        FreqUpdateEvent::Subscription freqListenerSub;
-        FreqUpdateEvent::Subscription realFreqListenerSub;
-        AppIdUpdateEvent::Subscription appIdListenerSub;
-        ProfileUpdateEvent::Subscription profileListenerSub;
-        TempUpdateEvent::Subscription tempListenerSub;
-
-        StatusCell *cpuFreqCell;
-        StatusCell *gpuFreqCell;
-        StatusCell *memFreqCell;
-
-        StatusCell *realCpuFreqCell;
-        StatusCell *realGpuFreqCell;
-        StatusCell *realMemFreqCell;
-
-        StatusCell *socTempCell;
-        StatusCell *pcbTempCell;
-        StatusCell *skinTempCell;
-
-        StatusCell *nowPowerCell;
-        StatusCell *avgPowerCell;
-
-        StatusCell *profileCell;
-        StatusCell *tidCell;
-
-    public:
-        StatusTab(RefreshTask *refreshTask);
-        ~StatusTab();
-};
diff --git a/Source/sys-clk/manager/src/utils.cpp b/Source/sys-clk/manager/src/utils.cpp
deleted file mode 100644
index 9c1f48f7..00000000
--- a/Source/sys-clk/manager/src/utils.cpp
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
-    sys-clk manager, a sys-clk frontend homebrew
-    Copyright (C) 2019  natinusala
-    Copyright (C) 2019  p-sam
-    Copyright (C) 2019  m4xw
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#include "utils.h"
-
-#include <borealis.hpp>
-
-#include "ipc/client.h"
-
-uint32_t g_freq_table_hz[SysClkModule_EnumMax][SYSCLK_FREQ_LIST_MAX+1];
-
-Result cacheFreqList()
-{
-    Result rc;
-    for(uint32_t i = 0; i < SysClkModule_EnumMax; i++)
-    {
-        rc = sysclkIpcGetFreqList((SysClkModule)i, &g_freq_table_hz[i][1], SYSCLK_FREQ_LIST_MAX, &g_freq_table_hz[i][0]);
-        if(R_FAILED(rc))
-        {
-            return rc;
-        }
-    }
-
-    return 0;
-}
-
-std::string formatFreq(uint32_t freq)
-{
-    char str[16];
-    snprintf(str, sizeof(str), "%.1f MHz", (float)freq / 1000000.0f);
-    return std::string(str);
-}
-
-std::string formatTid(uint64_t tid)
-{
-    char str[17];
-    snprintf(str, sizeof(str), "%016lX", tid);
-    return std::string(str);
-}
-
-std::string formatProfile(SysClkProfile profile)
-{
-    return std::string(sysclkFormatProfile(profile, true));
-}
-
-std::string formatTemp(uint32_t temp)
-{
-    char str[16];
-    snprintf(str, sizeof(str), "%.1f °C", (float)temp / 1000.0f);
-    return std::string(str);
-}
-
-std::string formatPower(int32_t power)
-{
-    char str[16];
-    snprintf(str, sizeof(str), "%d mW", power);
-    return std::string(str);
-}
-
-void errorResult(std::string tag, Result rc)
-{
-#ifdef __SWITCH__
-    brls::Logger::error("[0x%x] %s failed - %04d-%04d", rc, tag.c_str(), R_MODULE(rc), R_DESCRIPTION(rc));
-#else
-    brls::Logger::error("[0x%x] %s failed - xxxx-xxxx", rc, tag.c_str());
-#endif
-}
-
-// TODO: Merge ticker for single line labels in Borealis and remove usage of this
-std::string formatListItemTitle(const std::string str, size_t maxScore)
-{
-    size_t score = 0;
-    for (size_t i = 0; i < str.length(); i++)
-    {
-        score += std::isupper(str[i]) ? 4 : 3;
-        if(score > maxScore)
-        {
-            return str.substr(0, i-1) + "\u2026";
-        }
-    }
-
-    return str;
-}
-
-brls::SelectListItem* createFreqListItem(SysClkModule module, uint32_t selectedFreqInMHz, std::string defaultString)
-{
-    std::string name;
-
-    switch (module)
-    {
-        case SysClkModule_CPU:
-            name = "CPU Frequency";
-            break;
-        case SysClkModule_GPU:
-            name = "GPU Frequency";
-            break;
-        case SysClkModule_MEM:
-            name = "MEM Frequency";
-            break;
-        default:
-            return nullptr;
-    }
-
-    uint32_t* table = &g_freq_table_hz[module][0];
-    size_t selected = 0;
-    size_t i        = 1;
-
-    std::vector<std::string> clocks;
-
-    clocks.push_back(defaultString);
-
-    while (i <= table[0])
-    {
-        uint32_t freq = table[i];
-
-        if (freq / 1000000 == selectedFreqInMHz)
-            selected = i;
-
-        char clock[16];
-        snprintf(clock, sizeof(clock), "%d MHz", freq / 1000000);
-
-        clocks.push_back(std::string(clock));
-
-        i++;
-    }
-
-    return new brls::SelectListItem(name, clocks, selected);
-}
diff --git a/Source/sys-clk/manager/src/utils.h b/Source/sys-clk/manager/src/utils.h
deleted file mode 100644
index 316fa5b2..00000000
--- a/Source/sys-clk/manager/src/utils.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-    sys-clk manager, a sys-clk frontend homebrew
-    Copyright (C) 2019  natinusala
-    Copyright (C) 2019  p-sam
-    Copyright (C) 2019  m4xw
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include <string>
-
-#include <sysclk.h>
-#include "ipc/ipc.h"
-
-#include <borealis.hpp>
-
-#define APP_ASSET(p) APP_RESOURCES p
-
-extern uint32_t g_freq_table_hz[SysClkModule_EnumMax][SYSCLK_FREQ_LIST_MAX+1];
-
-Result cacheFreqList();
-std::string formatListItemTitle(const std::string str, size_t maxScore = 140);
-brls::SelectListItem* createFreqListItem(SysClkModule module, uint32_t selectedFreqInMHz, std::string defaultString = "Default");
-
-std::string formatFreq(uint32_t freq);
-std::string formatTid(uint64_t tid);
-std::string formatProfile(SysClkProfile profile);
-std::string formatTemp(uint32_t temp);
-std::string formatPower(int32_t power);
-
-void errorResult(std::string tag, Result rc);
diff --git a/Source/sys-clk/overlay/lib/libultrahand/.github/FUNDING.yml b/Source/sys-clk/overlay/lib/libultrahand/.github/FUNDING.yml
new file mode 100644
index 00000000..57fdec3d
--- /dev/null
+++ b/Source/sys-clk/overlay/lib/libultrahand/.github/FUNDING.yml
@@ -0,0 +1,2 @@
+github: ppkantorski
+ko_fi: ppkantorski
diff --git a/Source/sys-clk/manager/resources/.gitkeep b/Source/sys-clk/overlay/lib/libultrahand/.gitmodules
similarity index 100%
rename from Source/sys-clk/manager/resources/.gitkeep
rename to Source/sys-clk/overlay/lib/libultrahand/.gitmodules
diff --git a/Source/sys-clk/overlay/lib/libultrahand/.pics/libultrahand.png b/Source/sys-clk/overlay/lib/libultrahand/.pics/libultrahand.png
new file mode 100644
index 00000000..7165fb92
Binary files /dev/null and b/Source/sys-clk/overlay/lib/libultrahand/.pics/libultrahand.png differ
diff --git a/Source/sys-clk/overlay/lib/libultrahand/LICENSE b/Source/sys-clk/overlay/lib/libultrahand/LICENSE
new file mode 100644
index 00000000..d159169d
--- /dev/null
+++ b/Source/sys-clk/overlay/lib/libultrahand/LICENSE
@@ -0,0 +1,339 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
diff --git a/Source/sys-clk/overlay/lib/libultrahand/README.md b/Source/sys-clk/overlay/lib/libultrahand/README.md
new file mode 100644
index 00000000..26492baa
--- /dev/null
+++ b/Source/sys-clk/overlay/lib/libultrahand/README.md
@@ -0,0 +1,211 @@
+# ☆ libultrahand
+[![platform](https://img.shields.io/badge/platform-Switch-898c8c?logo=C++.svg)](https://gbatemp.net/forums/nintendo-switch.283/?prefix_id=44)
+[![language](https://img.shields.io/badge/language-C++-ba1632?logo=C++.svg)](https://github.com/topics/cpp)
+[![GPLv2 License](https://img.shields.io/badge/license-GPLv2-189c11.svg)](https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html)
+[![Latest Version](https://img.shields.io/github/v/release/ppkantorski/libultrahand?label=latest&color=blue)](https://github.com/ppkantorski/libultrahand/releases/latest)
+[![Downloads](https://img.shields.io/github/downloads/ppkantorski/libultrahand/total?color=6f42c1)](https://github.com/ppkantorski/libultrahand/graphs/traffic)
+[![GitHub issues](https://img.shields.io/github/issues/ppkantorski/libultrahand?color=222222)](https://github.com/ppkantorski/libultrahand/issues)
+[![GitHub stars](https://img.shields.io/github/stars/ppkantorski/libultrahand)](https://github.com/ppkantorski/libultrahand/stargazers)
+
+
+Expanded [**libtesla**](https://github.com/WerWolv/libtesla) (originally by [WerWolv](https://github.com/WerWolv)) + **libultra** libraries for overlay development on the Nintendo Switch
+
+![libultrahand Logo](.pics/libultrahand.png)
+
+## Compiling
+
+### Necessary Libraries and Imports
+For easy importing and inclusion, try using `ultrahand.mk`. These lines must go after your projects `SOURCES` and `INCLUDES` definitions.
+```sh
+include $(TOPDIR)/lib/libultrahand/ultrahand.mk
+```
+This location should reflect where you place the `libultrahand` directory (`lib` can vary between projects).
+
+##
+
+Otherwise developers should include the following `SOURCES` and `INCLUDES` lines.
+```sh
+SOURCES  += lib/libultrahand/common lib/libultrahand/libultra/source
+INCLUDES += lib/libultrahand/common lib/libultrahand/libultra/include lib/libultrahand/libtesla/include
+```
+##
+
+Including the following libraries are also essential for compilation.
+```sh
+LIBS := -lcurl -lz -lminizip -lmbedtls -lmbedx509 -lmbedcrypto -lnx
+```
+
+### Active Services
+Service conflictions can occur, so if you are already using the following libnx services, you may want to remove them from your project.
+```cpp
+i2cInitialize();
+fsdevMountSdmc();
+splInitialize();
+spsmInitialize();
+ASSERT_FATAL(socketInitializeDefault());
+ASSERT_FATAL(nifmInitialize(NifmServiceType_User));
+ASSERT_FATAL(smInitialize()); // needed to prevent issues with powering device into sleep
+```
+Service `i2cInitialize` however is only utilized in accordance with `USING_WIDGET_DIRECTIVE`.
+
+### Optional Compilation Flags
+```
+-ffunction-sections -fdata-sections
+```
+These options are present in both CFLAGS and CXXFLAGS. They instruct the compiler to place each function and data item in its own section, which allows the linker to more easily identify and remove unused code.
+
+```
+-Wl,--gc-sections
+```
+Included in LDFLAGS. This linker flag instructs the linker to remove unused sections that were created by -ffunction-sections and -fdata-sections. This ensures that functions or data that are not used are removed from the final executable.
+
+```
+-flto (Link Time Optimization)
+```
+Present in CFLAGS, CXXFLAGS, and LDFLAGS. It enables link-time optimization, allowing the compiler to optimize across different translation units and remove any unused code during the linking phase. You also use -flto=6 to control the number of threads for parallel LTO, which helps speed up the process.
+
+```
+-fuse-linker-plugin
+```
+This flag allows the compiler and linker to better collaborate when using LTO, which further helps in optimizing and eliminating unused code.
+Together, these flags (-ffunction-sections, -fdata-sections, -Wl,--gc-sections, and -flto) ensure that any unused functions or data are stripped out during the build process, leading to a smaller and more optimized final binary.
+
+
+## Build Examples
+- [Ultrahand Overlay](https://github.com/ppkantorski/Ultrahand-Overlay)
+
+- [Tetris Overlay](https://github.com/ppkantorski/Tetris-Overlay)
+
+- [Status Monitor Overlay](https://github.com/ppkantorski/Status-Monitor-Overlay)
+
+- [Edizon Overlay](https://github.com/ppkantorski/EdiZon-Overlay)
+
+- [Sysmodules](https://github.com/ppkantorski/ovl-sysmodules)
+
+- [sys-clk](https://github.com/ppkantorski/sys-clk)
+
+- [FPSLocker](https://github.com/ppkantorski/FPSLocker)
+
+- [ReverseNX-RT](https://github.com/ppkantorski/ReverseNX-RT) 
+
+- [QuickNTP](https://github.com/ppkantorski/QuickNTP)
+
+- [SysDVR Overlay](https://github.com/ppkantorski/sysdvr-overlay)
+
+- [Fizeau](https://github.com/ppkantorski/Fizeau)
+
+- [NX-FanControl](https://github.com/ppkantorski/NX-FanControl)
+
+- [DNS-MITM_Manager](https://github.com/ppkantorski/DNS-MITM_Manager)
+
+
+## Features
+
+### Overriding Themes and Wallpapers
+
+To customize theme, wallpaper and / or allow direct language translations for your overlay, you can override the default settings by adding the following lines to your `Makefile`:
+
+```
+# Enable appearance overriding
+UI_OVERRIDE_PATH := /config/<OVERLAY_NAME>/
+CFLAGS += -DUI_OVERRIDE_PATH="\"$(UI_OVERRIDE_PATH)\""
+```
+
+Replace `<OVERLAY_NAME>` with the desired name of your overlay config directory.
+
+Users can specify custom Ultrahand `theme.ini` and `wallpaper.rgba` files for the overlay to use located in your SD card's `/config/<OVERLAY_NAME>/` or `{UI_OVERRIDE_PATH}` directory.
+
+#### **Troubleshooting**
+**Notice:** Makefile directives also must be added to `CXXFLAGS`.
+You can do this by adding the directives before `CXXFLAGS := $(CFLAGS)` gets defined, or include `CXXFLAGS += ...`.
+
+
+There are rare occurences where the theme and wallpaper are still not being loaded.  This may have to do with how the GUI class is used in some projects. For a work around, you can try adding the `INITIALIZE_IN_GUI_DIRECTIVE` directive. 
+
+```
+# For theme / wallpaper loading in GUI class method (add to project if theme does not appear)
+INITIALIZE_IN_GUI_DIRECTIVE := 1
+CFLAGS += -DINITIALIZE_IN_GUI_DIRECTIVE=$(INITIALIZE_IN_GUI_DIRECTIVE)
+```
+
+This fix will work for many projects, but other projects may not like this directive or may not need it at all so use with that in mind.
+
+---
+
+### Overriding Languages
+For language translation, `UI_OVERRIDE_PATH` must be defined.  Translations are performed direction on the rederer's `drawString` method. Direct strings can be added to a json located in `/config/<OVERLAY_NAME>/lang/` or `{UI_OVERRIDE_PATH}/lang/`.
+
+Jsons will need to be named ISO 639-1 format (en, de, fr, es, etc...) and will only be used in accordance with the current language set in the Ultrahand Overlay `/config/ultrahand/config.ini`.
+
+The format for language jsons is as follows.
+```json
+{
+  "English String": "Translated String",
+  "Another String": "Another Translation",
+  ...
+}
+```
+
+---
+
+### Ultrahand Overlay Widget
+
+To add the Ultrahand Overlay widget to your `OverlayFrame`'s, add the following directive to your `Makefile`:
+
+```
+# Enable Widget
+USING_WIDGET_DIRECTIVE := 1 
+CFLAGS += -DUSING_WIDGET_DIRECTIVE=$(USING_WIDGET_DIRECTIVE)
+```
+
+---
+
+### Forcing use of `<fstream>` instead of `<stdio.h>` (unnecessary)
+
+To compile utilizing `fstream`, add the following directive to your `Makefile`:
+
+```
+# Enable fstream
+USING_FSTREAM_DIRECTIVE := 1 
+CFLAGS += -DUSING_FSTREAM_DIRECTIVE=$(USING_FSTREAM_DIRECTIVE)
+```
+
+---
+
+### Initializing Settings
+
+Ultrahand Overlay theme variables and settings for your overlay are read automatically upon initialization.  Themes loading implementation is currently set within `OverlayFrame` and `HeaderOverlayFrame`.  
+
+However if you are breaking your project up into individual parts that only import `tesla.hpp` and modify elements, you may need to declare `/libultrahand/libultra/include` at the start of your `INCLUDES` in your make file.
+
+If that still is not working, then you may need to add this line somewhere for the theme to be applied to that element.
+
+```cpp
+tsl::initializeThemeVars(); // Initialize variables for ultrahand themes
+```
+
+### Download Methods
+
+To utilize the `libultra` download methods in your project, you will need to add the following line to your `initServices` function:
+```cpp
+initializeCurl();
+```
+As well as the following line to your `exetServices` function:
+```cpp
+cleanupCurl();
+```
+
+These lines will ensure `curl` functions properly within the overlay.
+
+
+## Contributing
+
+Contributions are welcome! If you have any ideas, suggestions, or bug reports, please raise an [issue](https://github.com/ppkantorski/libultrahand/issues/new/choose), submit a [pull request](https://github.com/ppkantorski/libultrahand/compare) or reach out to me directly on [GBATemp](https://gbatemp.net/threads/ultrahand-overlay-the-fully-craft-able-overlay-executor.633560/).
+
+[![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/X8X3VR194)
+
+## License
+
+This project is licensed and distributed under [GPLv2](LICENSE) with a [custom library](libultra) utilizing [CC-BY-4.0](SUB_LICENSE).
+
+Copyright (c) 2024 ppkantorski
diff --git a/Source/sys-clk/overlay/lib/libultrahand/SUB_LICENSE b/Source/sys-clk/overlay/lib/libultrahand/SUB_LICENSE
new file mode 100644
index 00000000..2f244ac8
--- /dev/null
+++ b/Source/sys-clk/overlay/lib/libultrahand/SUB_LICENSE
@@ -0,0 +1,395 @@
+Attribution 4.0 International
+
+=======================================================================
+
+Creative Commons Corporation ("Creative Commons") is not a law firm and
+does not provide legal services or legal advice. Distribution of
+Creative Commons public licenses does not create a lawyer-client or
+other relationship. Creative Commons makes its licenses and related
+information available on an "as-is" basis. Creative Commons gives no
+warranties regarding its licenses, any material licensed under their
+terms and conditions, or any related information. Creative Commons
+disclaims all liability for damages resulting from their use to the
+fullest extent possible.
+
+Using Creative Commons Public Licenses
+
+Creative Commons public licenses provide a standard set of terms and
+conditions that creators and other rights holders may use to share
+original works of authorship and other material subject to copyright
+and certain other rights specified in the public license below. The
+following considerations are for informational purposes only, are not
+exhaustive, and do not form part of our licenses.
+
+     Considerations for licensors: Our public licenses are
+     intended for use by those authorized to give the public
+     permission to use material in ways otherwise restricted by
+     copyright and certain other rights. Our licenses are
+     irrevocable. Licensors should read and understand the terms
+     and conditions of the license they choose before applying it.
+     Licensors should also secure all rights necessary before
+     applying our licenses so that the public can reuse the
+     material as expected. Licensors should clearly mark any
+     material not subject to the license. This includes other CC-
+     licensed material, or material used under an exception or
+     limitation to copyright. More considerations for licensors:
+	wiki.creativecommons.org/Considerations_for_licensors
+
+     Considerations for the public: By using one of our public
+     licenses, a licensor grants the public permission to use the
+     licensed material under specified terms and conditions. If
+     the licensor's permission is not necessary for any reason--for
+     example, because of any applicable exception or limitation to
+     copyright--then that use is not regulated by the license. Our
+     licenses grant only permissions under copyright and certain
+     other rights that a licensor has authority to grant. Use of
+     the licensed material may still be restricted for other
+     reasons, including because others have copyright or other
+     rights in the material. A licensor may make special requests,
+     such as asking that all changes be marked or described.
+     Although not required by our licenses, you are encouraged to
+     respect those requests where reasonable. More_considerations
+     for the public:
+	wiki.creativecommons.org/Considerations_for_licensees
+
+=======================================================================
+
+Creative Commons Attribution 4.0 International Public License
+
+By exercising the Licensed Rights (defined below), You accept and agree
+to be bound by the terms and conditions of this Creative Commons
+Attribution 4.0 International Public License ("Public License"). To the
+extent this Public License may be interpreted as a contract, You are
+granted the Licensed Rights in consideration of Your acceptance of
+these terms and conditions, and the Licensor grants You such rights in
+consideration of benefits the Licensor receives from making the
+Licensed Material available under these terms and conditions.
+
+
+Section 1 -- Definitions.
+
+  a. Adapted Material means material subject to Copyright and Similar
+     Rights that is derived from or based upon the Licensed Material
+     and in which the Licensed Material is translated, altered,
+     arranged, transformed, or otherwise modified in a manner requiring
+     permission under the Copyright and Similar Rights held by the
+     Licensor. For purposes of this Public License, where the Licensed
+     Material is a musical work, performance, or sound recording,
+     Adapted Material is always produced where the Licensed Material is
+     synched in timed relation with a moving image.
+
+  b. Adapter's License means the license You apply to Your Copyright
+     and Similar Rights in Your contributions to Adapted Material in
+     accordance with the terms and conditions of this Public License.
+
+  c. Copyright and Similar Rights means copyright and/or similar rights
+     closely related to copyright including, without limitation,
+     performance, broadcast, sound recording, and Sui Generis Database
+     Rights, without regard to how the rights are labeled or
+     categorized. For purposes of this Public License, the rights
+     specified in Section 2(b)(1)-(2) are not Copyright and Similar
+     Rights.
+
+  d. Effective Technological Measures means those measures that, in the
+     absence of proper authority, may not be circumvented under laws
+     fulfilling obligations under Article 11 of the WIPO Copyright
+     Treaty adopted on December 20, 1996, and/or similar international
+     agreements.
+
+  e. Exceptions and Limitations means fair use, fair dealing, and/or
+     any other exception or limitation to Copyright and Similar Rights
+     that applies to Your use of the Licensed Material.
+
+  f. Licensed Material means the artistic or literary work, database,
+     or other material to which the Licensor applied this Public
+     License.
+
+  g. Licensed Rights means the rights granted to You subject to the
+     terms and conditions of this Public License, which are limited to
+     all Copyright and Similar Rights that apply to Your use of the
+     Licensed Material and that the Licensor has authority to license.
+
+  h. Licensor means the individual(s) or entity(ies) granting rights
+     under this Public License.
+
+  i. Share means to provide material to the public by any means or
+     process that requires permission under the Licensed Rights, such
+     as reproduction, public display, public performance, distribution,
+     dissemination, communication, or importation, and to make material
+     available to the public including in ways that members of the
+     public may access the material from a place and at a time
+     individually chosen by them.
+
+  j. Sui Generis Database Rights means rights other than copyright
+     resulting from Directive 96/9/EC of the European Parliament and of
+     the Council of 11 March 1996 on the legal protection of databases,
+     as amended and/or succeeded, as well as other essentially
+     equivalent rights anywhere in the world.
+
+  k. You means the individual or entity exercising the Licensed Rights
+     under this Public License. Your has a corresponding meaning.
+
+
+Section 2 -- Scope.
+
+  a. License grant.
+
+       1. Subject to the terms and conditions of this Public License,
+          the Licensor hereby grants You a worldwide, royalty-free,
+          non-sublicensable, non-exclusive, irrevocable license to
+          exercise the Licensed Rights in the Licensed Material to:
+
+            a. reproduce and Share the Licensed Material, in whole or
+               in part; and
+
+            b. produce, reproduce, and Share Adapted Material.
+
+       2. Exceptions and Limitations. For the avoidance of doubt, where
+          Exceptions and Limitations apply to Your use, this Public
+          License does not apply, and You do not need to comply with
+          its terms and conditions.
+
+       3. Term. The term of this Public License is specified in Section
+          6(a).
+
+       4. Media and formats; technical modifications allowed. The
+          Licensor authorizes You to exercise the Licensed Rights in
+          all media and formats whether now known or hereafter created,
+          and to make technical modifications necessary to do so. The
+          Licensor waives and/or agrees not to assert any right or
+          authority to forbid You from making technical modifications
+          necessary to exercise the Licensed Rights, including
+          technical modifications necessary to circumvent Effective
+          Technological Measures. For purposes of this Public License,
+          simply making modifications authorized by this Section 2(a)
+          (4) never produces Adapted Material.
+
+       5. Downstream recipients.
+
+            a. Offer from the Licensor -- Licensed Material. Every
+               recipient of the Licensed Material automatically
+               receives an offer from the Licensor to exercise the
+               Licensed Rights under the terms and conditions of this
+               Public License.
+
+            b. No downstream restrictions. You may not offer or impose
+               any additional or different terms or conditions on, or
+               apply any Effective Technological Measures to, the
+               Licensed Material if doing so restricts exercise of the
+               Licensed Rights by any recipient of the Licensed
+               Material.
+
+       6. No endorsement. Nothing in this Public License constitutes or
+          may be construed as permission to assert or imply that You
+          are, or that Your use of the Licensed Material is, connected
+          with, or sponsored, endorsed, or granted official status by,
+          the Licensor or others designated to receive attribution as
+          provided in Section 3(a)(1)(A)(i).
+
+  b. Other rights.
+
+       1. Moral rights, such as the right of integrity, are not
+          licensed under this Public License, nor are publicity,
+          privacy, and/or other similar personality rights; however, to
+          the extent possible, the Licensor waives and/or agrees not to
+          assert any such rights held by the Licensor to the limited
+          extent necessary to allow You to exercise the Licensed
+          Rights, but not otherwise.
+
+       2. Patent and trademark rights are not licensed under this
+          Public License.
+
+       3. To the extent possible, the Licensor waives any right to
+          collect royalties from You for the exercise of the Licensed
+          Rights, whether directly or through a collecting society
+          under any voluntary or waivable statutory or compulsory
+          licensing scheme. In all other cases the Licensor expressly
+          reserves any right to collect such royalties.
+
+
+Section 3 -- License Conditions.
+
+Your exercise of the Licensed Rights is expressly made subject to the
+following conditions.
+
+  a. Attribution.
+
+       1. If You Share the Licensed Material (including in modified
+          form), You must:
+
+            a. retain the following if it is supplied by the Licensor
+               with the Licensed Material:
+
+                 i. identification of the creator(s) of the Licensed
+                    Material and any others designated to receive
+                    attribution, in any reasonable manner requested by
+                    the Licensor (including by pseudonym if
+                    designated);
+
+                ii. a copyright notice;
+
+               iii. a notice that refers to this Public License;
+
+                iv. a notice that refers to the disclaimer of
+                    warranties;
+
+                 v. a URI or hyperlink to the Licensed Material to the
+                    extent reasonably practicable;
+
+            b. indicate if You modified the Licensed Material and
+               retain an indication of any previous modifications; and
+
+            c. indicate the Licensed Material is licensed under this
+               Public License, and include the text of, or the URI or
+               hyperlink to, this Public License.
+
+       2. You may satisfy the conditions in Section 3(a)(1) in any
+          reasonable manner based on the medium, means, and context in
+          which You Share the Licensed Material. For example, it may be
+          reasonable to satisfy the conditions by providing a URI or
+          hyperlink to a resource that includes the required
+          information.
+
+       3. If requested by the Licensor, You must remove any of the
+          information required by Section 3(a)(1)(A) to the extent
+          reasonably practicable.
+
+       4. If You Share Adapted Material You produce, the Adapter's
+          License You apply must not prevent recipients of the Adapted
+          Material from complying with this Public License.
+
+
+Section 4 -- Sui Generis Database Rights.
+
+Where the Licensed Rights include Sui Generis Database Rights that
+apply to Your use of the Licensed Material:
+
+  a. for the avoidance of doubt, Section 2(a)(1) grants You the right
+     to extract, reuse, reproduce, and Share all or a substantial
+     portion of the contents of the database;
+
+  b. if You include all or a substantial portion of the database
+     contents in a database in which You have Sui Generis Database
+     Rights, then the database in which You have Sui Generis Database
+     Rights (but not its individual contents) is Adapted Material; and
+
+  c. You must comply with the conditions in Section 3(a) if You Share
+     all or a substantial portion of the contents of the database.
+
+For the avoidance of doubt, this Section 4 supplements and does not
+replace Your obligations under this Public License where the Licensed
+Rights include other Copyright and Similar Rights.
+
+
+Section 5 -- Disclaimer of Warranties and Limitation of Liability.
+
+  a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE
+     EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS
+     AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF
+     ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS,
+     IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION,
+     WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR
+     PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS,
+     ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT
+     KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT
+     ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU.
+
+  b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE
+     TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION,
+     NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT,
+     INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES,
+     COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR
+     USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN
+     ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR
+     DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR
+     IN PART, THIS LIMITATION MAY NOT APPLY TO YOU.
+
+  c. The disclaimer of warranties and limitation of liability provided
+     above shall be interpreted in a manner that, to the extent
+     possible, most closely approximates an absolute disclaimer and
+     waiver of all liability.
+
+
+Section 6 -- Term and Termination.
+
+  a. This Public License applies for the term of the Copyright and
+     Similar Rights licensed here. However, if You fail to comply with
+     this Public License, then Your rights under this Public License
+     terminate automatically.
+
+  b. Where Your right to use the Licensed Material has terminated under
+     Section 6(a), it reinstates:
+
+       1. automatically as of the date the violation is cured, provided
+          it is cured within 30 days of Your discovery of the
+          violation; or
+
+       2. upon express reinstatement by the Licensor.
+
+     For the avoidance of doubt, this Section 6(b) does not affect any
+     right the Licensor may have to seek remedies for Your violations
+     of this Public License.
+
+  c. For the avoidance of doubt, the Licensor may also offer the
+     Licensed Material under separate terms or conditions or stop
+     distributing the Licensed Material at any time; however, doing so
+     will not terminate this Public License.
+
+  d. Sections 1, 5, 6, 7, and 8 survive termination of this Public
+     License.
+
+
+Section 7 -- Other Terms and Conditions.
+
+  a. The Licensor shall not be bound by any additional or different
+     terms or conditions communicated by You unless expressly agreed.
+
+  b. Any arrangements, understandings, or agreements regarding the
+     Licensed Material not stated herein are separate from and
+     independent of the terms and conditions of this Public License.
+
+
+Section 8 -- Interpretation.
+
+  a. For the avoidance of doubt, this Public License does not, and
+     shall not be interpreted to, reduce, limit, restrict, or impose
+     conditions on any use of the Licensed Material that could lawfully
+     be made without permission under this Public License.
+
+  b. To the extent possible, if any provision of this Public License is
+     deemed unenforceable, it shall be automatically reformed to the
+     minimum extent necessary to make it enforceable. If the provision
+     cannot be reformed, it shall be severed from this Public License
+     without affecting the enforceability of the remaining terms and
+     conditions.
+
+  c. No term or condition of this Public License will be waived and no
+     failure to comply consented to unless expressly agreed to by the
+     Licensor.
+
+  d. Nothing in this Public License constitutes or may be interpreted
+     as a limitation upon, or waiver of, any privileges and immunities
+     that apply to the Licensor or You, including from the legal
+     processes of any jurisdiction or authority.
+
+
+=======================================================================
+
+Creative Commons is not a party to its public
+licenses. Notwithstanding, Creative Commons may elect to apply one of
+its public licenses to material it publishes and in those instances
+will be considered the “Licensor.” The text of the Creative Commons
+public licenses is dedicated to the public domain under the CC0 Public
+Domain Dedication. Except for the limited purpose of indicating that
+material is shared under a Creative Commons public license or as
+otherwise permitted by the Creative Commons policies published at
+creativecommons.org/policies, Creative Commons does not authorize the
+use of the trademark "Creative Commons" or any other trademark or logo
+of Creative Commons without its prior written consent including,
+without limitation, in connection with any unauthorized modifications
+to any of its public licenses or any other arrangements,
+understandings, or agreements concerning use of licensed material. For
+the avoidance of doubt, this paragraph does not form part of the
+public licenses.
+
+Creative Commons may be contacted at creativecommons.org.
diff --git a/Source/sys-clk/overlay/lib/libultrahand/common/cJSON.c b/Source/sys-clk/overlay/lib/libultrahand/common/cJSON.c
new file mode 100644
index 00000000..ca824f0e
--- /dev/null
+++ b/Source/sys-clk/overlay/lib/libultrahand/common/cJSON.c
@@ -0,0 +1,3191 @@
+/*
+  Copyright (c) 2009-2017 Dave Gamble and cJSON contributors
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+  THE SOFTWARE.
+*/
+
+/* cJSON */
+/* JSON parser in C. */
+
+/* disable warnings about old C89 functions in MSVC */
+#if !defined(_CRT_SECURE_NO_DEPRECATE) && defined(_MSC_VER)
+#define _CRT_SECURE_NO_DEPRECATE
+#endif
+
+#ifdef __GNUC__
+#pragma GCC visibility push(default)
+#endif
+#if defined(_MSC_VER)
+#pragma warning (push)
+/* disable warning about single line comments in system headers */
+#pragma warning (disable : 4001)
+#endif
+
+#include <string.h>
+#include <stdio.h>
+#include <math.h>
+#include <stdlib.h>
+#include <limits.h>
+#include <ctype.h>
+#include <float.h>
+
+#ifdef ENABLE_LOCALES
+#include <locale.h>
+#endif
+
+#if defined(_MSC_VER)
+#pragma warning (pop)
+#endif
+#ifdef __GNUC__
+#pragma GCC visibility pop
+#endif
+
+#include "cJSON.h"
+
+/* define our own boolean type */
+#ifdef true
+#undef true
+#endif
+#define true ((cJSON_bool)1)
+
+#ifdef false
+#undef false
+#endif
+#define false ((cJSON_bool)0)
+
+/* define isnan and isinf for ANSI C, if in C99 or above, isnan and isinf has been defined in math.h */
+#ifndef isinf
+#define isinf(d) (isnan((d - d)) && !isnan(d))
+#endif
+#ifndef isnan
+#define isnan(d) (d != d)
+#endif
+
+#ifndef NAN
+#ifdef _WIN32
+#define NAN sqrt(-1.0)
+#else
+#define NAN 0.0/0.0
+#endif
+#endif
+
+typedef struct {
+    const unsigned char *json;
+    size_t position;
+} error;
+static error global_error = { NULL, 0 };
+
+CJSON_PUBLIC(const char *) cJSON_GetErrorPtr(void)
+{
+    return (const char*) (global_error.json + global_error.position);
+}
+
+CJSON_PUBLIC(char *) cJSON_GetStringValue(const cJSON * const item)
+{
+    if (!cJSON_IsString(item))
+    {
+        return NULL;
+    }
+
+    return item->valuestring;
+}
+
+CJSON_PUBLIC(double) cJSON_GetNumberValue(const cJSON * const item)
+{
+    if (!cJSON_IsNumber(item))
+    {
+        return (double) NAN;
+    }
+
+    return item->valuedouble;
+}
+
+/* This is a safeguard to prevent copy-pasters from using incompatible C and header files */
+#if (CJSON_VERSION_MAJOR != 1) || (CJSON_VERSION_MINOR != 7) || (CJSON_VERSION_PATCH != 18)
+    #error cJSON.h and cJSON.c have different versions. Make sure that both have the same.
+#endif
+
+CJSON_PUBLIC(const char*) cJSON_Version(void)
+{
+    static char version[15];
+    sprintf(version, "%i.%i.%i", CJSON_VERSION_MAJOR, CJSON_VERSION_MINOR, CJSON_VERSION_PATCH);
+
+    return version;
+}
+
+/* Case insensitive string comparison, doesn't consider two NULL pointers equal though */
+static int case_insensitive_strcmp(const unsigned char *string1, const unsigned char *string2)
+{
+    if ((string1 == NULL) || (string2 == NULL))
+    {
+        return 1;
+    }
+
+    if (string1 == string2)
+    {
+        return 0;
+    }
+
+    for(; tolower(*string1) == tolower(*string2); (void)string1++, string2++)
+    {
+        if (*string1 == '\0')
+        {
+            return 0;
+        }
+    }
+
+    return tolower(*string1) - tolower(*string2);
+}
+
+typedef struct internal_hooks
+{
+    void *(CJSON_CDECL *allocate)(size_t size);
+    void (CJSON_CDECL *deallocate)(void *pointer);
+    void *(CJSON_CDECL *reallocate)(void *pointer, size_t size);
+} internal_hooks;
+
+#if defined(_MSC_VER)
+/* work around MSVC error C2322: '...' address of dllimport '...' is not static */
+static void * CJSON_CDECL internal_malloc(size_t size)
+{
+    return malloc(size);
+}
+static void CJSON_CDECL internal_free(void *pointer)
+{
+    free(pointer);
+}
+static void * CJSON_CDECL internal_realloc(void *pointer, size_t size)
+{
+    return realloc(pointer, size);
+}
+#else
+#define internal_malloc malloc
+#define internal_free free
+#define internal_realloc realloc
+#endif
+
+/* strlen of character literals resolved at compile time */
+#define static_strlen(string_literal) (sizeof(string_literal) - sizeof(""))
+
+static internal_hooks global_hooks = { internal_malloc, internal_free, internal_realloc };
+
+static unsigned char* cJSON_strdup(const unsigned char* string, const internal_hooks * const hooks)
+{
+    size_t length = 0;
+    unsigned char *copy = NULL;
+
+    if (string == NULL)
+    {
+        return NULL;
+    }
+
+    length = strlen((const char*)string) + sizeof("");
+    copy = (unsigned char*)hooks->allocate(length);
+    if (copy == NULL)
+    {
+        return NULL;
+    }
+    memcpy(copy, string, length);
+
+    return copy;
+}
+
+CJSON_PUBLIC(void) cJSON_InitHooks(cJSON_Hooks* hooks)
+{
+    if (hooks == NULL)
+    {
+        /* Reset hooks */
+        global_hooks.allocate = malloc;
+        global_hooks.deallocate = free;
+        global_hooks.reallocate = realloc;
+        return;
+    }
+
+    global_hooks.allocate = malloc;
+    if (hooks->malloc_fn != NULL)
+    {
+        global_hooks.allocate = hooks->malloc_fn;
+    }
+
+    global_hooks.deallocate = free;
+    if (hooks->free_fn != NULL)
+    {
+        global_hooks.deallocate = hooks->free_fn;
+    }
+
+    /* use realloc only if both free and malloc are used */
+    global_hooks.reallocate = NULL;
+    if ((global_hooks.allocate == malloc) && (global_hooks.deallocate == free))
+    {
+        global_hooks.reallocate = realloc;
+    }
+}
+
+/* Internal constructor. */
+static cJSON *cJSON_New_Item(const internal_hooks * const hooks)
+{
+    cJSON* node = (cJSON*)hooks->allocate(sizeof(cJSON));
+    if (node)
+    {
+        memset(node, '\0', sizeof(cJSON));
+    }
+
+    return node;
+}
+
+/* Delete a cJSON structure. */
+CJSON_PUBLIC(void) cJSON_Delete(cJSON *item)
+{
+    cJSON *next = NULL;
+    while (item != NULL)
+    {
+        next = item->next;
+        if (!(item->type & cJSON_IsReference) && (item->child != NULL))
+        {
+            cJSON_Delete(item->child);
+        }
+        if (!(item->type & cJSON_IsReference) && (item->valuestring != NULL))
+        {
+            global_hooks.deallocate(item->valuestring);
+            item->valuestring = NULL;
+        }
+        if (!(item->type & cJSON_StringIsConst) && (item->string != NULL))
+        {
+            global_hooks.deallocate(item->string);
+            item->string = NULL;
+        }
+        global_hooks.deallocate(item);
+        item = next;
+    }
+}
+
+/* get the decimal point character of the current locale */
+static unsigned char get_decimal_point(void)
+{
+#ifdef ENABLE_LOCALES
+    struct lconv *lconv = localeconv();
+    return (unsigned char) lconv->decimal_point[0];
+#else
+    return '.';
+#endif
+}
+
+typedef struct
+{
+    const unsigned char *content;
+    size_t length;
+    size_t offset;
+    size_t depth; /* How deeply nested (in arrays/objects) is the input at the current offset. */
+    internal_hooks hooks;
+} parse_buffer;
+
+/* check if the given size is left to read in a given parse buffer (starting with 1) */
+#define can_read(buffer, size) ((buffer != NULL) && (((buffer)->offset + size) <= (buffer)->length))
+/* check if the buffer can be accessed at the given index (starting with 0) */
+#define can_access_at_index(buffer, index) ((buffer != NULL) && (((buffer)->offset + index) < (buffer)->length))
+#define cannot_access_at_index(buffer, index) (!can_access_at_index(buffer, index))
+/* get a pointer to the buffer at the position */
+#define buffer_at_offset(buffer) ((buffer)->content + (buffer)->offset)
+
+/* Parse the input text to generate a number, and populate the result into item. */
+static cJSON_bool parse_number(cJSON * const item, parse_buffer * const input_buffer)
+{
+    double number = 0;
+    unsigned char *after_end = NULL;
+    unsigned char *number_c_string;
+    unsigned char decimal_point = get_decimal_point();
+    size_t i = 0;
+    size_t number_string_length = 0;
+    cJSON_bool has_decimal_point = false;
+
+    if ((input_buffer == NULL) || (input_buffer->content == NULL))
+    {
+        return false;
+    }
+
+    /* copy the number into a temporary buffer and replace '.' with the decimal point
+     * of the current locale (for strtod)
+     * This also takes care of '\0' not necessarily being available for marking the end of the input */
+    for (i = 0; can_access_at_index(input_buffer, i); i++)
+    {
+        switch (buffer_at_offset(input_buffer)[i])
+        {
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            case '+':
+            case '-':
+            case 'e':
+            case 'E':
+                number_string_length++;
+                break;
+
+            case '.':
+                number_string_length++;
+                has_decimal_point = true;
+                break;
+
+            default:
+                goto loop_end;
+        }
+    }
+loop_end:
+    /* malloc for temporary buffer, add 1 for '\0' */
+    number_c_string = (unsigned char *) input_buffer->hooks.allocate(number_string_length + 1);
+    if (number_c_string == NULL)
+    {
+        return false; /* allocation failure */
+    }
+
+    memcpy(number_c_string, buffer_at_offset(input_buffer), number_string_length);
+    number_c_string[number_string_length] = '\0';
+
+    if (has_decimal_point)
+    {
+        for (i = 0; i < number_string_length; i++)
+        {
+            if (number_c_string[i] == '.')
+            {
+                /* replace '.' with the decimal point of the current locale (for strtod) */
+                number_c_string[i] = decimal_point;
+            }
+        }
+    }
+
+    number = strtod((const char*)number_c_string, (char**)&after_end);
+    if (number_c_string == after_end)
+    {
+        /* free the temporary buffer */
+        input_buffer->hooks.deallocate(number_c_string);
+        return false; /* parse_error */
+    }
+
+    item->valuedouble = number;
+
+    /* use saturation in case of overflow */
+    if (number >= INT_MAX)
+    {
+        item->valueint = INT_MAX;
+    }
+    else if (number <= (double)INT_MIN)
+    {
+        item->valueint = INT_MIN;
+    }
+    else
+    {
+        item->valueint = (int)number;
+    }
+
+    item->type = cJSON_Number;
+
+    input_buffer->offset += (size_t)(after_end - number_c_string);
+    /* free the temporary buffer */
+    input_buffer->hooks.deallocate(number_c_string);
+    return true;
+}
+
+/* don't ask me, but the original cJSON_SetNumberValue returns an integer or double */
+CJSON_PUBLIC(double) cJSON_SetNumberHelper(cJSON *object, double number)
+{
+    if (number >= INT_MAX)
+    {
+        object->valueint = INT_MAX;
+    }
+    else if (number <= (double)INT_MIN)
+    {
+        object->valueint = INT_MIN;
+    }
+    else
+    {
+        object->valueint = (int)number;
+    }
+
+    return object->valuedouble = number;
+}
+
+/* Note: when passing a NULL valuestring, cJSON_SetValuestring treats this as an error and return NULL */
+CJSON_PUBLIC(char*) cJSON_SetValuestring(cJSON *object, const char *valuestring)
+{
+    char *copy = NULL;
+    size_t v1_len;
+    size_t v2_len;
+    /* if object's type is not cJSON_String or is cJSON_IsReference, it should not set valuestring */
+    if ((object == NULL) || !(object->type & cJSON_String) || (object->type & cJSON_IsReference))
+    {
+        return NULL;
+    }
+    /* return NULL if the object is corrupted or valuestring is NULL */
+    if (object->valuestring == NULL || valuestring == NULL)
+    {
+        return NULL;
+    }
+
+    v1_len = strlen(valuestring);
+    v2_len = strlen(object->valuestring);
+
+    if (v1_len <= v2_len)
+    {
+        /* strcpy does not handle overlapping string: [X1, X2] [Y1, Y2] => X2 < Y1 or Y2 < X1 */
+        if (!( valuestring + v1_len < object->valuestring || object->valuestring + v2_len < valuestring ))
+        {
+            return NULL;
+        }
+        strcpy(object->valuestring, valuestring);
+        return object->valuestring;
+    }
+    copy = (char*) cJSON_strdup((const unsigned char*)valuestring, &global_hooks);
+    if (copy == NULL)
+    {
+        return NULL;
+    }
+    if (object->valuestring != NULL)
+    {
+        cJSON_free(object->valuestring);
+    }
+    object->valuestring = copy;
+
+    return copy;
+}
+
+typedef struct
+{
+    unsigned char *buffer;
+    size_t length;
+    size_t offset;
+    size_t depth; /* current nesting depth (for formatted printing) */
+    cJSON_bool noalloc;
+    cJSON_bool format; /* is this print a formatted print */
+    internal_hooks hooks;
+} printbuffer;
+
+/* realloc printbuffer if necessary to have at least "needed" bytes more */
+static unsigned char* ensure(printbuffer * const p, size_t needed)
+{
+    unsigned char *newbuffer = NULL;
+    size_t newsize = 0;
+
+    if ((p == NULL) || (p->buffer == NULL))
+    {
+        return NULL;
+    }
+
+    if ((p->length > 0) && (p->offset >= p->length))
+    {
+        /* make sure that offset is valid */
+        return NULL;
+    }
+
+    if (needed > INT_MAX)
+    {
+        /* sizes bigger than INT_MAX are currently not supported */
+        return NULL;
+    }
+
+    needed += p->offset + 1;
+    if (needed <= p->length)
+    {
+        return p->buffer + p->offset;
+    }
+
+    if (p->noalloc) {
+        return NULL;
+    }
+
+    /* calculate new buffer size */
+    if (needed > (INT_MAX / 2))
+    {
+        /* overflow of int, use INT_MAX if possible */
+        if (needed <= INT_MAX)
+        {
+            newsize = INT_MAX;
+        }
+        else
+        {
+            return NULL;
+        }
+    }
+    else
+    {
+        newsize = needed * 2;
+    }
+
+    if (p->hooks.reallocate != NULL)
+    {
+        /* reallocate with realloc if available */
+        newbuffer = (unsigned char*)p->hooks.reallocate(p->buffer, newsize);
+        if (newbuffer == NULL)
+        {
+            p->hooks.deallocate(p->buffer);
+            p->length = 0;
+            p->buffer = NULL;
+
+            return NULL;
+        }
+    }
+    else
+    {
+        /* otherwise reallocate manually */
+        newbuffer = (unsigned char*)p->hooks.allocate(newsize);
+        if (!newbuffer)
+        {
+            p->hooks.deallocate(p->buffer);
+            p->length = 0;
+            p->buffer = NULL;
+
+            return NULL;
+        }
+
+        memcpy(newbuffer, p->buffer, p->offset + 1);
+        p->hooks.deallocate(p->buffer);
+    }
+    p->length = newsize;
+    p->buffer = newbuffer;
+
+    return newbuffer + p->offset;
+}
+
+/* calculate the new length of the string in a printbuffer and update the offset */
+static void update_offset(printbuffer * const buffer)
+{
+    const unsigned char *buffer_pointer = NULL;
+    if ((buffer == NULL) || (buffer->buffer == NULL))
+    {
+        return;
+    }
+    buffer_pointer = buffer->buffer + buffer->offset;
+
+    buffer->offset += strlen((const char*)buffer_pointer);
+}
+
+/* securely comparison of floating-point variables */
+static cJSON_bool compare_double(double a, double b)
+{
+    double maxVal = fabs(a) > fabs(b) ? fabs(a) : fabs(b);
+    return (fabs(a - b) <= maxVal * DBL_EPSILON);
+}
+
+/* Render the number nicely from the given item into a string. */
+static cJSON_bool print_number(const cJSON * const item, printbuffer * const output_buffer)
+{
+    unsigned char *output_pointer = NULL;
+    double d = item->valuedouble;
+    int length = 0;
+    size_t i = 0;
+    unsigned char number_buffer[26] = {0}; /* temporary buffer to print the number into */
+    unsigned char decimal_point = get_decimal_point();
+    double test = 0.0;
+
+    if (output_buffer == NULL)
+    {
+        return false;
+    }
+
+    /* This checks for NaN and Infinity */
+    if (isnan(d) || isinf(d))
+    {
+        length = sprintf((char*)number_buffer, "null");
+    }
+    else if(d == (double)item->valueint)
+    {
+        length = sprintf((char*)number_buffer, "%d", item->valueint);
+    }
+    else
+    {
+        /* Try 15 decimal places of precision to avoid nonsignificant nonzero digits */
+        length = sprintf((char*)number_buffer, "%1.15g", d);
+
+        /* Check whether the original double can be recovered */
+        if ((sscanf((char*)number_buffer, "%lg", &test) != 1) || !compare_double((double)test, d))
+        {
+            /* If not, print with 17 decimal places of precision */
+            length = sprintf((char*)number_buffer, "%1.17g", d);
+        }
+    }
+
+    /* sprintf failed or buffer overrun occurred */
+    if ((length < 0) || (length > (int)(sizeof(number_buffer) - 1)))
+    {
+        return false;
+    }
+
+    /* reserve appropriate space in the output */
+    output_pointer = ensure(output_buffer, (size_t)length + sizeof(""));
+    if (output_pointer == NULL)
+    {
+        return false;
+    }
+
+    /* copy the printed number to the output and replace locale
+     * dependent decimal point with '.' */
+    for (i = 0; i < ((size_t)length); i++)
+    {
+        if (number_buffer[i] == decimal_point)
+        {
+            output_pointer[i] = '.';
+            continue;
+        }
+
+        output_pointer[i] = number_buffer[i];
+    }
+    output_pointer[i] = '\0';
+
+    output_buffer->offset += (size_t)length;
+
+    return true;
+}
+
+/* parse 4 digit hexadecimal number */
+static unsigned parse_hex4(const unsigned char * const input)
+{
+    unsigned int h = 0;
+    size_t i = 0;
+
+    for (i = 0; i < 4; i++)
+    {
+        /* parse digit */
+        if ((input[i] >= '0') && (input[i] <= '9'))
+        {
+            h += (unsigned int) input[i] - '0';
+        }
+        else if ((input[i] >= 'A') && (input[i] <= 'F'))
+        {
+            h += (unsigned int) 10 + input[i] - 'A';
+        }
+        else if ((input[i] >= 'a') && (input[i] <= 'f'))
+        {
+            h += (unsigned int) 10 + input[i] - 'a';
+        }
+        else /* invalid */
+        {
+            return 0;
+        }
+
+        if (i < 3)
+        {
+            /* shift left to make place for the next nibble */
+            h = h << 4;
+        }
+    }
+
+    return h;
+}
+
+/* converts a UTF-16 literal to UTF-8
+ * A literal can be one or two sequences of the form \uXXXX */
+static unsigned char utf16_literal_to_utf8(const unsigned char * const input_pointer, const unsigned char * const input_end, unsigned char **output_pointer)
+{
+    long unsigned int codepoint = 0;
+    unsigned int first_code = 0;
+    const unsigned char *first_sequence = input_pointer;
+    unsigned char utf8_length = 0;
+    unsigned char utf8_position = 0;
+    unsigned char sequence_length = 0;
+    unsigned char first_byte_mark = 0;
+
+    if ((input_end - first_sequence) < 6)
+    {
+        /* input ends unexpectedly */
+        goto fail;
+    }
+
+    /* get the first utf16 sequence */
+    first_code = parse_hex4(first_sequence + 2);
+
+    /* check that the code is valid */
+    if (((first_code >= 0xDC00) && (first_code <= 0xDFFF)))
+    {
+        goto fail;
+    }
+
+    /* UTF16 surrogate pair */
+    if ((first_code >= 0xD800) && (first_code <= 0xDBFF))
+    {
+        const unsigned char *second_sequence = first_sequence + 6;
+        unsigned int second_code = 0;
+        sequence_length = 12; /* \uXXXX\uXXXX */
+
+        if ((input_end - second_sequence) < 6)
+        {
+            /* input ends unexpectedly */
+            goto fail;
+        }
+
+        if ((second_sequence[0] != '\\') || (second_sequence[1] != 'u'))
+        {
+            /* missing second half of the surrogate pair */
+            goto fail;
+        }
+
+        /* get the second utf16 sequence */
+        second_code = parse_hex4(second_sequence + 2);
+        /* check that the code is valid */
+        if ((second_code < 0xDC00) || (second_code > 0xDFFF))
+        {
+            /* invalid second half of the surrogate pair */
+            goto fail;
+        }
+
+
+        /* calculate the unicode codepoint from the surrogate pair */
+        codepoint = 0x10000 + (((first_code & 0x3FF) << 10) | (second_code & 0x3FF));
+    }
+    else
+    {
+        sequence_length = 6; /* \uXXXX */
+        codepoint = first_code;
+    }
+
+    /* encode as UTF-8
+     * takes at maximum 4 bytes to encode:
+     * 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx */
+    if (codepoint < 0x80)
+    {
+        /* normal ascii, encoding 0xxxxxxx */
+        utf8_length = 1;
+    }
+    else if (codepoint < 0x800)
+    {
+        /* two bytes, encoding 110xxxxx 10xxxxxx */
+        utf8_length = 2;
+        first_byte_mark = 0xC0; /* 11000000 */
+    }
+    else if (codepoint < 0x10000)
+    {
+        /* three bytes, encoding 1110xxxx 10xxxxxx 10xxxxxx */
+        utf8_length = 3;
+        first_byte_mark = 0xE0; /* 11100000 */
+    }
+    else if (codepoint <= 0x10FFFF)
+    {
+        /* four bytes, encoding 1110xxxx 10xxxxxx 10xxxxxx 10xxxxxx */
+        utf8_length = 4;
+        first_byte_mark = 0xF0; /* 11110000 */
+    }
+    else
+    {
+        /* invalid unicode codepoint */
+        goto fail;
+    }
+
+    /* encode as utf8 */
+    for (utf8_position = (unsigned char)(utf8_length - 1); utf8_position > 0; utf8_position--)
+    {
+        /* 10xxxxxx */
+        (*output_pointer)[utf8_position] = (unsigned char)((codepoint | 0x80) & 0xBF);
+        codepoint >>= 6;
+    }
+    /* encode first byte */
+    if (utf8_length > 1)
+    {
+        (*output_pointer)[0] = (unsigned char)((codepoint | first_byte_mark) & 0xFF);
+    }
+    else
+    {
+        (*output_pointer)[0] = (unsigned char)(codepoint & 0x7F);
+    }
+
+    *output_pointer += utf8_length;
+
+    return sequence_length;
+
+fail:
+    return 0;
+}
+
+/* Parse the input text into an unescaped cinput, and populate item. */
+static cJSON_bool parse_string(cJSON * const item, parse_buffer * const input_buffer)
+{
+    const unsigned char *input_pointer = buffer_at_offset(input_buffer) + 1;
+    const unsigned char *input_end = buffer_at_offset(input_buffer) + 1;
+    unsigned char *output_pointer = NULL;
+    unsigned char *output = NULL;
+
+    /* not a string */
+    if (buffer_at_offset(input_buffer)[0] != '\"')
+    {
+        goto fail;
+    }
+
+    {
+        /* calculate approximate size of the output (overestimate) */
+        size_t allocation_length = 0;
+        size_t skipped_bytes = 0;
+        while (((size_t)(input_end - input_buffer->content) < input_buffer->length) && (*input_end != '\"'))
+        {
+            /* is escape sequence */
+            if (input_end[0] == '\\')
+            {
+                if ((size_t)(input_end + 1 - input_buffer->content) >= input_buffer->length)
+                {
+                    /* prevent buffer overflow when last input character is a backslash */
+                    goto fail;
+                }
+                skipped_bytes++;
+                input_end++;
+            }
+            input_end++;
+        }
+        if (((size_t)(input_end - input_buffer->content) >= input_buffer->length) || (*input_end != '\"'))
+        {
+            goto fail; /* string ended unexpectedly */
+        }
+
+        /* This is at most how much we need for the output */
+        allocation_length = (size_t) (input_end - buffer_at_offset(input_buffer)) - skipped_bytes;
+        output = (unsigned char*)input_buffer->hooks.allocate(allocation_length + sizeof(""));
+        if (output == NULL)
+        {
+            goto fail; /* allocation failure */
+        }
+    }
+
+    output_pointer = output;
+    /* loop through the string literal */
+    while (input_pointer < input_end)
+    {
+        if (*input_pointer != '\\')
+        {
+            *output_pointer++ = *input_pointer++;
+        }
+        /* escape sequence */
+        else
+        {
+            unsigned char sequence_length = 2;
+            if ((input_end - input_pointer) < 1)
+            {
+                goto fail;
+            }
+
+            switch (input_pointer[1])
+            {
+                case 'b':
+                    *output_pointer++ = '\b';
+                    break;
+                case 'f':
+                    *output_pointer++ = '\f';
+                    break;
+                case 'n':
+                    *output_pointer++ = '\n';
+                    break;
+                case 'r':
+                    *output_pointer++ = '\r';
+                    break;
+                case 't':
+                    *output_pointer++ = '\t';
+                    break;
+                case '\"':
+                case '\\':
+                case '/':
+                    *output_pointer++ = input_pointer[1];
+                    break;
+
+                /* UTF-16 literal */
+                case 'u':
+                    sequence_length = utf16_literal_to_utf8(input_pointer, input_end, &output_pointer);
+                    if (sequence_length == 0)
+                    {
+                        /* failed to convert UTF16-literal to UTF-8 */
+                        goto fail;
+                    }
+                    break;
+
+                default:
+                    goto fail;
+            }
+            input_pointer += sequence_length;
+        }
+    }
+
+    /* zero terminate the output */
+    *output_pointer = '\0';
+
+    item->type = cJSON_String;
+    item->valuestring = (char*)output;
+
+    input_buffer->offset = (size_t) (input_end - input_buffer->content);
+    input_buffer->offset++;
+
+    return true;
+
+fail:
+    if (output != NULL)
+    {
+        input_buffer->hooks.deallocate(output);
+        output = NULL;
+    }
+
+    if (input_pointer != NULL)
+    {
+        input_buffer->offset = (size_t)(input_pointer - input_buffer->content);
+    }
+
+    return false;
+}
+
+/* Render the cstring provided to an escaped version that can be printed. */
+static cJSON_bool print_string_ptr(const unsigned char * const input, printbuffer * const output_buffer)
+{
+    const unsigned char *input_pointer = NULL;
+    unsigned char *output = NULL;
+    unsigned char *output_pointer = NULL;
+    size_t output_length = 0;
+    /* numbers of additional characters needed for escaping */
+    size_t escape_characters = 0;
+
+    if (output_buffer == NULL)
+    {
+        return false;
+    }
+
+    /* empty string */
+    if (input == NULL)
+    {
+        output = ensure(output_buffer, sizeof("\"\""));
+        if (output == NULL)
+        {
+            return false;
+        }
+        strcpy((char*)output, "\"\"");
+
+        return true;
+    }
+
+    /* set "flag" to 1 if something needs to be escaped */
+    for (input_pointer = input; *input_pointer; input_pointer++)
+    {
+        switch (*input_pointer)
+        {
+            case '\"':
+            case '\\':
+            case '\b':
+            case '\f':
+            case '\n':
+            case '\r':
+            case '\t':
+                /* one character escape sequence */
+                escape_characters++;
+                break;
+            default:
+                if (*input_pointer < 32)
+                {
+                    /* UTF-16 escape sequence uXXXX */
+                    escape_characters += 5;
+                }
+                break;
+        }
+    }
+    output_length = (size_t)(input_pointer - input) + escape_characters;
+
+    output = ensure(output_buffer, output_length + sizeof("\"\""));
+    if (output == NULL)
+    {
+        return false;
+    }
+
+    /* no characters have to be escaped */
+    if (escape_characters == 0)
+    {
+        output[0] = '\"';
+        memcpy(output + 1, input, output_length);
+        output[output_length + 1] = '\"';
+        output[output_length + 2] = '\0';
+
+        return true;
+    }
+
+    output[0] = '\"';
+    output_pointer = output + 1;
+    /* copy the string */
+    for (input_pointer = input; *input_pointer != '\0'; (void)input_pointer++, output_pointer++)
+    {
+        if ((*input_pointer > 31) && (*input_pointer != '\"') && (*input_pointer != '\\'))
+        {
+            /* normal character, copy */
+            *output_pointer = *input_pointer;
+        }
+        else
+        {
+            /* character needs to be escaped */
+            *output_pointer++ = '\\';
+            switch (*input_pointer)
+            {
+                case '\\':
+                    *output_pointer = '\\';
+                    break;
+                case '\"':
+                    *output_pointer = '\"';
+                    break;
+                case '\b':
+                    *output_pointer = 'b';
+                    break;
+                case '\f':
+                    *output_pointer = 'f';
+                    break;
+                case '\n':
+                    *output_pointer = 'n';
+                    break;
+                case '\r':
+                    *output_pointer = 'r';
+                    break;
+                case '\t':
+                    *output_pointer = 't';
+                    break;
+                default:
+                    /* escape and print as unicode codepoint */
+                    sprintf((char*)output_pointer, "u%04x", *input_pointer);
+                    output_pointer += 4;
+                    break;
+            }
+        }
+    }
+    output[output_length + 1] = '\"';
+    output[output_length + 2] = '\0';
+
+    return true;
+}
+
+/* Invoke print_string_ptr (which is useful) on an item. */
+static cJSON_bool print_string(const cJSON * const item, printbuffer * const p)
+{
+    return print_string_ptr((unsigned char*)item->valuestring, p);
+}
+
+/* Predeclare these prototypes. */
+static cJSON_bool parse_value(cJSON * const item, parse_buffer * const input_buffer);
+static cJSON_bool print_value(const cJSON * const item, printbuffer * const output_buffer);
+static cJSON_bool parse_array(cJSON * const item, parse_buffer * const input_buffer);
+static cJSON_bool print_array(const cJSON * const item, printbuffer * const output_buffer);
+static cJSON_bool parse_object(cJSON * const item, parse_buffer * const input_buffer);
+static cJSON_bool print_object(const cJSON * const item, printbuffer * const output_buffer);
+
+/* Utility to jump whitespace and cr/lf */
+static parse_buffer *buffer_skip_whitespace(parse_buffer * const buffer)
+{
+    if ((buffer == NULL) || (buffer->content == NULL))
+    {
+        return NULL;
+    }
+
+    if (cannot_access_at_index(buffer, 0))
+    {
+        return buffer;
+    }
+
+    while (can_access_at_index(buffer, 0) && (buffer_at_offset(buffer)[0] <= 32))
+    {
+       buffer->offset++;
+    }
+
+    if (buffer->offset == buffer->length)
+    {
+        buffer->offset--;
+    }
+
+    return buffer;
+}
+
+/* skip the UTF-8 BOM (byte order mark) if it is at the beginning of a buffer */
+static parse_buffer *skip_utf8_bom(parse_buffer * const buffer)
+{
+    if ((buffer == NULL) || (buffer->content == NULL) || (buffer->offset != 0))
+    {
+        return NULL;
+    }
+
+    if (can_access_at_index(buffer, 4) && (strncmp((const char*)buffer_at_offset(buffer), "\xEF\xBB\xBF", 3) == 0))
+    {
+        buffer->offset += 3;
+    }
+
+    return buffer;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_ParseWithOpts(const char *value, const char **return_parse_end, cJSON_bool require_null_terminated)
+{
+    size_t buffer_length;
+
+    if (NULL == value)
+    {
+        return NULL;
+    }
+
+    /* Adding null character size due to require_null_terminated. */
+    buffer_length = strlen(value) + sizeof("");
+
+    return cJSON_ParseWithLengthOpts(value, buffer_length, return_parse_end, require_null_terminated);
+}
+
+/* Parse an object - create a new root, and populate. */
+CJSON_PUBLIC(cJSON *) cJSON_ParseWithLengthOpts(const char *value, size_t buffer_length, const char **return_parse_end, cJSON_bool require_null_terminated)
+{
+    parse_buffer buffer = { 0, 0, 0, 0, { 0, 0, 0 } };
+    cJSON *item = NULL;
+
+    /* reset error position */
+    global_error.json = NULL;
+    global_error.position = 0;
+
+    if (value == NULL || 0 == buffer_length)
+    {
+        goto fail;
+    }
+
+    buffer.content = (const unsigned char*)value;
+    buffer.length = buffer_length;
+    buffer.offset = 0;
+    buffer.hooks = global_hooks;
+
+    item = cJSON_New_Item(&global_hooks);
+    if (item == NULL) /* memory fail */
+    {
+        goto fail;
+    }
+
+    if (!parse_value(item, buffer_skip_whitespace(skip_utf8_bom(&buffer))))
+    {
+        /* parse failure. ep is set. */
+        goto fail;
+    }
+
+    /* if we require null-terminated JSON without appended garbage, skip and then check for a null terminator */
+    if (require_null_terminated)
+    {
+        buffer_skip_whitespace(&buffer);
+        if ((buffer.offset >= buffer.length) || buffer_at_offset(&buffer)[0] != '\0')
+        {
+            goto fail;
+        }
+    }
+    if (return_parse_end)
+    {
+        *return_parse_end = (const char*)buffer_at_offset(&buffer);
+    }
+
+    return item;
+
+fail:
+    if (item != NULL)
+    {
+        cJSON_Delete(item);
+    }
+
+    if (value != NULL)
+    {
+        error local_error;
+        local_error.json = (const unsigned char*)value;
+        local_error.position = 0;
+
+        if (buffer.offset < buffer.length)
+        {
+            local_error.position = buffer.offset;
+        }
+        else if (buffer.length > 0)
+        {
+            local_error.position = buffer.length - 1;
+        }
+
+        if (return_parse_end != NULL)
+        {
+            *return_parse_end = (const char*)local_error.json + local_error.position;
+        }
+
+        global_error = local_error;
+    }
+
+    return NULL;
+}
+
+/* Default options for cJSON_Parse */
+CJSON_PUBLIC(cJSON *) cJSON_Parse(const char *value)
+{
+    return cJSON_ParseWithOpts(value, 0, 0);
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_ParseWithLength(const char *value, size_t buffer_length)
+{
+    return cJSON_ParseWithLengthOpts(value, buffer_length, 0, 0);
+}
+
+#define cjson_min(a, b) (((a) < (b)) ? (a) : (b))
+
+static unsigned char *print(const cJSON * const item, cJSON_bool format, const internal_hooks * const hooks)
+{
+    static const size_t default_buffer_size = 256;
+    printbuffer buffer[1];
+    unsigned char *printed = NULL;
+
+    memset(buffer, 0, sizeof(buffer));
+
+    /* create buffer */
+    buffer->buffer = (unsigned char*) hooks->allocate(default_buffer_size);
+    buffer->length = default_buffer_size;
+    buffer->format = format;
+    buffer->hooks = *hooks;
+    if (buffer->buffer == NULL)
+    {
+        goto fail;
+    }
+
+    /* print the value */
+    if (!print_value(item, buffer))
+    {
+        goto fail;
+    }
+    update_offset(buffer);
+
+    /* check if reallocate is available */
+    if (hooks->reallocate != NULL)
+    {
+        printed = (unsigned char*) hooks->reallocate(buffer->buffer, buffer->offset + 1);
+        if (printed == NULL) {
+            goto fail;
+        }
+        buffer->buffer = NULL;
+    }
+    else /* otherwise copy the JSON over to a new buffer */
+    {
+        printed = (unsigned char*) hooks->allocate(buffer->offset + 1);
+        if (printed == NULL)
+        {
+            goto fail;
+        }
+        memcpy(printed, buffer->buffer, cjson_min(buffer->length, buffer->offset + 1));
+        printed[buffer->offset] = '\0'; /* just to be sure */
+
+        /* free the buffer */
+        hooks->deallocate(buffer->buffer);
+        buffer->buffer = NULL;
+    }
+
+    return printed;
+
+fail:
+    if (buffer->buffer != NULL)
+    {
+        hooks->deallocate(buffer->buffer);
+        buffer->buffer = NULL;
+    }
+
+    if (printed != NULL)
+    {
+        hooks->deallocate(printed);
+        printed = NULL;
+    }
+
+    return NULL;
+}
+
+/* Render a cJSON item/entity/structure to text. */
+CJSON_PUBLIC(char *) cJSON_Print(const cJSON *item)
+{
+    return (char*)print(item, true, &global_hooks);
+}
+
+CJSON_PUBLIC(char *) cJSON_PrintUnformatted(const cJSON *item)
+{
+    return (char*)print(item, false, &global_hooks);
+}
+
+CJSON_PUBLIC(char *) cJSON_PrintBuffered(const cJSON *item, int prebuffer, cJSON_bool fmt)
+{
+    printbuffer p = { 0, 0, 0, 0, 0, 0, { 0, 0, 0 } };
+
+    if (prebuffer < 0)
+    {
+        return NULL;
+    }
+
+    p.buffer = (unsigned char*)global_hooks.allocate((size_t)prebuffer);
+    if (!p.buffer)
+    {
+        return NULL;
+    }
+
+    p.length = (size_t)prebuffer;
+    p.offset = 0;
+    p.noalloc = false;
+    p.format = fmt;
+    p.hooks = global_hooks;
+
+    if (!print_value(item, &p))
+    {
+        global_hooks.deallocate(p.buffer);
+        p.buffer = NULL;
+        return NULL;
+    }
+
+    return (char*)p.buffer;
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_PrintPreallocated(cJSON *item, char *buffer, const int length, const cJSON_bool format)
+{
+    printbuffer p = { 0, 0, 0, 0, 0, 0, { 0, 0, 0 } };
+
+    if ((length < 0) || (buffer == NULL))
+    {
+        return false;
+    }
+
+    p.buffer = (unsigned char*)buffer;
+    p.length = (size_t)length;
+    p.offset = 0;
+    p.noalloc = true;
+    p.format = format;
+    p.hooks = global_hooks;
+
+    return print_value(item, &p);
+}
+
+/* Parser core - when encountering text, process appropriately. */
+static cJSON_bool parse_value(cJSON * const item, parse_buffer * const input_buffer)
+{
+    if ((input_buffer == NULL) || (input_buffer->content == NULL))
+    {
+        return false; /* no input */
+    }
+
+    /* parse the different types of values */
+    /* null */
+    if (can_read(input_buffer, 4) && (strncmp((const char*)buffer_at_offset(input_buffer), "null", 4) == 0))
+    {
+        item->type = cJSON_NULL;
+        input_buffer->offset += 4;
+        return true;
+    }
+    /* false */
+    if (can_read(input_buffer, 5) && (strncmp((const char*)buffer_at_offset(input_buffer), "false", 5) == 0))
+    {
+        item->type = cJSON_False;
+        input_buffer->offset += 5;
+        return true;
+    }
+    /* true */
+    if (can_read(input_buffer, 4) && (strncmp((const char*)buffer_at_offset(input_buffer), "true", 4) == 0))
+    {
+        item->type = cJSON_True;
+        item->valueint = 1;
+        input_buffer->offset += 4;
+        return true;
+    }
+    /* string */
+    if (can_access_at_index(input_buffer, 0) && (buffer_at_offset(input_buffer)[0] == '\"'))
+    {
+        return parse_string(item, input_buffer);
+    }
+    /* number */
+    if (can_access_at_index(input_buffer, 0) && ((buffer_at_offset(input_buffer)[0] == '-') || ((buffer_at_offset(input_buffer)[0] >= '0') && (buffer_at_offset(input_buffer)[0] <= '9'))))
+    {
+        return parse_number(item, input_buffer);
+    }
+    /* array */
+    if (can_access_at_index(input_buffer, 0) && (buffer_at_offset(input_buffer)[0] == '['))
+    {
+        return parse_array(item, input_buffer);
+    }
+    /* object */
+    if (can_access_at_index(input_buffer, 0) && (buffer_at_offset(input_buffer)[0] == '{'))
+    {
+        return parse_object(item, input_buffer);
+    }
+
+    return false;
+}
+
+/* Render a value to text. */
+static cJSON_bool print_value(const cJSON * const item, printbuffer * const output_buffer)
+{
+    unsigned char *output = NULL;
+
+    if ((item == NULL) || (output_buffer == NULL))
+    {
+        return false;
+    }
+
+    switch ((item->type) & 0xFF)
+    {
+        case cJSON_NULL:
+            output = ensure(output_buffer, 5);
+            if (output == NULL)
+            {
+                return false;
+            }
+            strcpy((char*)output, "null");
+            return true;
+
+        case cJSON_False:
+            output = ensure(output_buffer, 6);
+            if (output == NULL)
+            {
+                return false;
+            }
+            strcpy((char*)output, "false");
+            return true;
+
+        case cJSON_True:
+            output = ensure(output_buffer, 5);
+            if (output == NULL)
+            {
+                return false;
+            }
+            strcpy((char*)output, "true");
+            return true;
+
+        case cJSON_Number:
+            return print_number(item, output_buffer);
+
+        case cJSON_Raw:
+        {
+            size_t raw_length = 0;
+            if (item->valuestring == NULL)
+            {
+                return false;
+            }
+
+            raw_length = strlen(item->valuestring) + sizeof("");
+            output = ensure(output_buffer, raw_length);
+            if (output == NULL)
+            {
+                return false;
+            }
+            memcpy(output, item->valuestring, raw_length);
+            return true;
+        }
+
+        case cJSON_String:
+            return print_string(item, output_buffer);
+
+        case cJSON_Array:
+            return print_array(item, output_buffer);
+
+        case cJSON_Object:
+            return print_object(item, output_buffer);
+
+        default:
+            return false;
+    }
+}
+
+/* Build an array from input text. */
+static cJSON_bool parse_array(cJSON * const item, parse_buffer * const input_buffer)
+{
+    cJSON *head = NULL; /* head of the linked list */
+    cJSON *current_item = NULL;
+
+    if (input_buffer->depth >= CJSON_NESTING_LIMIT)
+    {
+        return false; /* to deeply nested */
+    }
+    input_buffer->depth++;
+
+    if (buffer_at_offset(input_buffer)[0] != '[')
+    {
+        /* not an array */
+        goto fail;
+    }
+
+    input_buffer->offset++;
+    buffer_skip_whitespace(input_buffer);
+    if (can_access_at_index(input_buffer, 0) && (buffer_at_offset(input_buffer)[0] == ']'))
+    {
+        /* empty array */
+        goto success;
+    }
+
+    /* check if we skipped to the end of the buffer */
+    if (cannot_access_at_index(input_buffer, 0))
+    {
+        input_buffer->offset--;
+        goto fail;
+    }
+
+    /* step back to character in front of the first element */
+    input_buffer->offset--;
+    /* loop through the comma separated array elements */
+    do
+    {
+        /* allocate next item */
+        cJSON *new_item = cJSON_New_Item(&(input_buffer->hooks));
+        if (new_item == NULL)
+        {
+            goto fail; /* allocation failure */
+        }
+
+        /* attach next item to list */
+        if (head == NULL)
+        {
+            /* start the linked list */
+            current_item = head = new_item;
+        }
+        else
+        {
+            /* add to the end and advance */
+            current_item->next = new_item;
+            new_item->prev = current_item;
+            current_item = new_item;
+        }
+
+        /* parse next value */
+        input_buffer->offset++;
+        buffer_skip_whitespace(input_buffer);
+        if (!parse_value(current_item, input_buffer))
+        {
+            goto fail; /* failed to parse value */
+        }
+        buffer_skip_whitespace(input_buffer);
+    }
+    while (can_access_at_index(input_buffer, 0) && (buffer_at_offset(input_buffer)[0] == ','));
+
+    if (cannot_access_at_index(input_buffer, 0) || buffer_at_offset(input_buffer)[0] != ']')
+    {
+        goto fail; /* expected end of array */
+    }
+
+success:
+    input_buffer->depth--;
+
+    if (head != NULL) {
+        head->prev = current_item;
+    }
+
+    item->type = cJSON_Array;
+    item->child = head;
+
+    input_buffer->offset++;
+
+    return true;
+
+fail:
+    if (head != NULL)
+    {
+        cJSON_Delete(head);
+    }
+
+    return false;
+}
+
+/* Render an array to text */
+static cJSON_bool print_array(const cJSON * const item, printbuffer * const output_buffer)
+{
+    unsigned char *output_pointer = NULL;
+    size_t length = 0;
+    cJSON *current_element = item->child;
+
+    if (output_buffer == NULL)
+    {
+        return false;
+    }
+
+    /* Compose the output array. */
+    /* opening square bracket */
+    output_pointer = ensure(output_buffer, 1);
+    if (output_pointer == NULL)
+    {
+        return false;
+    }
+
+    *output_pointer = '[';
+    output_buffer->offset++;
+    output_buffer->depth++;
+
+    while (current_element != NULL)
+    {
+        if (!print_value(current_element, output_buffer))
+        {
+            return false;
+        }
+        update_offset(output_buffer);
+        if (current_element->next)
+        {
+            length = (size_t) (output_buffer->format ? 2 : 1);
+            output_pointer = ensure(output_buffer, length + 1);
+            if (output_pointer == NULL)
+            {
+                return false;
+            }
+            *output_pointer++ = ',';
+            if(output_buffer->format)
+            {
+                *output_pointer++ = ' ';
+            }
+            *output_pointer = '\0';
+            output_buffer->offset += length;
+        }
+        current_element = current_element->next;
+    }
+
+    output_pointer = ensure(output_buffer, 2);
+    if (output_pointer == NULL)
+    {
+        return false;
+    }
+    *output_pointer++ = ']';
+    *output_pointer = '\0';
+    output_buffer->depth--;
+
+    return true;
+}
+
+/* Build an object from the text. */
+static cJSON_bool parse_object(cJSON * const item, parse_buffer * const input_buffer)
+{
+    cJSON *head = NULL; /* linked list head */
+    cJSON *current_item = NULL;
+
+    if (input_buffer->depth >= CJSON_NESTING_LIMIT)
+    {
+        return false; /* to deeply nested */
+    }
+    input_buffer->depth++;
+
+    if (cannot_access_at_index(input_buffer, 0) || (buffer_at_offset(input_buffer)[0] != '{'))
+    {
+        goto fail; /* not an object */
+    }
+
+    input_buffer->offset++;
+    buffer_skip_whitespace(input_buffer);
+    if (can_access_at_index(input_buffer, 0) && (buffer_at_offset(input_buffer)[0] == '}'))
+    {
+        goto success; /* empty object */
+    }
+
+    /* check if we skipped to the end of the buffer */
+    if (cannot_access_at_index(input_buffer, 0))
+    {
+        input_buffer->offset--;
+        goto fail;
+    }
+
+    /* step back to character in front of the first element */
+    input_buffer->offset--;
+    /* loop through the comma separated array elements */
+    do
+    {
+        /* allocate next item */
+        cJSON *new_item = cJSON_New_Item(&(input_buffer->hooks));
+        if (new_item == NULL)
+        {
+            goto fail; /* allocation failure */
+        }
+
+        /* attach next item to list */
+        if (head == NULL)
+        {
+            /* start the linked list */
+            current_item = head = new_item;
+        }
+        else
+        {
+            /* add to the end and advance */
+            current_item->next = new_item;
+            new_item->prev = current_item;
+            current_item = new_item;
+        }
+
+        if (cannot_access_at_index(input_buffer, 1))
+        {
+            goto fail; /* nothing comes after the comma */
+        }
+
+        /* parse the name of the child */
+        input_buffer->offset++;
+        buffer_skip_whitespace(input_buffer);
+        if (!parse_string(current_item, input_buffer))
+        {
+            goto fail; /* failed to parse name */
+        }
+        buffer_skip_whitespace(input_buffer);
+
+        /* swap valuestring and string, because we parsed the name */
+        current_item->string = current_item->valuestring;
+        current_item->valuestring = NULL;
+
+        if (cannot_access_at_index(input_buffer, 0) || (buffer_at_offset(input_buffer)[0] != ':'))
+        {
+            goto fail; /* invalid object */
+        }
+
+        /* parse the value */
+        input_buffer->offset++;
+        buffer_skip_whitespace(input_buffer);
+        if (!parse_value(current_item, input_buffer))
+        {
+            goto fail; /* failed to parse value */
+        }
+        buffer_skip_whitespace(input_buffer);
+    }
+    while (can_access_at_index(input_buffer, 0) && (buffer_at_offset(input_buffer)[0] == ','));
+
+    if (cannot_access_at_index(input_buffer, 0) || (buffer_at_offset(input_buffer)[0] != '}'))
+    {
+        goto fail; /* expected end of object */
+    }
+
+success:
+    input_buffer->depth--;
+
+    if (head != NULL) {
+        head->prev = current_item;
+    }
+
+    item->type = cJSON_Object;
+    item->child = head;
+
+    input_buffer->offset++;
+    return true;
+
+fail:
+    if (head != NULL)
+    {
+        cJSON_Delete(head);
+    }
+
+    return false;
+}
+
+/* Render an object to text. */
+static cJSON_bool print_object(const cJSON * const item, printbuffer * const output_buffer)
+{
+    unsigned char *output_pointer = NULL;
+    size_t length = 0;
+    cJSON *current_item = item->child;
+
+    if (output_buffer == NULL)
+    {
+        return false;
+    }
+
+    /* Compose the output: */
+    length = (size_t) (output_buffer->format ? 2 : 1); /* fmt: {\n */
+    output_pointer = ensure(output_buffer, length + 1);
+    if (output_pointer == NULL)
+    {
+        return false;
+    }
+
+    *output_pointer++ = '{';
+    output_buffer->depth++;
+    if (output_buffer->format)
+    {
+        *output_pointer++ = '\n';
+    }
+    output_buffer->offset += length;
+
+    while (current_item)
+    {
+        if (output_buffer->format)
+        {
+            size_t i;
+            output_pointer = ensure(output_buffer, output_buffer->depth);
+            if (output_pointer == NULL)
+            {
+                return false;
+            }
+            for (i = 0; i < output_buffer->depth; i++)
+            {
+                *output_pointer++ = '\t';
+            }
+            output_buffer->offset += output_buffer->depth;
+        }
+
+        /* print key */
+        if (!print_string_ptr((unsigned char*)current_item->string, output_buffer))
+        {
+            return false;
+        }
+        update_offset(output_buffer);
+
+        length = (size_t) (output_buffer->format ? 2 : 1);
+        output_pointer = ensure(output_buffer, length);
+        if (output_pointer == NULL)
+        {
+            return false;
+        }
+        *output_pointer++ = ':';
+        if (output_buffer->format)
+        {
+            *output_pointer++ = '\t';
+        }
+        output_buffer->offset += length;
+
+        /* print value */
+        if (!print_value(current_item, output_buffer))
+        {
+            return false;
+        }
+        update_offset(output_buffer);
+
+        /* print comma if not last */
+        length = ((size_t)(output_buffer->format ? 1 : 0) + (size_t)(current_item->next ? 1 : 0));
+        output_pointer = ensure(output_buffer, length + 1);
+        if (output_pointer == NULL)
+        {
+            return false;
+        }
+        if (current_item->next)
+        {
+            *output_pointer++ = ',';
+        }
+
+        if (output_buffer->format)
+        {
+            *output_pointer++ = '\n';
+        }
+        *output_pointer = '\0';
+        output_buffer->offset += length;
+
+        current_item = current_item->next;
+    }
+
+    output_pointer = ensure(output_buffer, output_buffer->format ? (output_buffer->depth + 1) : 2);
+    if (output_pointer == NULL)
+    {
+        return false;
+    }
+    if (output_buffer->format)
+    {
+        size_t i;
+        for (i = 0; i < (output_buffer->depth - 1); i++)
+        {
+            *output_pointer++ = '\t';
+        }
+    }
+    *output_pointer++ = '}';
+    *output_pointer = '\0';
+    output_buffer->depth--;
+
+    return true;
+}
+
+/* Get Array size/item / object item. */
+CJSON_PUBLIC(int) cJSON_GetArraySize(const cJSON *array)
+{
+    cJSON *child = NULL;
+    size_t size = 0;
+
+    if (array == NULL)
+    {
+        return 0;
+    }
+
+    child = array->child;
+
+    while(child != NULL)
+    {
+        size++;
+        child = child->next;
+    }
+
+    /* FIXME: Can overflow here. Cannot be fixed without breaking the API */
+
+    return (int)size;
+}
+
+static cJSON* get_array_item(const cJSON *array, size_t index)
+{
+    cJSON *current_child = NULL;
+
+    if (array == NULL)
+    {
+        return NULL;
+    }
+
+    current_child = array->child;
+    while ((current_child != NULL) && (index > 0))
+    {
+        index--;
+        current_child = current_child->next;
+    }
+
+    return current_child;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_GetArrayItem(const cJSON *array, int index)
+{
+    if (index < 0)
+    {
+        return NULL;
+    }
+
+    return get_array_item(array, (size_t)index);
+}
+
+static cJSON *get_object_item(const cJSON * const object, const char * const name, const cJSON_bool case_sensitive)
+{
+    cJSON *current_element = NULL;
+
+    if ((object == NULL) || (name == NULL))
+    {
+        return NULL;
+    }
+
+    current_element = object->child;
+    if (case_sensitive)
+    {
+        while ((current_element != NULL) && (current_element->string != NULL) && (strcmp(name, current_element->string) != 0))
+        {
+            current_element = current_element->next;
+        }
+    }
+    else
+    {
+        while ((current_element != NULL) && (case_insensitive_strcmp((const unsigned char*)name, (const unsigned char*)(current_element->string)) != 0))
+        {
+            current_element = current_element->next;
+        }
+    }
+
+    if ((current_element == NULL) || (current_element->string == NULL)) {
+        return NULL;
+    }
+
+    return current_element;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_GetObjectItem(const cJSON * const object, const char * const string)
+{
+    return get_object_item(object, string, false);
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_GetObjectItemCaseSensitive(const cJSON * const object, const char * const string)
+{
+    return get_object_item(object, string, true);
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_HasObjectItem(const cJSON *object, const char *string)
+{
+    return cJSON_GetObjectItem(object, string) ? 1 : 0;
+}
+
+/* Utility for array list handling. */
+static void suffix_object(cJSON *prev, cJSON *item)
+{
+    prev->next = item;
+    item->prev = prev;
+}
+
+/* Utility for handling references. */
+static cJSON *create_reference(const cJSON *item, const internal_hooks * const hooks)
+{
+    cJSON *reference = NULL;
+    if (item == NULL)
+    {
+        return NULL;
+    }
+
+    reference = cJSON_New_Item(hooks);
+    if (reference == NULL)
+    {
+        return NULL;
+    }
+
+    memcpy(reference, item, sizeof(cJSON));
+    reference->string = NULL;
+    reference->type |= cJSON_IsReference;
+    reference->next = reference->prev = NULL;
+    return reference;
+}
+
+static cJSON_bool add_item_to_array(cJSON *array, cJSON *item)
+{
+    cJSON *child = NULL;
+
+    if ((item == NULL) || (array == NULL) || (array == item))
+    {
+        return false;
+    }
+
+    child = array->child;
+    /*
+     * To find the last item in array quickly, we use prev in array
+     */
+    if (child == NULL)
+    {
+        /* list is empty, start new one */
+        array->child = item;
+        item->prev = item;
+        item->next = NULL;
+    }
+    else
+    {
+        /* append to the end */
+        if (child->prev)
+        {
+            suffix_object(child->prev, item);
+            array->child->prev = item;
+        }
+    }
+
+    return true;
+}
+
+/* Add item to array/object. */
+CJSON_PUBLIC(cJSON_bool) cJSON_AddItemToArray(cJSON *array, cJSON *item)
+{
+    return add_item_to_array(array, item);
+}
+
+#if defined(__clang__) || (defined(__GNUC__)  && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 5))))
+    #pragma GCC diagnostic push
+#endif
+#ifdef __GNUC__
+#pragma GCC diagnostic ignored "-Wcast-qual"
+#endif
+/* helper function to cast away const */
+static void* cast_away_const(const void* string)
+{
+    return (void*)string;
+}
+#if defined(__clang__) || (defined(__GNUC__)  && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 5))))
+    #pragma GCC diagnostic pop
+#endif
+
+
+static cJSON_bool add_item_to_object(cJSON * const object, const char * const string, cJSON * const item, const internal_hooks * const hooks, const cJSON_bool constant_key)
+{
+    char *new_key = NULL;
+    int new_type = cJSON_Invalid;
+
+    if ((object == NULL) || (string == NULL) || (item == NULL) || (object == item))
+    {
+        return false;
+    }
+
+    if (constant_key)
+    {
+        new_key = (char*)cast_away_const(string);
+        new_type = item->type | cJSON_StringIsConst;
+    }
+    else
+    {
+        new_key = (char*)cJSON_strdup((const unsigned char*)string, hooks);
+        if (new_key == NULL)
+        {
+            return false;
+        }
+
+        new_type = item->type & ~cJSON_StringIsConst;
+    }
+
+    if (!(item->type & cJSON_StringIsConst) && (item->string != NULL))
+    {
+        hooks->deallocate(item->string);
+    }
+
+    item->string = new_key;
+    item->type = new_type;
+
+    return add_item_to_array(object, item);
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_AddItemToObject(cJSON *object, const char *string, cJSON *item)
+{
+    return add_item_to_object(object, string, item, &global_hooks, false);
+}
+
+/* Add an item to an object with constant string as key */
+CJSON_PUBLIC(cJSON_bool) cJSON_AddItemToObjectCS(cJSON *object, const char *string, cJSON *item)
+{
+    return add_item_to_object(object, string, item, &global_hooks, true);
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_AddItemReferenceToArray(cJSON *array, cJSON *item)
+{
+    if (array == NULL)
+    {
+        return false;
+    }
+
+    return add_item_to_array(array, create_reference(item, &global_hooks));
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_AddItemReferenceToObject(cJSON *object, const char *string, cJSON *item)
+{
+    if ((object == NULL) || (string == NULL))
+    {
+        return false;
+    }
+
+    return add_item_to_object(object, string, create_reference(item, &global_hooks), &global_hooks, false);
+}
+
+CJSON_PUBLIC(cJSON*) cJSON_AddNullToObject(cJSON * const object, const char * const name)
+{
+    cJSON *null = cJSON_CreateNull();
+    if (add_item_to_object(object, name, null, &global_hooks, false))
+    {
+        return null;
+    }
+
+    cJSON_Delete(null);
+    return NULL;
+}
+
+CJSON_PUBLIC(cJSON*) cJSON_AddTrueToObject(cJSON * const object, const char * const name)
+{
+    cJSON *true_item = cJSON_CreateTrue();
+    if (add_item_to_object(object, name, true_item, &global_hooks, false))
+    {
+        return true_item;
+    }
+
+    cJSON_Delete(true_item);
+    return NULL;
+}
+
+CJSON_PUBLIC(cJSON*) cJSON_AddFalseToObject(cJSON * const object, const char * const name)
+{
+    cJSON *false_item = cJSON_CreateFalse();
+    if (add_item_to_object(object, name, false_item, &global_hooks, false))
+    {
+        return false_item;
+    }
+
+    cJSON_Delete(false_item);
+    return NULL;
+}
+
+CJSON_PUBLIC(cJSON*) cJSON_AddBoolToObject(cJSON * const object, const char * const name, const cJSON_bool boolean)
+{
+    cJSON *bool_item = cJSON_CreateBool(boolean);
+    if (add_item_to_object(object, name, bool_item, &global_hooks, false))
+    {
+        return bool_item;
+    }
+
+    cJSON_Delete(bool_item);
+    return NULL;
+}
+
+CJSON_PUBLIC(cJSON*) cJSON_AddNumberToObject(cJSON * const object, const char * const name, const double number)
+{
+    cJSON *number_item = cJSON_CreateNumber(number);
+    if (add_item_to_object(object, name, number_item, &global_hooks, false))
+    {
+        return number_item;
+    }
+
+    cJSON_Delete(number_item);
+    return NULL;
+}
+
+CJSON_PUBLIC(cJSON*) cJSON_AddStringToObject(cJSON * const object, const char * const name, const char * const string)
+{
+    cJSON *string_item = cJSON_CreateString(string);
+    if (add_item_to_object(object, name, string_item, &global_hooks, false))
+    {
+        return string_item;
+    }
+
+    cJSON_Delete(string_item);
+    return NULL;
+}
+
+CJSON_PUBLIC(cJSON*) cJSON_AddRawToObject(cJSON * const object, const char * const name, const char * const raw)
+{
+    cJSON *raw_item = cJSON_CreateRaw(raw);
+    if (add_item_to_object(object, name, raw_item, &global_hooks, false))
+    {
+        return raw_item;
+    }
+
+    cJSON_Delete(raw_item);
+    return NULL;
+}
+
+CJSON_PUBLIC(cJSON*) cJSON_AddObjectToObject(cJSON * const object, const char * const name)
+{
+    cJSON *object_item = cJSON_CreateObject();
+    if (add_item_to_object(object, name, object_item, &global_hooks, false))
+    {
+        return object_item;
+    }
+
+    cJSON_Delete(object_item);
+    return NULL;
+}
+
+CJSON_PUBLIC(cJSON*) cJSON_AddArrayToObject(cJSON * const object, const char * const name)
+{
+    cJSON *array = cJSON_CreateArray();
+    if (add_item_to_object(object, name, array, &global_hooks, false))
+    {
+        return array;
+    }
+
+    cJSON_Delete(array);
+    return NULL;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_DetachItemViaPointer(cJSON *parent, cJSON * const item)
+{
+    if ((parent == NULL) || (item == NULL) || (item != parent->child && item->prev == NULL))
+    {
+        return NULL;
+    }
+
+    if (item != parent->child)
+    {
+        /* not the first element */
+        item->prev->next = item->next;
+    }
+    if (item->next != NULL)
+    {
+        /* not the last element */
+        item->next->prev = item->prev;
+    }
+
+    if (item == parent->child)
+    {
+        /* first element */
+        parent->child = item->next;
+    }
+    else if (item->next == NULL)
+    {
+        /* last element */
+        parent->child->prev = item->prev;
+    }
+
+    /* make sure the detached item doesn't point anywhere anymore */
+    item->prev = NULL;
+    item->next = NULL;
+
+    return item;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromArray(cJSON *array, int which)
+{
+    if (which < 0)
+    {
+        return NULL;
+    }
+
+    return cJSON_DetachItemViaPointer(array, get_array_item(array, (size_t)which));
+}
+
+CJSON_PUBLIC(void) cJSON_DeleteItemFromArray(cJSON *array, int which)
+{
+    cJSON_Delete(cJSON_DetachItemFromArray(array, which));
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromObject(cJSON *object, const char *string)
+{
+    cJSON *to_detach = cJSON_GetObjectItem(object, string);
+
+    return cJSON_DetachItemViaPointer(object, to_detach);
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromObjectCaseSensitive(cJSON *object, const char *string)
+{
+    cJSON *to_detach = cJSON_GetObjectItemCaseSensitive(object, string);
+
+    return cJSON_DetachItemViaPointer(object, to_detach);
+}
+
+CJSON_PUBLIC(void) cJSON_DeleteItemFromObject(cJSON *object, const char *string)
+{
+    cJSON_Delete(cJSON_DetachItemFromObject(object, string));
+}
+
+CJSON_PUBLIC(void) cJSON_DeleteItemFromObjectCaseSensitive(cJSON *object, const char *string)
+{
+    cJSON_Delete(cJSON_DetachItemFromObjectCaseSensitive(object, string));
+}
+
+/* Replace array/object items with new ones. */
+CJSON_PUBLIC(cJSON_bool) cJSON_InsertItemInArray(cJSON *array, int which, cJSON *newitem)
+{
+    cJSON *after_inserted = NULL;
+
+    if (which < 0 || newitem == NULL)
+    {
+        return false;
+    }
+
+    after_inserted = get_array_item(array, (size_t)which);
+    if (after_inserted == NULL)
+    {
+        return add_item_to_array(array, newitem);
+    }
+
+    if (after_inserted != array->child && after_inserted->prev == NULL) {
+        /* return false if after_inserted is a corrupted array item */
+        return false;
+    }
+
+    newitem->next = after_inserted;
+    newitem->prev = after_inserted->prev;
+    after_inserted->prev = newitem;
+    if (after_inserted == array->child)
+    {
+        array->child = newitem;
+    }
+    else
+    {
+        newitem->prev->next = newitem;
+    }
+    return true;
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_ReplaceItemViaPointer(cJSON * const parent, cJSON * const item, cJSON * replacement)
+{
+    if ((parent == NULL) || (parent->child == NULL) || (replacement == NULL) || (item == NULL))
+    {
+        return false;
+    }
+
+    if (replacement == item)
+    {
+        return true;
+    }
+
+    replacement->next = item->next;
+    replacement->prev = item->prev;
+
+    if (replacement->next != NULL)
+    {
+        replacement->next->prev = replacement;
+    }
+    if (parent->child == item)
+    {
+        if (parent->child->prev == parent->child)
+        {
+            replacement->prev = replacement;
+        }
+        parent->child = replacement;
+    }
+    else
+    {   /*
+         * To find the last item in array quickly, we use prev in array.
+         * We can't modify the last item's next pointer where this item was the parent's child
+         */
+        if (replacement->prev != NULL)
+        {
+            replacement->prev->next = replacement;
+        }
+        if (replacement->next == NULL)
+        {
+            parent->child->prev = replacement;
+        }
+    }
+
+    item->next = NULL;
+    item->prev = NULL;
+    cJSON_Delete(item);
+
+    return true;
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_ReplaceItemInArray(cJSON *array, int which, cJSON *newitem)
+{
+    if (which < 0)
+    {
+        return false;
+    }
+
+    return cJSON_ReplaceItemViaPointer(array, get_array_item(array, (size_t)which), newitem);
+}
+
+static cJSON_bool replace_item_in_object(cJSON *object, const char *string, cJSON *replacement, cJSON_bool case_sensitive)
+{
+    if ((replacement == NULL) || (string == NULL))
+    {
+        return false;
+    }
+
+    /* replace the name in the replacement */
+    if (!(replacement->type & cJSON_StringIsConst) && (replacement->string != NULL))
+    {
+        cJSON_free(replacement->string);
+    }
+    replacement->string = (char*)cJSON_strdup((const unsigned char*)string, &global_hooks);
+    if (replacement->string == NULL)
+    {
+        return false;
+    }
+
+    replacement->type &= ~cJSON_StringIsConst;
+
+    return cJSON_ReplaceItemViaPointer(object, get_object_item(object, string, case_sensitive), replacement);
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_ReplaceItemInObject(cJSON *object, const char *string, cJSON *newitem)
+{
+    return replace_item_in_object(object, string, newitem, false);
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_ReplaceItemInObjectCaseSensitive(cJSON *object, const char *string, cJSON *newitem)
+{
+    return replace_item_in_object(object, string, newitem, true);
+}
+
+/* Create basic types: */
+CJSON_PUBLIC(cJSON *) cJSON_CreateNull(void)
+{
+    cJSON *item = cJSON_New_Item(&global_hooks);
+    if(item)
+    {
+        item->type = cJSON_NULL;
+    }
+
+    return item;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_CreateTrue(void)
+{
+    cJSON *item = cJSON_New_Item(&global_hooks);
+    if(item)
+    {
+        item->type = cJSON_True;
+    }
+
+    return item;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_CreateFalse(void)
+{
+    cJSON *item = cJSON_New_Item(&global_hooks);
+    if(item)
+    {
+        item->type = cJSON_False;
+    }
+
+    return item;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_CreateBool(cJSON_bool boolean)
+{
+    cJSON *item = cJSON_New_Item(&global_hooks);
+    if(item)
+    {
+        item->type = boolean ? cJSON_True : cJSON_False;
+    }
+
+    return item;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_CreateNumber(double num)
+{
+    cJSON *item = cJSON_New_Item(&global_hooks);
+    if(item)
+    {
+        item->type = cJSON_Number;
+        item->valuedouble = num;
+
+        /* use saturation in case of overflow */
+        if (num >= INT_MAX)
+        {
+            item->valueint = INT_MAX;
+        }
+        else if (num <= (double)INT_MIN)
+        {
+            item->valueint = INT_MIN;
+        }
+        else
+        {
+            item->valueint = (int)num;
+        }
+    }
+
+    return item;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_CreateString(const char *string)
+{
+    cJSON *item = cJSON_New_Item(&global_hooks);
+    if(item)
+    {
+        item->type = cJSON_String;
+        item->valuestring = (char*)cJSON_strdup((const unsigned char*)string, &global_hooks);
+        if(!item->valuestring)
+        {
+            cJSON_Delete(item);
+            return NULL;
+        }
+    }
+
+    return item;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_CreateStringReference(const char *string)
+{
+    cJSON *item = cJSON_New_Item(&global_hooks);
+    if (item != NULL)
+    {
+        item->type = cJSON_String | cJSON_IsReference;
+        item->valuestring = (char*)cast_away_const(string);
+    }
+
+    return item;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_CreateObjectReference(const cJSON *child)
+{
+    cJSON *item = cJSON_New_Item(&global_hooks);
+    if (item != NULL) {
+        item->type = cJSON_Object | cJSON_IsReference;
+        item->child = (cJSON*)cast_away_const(child);
+    }
+
+    return item;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_CreateArrayReference(const cJSON *child) {
+    cJSON *item = cJSON_New_Item(&global_hooks);
+    if (item != NULL) {
+        item->type = cJSON_Array | cJSON_IsReference;
+        item->child = (cJSON*)cast_away_const(child);
+    }
+
+    return item;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_CreateRaw(const char *raw)
+{
+    cJSON *item = cJSON_New_Item(&global_hooks);
+    if(item)
+    {
+        item->type = cJSON_Raw;
+        item->valuestring = (char*)cJSON_strdup((const unsigned char*)raw, &global_hooks);
+        if(!item->valuestring)
+        {
+            cJSON_Delete(item);
+            return NULL;
+        }
+    }
+
+    return item;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_CreateArray(void)
+{
+    cJSON *item = cJSON_New_Item(&global_hooks);
+    if(item)
+    {
+        item->type=cJSON_Array;
+    }
+
+    return item;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_CreateObject(void)
+{
+    cJSON *item = cJSON_New_Item(&global_hooks);
+    if (item)
+    {
+        item->type = cJSON_Object;
+    }
+
+    return item;
+}
+
+/* Create Arrays: */
+CJSON_PUBLIC(cJSON *) cJSON_CreateIntArray(const int *numbers, int count)
+{
+    size_t i = 0;
+    cJSON *n = NULL;
+    cJSON *p = NULL;
+    cJSON *a = NULL;
+
+    if ((count < 0) || (numbers == NULL))
+    {
+        return NULL;
+    }
+
+    a = cJSON_CreateArray();
+
+    for(i = 0; a && (i < (size_t)count); i++)
+    {
+        n = cJSON_CreateNumber(numbers[i]);
+        if (!n)
+        {
+            cJSON_Delete(a);
+            return NULL;
+        }
+        if(!i)
+        {
+            a->child = n;
+        }
+        else
+        {
+            suffix_object(p, n);
+        }
+        p = n;
+    }
+
+    if (a && a->child) {
+        a->child->prev = n;
+    }
+
+    return a;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_CreateFloatArray(const float *numbers, int count)
+{
+    size_t i = 0;
+    cJSON *n = NULL;
+    cJSON *p = NULL;
+    cJSON *a = NULL;
+
+    if ((count < 0) || (numbers == NULL))
+    {
+        return NULL;
+    }
+
+    a = cJSON_CreateArray();
+
+    for(i = 0; a && (i < (size_t)count); i++)
+    {
+        n = cJSON_CreateNumber((double)numbers[i]);
+        if(!n)
+        {
+            cJSON_Delete(a);
+            return NULL;
+        }
+        if(!i)
+        {
+            a->child = n;
+        }
+        else
+        {
+            suffix_object(p, n);
+        }
+        p = n;
+    }
+
+    if (a && a->child) {
+        a->child->prev = n;
+    }
+
+    return a;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_CreateDoubleArray(const double *numbers, int count)
+{
+    size_t i = 0;
+    cJSON *n = NULL;
+    cJSON *p = NULL;
+    cJSON *a = NULL;
+
+    if ((count < 0) || (numbers == NULL))
+    {
+        return NULL;
+    }
+
+    a = cJSON_CreateArray();
+
+    for(i = 0; a && (i < (size_t)count); i++)
+    {
+        n = cJSON_CreateNumber(numbers[i]);
+        if(!n)
+        {
+            cJSON_Delete(a);
+            return NULL;
+        }
+        if(!i)
+        {
+            a->child = n;
+        }
+        else
+        {
+            suffix_object(p, n);
+        }
+        p = n;
+    }
+
+    if (a && a->child) {
+        a->child->prev = n;
+    }
+
+    return a;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_CreateStringArray(const char *const *strings, int count)
+{
+    size_t i = 0;
+    cJSON *n = NULL;
+    cJSON *p = NULL;
+    cJSON *a = NULL;
+
+    if ((count < 0) || (strings == NULL))
+    {
+        return NULL;
+    }
+
+    a = cJSON_CreateArray();
+
+    for (i = 0; a && (i < (size_t)count); i++)
+    {
+        n = cJSON_CreateString(strings[i]);
+        if(!n)
+        {
+            cJSON_Delete(a);
+            return NULL;
+        }
+        if(!i)
+        {
+            a->child = n;
+        }
+        else
+        {
+            suffix_object(p,n);
+        }
+        p = n;
+    }
+
+    if (a && a->child) {
+        a->child->prev = n;
+    }
+
+    return a;
+}
+
+/* Duplication */
+cJSON * cJSON_Duplicate_rec(const cJSON *item, size_t depth, cJSON_bool recurse);
+
+CJSON_PUBLIC(cJSON *) cJSON_Duplicate(const cJSON *item, cJSON_bool recurse)
+{
+    return cJSON_Duplicate_rec(item, 0, recurse );
+}
+
+cJSON * cJSON_Duplicate_rec(const cJSON *item, size_t depth, cJSON_bool recurse)
+{
+    cJSON *newitem = NULL;
+    cJSON *child = NULL;
+    cJSON *next = NULL;
+    cJSON *newchild = NULL;
+
+    /* Bail on bad ptr */
+    if (!item)
+    {
+        goto fail;
+    }
+    /* Create new item */
+    newitem = cJSON_New_Item(&global_hooks);
+    if (!newitem)
+    {
+        goto fail;
+    }
+    /* Copy over all vars */
+    newitem->type = item->type & (~cJSON_IsReference);
+    newitem->valueint = item->valueint;
+    newitem->valuedouble = item->valuedouble;
+    if (item->valuestring)
+    {
+        newitem->valuestring = (char*)cJSON_strdup((unsigned char*)item->valuestring, &global_hooks);
+        if (!newitem->valuestring)
+        {
+            goto fail;
+        }
+    }
+    if (item->string)
+    {
+        newitem->string = (item->type&cJSON_StringIsConst) ? item->string : (char*)cJSON_strdup((unsigned char*)item->string, &global_hooks);
+        if (!newitem->string)
+        {
+            goto fail;
+        }
+    }
+    /* If non-recursive, then we're done! */
+    if (!recurse)
+    {
+        return newitem;
+    }
+    /* Walk the ->next chain for the child. */
+    child = item->child;
+    while (child != NULL)
+    {
+        if(depth >= CJSON_CIRCULAR_LIMIT) {
+            goto fail;
+        }
+        newchild = cJSON_Duplicate_rec(child, depth + 1, true); /* Duplicate (with recurse) each item in the ->next chain */
+        if (!newchild)
+        {
+            goto fail;
+        }
+        if (next != NULL)
+        {
+            /* If newitem->child already set, then crosswire ->prev and ->next and move on */
+            next->next = newchild;
+            newchild->prev = next;
+            next = newchild;
+        }
+        else
+        {
+            /* Set newitem->child and move to it */
+            newitem->child = newchild;
+            next = newchild;
+        }
+        child = child->next;
+    }
+    if (newitem && newitem->child)
+    {
+        newitem->child->prev = newchild;
+    }
+
+    return newitem;
+
+fail:
+    if (newitem != NULL)
+    {
+        cJSON_Delete(newitem);
+    }
+
+    return NULL;
+}
+
+static void skip_oneline_comment(char **input)
+{
+    *input += static_strlen("//");
+
+    for (; (*input)[0] != '\0'; ++(*input))
+    {
+        if ((*input)[0] == '\n') {
+            *input += static_strlen("\n");
+            return;
+        }
+    }
+}
+
+static void skip_multiline_comment(char **input)
+{
+    *input += static_strlen("/*");
+
+    for (; (*input)[0] != '\0'; ++(*input))
+    {
+        if (((*input)[0] == '*') && ((*input)[1] == '/'))
+        {
+            *input += static_strlen("*/");
+            return;
+        }
+    }
+}
+
+static void minify_string(char **input, char **output) {
+    (*output)[0] = (*input)[0];
+    *input += static_strlen("\"");
+    *output += static_strlen("\"");
+
+
+    for (; (*input)[0] != '\0'; (void)++(*input), ++(*output)) {
+        (*output)[0] = (*input)[0];
+
+        if ((*input)[0] == '\"') {
+            (*output)[0] = '\"';
+            *input += static_strlen("\"");
+            *output += static_strlen("\"");
+            return;
+        } else if (((*input)[0] == '\\') && ((*input)[1] == '\"')) {
+            (*output)[1] = (*input)[1];
+            *input += static_strlen("\"");
+            *output += static_strlen("\"");
+        }
+    }
+}
+
+CJSON_PUBLIC(void) cJSON_Minify(char *json)
+{
+    char *into = json;
+
+    if (json == NULL)
+    {
+        return;
+    }
+
+    while (json[0] != '\0')
+    {
+        switch (json[0])
+        {
+            case ' ':
+            case '\t':
+            case '\r':
+            case '\n':
+                json++;
+                break;
+
+            case '/':
+                if (json[1] == '/')
+                {
+                    skip_oneline_comment(&json);
+                }
+                else if (json[1] == '*')
+                {
+                    skip_multiline_comment(&json);
+                } else {
+                    json++;
+                }
+                break;
+
+            case '\"':
+                minify_string(&json, (char**)&into);
+                break;
+
+            default:
+                into[0] = json[0];
+                json++;
+                into++;
+        }
+    }
+
+    /* and null-terminate. */
+    *into = '\0';
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_IsInvalid(const cJSON * const item)
+{
+    if (item == NULL)
+    {
+        return false;
+    }
+
+    return (item->type & 0xFF) == cJSON_Invalid;
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_IsFalse(const cJSON * const item)
+{
+    if (item == NULL)
+    {
+        return false;
+    }
+
+    return (item->type & 0xFF) == cJSON_False;
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_IsTrue(const cJSON * const item)
+{
+    if (item == NULL)
+    {
+        return false;
+    }
+
+    return (item->type & 0xff) == cJSON_True;
+}
+
+
+CJSON_PUBLIC(cJSON_bool) cJSON_IsBool(const cJSON * const item)
+{
+    if (item == NULL)
+    {
+        return false;
+    }
+
+    return (item->type & (cJSON_True | cJSON_False)) != 0;
+}
+CJSON_PUBLIC(cJSON_bool) cJSON_IsNull(const cJSON * const item)
+{
+    if (item == NULL)
+    {
+        return false;
+    }
+
+    return (item->type & 0xFF) == cJSON_NULL;
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_IsNumber(const cJSON * const item)
+{
+    if (item == NULL)
+    {
+        return false;
+    }
+
+    return (item->type & 0xFF) == cJSON_Number;
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_IsString(const cJSON * const item)
+{
+    if (item == NULL)
+    {
+        return false;
+    }
+
+    return (item->type & 0xFF) == cJSON_String;
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_IsArray(const cJSON * const item)
+{
+    if (item == NULL)
+    {
+        return false;
+    }
+
+    return (item->type & 0xFF) == cJSON_Array;
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_IsObject(const cJSON * const item)
+{
+    if (item == NULL)
+    {
+        return false;
+    }
+
+    return (item->type & 0xFF) == cJSON_Object;
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_IsRaw(const cJSON * const item)
+{
+    if (item == NULL)
+    {
+        return false;
+    }
+
+    return (item->type & 0xFF) == cJSON_Raw;
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_Compare(const cJSON * const a, const cJSON * const b, const cJSON_bool case_sensitive)
+{
+    if ((a == NULL) || (b == NULL) || ((a->type & 0xFF) != (b->type & 0xFF)))
+    {
+        return false;
+    }
+
+    /* check if type is valid */
+    switch (a->type & 0xFF)
+    {
+        case cJSON_False:
+        case cJSON_True:
+        case cJSON_NULL:
+        case cJSON_Number:
+        case cJSON_String:
+        case cJSON_Raw:
+        case cJSON_Array:
+        case cJSON_Object:
+            break;
+
+        default:
+            return false;
+    }
+
+    /* identical objects are equal */
+    if (a == b)
+    {
+        return true;
+    }
+
+    switch (a->type & 0xFF)
+    {
+        /* in these cases and equal type is enough */
+        case cJSON_False:
+        case cJSON_True:
+        case cJSON_NULL:
+            return true;
+
+        case cJSON_Number:
+            if (compare_double(a->valuedouble, b->valuedouble))
+            {
+                return true;
+            }
+            return false;
+
+        case cJSON_String:
+        case cJSON_Raw:
+            if ((a->valuestring == NULL) || (b->valuestring == NULL))
+            {
+                return false;
+            }
+            if (strcmp(a->valuestring, b->valuestring) == 0)
+            {
+                return true;
+            }
+
+            return false;
+
+        case cJSON_Array:
+        {
+            cJSON *a_element = a->child;
+            cJSON *b_element = b->child;
+
+            for (; (a_element != NULL) && (b_element != NULL);)
+            {
+                if (!cJSON_Compare(a_element, b_element, case_sensitive))
+                {
+                    return false;
+                }
+
+                a_element = a_element->next;
+                b_element = b_element->next;
+            }
+
+            /* one of the arrays is longer than the other */
+            if (a_element != b_element) {
+                return false;
+            }
+
+            return true;
+        }
+
+        case cJSON_Object:
+        {
+            cJSON *a_element = NULL;
+            cJSON *b_element = NULL;
+            cJSON_ArrayForEach(a_element, a)
+            {
+                /* TODO This has O(n^2) runtime, which is horrible! */
+                b_element = get_object_item(b, a_element->string, case_sensitive);
+                if (b_element == NULL)
+                {
+                    return false;
+                }
+
+                if (!cJSON_Compare(a_element, b_element, case_sensitive))
+                {
+                    return false;
+                }
+            }
+
+            /* doing this twice, once on a and b to prevent true comparison if a subset of b
+             * TODO: Do this the proper way, this is just a fix for now */
+            cJSON_ArrayForEach(b_element, b)
+            {
+                a_element = get_object_item(a, b_element->string, case_sensitive);
+                if (a_element == NULL)
+                {
+                    return false;
+                }
+
+                if (!cJSON_Compare(b_element, a_element, case_sensitive))
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        default:
+            return false;
+    }
+}
+
+CJSON_PUBLIC(void *) cJSON_malloc(size_t size)
+{
+    return global_hooks.allocate(size);
+}
+
+CJSON_PUBLIC(void) cJSON_free(void *object)
+{
+    global_hooks.deallocate(object);
+    object = NULL;
+}
diff --git a/Source/sys-clk/overlay/lib/libultrahand/common/cJSON.h b/Source/sys-clk/overlay/lib/libultrahand/common/cJSON.h
new file mode 100644
index 00000000..37520bbc
--- /dev/null
+++ b/Source/sys-clk/overlay/lib/libultrahand/common/cJSON.h
@@ -0,0 +1,306 @@
+/*
+  Copyright (c) 2009-2017 Dave Gamble and cJSON contributors
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+  THE SOFTWARE.
+*/
+
+#ifndef cJSON__h
+#define cJSON__h
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+#if !defined(__WINDOWS__) && (defined(WIN32) || defined(WIN64) || defined(_MSC_VER) || defined(_WIN32))
+#define __WINDOWS__
+#endif
+
+#ifdef __WINDOWS__
+
+/* When compiling for windows, we specify a specific calling convention to avoid issues where we are being called from a project with a different default calling convention.  For windows you have 3 define options:
+
+CJSON_HIDE_SYMBOLS - Define this in the case where you don't want to ever dllexport symbols
+CJSON_EXPORT_SYMBOLS - Define this on library build when you want to dllexport symbols (default)
+CJSON_IMPORT_SYMBOLS - Define this if you want to dllimport symbol
+
+For *nix builds that support visibility attribute, you can define similar behavior by
+
+setting default visibility to hidden by adding
+-fvisibility=hidden (for gcc)
+or
+-xldscope=hidden (for sun cc)
+to CFLAGS
+
+then using the CJSON_API_VISIBILITY flag to "export" the same symbols the way CJSON_EXPORT_SYMBOLS does
+
+*/
+
+#define CJSON_CDECL __cdecl
+#define CJSON_STDCALL __stdcall
+
+/* export symbols by default, this is necessary for copy pasting the C and header file */
+#if !defined(CJSON_HIDE_SYMBOLS) && !defined(CJSON_IMPORT_SYMBOLS) && !defined(CJSON_EXPORT_SYMBOLS)
+#define CJSON_EXPORT_SYMBOLS
+#endif
+
+#if defined(CJSON_HIDE_SYMBOLS)
+#define CJSON_PUBLIC(type)   type CJSON_STDCALL
+#elif defined(CJSON_EXPORT_SYMBOLS)
+#define CJSON_PUBLIC(type)   __declspec(dllexport) type CJSON_STDCALL
+#elif defined(CJSON_IMPORT_SYMBOLS)
+#define CJSON_PUBLIC(type)   __declspec(dllimport) type CJSON_STDCALL
+#endif
+#else /* !__WINDOWS__ */
+#define CJSON_CDECL
+#define CJSON_STDCALL
+
+#if (defined(__GNUC__) || defined(__SUNPRO_CC) || defined (__SUNPRO_C)) && defined(CJSON_API_VISIBILITY)
+#define CJSON_PUBLIC(type)   __attribute__((visibility("default"))) type
+#else
+#define CJSON_PUBLIC(type) type
+#endif
+#endif
+
+/* project version */
+#define CJSON_VERSION_MAJOR 1
+#define CJSON_VERSION_MINOR 7
+#define CJSON_VERSION_PATCH 18
+
+#include <stddef.h>
+
+/* cJSON Types: */
+#define cJSON_Invalid (0)
+#define cJSON_False  (1 << 0)
+#define cJSON_True   (1 << 1)
+#define cJSON_NULL   (1 << 2)
+#define cJSON_Number (1 << 3)
+#define cJSON_String (1 << 4)
+#define cJSON_Array  (1 << 5)
+#define cJSON_Object (1 << 6)
+#define cJSON_Raw    (1 << 7) /* raw json */
+
+#define cJSON_IsReference 256
+#define cJSON_StringIsConst 512
+
+/* The cJSON structure: */
+typedef struct cJSON
+{
+    /* next/prev allow you to walk array/object chains. Alternatively, use GetArraySize/GetArrayItem/GetObjectItem */
+    struct cJSON *next;
+    struct cJSON *prev;
+    /* An array or object item will have a child pointer pointing to a chain of the items in the array/object. */
+    struct cJSON *child;
+
+    /* The type of the item, as above. */
+    int type;
+
+    /* The item's string, if type==cJSON_String  and type == cJSON_Raw */
+    char *valuestring;
+    /* writing to valueint is DEPRECATED, use cJSON_SetNumberValue instead */
+    int valueint;
+    /* The item's number, if type==cJSON_Number */
+    double valuedouble;
+
+    /* The item's name string, if this item is the child of, or is in the list of subitems of an object. */
+    char *string;
+} cJSON;
+
+typedef struct cJSON_Hooks
+{
+      /* malloc/free are CDECL on Windows regardless of the default calling convention of the compiler, so ensure the hooks allow passing those functions directly. */
+      void *(CJSON_CDECL *malloc_fn)(size_t sz);
+      void (CJSON_CDECL *free_fn)(void *ptr);
+} cJSON_Hooks;
+
+typedef int cJSON_bool;
+
+/* Limits how deeply nested arrays/objects can be before cJSON rejects to parse them.
+ * This is to prevent stack overflows. */
+#ifndef CJSON_NESTING_LIMIT
+#define CJSON_NESTING_LIMIT 1000
+#endif
+
+/* Limits the length of circular references can be before cJSON rejects to parse them.
+ * This is to prevent stack overflows. */
+#ifndef CJSON_CIRCULAR_LIMIT
+#define CJSON_CIRCULAR_LIMIT 10000
+#endif
+
+/* returns the version of cJSON as a string */
+CJSON_PUBLIC(const char*) cJSON_Version(void);
+
+/* Supply malloc, realloc and free functions to cJSON */
+CJSON_PUBLIC(void) cJSON_InitHooks(cJSON_Hooks* hooks);
+
+/* Memory Management: the caller is always responsible to free the results from all variants of cJSON_Parse (with cJSON_Delete) and cJSON_Print (with stdlib free, cJSON_Hooks.free_fn, or cJSON_free as appropriate). The exception is cJSON_PrintPreallocated, where the caller has full responsibility of the buffer. */
+/* Supply a block of JSON, and this returns a cJSON object you can interrogate. */
+CJSON_PUBLIC(cJSON *) cJSON_Parse(const char *value);
+CJSON_PUBLIC(cJSON *) cJSON_ParseWithLength(const char *value, size_t buffer_length);
+/* ParseWithOpts allows you to require (and check) that the JSON is null terminated, and to retrieve the pointer to the final byte parsed. */
+/* If you supply a ptr in return_parse_end and parsing fails, then return_parse_end will contain a pointer to the error so will match cJSON_GetErrorPtr(). */
+CJSON_PUBLIC(cJSON *) cJSON_ParseWithOpts(const char *value, const char **return_parse_end, cJSON_bool require_null_terminated);
+CJSON_PUBLIC(cJSON *) cJSON_ParseWithLengthOpts(const char *value, size_t buffer_length, const char **return_parse_end, cJSON_bool require_null_terminated);
+
+/* Render a cJSON entity to text for transfer/storage. */
+CJSON_PUBLIC(char *) cJSON_Print(const cJSON *item);
+/* Render a cJSON entity to text for transfer/storage without any formatting. */
+CJSON_PUBLIC(char *) cJSON_PrintUnformatted(const cJSON *item);
+/* Render a cJSON entity to text using a buffered strategy. prebuffer is a guess at the final size. guessing well reduces reallocation. fmt=0 gives unformatted, =1 gives formatted */
+CJSON_PUBLIC(char *) cJSON_PrintBuffered(const cJSON *item, int prebuffer, cJSON_bool fmt);
+/* Render a cJSON entity to text using a buffer already allocated in memory with given length. Returns 1 on success and 0 on failure. */
+/* NOTE: cJSON is not always 100% accurate in estimating how much memory it will use, so to be safe allocate 5 bytes more than you actually need */
+CJSON_PUBLIC(cJSON_bool) cJSON_PrintPreallocated(cJSON *item, char *buffer, const int length, const cJSON_bool format);
+/* Delete a cJSON entity and all subentities. */
+CJSON_PUBLIC(void) cJSON_Delete(cJSON *item);
+
+/* Returns the number of items in an array (or object). */
+CJSON_PUBLIC(int) cJSON_GetArraySize(const cJSON *array);
+/* Retrieve item number "index" from array "array". Returns NULL if unsuccessful. */
+CJSON_PUBLIC(cJSON *) cJSON_GetArrayItem(const cJSON *array, int index);
+/* Get item "string" from object. Case insensitive. */
+CJSON_PUBLIC(cJSON *) cJSON_GetObjectItem(const cJSON * const object, const char * const string);
+CJSON_PUBLIC(cJSON *) cJSON_GetObjectItemCaseSensitive(const cJSON * const object, const char * const string);
+CJSON_PUBLIC(cJSON_bool) cJSON_HasObjectItem(const cJSON *object, const char *string);
+/* For analysing failed parses. This returns a pointer to the parse error. You'll probably need to look a few chars back to make sense of it. Defined when cJSON_Parse() returns 0. 0 when cJSON_Parse() succeeds. */
+CJSON_PUBLIC(const char *) cJSON_GetErrorPtr(void);
+
+/* Check item type and return its value */
+CJSON_PUBLIC(char *) cJSON_GetStringValue(const cJSON * const item);
+CJSON_PUBLIC(double) cJSON_GetNumberValue(const cJSON * const item);
+
+/* These functions check the type of an item */
+CJSON_PUBLIC(cJSON_bool) cJSON_IsInvalid(const cJSON * const item);
+CJSON_PUBLIC(cJSON_bool) cJSON_IsFalse(const cJSON * const item);
+CJSON_PUBLIC(cJSON_bool) cJSON_IsTrue(const cJSON * const item);
+CJSON_PUBLIC(cJSON_bool) cJSON_IsBool(const cJSON * const item);
+CJSON_PUBLIC(cJSON_bool) cJSON_IsNull(const cJSON * const item);
+CJSON_PUBLIC(cJSON_bool) cJSON_IsNumber(const cJSON * const item);
+CJSON_PUBLIC(cJSON_bool) cJSON_IsString(const cJSON * const item);
+CJSON_PUBLIC(cJSON_bool) cJSON_IsArray(const cJSON * const item);
+CJSON_PUBLIC(cJSON_bool) cJSON_IsObject(const cJSON * const item);
+CJSON_PUBLIC(cJSON_bool) cJSON_IsRaw(const cJSON * const item);
+
+/* These calls create a cJSON item of the appropriate type. */
+CJSON_PUBLIC(cJSON *) cJSON_CreateNull(void);
+CJSON_PUBLIC(cJSON *) cJSON_CreateTrue(void);
+CJSON_PUBLIC(cJSON *) cJSON_CreateFalse(void);
+CJSON_PUBLIC(cJSON *) cJSON_CreateBool(cJSON_bool boolean);
+CJSON_PUBLIC(cJSON *) cJSON_CreateNumber(double num);
+CJSON_PUBLIC(cJSON *) cJSON_CreateString(const char *string);
+/* raw json */
+CJSON_PUBLIC(cJSON *) cJSON_CreateRaw(const char *raw);
+CJSON_PUBLIC(cJSON *) cJSON_CreateArray(void);
+CJSON_PUBLIC(cJSON *) cJSON_CreateObject(void);
+
+/* Create a string where valuestring references a string so
+ * it will not be freed by cJSON_Delete */
+CJSON_PUBLIC(cJSON *) cJSON_CreateStringReference(const char *string);
+/* Create an object/array that only references it's elements so
+ * they will not be freed by cJSON_Delete */
+CJSON_PUBLIC(cJSON *) cJSON_CreateObjectReference(const cJSON *child);
+CJSON_PUBLIC(cJSON *) cJSON_CreateArrayReference(const cJSON *child);
+
+/* These utilities create an Array of count items.
+ * The parameter count cannot be greater than the number of elements in the number array, otherwise array access will be out of bounds.*/
+CJSON_PUBLIC(cJSON *) cJSON_CreateIntArray(const int *numbers, int count);
+CJSON_PUBLIC(cJSON *) cJSON_CreateFloatArray(const float *numbers, int count);
+CJSON_PUBLIC(cJSON *) cJSON_CreateDoubleArray(const double *numbers, int count);
+CJSON_PUBLIC(cJSON *) cJSON_CreateStringArray(const char *const *strings, int count);
+
+/* Append item to the specified array/object. */
+CJSON_PUBLIC(cJSON_bool) cJSON_AddItemToArray(cJSON *array, cJSON *item);
+CJSON_PUBLIC(cJSON_bool) cJSON_AddItemToObject(cJSON *object, const char *string, cJSON *item);
+/* Use this when string is definitely const (i.e. a literal, or as good as), and will definitely survive the cJSON object.
+ * WARNING: When this function was used, make sure to always check that (item->type & cJSON_StringIsConst) is zero before
+ * writing to `item->string` */
+CJSON_PUBLIC(cJSON_bool) cJSON_AddItemToObjectCS(cJSON *object, const char *string, cJSON *item);
+/* Append reference to item to the specified array/object. Use this when you want to add an existing cJSON to a new cJSON, but don't want to corrupt your existing cJSON. */
+CJSON_PUBLIC(cJSON_bool) cJSON_AddItemReferenceToArray(cJSON *array, cJSON *item);
+CJSON_PUBLIC(cJSON_bool) cJSON_AddItemReferenceToObject(cJSON *object, const char *string, cJSON *item);
+
+/* Remove/Detach items from Arrays/Objects. */
+CJSON_PUBLIC(cJSON *) cJSON_DetachItemViaPointer(cJSON *parent, cJSON * const item);
+CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromArray(cJSON *array, int which);
+CJSON_PUBLIC(void) cJSON_DeleteItemFromArray(cJSON *array, int which);
+CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromObject(cJSON *object, const char *string);
+CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromObjectCaseSensitive(cJSON *object, const char *string);
+CJSON_PUBLIC(void) cJSON_DeleteItemFromObject(cJSON *object, const char *string);
+CJSON_PUBLIC(void) cJSON_DeleteItemFromObjectCaseSensitive(cJSON *object, const char *string);
+
+/* Update array items. */
+CJSON_PUBLIC(cJSON_bool) cJSON_InsertItemInArray(cJSON *array, int which, cJSON *newitem); /* Shifts pre-existing items to the right. */
+CJSON_PUBLIC(cJSON_bool) cJSON_ReplaceItemViaPointer(cJSON * const parent, cJSON * const item, cJSON * replacement);
+CJSON_PUBLIC(cJSON_bool) cJSON_ReplaceItemInArray(cJSON *array, int which, cJSON *newitem);
+CJSON_PUBLIC(cJSON_bool) cJSON_ReplaceItemInObject(cJSON *object,const char *string,cJSON *newitem);
+CJSON_PUBLIC(cJSON_bool) cJSON_ReplaceItemInObjectCaseSensitive(cJSON *object,const char *string,cJSON *newitem);
+
+/* Duplicate a cJSON item */
+CJSON_PUBLIC(cJSON *) cJSON_Duplicate(const cJSON *item, cJSON_bool recurse);
+/* Duplicate will create a new, identical cJSON item to the one you pass, in new memory that will
+ * need to be released. With recurse!=0, it will duplicate any children connected to the item.
+ * The item->next and ->prev pointers are always zero on return from Duplicate. */
+/* Recursively compare two cJSON items for equality. If either a or b is NULL or invalid, they will be considered unequal.
+ * case_sensitive determines if object keys are treated case sensitive (1) or case insensitive (0) */
+CJSON_PUBLIC(cJSON_bool) cJSON_Compare(const cJSON * const a, const cJSON * const b, const cJSON_bool case_sensitive);
+
+/* Minify a strings, remove blank characters(such as ' ', '\t', '\r', '\n') from strings.
+ * The input pointer json cannot point to a read-only address area, such as a string constant, 
+ * but should point to a readable and writable address area. */
+CJSON_PUBLIC(void) cJSON_Minify(char *json);
+
+/* Helper functions for creating and adding items to an object at the same time.
+ * They return the added item or NULL on failure. */
+CJSON_PUBLIC(cJSON*) cJSON_AddNullToObject(cJSON * const object, const char * const name);
+CJSON_PUBLIC(cJSON*) cJSON_AddTrueToObject(cJSON * const object, const char * const name);
+CJSON_PUBLIC(cJSON*) cJSON_AddFalseToObject(cJSON * const object, const char * const name);
+CJSON_PUBLIC(cJSON*) cJSON_AddBoolToObject(cJSON * const object, const char * const name, const cJSON_bool boolean);
+CJSON_PUBLIC(cJSON*) cJSON_AddNumberToObject(cJSON * const object, const char * const name, const double number);
+CJSON_PUBLIC(cJSON*) cJSON_AddStringToObject(cJSON * const object, const char * const name, const char * const string);
+CJSON_PUBLIC(cJSON*) cJSON_AddRawToObject(cJSON * const object, const char * const name, const char * const raw);
+CJSON_PUBLIC(cJSON*) cJSON_AddObjectToObject(cJSON * const object, const char * const name);
+CJSON_PUBLIC(cJSON*) cJSON_AddArrayToObject(cJSON * const object, const char * const name);
+
+/* When assigning an integer value, it needs to be propagated to valuedouble too. */
+#define cJSON_SetIntValue(object, number) ((object) ? (object)->valueint = (object)->valuedouble = (number) : (number))
+/* helper for the cJSON_SetNumberValue macro */
+CJSON_PUBLIC(double) cJSON_SetNumberHelper(cJSON *object, double number);
+#define cJSON_SetNumberValue(object, number) ((object != NULL) ? cJSON_SetNumberHelper(object, (double)number) : (number))
+/* Change the valuestring of a cJSON_String object, only takes effect when type of object is cJSON_String */
+CJSON_PUBLIC(char*) cJSON_SetValuestring(cJSON *object, const char *valuestring);
+
+/* If the object is not a boolean type this does nothing and returns cJSON_Invalid else it returns the new type*/
+#define cJSON_SetBoolValue(object, boolValue) ( \
+    (object != NULL && ((object)->type & (cJSON_False|cJSON_True))) ? \
+    (object)->type=((object)->type &(~(cJSON_False|cJSON_True)))|((boolValue)?cJSON_True:cJSON_False) : \
+    cJSON_Invalid\
+)
+
+/* Macro for iterating over an array or object */
+#define cJSON_ArrayForEach(element, array) for(element = (array != NULL) ? (array)->child : NULL; element != NULL; element = element->next)
+
+/* malloc/free objects using the malloc/free functions that have been set with cJSON_InitHooks */
+CJSON_PUBLIC(void *) cJSON_malloc(size_t size);
+CJSON_PUBLIC(void) cJSON_free(void *object);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/Source/sys-clk/overlay/lib/libultrahand/libtesla/LICENSE b/Source/sys-clk/overlay/lib/libultrahand/libtesla/LICENSE
new file mode 100644
index 00000000..d159169d
--- /dev/null
+++ b/Source/sys-clk/overlay/lib/libultrahand/libtesla/LICENSE
@@ -0,0 +1,339 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
diff --git a/Source/sys-clk/overlay/lib/libultrahand/libtesla/README.md b/Source/sys-clk/overlay/lib/libultrahand/libtesla/README.md
new file mode 100644
index 00000000..5782d161
--- /dev/null
+++ b/Source/sys-clk/overlay/lib/libultrahand/libtesla/README.md
@@ -0,0 +1,32 @@
+# libtesla
+
+<p align="center">
+  <img src="https://i.imgur.com/fhwyjbd.png">
+</p>
+
+libtesla is the interface between the Tesla overlay loader and user-made Overlays. It handles all layer creation, UI creation, drawing and input management.
+It's main goal is to make sure all overlays look and feel similar and don't differenciate themselves from the switch's native overlays.
+
+## Screenshots
+
+<div>
+    <img src="https://i.imgur.com/jJpxYjb.jpg" style="width: 50%; float: center">
+    <img src="https://i.imgur.com/nBUc7ps.jpg" style="width: 50%; float: right">
+</div>
+
+`Overlays do NOT show up on Screenshots. These pictures were taken using a capture card`
+
+## Example
+
+An example for how to use libtesla can be found here: https://github.com/WerWolv/libtesla/tree/master/example
+To create your own Overlay, please consider creating a new repository using the official Tesla overlay template: https://github.com/WerWolv/Tesla-Template
+
+**Please Note:** While it is possible to create overlays without libtesla, it's highly recommended to not do so. libtesla handles showing and hiding of overlays, button combo detection, layer creation and a lot more. Not using it will lead to an inconsistent user experience when using multiple different overlays ultimately making it worse for the end user. If something's missing, please consider opening a PR here.
+
+## Credits
+
+- **switchbrew** for nx-hbloader which is used as basis for overlay loading
+- **kardch** for the amazing icon
+- **All the devs on AtlasNX, RetroNX and Switchbrew** for their feedback
+- **All overlay devs** for making something awesome out of this :)
+
diff --git a/Source/sys-clk/manager/lib/borealis/Makefile b/Source/sys-clk/overlay/lib/libultrahand/libtesla/example/Makefile
similarity index 88%
rename from Source/sys-clk/manager/lib/borealis/Makefile
rename to Source/sys-clk/overlay/lib/libultrahand/libtesla/example/Makefile
index d6639f1b..cdb011ae 100644
--- a/Source/sys-clk/manager/lib/borealis/Makefile
+++ b/Source/sys-clk/overlay/lib/libultrahand/libtesla/example/Makefile
@@ -37,19 +37,17 @@ include $(DEVKITPRO)/libnx/switch_rules
 #   of a homebrew executable (.nro). This is intended to be used for sysmodules.
 #   NACP building is skipped as well.
 #---------------------------------------------------------------------------------
-TARGET		:=	borealis_example
-BUILD		:=	build.nx
-SOURCES		:=	example
-DATA		:=	data
-ICON		:=	resources/icon/borealis.jpg
-INCLUDES	:=	example
-APP_TITLE	:=	borealis example
-APP_AUTHOR	:=	natinusala
-APP_VERSION	:=	1.0
 
-ROMFS				:=	resources
-BOREALIS_PATH		:=	.
-BOREALIS_RESOURCES	:=	romfs:/
+APP_TITLE			:=		Tesla Example
+APP_VERSION 	:= 		1.3.0
+
+TARGET		:=	$(notdir $(CURDIR))
+BUILD		:=	build
+SOURCES		:=	source
+DATA		:=	data
+INCLUDES	:=	../include
+
+NO_ICON		:=  1
 
 #---------------------------------------------------------------------------------
 # options for code generation
@@ -59,15 +57,14 @@ ARCH	:=	-march=armv8-a+crc+crypto -mtune=cortex-a57 -mtp=soft -fPIE
 CFLAGS	:=	-g -Wall -O2 -ffunction-sections \
 			$(ARCH) $(DEFINES)
 
-CFLAGS	+=	$(INCLUDE) -D__SWITCH__ \
-			-DBOREALIS_RESOURCES="\"$(BOREALIS_RESOURCES)\""
+CFLAGS	+=	$(INCLUDE) -D__SWITCH__
 
-CXXFLAGS	:= $(CFLAGS) -fno-exceptions -std=c++1z -O2
+CXXFLAGS	:= $(CFLAGS) -fno-exceptions -std=c++20
 
 ASFLAGS	:=	-g $(ARCH)
 LDFLAGS	=	-specs=$(DEVKITPRO)/libnx/switch.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
 
-LIBS	:= -lnx -lm
+LIBS	:= -lnx
 
 #---------------------------------------------------------------------------------
 # list of directories containing libraries, this must be the top level containing
@@ -75,7 +72,6 @@ LIBS	:= -lnx -lm
 #---------------------------------------------------------------------------------
 LIBDIRS	:= $(PORTLIBS) $(LIBNX)
 
-include $(TOPDIR)/library/borealis.mk
 
 #---------------------------------------------------------------------------------
 # no real need to edit anything past this point unless you need to add additional
@@ -169,18 +165,14 @@ endif
 #---------------------------------------------------------------------------------
 all: $(BUILD)
 
+
 $(BUILD):
 	@[ -d $@ ] || mkdir -p $@
 	@$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
 
 #---------------------------------------------------------------------------------
 clean:
-	@echo clean ...
-ifeq ($(strip $(APP_JSON)),)
-	@rm -fr $(BUILD) $(TARGET).nro $(TARGET).nacp $(TARGET).elf
-else
-	@rm -fr $(BUILD) $(TARGET).nsp $(TARGET).nso $(TARGET).npdm $(TARGET).elf
-endif
+	@rm -fr $(BUILD) $(TARGET).ovl $(TARGET).nro $(TARGET).nacp $(TARGET).elf
 
 
 #---------------------------------------------------------------------------------
@@ -192,25 +184,11 @@ DEPENDS	:=	$(OFILES:.o=.d)
 #---------------------------------------------------------------------------------
 # main targets
 #---------------------------------------------------------------------------------
-ifeq ($(strip $(APP_JSON)),)
+all	:	 $(OUTPUT).ovl
 
-all	:	$(OUTPUT).nro
-
-ifeq ($(strip $(NO_NACP)),)
-$(OUTPUT).nro	:	$(OUTPUT).elf $(OUTPUT).nacp
-else
-$(OUTPUT).nro	:	$(OUTPUT).elf
-endif
-
-else
-
-all	:	$(OUTPUT).nsp
-
-$(OUTPUT).nsp	:	$(OUTPUT).nso $(OUTPUT).npdm
-
-$(OUTPUT).nso	:	$(OUTPUT).elf
-
-endif
+$(OUTPUT).ovl		:	$(OUTPUT).elf $(OUTPUT).nacp 
+	@elf2nro $< $@ $(NROFLAGS)
+	@echo "built ... $(notdir $(OUTPUT).ovl)"
 
 $(OUTPUT).elf	:	$(OFILES)
 
diff --git a/Source/sys-clk/overlay/lib/libultrahand/libtesla/example/source/main.cpp b/Source/sys-clk/overlay/lib/libultrahand/libtesla/example/source/main.cpp
new file mode 100644
index 00000000..bf4c2522
--- /dev/null
+++ b/Source/sys-clk/overlay/lib/libultrahand/libtesla/example/source/main.cpp
@@ -0,0 +1,100 @@
+#define TESLA_INIT_IMPL // If you have more than one file using the tesla header, only define this in the main one
+#include <tesla.hpp>    // The Tesla Header
+
+
+class GuiSecondary : public tsl::Gui {
+public:
+    GuiSecondary() {}
+
+    virtual tsl::elm::Element* createUI() override {
+        auto *rootFrame = new tsl::elm::OverlayFrame("Tesla Example", "v1.3.2 - Secondary Gui");
+
+        rootFrame->setContent(new tsl::elm::DebugRectangle(tsl::Color{ 0x8, 0x3, 0x8, 0xF }));
+
+        return rootFrame;
+    }
+};
+
+class GuiTest : public tsl::Gui {
+public:
+    GuiTest(u8 arg1, u8 arg2, bool arg3) { }
+
+    // Called when this Gui gets loaded to create the UI
+    // Allocate all elements on the heap. libtesla will make sure to clean them up when not needed anymore
+    virtual tsl::elm::Element* createUI() override {
+        // A OverlayFrame is the base element every overlay consists of. This will draw the default Title and Subtitle.
+        // If you need more information in the header or want to change it's look, use a HeaderOverlayFrame.
+        auto frame = new tsl::elm::OverlayFrame("Tesla Example", "v1.3.2");
+
+        // A list that can contain sub elements and handles scrolling
+        auto list = new tsl::elm::List();
+
+        // List Items
+        list->addItem(new tsl::elm::CategoryHeader("List items"));
+
+        auto *clickableListItem = new tsl::elm::ListItem("Clickable List Item", "...");
+        clickableListItem->setClickListener([](u64 keys) {
+            if (keys & HidNpadButton_A) {
+                tsl::changeTo<GuiSecondary>();
+                return true;
+            }
+
+            return false;
+        });
+
+        list->addItem(clickableListItem);
+        list->addItem(new tsl::elm::ListItem("Default List Item"));
+        list->addItem(new tsl::elm::ListItem("Default List Item with an extra long name to trigger truncation and scrolling"));
+        list->addItem(new tsl::elm::ToggleListItem("Toggle List Item", true));
+
+        // Custom Drawer, a element that gives direct access to the renderer
+        list->addItem(new tsl::elm::CategoryHeader("Custom Drawer", true));
+        list->addItem(new tsl::elm::CustomDrawer([](tsl::gfx::Renderer *renderer, s32 x, s32 y, s32 w, s32 h) {
+            renderer->drawCircle(x + 40, y + 40, 20, true, renderer->a(0xF00F));
+            renderer->drawCircle(x + 50, y + 50, 20, true, renderer->a(0xF0F0));
+            renderer->drawRect(x + 130, y + 30, 60, 40, renderer->a(0xFF00));
+            renderer->drawString("Hello :)", false, x + 250, y + 70, 20, renderer->a(0xFF0F));
+            renderer->drawRect(x + 40, y + 90, 300, 10, renderer->a(0xF0FF));
+        }), 100);
+
+        // Track bars
+        list->addItem(new tsl::elm::CategoryHeader("Track bars"));
+        list->addItem(new tsl::elm::TrackBar("\u2600"));
+        list->addItem(new tsl::elm::StepTrackBar("\uE13C", 20));
+        list->addItem(new tsl::elm::NamedStepTrackBar("\uE132", { "Selection 1", "Selection 2", "Selection 3" }));
+
+        // Add the list to the frame for it to be drawn
+        frame->setContent(list);
+
+        // Return the frame to have it become the top level element of this Gui
+        return frame;
+    }
+
+    // Called once every frame to update values
+    virtual void update() override {
+
+    }
+
+    // Called once every frame to handle inputs not handled by other UI elements
+    virtual bool handleInput(u64 keysDown, u64 keysHeld, const HidTouchState &touchPos, HidAnalogStickState joyStickPosLeft, HidAnalogStickState joyStickPosRight) override {
+        return false;   // Return true here to signal the inputs have been consumed
+    }
+};
+
+class OverlayTest : public tsl::Overlay {
+public:
+                                             // libtesla already initialized fs, hid, pl, pmdmnt, hid:sys and set:sys
+    virtual void initServices() override {}  // Called at the start to initialize all services necessary for this Overlay
+    virtual void exitServices() override {}  // Called at the end to clean up all services previously initialized
+
+    virtual void onShow() override {}    // Called before overlay wants to change from invisible to visible state
+    virtual void onHide() override {}    // Called before overlay wants to change from visible to invisible state
+
+    virtual std::unique_ptr<tsl::Gui> loadInitialGui() override {
+        return initially<GuiTest>(1, 2, true);  // Initial Gui to load. It's possible to pass arguments to it's constructor like this
+    }
+};
+
+int main(int argc, char **argv) {
+    return tsl::loop<OverlayTest>(argc, argv);
+}
diff --git a/Source/sys-clk/manager/lib/borealis/library/include/borealis/extern/nanovg/stb_truetype.h b/Source/sys-clk/overlay/lib/libultrahand/libtesla/include/stb_truetype.h
similarity index 80%
rename from Source/sys-clk/manager/lib/borealis/library/include/borealis/extern/nanovg/stb_truetype.h
rename to Source/sys-clk/overlay/lib/libultrahand/libtesla/include/stb_truetype.h
index 5ab9ba2c..392ca11d 100644
--- a/Source/sys-clk/manager/lib/borealis/library/include/borealis/extern/nanovg/stb_truetype.h
+++ b/Source/sys-clk/overlay/lib/libultrahand/libtesla/include/stb_truetype.h
@@ -1,5 +1,14 @@
-// stb_truetype.h - v1.21 - public domain
-// authored from 2009-2016 by Sean Barrett / RAD Game Tools
+// stb_truetype.h - v1.26 - public domain
+// authored from 2009-2021 by Sean Barrett / RAD Game Tools
+//
+// =======================================================================
+//
+//    NO SECURITY GUARANTEE -- DO NOT USE THIS ON UNTRUSTED FONT FILES
+//
+// This library does no range checking of the offsets found in the file,
+// meaning an attacker can use it to read arbitrary memory.
+//
+// =======================================================================
 //
 //   This library processes TrueType files:
 //        parse files
@@ -32,11 +41,11 @@
 //       Daniel Ribeiro Maciel
 //
 //   Bug/warning reports/fixes:
-//       "Zer" on mollyrocket       Fabian "ryg" Giesen
-//       Cass Everitt               Martins Mozeiko
-//       stoiko (Haemimont Games)   Cap Petschulat
-//       Brian Hook                 Omar Cornut
-//       Walter van Niftrik         github:aloucks
+//       "Zer" on mollyrocket       Fabian "ryg" Giesen   github:NiLuJe
+//       Cass Everitt               Martins Mozeiko       github:aloucks
+//       stoiko (Haemimont Games)   Cap Petschulat        github:oyvindjam
+//       Brian Hook                 Omar Cornut           github:vassvik
+//       Walter van Niftrik         Ryan Griege
 //       David Gow                  Peter LaValle
 //       David Given                Sergey Popov
 //       Ivan-Assen Ivanov          Giumo X. Clanjor
@@ -44,11 +53,16 @@
 //       Johan Duparc               Thomas Fields
 //       Hou Qiming                 Derek Vinyard
 //       Rob Loach                  Cort Stratton
-//       Kenney Phillis Jr.         github:oyvindjam
-//       Brian Costabile            github:vassvik
-//       
+//       Kenney Phillis Jr.         Brian Costabile
+//       Ken Voskuil (kaesve)       Yakov Galka
+//
 // VERSION HISTORY
 //
+//   1.26 (2021-08-28) fix broken rasterizer
+//   1.25 (2021-07-11) many fixes
+//   1.24 (2020-02-05) fix warning
+//   1.23 (2020-02-02) query SVG data for glyphs; query whole kerning table (but only kern not GPOS)
+//   1.22 (2019-08-11) minimize missing-glyph duplication; fix kerning if both 'GPOS' and 'kern' are defined
 //   1.21 (2019-02-25) fix warning
 //   1.20 (2019-02-07) PackFontRange skips missing codepoints; GetScaleFontVMetrics()
 //   1.19 (2018-02-11) GPOS kerning, STBTT_fmod
@@ -208,7 +222,7 @@
 //
 //  Advancing for the next character:
 //    Call GlyphHMetrics, and compute 'current_point += SF * advance'.
-// 
+//
 //
 // ADVANCED USAGE
 //
@@ -258,8 +272,8 @@
 ////  SAMPLE PROGRAMS
 ////
 //
-//  Incomplete text-in-3d-api example, which draws quads properly aligned to be lossless
-//
+//  Incomplete text-in-3d-api example, which draws quads properly aligned to be lossless.
+//  See "tests/truetype_demo_win32.c" for a complete version.
 #if 0
 #define STB_TRUETYPE_IMPLEMENTATION  // force following include to generate implementation
 #include "stb_truetype.h"
@@ -285,6 +299,8 @@ void my_stbtt_initfont(void)
 void my_stbtt_print(float x, float y, char *text)
 {
    // assume orthographic projection with units = screen pixels, origin at top left
+   glEnable(GL_BLEND);
+   glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
    glEnable(GL_TEXTURE_2D);
    glBindTexture(GL_TEXTURE_2D, ftex);
    glBegin(GL_QUADS);
@@ -292,10 +308,10 @@ void my_stbtt_print(float x, float y, char *text)
       if (*text >= 32 && *text < 128) {
          stbtt_aligned_quad q;
          stbtt_GetBakedQuad(cdata, 512,512, *text-32, &x,&y,&q,1);//1=opengl & d3d10+,0=d3d9
-         glTexCoord2f(q.s0,q.t1); glVertex2f(q.x0,q.y0);
-         glTexCoord2f(q.s1,q.t1); glVertex2f(q.x1,q.y0);
-         glTexCoord2f(q.s1,q.t0); glVertex2f(q.x1,q.y1);
-         glTexCoord2f(q.s0,q.t0); glVertex2f(q.x0,q.y1);
+         glTexCoord2f(q.s0,q.t0); glVertex2f(q.x0,q.y0);
+         glTexCoord2f(q.s1,q.t0); glVertex2f(q.x1,q.y0);
+         glTexCoord2f(q.s1,q.t1); glVertex2f(q.x1,q.y1);
+         glTexCoord2f(q.s0,q.t1); glVertex2f(q.x0,q.y1);
       }
       ++text;
    }
@@ -333,7 +349,7 @@ int main(int argc, char **argv)
    }
    return 0;
 }
-#endif 
+#endif
 //
 // Output:
 //
@@ -347,9 +363,9 @@ int main(int argc, char **argv)
 //  :@@.  M@M
 //   @@@o@@@@
 //   :M@@V:@@.
-//  
+//
 //////////////////////////////////////////////////////////////////////////////
-// 
+//
 // Complete program: print "Hello World!" banner, with bugs
 //
 #if 0
@@ -456,10 +472,10 @@ int main(int arg, char **argv)
    #define STBTT_free(x,u)    ((void)(u),free(x))
    #endif
 
-   #ifndef STBTT_assert
-   #include <assert.h>
-   #define STBTT_assert(x)    assert(x)
-   #endif
+   //ifndef STBTT_assert
+   //include <assert.h>
+   //define STBTT_assert(x)    assert(x)
+   //endif
 
    #ifndef STBTT_strlen
    #include <string.h>
@@ -650,7 +666,7 @@ STBTT_DEF int  stbtt_PackFontRangesRenderIntoRects(stbtt_pack_context *spc, cons
 // Calling these functions in sequence is roughly equivalent to calling
 // stbtt_PackFontRanges(). If you more control over the packing of multiple
 // fonts, or if you want to pack custom data into a font texture, take a look
-// at the source to of stbtt_PackFontRanges() and create a custom version 
+// at the source to of stbtt_PackFontRanges() and create a custom version
 // using these functions, e.g. call GatherRects multiple times,
 // building up a single array of rects, then call PackRects once,
 // then call RenderIntoRects repeatedly. This may result in a
@@ -702,7 +718,7 @@ struct stbtt_fontinfo
 
    int numGlyphs;                     // number of glyphs, needed for range checking
 
-   int loca,head,glyf,hhea,hmtx,kern,gpos; // table locations as offset from start of .ttf
+   int loca,head,glyf,hhea,hmtx,kern,gpos,svg; // table locations as offset from start of .ttf
    int index_map;                     // a cmap mapping for our chosen character encoding
    int indexToLocFormat;              // format needed to map from glyph index to glyph
 
@@ -785,6 +801,18 @@ STBTT_DEF int  stbtt_GetGlyphKernAdvance(const stbtt_fontinfo *info, int glyph1,
 STBTT_DEF int  stbtt_GetGlyphBox(const stbtt_fontinfo *info, int glyph_index, int *x0, int *y0, int *x1, int *y1);
 // as above, but takes one or more glyph indices for greater efficiency
 
+typedef struct stbtt_kerningentry
+{
+   int glyph1; // use stbtt_FindGlyphIndex
+   int glyph2;
+   int advance;
+} stbtt_kerningentry;
+
+STBTT_DEF int  stbtt_GetKerningTableLength(const stbtt_fontinfo *info);
+STBTT_DEF int  stbtt_GetKerningTable(const stbtt_fontinfo *info, stbtt_kerningentry* table, int table_length);
+// Retrieves a complete list of all of the kerning pairs provided by the font
+// stbtt_GetKerningTable never writes more than table_length entries and returns how many entries it did write.
+// The table will be sorted by (a.glyph1 == b.glyph1)?(a.glyph2 < b.glyph2):(a.glyph1 < b.glyph1)
 
 //////////////////////////////////////////////////////////////////////////////
 //
@@ -829,6 +857,12 @@ STBTT_DEF int stbtt_GetGlyphShape(const stbtt_fontinfo *info, int glyph_index, s
 STBTT_DEF void stbtt_FreeShape(const stbtt_fontinfo *info, stbtt_vertex *vertices);
 // frees the data allocated above
 
+STBTT_DEF unsigned char *stbtt_FindSVGDoc(const stbtt_fontinfo *info, int gl);
+STBTT_DEF int stbtt_GetCodepointSVG(const stbtt_fontinfo *info, int unicode_codepoint, const char **svg);
+STBTT_DEF int stbtt_GetGlyphSVG(const stbtt_fontinfo *info, int gl, const char **svg);
+// fills svg with the character's SVG data.
+// returns data size or 0 if SVG not found.
+
 //////////////////////////////////////////////////////////////////////////////
 //
 // BITMAP RENDERING
@@ -958,7 +992,7 @@ STBTT_DEF unsigned char * stbtt_GetCodepointSDF(const stbtt_fontinfo *info, floa
 // and computing from that can allow drop-out prevention).
 //
 // The algorithm has not been optimized at all, so expect it to be slow
-// if computing lots of characters or very large sizes. 
+// if computing lots of characters or very large sizes.
 
 
 
@@ -1112,7 +1146,7 @@ static stbtt_uint8 stbtt__buf_peek8(stbtt__buf *b)
 
 static void stbtt__buf_seek(stbtt__buf *b, int o)
 {
-   STBTT_assert(!(o > b->size || o < 0));
+   //STBTT_assert(!(o > b->size || o < 0));
    b->cursor = (o > b->size || o < 0) ? b->size : o;
 }
 
@@ -1125,7 +1159,7 @@ static stbtt_uint32 stbtt__buf_get(stbtt__buf *b, int n)
 {
    stbtt_uint32 v = 0;
    int i;
-   STBTT_assert(n >= 1 && n <= 4);
+   //STBTT_assert(n >= 1 && n <= 4);
    for (i = 0; i < n; i++)
       v = (v << 8) | stbtt__buf_get8(b);
    return v;
@@ -1134,7 +1168,7 @@ static stbtt_uint32 stbtt__buf_get(stbtt__buf *b, int n)
 static stbtt__buf stbtt__new_buf(const void *p, size_t size)
 {
    stbtt__buf r;
-   STBTT_assert(size < 0x40000000);
+   //STBTT_assert(size < 0x40000000);
    r.data = (stbtt_uint8*) p;
    r.size = (int) size;
    r.cursor = 0;
@@ -1160,7 +1194,7 @@ static stbtt__buf stbtt__cff_get_index(stbtt__buf *b)
    count = stbtt__buf_get16(b);
    if (count) {
       offsize = stbtt__buf_get8(b);
-      STBTT_assert(offsize >= 1 && offsize <= 4);
+      //STBTT_assert(offsize >= 1 && offsize <= 4);
       stbtt__buf_skip(b, offsize * count);
       stbtt__buf_skip(b, stbtt__buf_get(b, offsize) - 1);
    }
@@ -1175,46 +1209,63 @@ static stbtt_uint32 stbtt__cff_int(stbtt__buf *b)
    else if (b0 >= 251 && b0 <= 254) return -(b0 - 251)*256 - stbtt__buf_get8(b) - 108;
    else if (b0 == 28)               return stbtt__buf_get16(b);
    else if (b0 == 29)               return stbtt__buf_get32(b);
-   STBTT_assert(0);
+   //STBTT_assert(0);
    return 0;
 }
 
 static void stbtt__cff_skip_operand(stbtt__buf *b) {
-   int v, b0 = stbtt__buf_peek8(b);
-   STBTT_assert(b0 >= 28);
-   if (b0 == 30) {
-      stbtt__buf_skip(b, 1);
-      while (b->cursor < b->size) {
+   if (stbtt__buf_peek8(b) == 30) {
+      ++b->cursor;  // Direct increment instead of skip
+      int v;
+      do {
          v = stbtt__buf_get8(b);
-         if ((v & 0xF) == 0xF || (v >> 4) == 0xF)
-            break;
-      }
+      } while ((v & 0xF) != 0xF && (v >> 4) != 0xF && b->cursor < b->size);
    } else {
       stbtt__cff_int(b);
    }
 }
 
-static stbtt__buf stbtt__dict_get(stbtt__buf *b, int key)
-{
-   stbtt__buf_seek(b, 0);
+static stbtt__buf stbtt__dict_get(stbtt__buf *b, int key) {
+   // Variables moved outside the loop for better performance
+   int start;
+   int end;
+   int op;
+   
+   b->cursor = 0;  // Direct assignment instead of seek
+   
    while (b->cursor < b->size) {
-      int start = b->cursor, end, op;
+      start = b->cursor;
+      
       while (stbtt__buf_peek8(b) >= 28)
          stbtt__cff_skip_operand(b);
-      end = b->cursor;
+      
+      end = b->cursor;  // Capture end BEFORE reading operator
       op = stbtt__buf_get8(b);
-      if (op == 12)  op = stbtt__buf_get8(b) | 0x100;
-      if (op == key) return stbtt__buf_range(b, start, end-start);
+      if (op == 12) op = stbtt__buf_get8(b) | 0x100;
+      if (op == key) return stbtt__buf_range(b, start, end - start);
    }
-   return stbtt__buf_range(b, 0, 0);
+   
+   // Return empty range
+   stbtt__buf empty = {b->data, 0, 0};
+   return empty;
 }
 
-static void stbtt__dict_get_ints(stbtt__buf *b, int key, int outcount, stbtt_uint32 *out)
-{
-   int i;
+static void stbtt__dict_get_ints(stbtt__buf *b, int key, int outcount, stbtt_uint32 *out) {
    stbtt__buf operands = stbtt__dict_get(b, key);
-   for (i = 0; i < outcount && operands.cursor < operands.size; i++)
-      out[i] = stbtt__cff_int(&operands);
+   
+   // Unroll small common cases
+   switch (outcount) {
+      case 1:
+         if (operands.cursor < operands.size) out[0] = stbtt__cff_int(&operands);
+         break;
+      case 2:
+         if (operands.cursor < operands.size) out[0] = stbtt__cff_int(&operands);
+         if (operands.cursor < operands.size) out[1] = stbtt__cff_int(&operands);
+         break;
+      default:
+         for (int i = 0; i < outcount && operands.cursor < operands.size; i++)
+            out[i] = stbtt__cff_int(&operands);
+   }
 }
 
 static int stbtt__cff_index_count(stbtt__buf *b)
@@ -1229,8 +1280,8 @@ static stbtt__buf stbtt__cff_index_get(stbtt__buf b, int i)
    stbtt__buf_seek(&b, 0);
    count = stbtt__buf_get16(&b);
    offsize = stbtt__buf_get8(&b);
-   STBTT_assert(i >= 0 && i < count);
-   STBTT_assert(offsize >= 1 && offsize <= 4);
+   //STBTT_assert(i >= 0 && i < count);
+   //STBTT_assert(offsize >= 1 && offsize <= 4);
    stbtt__buf_skip(&b, i*offsize);
    start = stbtt__buf_get(&b, offsize);
    end = stbtt__buf_get(&b, offsize);
@@ -1274,8 +1325,9 @@ static stbtt_uint32 stbtt__find_table(stbtt_uint8 *data, stbtt_uint32 fontstart,
    stbtt_int32 num_tables = ttUSHORT(data+fontstart+4);
    stbtt_uint32 tabledir = fontstart + 12;
    stbtt_int32 i;
+   stbtt_uint32 loc;
    for (i=0; i < num_tables; ++i) {
-      stbtt_uint32 loc = tabledir + 16*i;
+      loc = tabledir + 16*i;
       if (stbtt_tag(data+loc+0, tag))
          return ttULONG(data+loc+8);
    }
@@ -1330,6 +1382,22 @@ static stbtt__buf stbtt__get_subrs(stbtt__buf cff, stbtt__buf fontdict)
    return stbtt__cff_get_index(&cff);
 }
 
+// since most people won't use this, find this table the first time it's needed
+static int stbtt__get_svg(stbtt_fontinfo *info)
+{
+   stbtt_uint32 t;
+   if (info->svg < 0) {
+      t = stbtt__find_table(info->data, info->fontstart, "SVG ");
+      if (t) {
+         stbtt_uint32 offset = ttULONG(info->data + t + 2);
+         info->svg = t + offset;
+      } else {
+         info->svg = 0;
+      }
+   }
+   return info->svg;
+}
+
 static int stbtt_InitFont_internal(stbtt_fontinfo *info, unsigned char *data, int fontstart)
 {
    stbtt_uint32 cmap, t;
@@ -1409,13 +1477,16 @@ static int stbtt_InitFont_internal(stbtt_fontinfo *info, unsigned char *data, in
    else
       info->numGlyphs = 0xffff;
 
+   info->svg = -1;
+
    // find a cmap encoding table we understand *now* to avoid searching
    // later. (todo: could make this installable)
    // the same regardless of glyph.
    numTables = ttUSHORT(data + cmap + 2);
    info->index_map = 0;
+   stbtt_uint32 encoding_record;
    for (i=0; i < numTables; ++i) {
-      stbtt_uint32 encoding_record = cmap + 4 + 8 * i;
+      encoding_record = cmap + 4 + 8 * i;
       // find an encoding we understand:
       switch(ttUSHORT(data+encoding_record)) {
          case STBTT_PLATFORM_ID_MICROSOFT:
@@ -1441,99 +1512,161 @@ static int stbtt_InitFont_internal(stbtt_fontinfo *info, unsigned char *data, in
    return 1;
 }
 
-STBTT_DEF int stbtt_FindGlyphIndex(const stbtt_fontinfo *info, int unicode_codepoint)
+// Inline helper functions for better performance - avoid function call overhead
+#define FAST_USHORT(p) (((stbtt_uint16)(p)[0] << 8) | (p)[1])
+#define FAST_ULONG(p) (((stbtt_uint32)(p)[0] << 24) | ((stbtt_uint32)(p)[1] << 16) | ((stbtt_uint32)(p)[2] << 8) | (p)[3])
+#define FAST_SHORT(p) ((stbtt_int16)FAST_USHORT(p))
+
+// Force inline for maximum performance
+static inline int stbtt_FindGlyphIndex_impl(stbtt_uint8 *data, stbtt_uint32 index_map, int unicode_codepoint)
 {
-   stbtt_uint8 *data = info->data;
-   stbtt_uint32 index_map = info->index_map;
-
-   stbtt_uint16 format = ttUSHORT(data + index_map + 0);
-   if (format == 0) { // apple byte encoding
-      stbtt_int32 bytes = ttUSHORT(data + index_map + 2);
-      if (unicode_codepoint < bytes-6)
-         return ttBYTE(data + index_map + 6 + unicode_codepoint);
-      return 0;
-   } else if (format == 6) {
-      stbtt_uint32 first = ttUSHORT(data + index_map + 6);
-      stbtt_uint32 count = ttUSHORT(data + index_map + 8);
-      if ((stbtt_uint32) unicode_codepoint >= first && (stbtt_uint32) unicode_codepoint < first+count)
-         return ttUSHORT(data + index_map + 10 + (unicode_codepoint - first)*2);
-      return 0;
-   } else if (format == 2) {
-      STBTT_assert(0); // @TODO: high-byte mapping for japanese/chinese/korean
-      return 0;
-   } else if (format == 4) { // standard mapping for windows fonts: binary search collection of ranges
-      stbtt_uint16 segcount = ttUSHORT(data+index_map+6) >> 1;
-      stbtt_uint16 searchRange = ttUSHORT(data+index_map+8) >> 1;
-      stbtt_uint16 entrySelector = ttUSHORT(data+index_map+10);
-      stbtt_uint16 rangeShift = ttUSHORT(data+index_map+12) >> 1;
-
-      // do a binary search of the segments
+   // Read format once - single memory access
+   stbtt_uint16 format = FAST_USHORT(data + index_map);
+   
+   // Variables used across multiple cases or frequently in loops
+   stbtt_uint32 low, high, mid;
+   stbtt_uint8 *group;
+   stbtt_uint32 start_char, end_char;
+   stbtt_uint32 uc;
+   
+   // Switch for jump table optimization
+   switch (format) {
+   case 4: { // Windows fonts - most common
+      // Early exit for out-of-range Unicode
+      if ((unsigned)unicode_codepoint > 0xffff) return 0;
+      
+      // Cache all header values in one go - burst read
+      stbtt_uint8 *header = data + index_map;
+      stbtt_uint16 segcount = FAST_USHORT(header + 6) >> 1;
+      stbtt_uint16 searchRange = FAST_USHORT(header + 8) >> 1;
+      stbtt_uint16 entrySelector = FAST_USHORT(header + 10);
+      stbtt_uint16 rangeShift = FAST_USHORT(header + 12) >> 1;
+      
+      // Optimized binary search with fewer memory accesses
       stbtt_uint32 endCount = index_map + 14;
       stbtt_uint32 search = endCount;
-
-      if (unicode_codepoint > 0xffff)
-         return 0;
-
-      // they lie from endCount .. endCount + segCount
-      // but searchRange is the nearest power of two, so...
-      if (unicode_codepoint >= ttUSHORT(data + search + rangeShift*2))
-         search += rangeShift*2;
-
-      // now decrement to bias correctly to find smallest
+      
+      // Use the precomputed rangeShift for initial jump
+      if (unicode_codepoint >= FAST_USHORT(data + search + (rangeShift << 1)))
+         search += rangeShift << 1;
+      
       search -= 2;
+      
+      // Unrolled binary search - most critical path
       while (entrySelector) {
-         stbtt_uint16 end;
          searchRange >>= 1;
-         end = ttUSHORT(data + search + searchRange*2);
-         if (unicode_codepoint > end)
-            search += searchRange*2;
+         stbtt_uint32 test_pos = search + (searchRange << 1);
+         if (unicode_codepoint > FAST_USHORT(data + test_pos))
+            search = test_pos;
          --entrySelector;
       }
+      
       search += 2;
-
-      {
-         stbtt_uint16 offset, start;
-         stbtt_uint16 item = (stbtt_uint16) ((search - endCount) >> 1);
-
-         STBTT_assert(unicode_codepoint <= ttUSHORT(data + endCount + 2*item));
-         start = ttUSHORT(data + index_map + 14 + segcount*2 + 2 + 2*item);
-         if (unicode_codepoint < start)
-            return 0;
-
-         offset = ttUSHORT(data + index_map + 14 + segcount*6 + 2 + 2*item);
-         if (offset == 0)
-            return (stbtt_uint16) (unicode_codepoint + ttSHORT(data + index_map + 14 + segcount*4 + 2 + 2*item));
-
-         return ttUSHORT(data + offset + (unicode_codepoint-start)*2 + index_map + 14 + segcount*6 + 2 + 2*item);
+      stbtt_uint16 item = (stbtt_uint16)((search - endCount) >> 1);
+      
+      // Calculate all offsets upfront - better instruction scheduling
+      stbtt_uint32 base1 = index_map + 14;
+      stbtt_uint32 startCode_offset = base1 + (segcount << 1) + 2 + (item << 1);
+      stbtt_uint32 endCode_offset = endCount + (item << 1);
+      stbtt_uint32 idRangeOffset_offset = base1 + (segcount * 6) + 2 + (item << 1);
+      
+      stbtt_uint16 start = FAST_USHORT(data + startCode_offset);
+      stbtt_uint16 end = FAST_USHORT(data + endCode_offset);
+      
+      // Single comparison using unsigned arithmetic trick
+      if ((unsigned)(unicode_codepoint - start) > (unsigned)(end - start))
+         return 0;
+      
+      stbtt_uint16 offset = FAST_USHORT(data + idRangeOffset_offset);
+      if (offset == 0) {
+         stbtt_uint32 idDelta_offset = base1 + (segcount << 2) + 2 + (item << 1);
+         return (stbtt_uint16)(unicode_codepoint + FAST_SHORT(data + idDelta_offset));
       }
-   } else if (format == 12 || format == 13) {
-      stbtt_uint32 ngroups = ttULONG(data+index_map+12);
-      stbtt_int32 low,high;
-      low = 0; high = (stbtt_int32)ngroups;
-      // Binary search the right group.
+      
+      return FAST_USHORT(data + offset + ((unicode_codepoint - start) << 1) + idRangeOffset_offset);
+   }
+   
+   case 12: { // 32-bit format
+      stbtt_uint32 ngroups = FAST_ULONG(data + index_map + 12);
+      uc = (stbtt_uint32)unicode_codepoint;
+      
+      // Optimized binary search with minimal memory access
+      low = 0; high = ngroups;
+      stbtt_uint8 *groups_base = data + index_map + 16;
+      
       while (low < high) {
-         stbtt_int32 mid = low + ((high-low) >> 1); // rounds down, so low <= mid < high
-         stbtt_uint32 start_char = ttULONG(data+index_map+16+mid*12);
-         stbtt_uint32 end_char = ttULONG(data+index_map+16+mid*12+4);
-         if ((stbtt_uint32) unicode_codepoint < start_char)
+         mid = (low + high) >> 1;
+         group = groups_base + (mid * 12);
+         
+         start_char = FAST_ULONG(group);
+         if (uc < start_char) {
             high = mid;
-         else if ((stbtt_uint32) unicode_codepoint > end_char)
-            low = mid+1;
-         else {
-            stbtt_uint32 start_glyph = ttULONG(data+index_map+16+mid*12+8);
-            if (format == 12)
-               return start_glyph + unicode_codepoint-start_char;
-            else // format == 13
-               return start_glyph;
+         } else {
+            end_char = FAST_ULONG(group + 4);
+            if (uc <= end_char) {
+               stbtt_uint32 start_glyph = FAST_ULONG(group + 8);
+               return start_glyph + uc - start_char;
+            }
+            low = mid + 1;
          }
       }
-      return 0; // not found
+      return 0;
+   }
+   
+   case 13: { // 32-bit format, many-to-one mapping
+      stbtt_uint32 ngroups = FAST_ULONG(data + index_map + 12);
+      uc = (stbtt_uint32)unicode_codepoint;
+      
+      low = 0; high = ngroups;
+      stbtt_uint8 *groups_base = data + index_map + 16;
+      
+      while (low < high) {
+         mid = (low + high) >> 1;
+         group = groups_base + (mid * 12);
+         
+         start_char = FAST_ULONG(group);
+         if (uc < start_char) {
+            high = mid;
+         } else {
+            end_char = FAST_ULONG(group + 4);
+            if (uc <= end_char) {
+               return FAST_ULONG(group + 8); // Same glyph for all chars in range
+            }
+            low = mid + 1;
+         }
+      }
+      return 0;
+   }
+   
+   case 0: { // Apple byte encoding - simple and fast
+      stbtt_int32 bytes = FAST_USHORT(data + index_map + 2);
+      return ((unsigned)unicode_codepoint < (unsigned)(bytes - 6)) ? 
+             data[index_map + 6 + unicode_codepoint] : 0;
+   }
+   
+   case 6: { // Trimmed table mapping
+      stbtt_uint32 first = FAST_USHORT(data + index_map + 6);
+      stbtt_uint32 count = FAST_USHORT(data + index_map + 8);
+      uc = (stbtt_uint32)unicode_codepoint;
+      stbtt_uint32 offset = uc - first;
+      return (offset < count) ? FAST_USHORT(data + index_map + 10 + (offset << 1)) : 0;
+   }
+   
+   default:
+      return 0; // Unsupported format
    }
-   // @TODO
-   STBTT_assert(0);
-   return 0;
 }
 
+
+STBTT_DEF int stbtt_FindGlyphIndex(const stbtt_fontinfo *info, int unicode_codepoint)
+{
+   // Early negative check before function call
+   if (unicode_codepoint < 0) return 0;
+   
+   return stbtt_FindGlyphIndex_impl(info->data, info->index_map, unicode_codepoint);
+}
+
+
 STBTT_DEF int stbtt_GetCodepointShape(const stbtt_fontinfo *info, int unicode_codepoint, stbtt_vertex **vertices)
 {
    return stbtt_GetGlyphShape(info, stbtt_FindGlyphIndex(info, unicode_codepoint), vertices);
@@ -1552,7 +1685,7 @@ static int stbtt__GetGlyfOffset(const stbtt_fontinfo *info, int glyph_index)
 {
    int g1,g2;
 
-   STBTT_assert(!info->cff.size);
+   //STBTT_assert(!info->cff.size);
 
    if (glyph_index >= info->numGlyphs) return -1; // glyph index out of range
    if (info->indexToLocFormat >= 2)    return -1; // unknown index->glyph map format
@@ -1635,10 +1768,13 @@ static int stbtt__GetGlyphShapeTT(const stbtt_fontinfo *info, int glyph_index, s
    numberOfContours = ttSHORT(data + g);
 
    if (numberOfContours > 0) {
+      // Variables moved outside loops for simple contours processing
       stbtt_uint8 flags=0,flagcount;
       stbtt_int32 ins, i,j=0,m,n, next_move, was_off=0, off, start_off=0;
       stbtt_int32 x,y,cx,cy,sx,sy, scx,scy;
       stbtt_uint8 *points;
+      stbtt_int16 dx, dy;  // Moved outside x/y coordinate loading loops
+      
       endPtsOfContours = (data + g + 10);
       ins = ttUSHORT(data + g + 10 + numberOfContours * 2);
       points = data + g + 10 + numberOfContours * 2 + 2 + ins;
@@ -1676,7 +1812,7 @@ static int stbtt__GetGlyphShapeTT(const stbtt_fontinfo *info, int glyph_index, s
       for (i=0; i < n; ++i) {
          flags = vertices[off+i].type;
          if (flags & 2) {
-            stbtt_int16 dx = *points++;
+            dx = *points++;
             x += (flags & 16) ? dx : -dx; // ???
          } else {
             if (!(flags & 16)) {
@@ -1692,7 +1828,7 @@ static int stbtt__GetGlyphShapeTT(const stbtt_fontinfo *info, int glyph_index, s
       for (i=0; i < n; ++i) {
          flags = vertices[off+i].type;
          if (flags & 4) {
-            stbtt_int16 dy = *points++;
+            dy = *points++;
             y += (flags & 32) ? dy : -dy; // ???
          } else {
             if (!(flags & 32)) {
@@ -1715,7 +1851,7 @@ static int stbtt__GetGlyphShapeTT(const stbtt_fontinfo *info, int glyph_index, s
             if (i != 0)
                num_vertices = stbtt__close_shape(vertices, num_vertices, was_off, start_off, sx,sy,scx,scy,cx,cy);
 
-            // now start the new one               
+            // now start the new one
             start_off = !(flags & 1);
             if (start_off) {
                // if we start off with an off-curve point, then when we need to find a point on the curve
@@ -1757,21 +1893,27 @@ static int stbtt__GetGlyphShapeTT(const stbtt_fontinfo *info, int glyph_index, s
          }
       }
       num_vertices = stbtt__close_shape(vertices, num_vertices, was_off, start_off, sx,sy,scx,scy,cx,cy);
-   } else if (numberOfContours == -1) {
+   } else if (numberOfContours < 0) {
       // Compound shapes.
+      // Variables moved outside the while loop for compound shape processing
       int more = 1;
       stbtt_uint8 *comp = data + g + 10;
+      stbtt_uint16 flags, gidx;
+      int comp_num_verts = 0, i;
+      stbtt_vertex *comp_verts = 0, *tmp = 0;
+      float mtx[6] = {1,0,0,1,0,0}, m, n;
+      stbtt_vertex* v;
+      stbtt_vertex_type vx, vy;  // Temporary variables for vertex transformation
+      
       num_vertices = 0;
       vertices = 0;
       while (more) {
-         stbtt_uint16 flags, gidx;
-         int comp_num_verts = 0, i;
-         stbtt_vertex *comp_verts = 0, *tmp = 0;
-         float mtx[6] = {1,0,0,1,0,0}, m, n;
-         
          flags = ttSHORT(comp); comp+=2;
          gidx = ttSHORT(comp); comp+=2;
 
+         // Reset matrix to identity
+         mtx[0] = mtx[3] = 1; mtx[1] = mtx[2] = mtx[4] = mtx[5] = 0;
+
          if (flags & 2) { // XY values
             if (flags & 1) { // shorts
                mtx[4] = ttSHORT(comp); comp+=2;
@@ -1783,7 +1925,7 @@ static int stbtt__GetGlyphShapeTT(const stbtt_fontinfo *info, int glyph_index, s
          }
          else {
             // @TODO handle matching point
-            STBTT_assert(0);
+            //STBTT_assert(0);
          }
          if (flags & (1<<3)) { // WE_HAVE_A_SCALE
             mtx[0] = mtx[3] = ttSHORT(comp)/16384.0f; comp+=2;
@@ -1798,7 +1940,7 @@ static int stbtt__GetGlyphShapeTT(const stbtt_fontinfo *info, int glyph_index, s
             mtx[2] = ttSHORT(comp)/16384.0f; comp+=2;
             mtx[3] = ttSHORT(comp)/16384.0f; comp+=2;
          }
-         
+
          // Find transformation scales.
          m = (float) STBTT_sqrt(mtx[0]*mtx[0] + mtx[1]*mtx[1]);
          n = (float) STBTT_sqrt(mtx[2]*mtx[2] + mtx[3]*mtx[3]);
@@ -1808,14 +1950,13 @@ static int stbtt__GetGlyphShapeTT(const stbtt_fontinfo *info, int glyph_index, s
          if (comp_num_verts > 0) {
             // Transform vertices.
             for (i = 0; i < comp_num_verts; ++i) {
-               stbtt_vertex* v = &comp_verts[i];
-               stbtt_vertex_type x,y;
-               x=v->x; y=v->y;
-               v->x = (stbtt_vertex_type)(m * (mtx[0]*x + mtx[2]*y + mtx[4]));
-               v->y = (stbtt_vertex_type)(n * (mtx[1]*x + mtx[3]*y + mtx[5]));
-               x=v->cx; y=v->cy;
-               v->cx = (stbtt_vertex_type)(m * (mtx[0]*x + mtx[2]*y + mtx[4]));
-               v->cy = (stbtt_vertex_type)(n * (mtx[1]*x + mtx[3]*y + mtx[5]));
+               v = &comp_verts[i];
+               vx=v->x; vy=v->y;
+               v->x = (stbtt_vertex_type)(m * (mtx[0]*vx + mtx[2]*vy + mtx[4]));
+               v->y = (stbtt_vertex_type)(n * (mtx[1]*vx + mtx[3]*vy + mtx[5]));
+               vx=v->cx; vy=v->cy;
+               v->cx = (stbtt_vertex_type)(m * (mtx[0]*vx + mtx[2]*vy + mtx[4]));
+               v->cy = (stbtt_vertex_type)(n * (mtx[1]*vx + mtx[3]*vy + mtx[5]));
             }
             // Append vertices.
             tmp = (stbtt_vertex*)STBTT_malloc((num_vertices+comp_num_verts)*sizeof(stbtt_vertex), info->userdata);
@@ -1824,7 +1965,7 @@ static int stbtt__GetGlyphShapeTT(const stbtt_fontinfo *info, int glyph_index, s
                if (comp_verts) STBTT_free(comp_verts, info->userdata);
                return 0;
             }
-            if (num_vertices > 0) STBTT_memcpy(tmp, vertices, num_vertices*sizeof(stbtt_vertex));
+            if (num_vertices > 0 && vertices) STBTT_memcpy(tmp, vertices, num_vertices*sizeof(stbtt_vertex));
             STBTT_memcpy(tmp+num_vertices, comp_verts, comp_num_verts*sizeof(stbtt_vertex));
             if (vertices) STBTT_free(vertices, info->userdata);
             vertices = tmp;
@@ -1834,9 +1975,6 @@ static int stbtt__GetGlyphShapeTT(const stbtt_fontinfo *info, int glyph_index, s
          // More components ?
          more = flags & (1<<5);
       }
-   } else if (numberOfContours < 0) {
-      // @TODO other compound variations?
-      STBTT_assert(0);
    } else {
       // numberOfCounters == 0, do nothing
    }
@@ -2090,7 +2228,7 @@ static int stbtt__run_charstring(const stbtt_fontinfo *info, int glyph_index, st
                subrs = stbtt__cid_get_glyph_subrs(info, glyph_index);
             has_subrs = 1;
          }
-         // fallthrough
+         // FALLTHROUGH
       case 0x1D: // callgsubr
          if (sp < 1) return STBTT__CSERR("call(g|)subr stack");
          v = (int) s[--sp];
@@ -2195,7 +2333,7 @@ static int stbtt__run_charstring(const stbtt_fontinfo *info, int glyph_index, st
       } break;
 
       default:
-         if (b0 != 255 && b0 != 28 && (b0 < 32 || b0 > 254))
+         if (b0 != 255 && b0 != 28 && b0 < 32)
             return STBTT__CSERR("reserved operator");
 
          // push immediate
@@ -2226,7 +2364,7 @@ static int stbtt__GetGlyphShapeT2(const stbtt_fontinfo *info, int glyph_index, s
       *pvertices = (stbtt_vertex*)STBTT_malloc(count_ctx.num_vertices*sizeof(stbtt_vertex), info->userdata);
       output_ctx.pvertices = *pvertices;
       if (stbtt__run_charstring(info, glyph_index, &output_ctx)) {
-         STBTT_assert(output_ctx.num_vertices == count_ctx.num_vertices);
+         //STBTT_assert(output_ctx.num_vertices == count_ctx.num_vertices);
          return output_ctx.num_vertices;
       }
    }
@@ -2265,7 +2403,49 @@ STBTT_DEF void stbtt_GetGlyphHMetrics(const stbtt_fontinfo *info, int glyph_inde
    }
 }
 
-static int  stbtt__GetGlyphKernInfoAdvance(const stbtt_fontinfo *info, int glyph1, int glyph2)
+STBTT_DEF int  stbtt_GetKerningTableLength(const stbtt_fontinfo *info)
+{
+   stbtt_uint8 *data = info->data + info->kern;
+
+   // we only look at the first table. it must be 'horizontal' and format 0.
+   if (!info->kern)
+      return 0;
+   if (ttUSHORT(data+2) < 1) // number of tables, need at least 1
+      return 0;
+   if (ttUSHORT(data+8) != 1) // horizontal flag must be set in format
+      return 0;
+
+   return ttUSHORT(data+10);
+}
+
+STBTT_DEF int stbtt_GetKerningTable(const stbtt_fontinfo *info, stbtt_kerningentry* table, int table_length)
+{
+   stbtt_uint8 *data = info->data + info->kern;
+   int k, length;
+
+   // we only look at the first table. it must be 'horizontal' and format 0.
+   if (!info->kern)
+      return 0;
+   if (ttUSHORT(data+2) < 1) // number of tables, need at least 1
+      return 0;
+   if (ttUSHORT(data+8) != 1) // horizontal flag must be set in format
+      return 0;
+
+   length = ttUSHORT(data+10);
+   if (table_length < length)
+      length = table_length;
+
+   for (k = 0; k < length; k++)
+   {
+      table[k].glyph1 = ttUSHORT(data+18+(k*6));
+      table[k].glyph2 = ttUSHORT(data+20+(k*6));
+      table[k].advance = ttSHORT(data+22+(k*6));
+   }
+
+   return length;
+}
+
+static int stbtt__GetGlyphKernInfoAdvance(const stbtt_fontinfo *info, int glyph1, int glyph2)
 {
    stbtt_uint8 *data = info->data + info->kern;
    stbtt_uint32 needle, straw;
@@ -2295,243 +2475,251 @@ static int  stbtt__GetGlyphKernInfoAdvance(const stbtt_fontinfo *info, int glyph
    return 0;
 }
 
-static stbtt_int32  stbtt__GetCoverageIndex(stbtt_uint8 *coverageTable, int glyph)
+static stbtt_int32 stbtt__GetCoverageIndex(stbtt_uint8 *coverageTable, int glyph)
 {
-    stbtt_uint16 coverageFormat = ttUSHORT(coverageTable);
-    switch(coverageFormat) {
-        case 1: {
-            stbtt_uint16 glyphCount = ttUSHORT(coverageTable + 2);
+   stbtt_uint16 coverageFormat = ttUSHORT(coverageTable);
+   switch (coverageFormat) {
+      case 1: {
+         stbtt_uint16 glyphCount = ttUSHORT(coverageTable + 2);
 
-            // Binary search.
-            stbtt_int32 l=0, r=glyphCount-1, m;
-            int straw, needle=glyph;
-            while (l <= r) {
-                stbtt_uint8 *glyphArray = coverageTable + 4;
-                stbtt_uint16 glyphID;
-                m = (l + r) >> 1;
-                glyphID = ttUSHORT(glyphArray + 2 * m);
-                straw = glyphID;
-                if (needle < straw)
-                    r = m - 1;
-                else if (needle > straw)
-                    l = m + 1;
-                else {
-                     return m;
-                }
+         // Binary search.
+         stbtt_int32 l=0, r=glyphCount-1, m;
+         int straw, needle=glyph;
+         while (l <= r) {
+            stbtt_uint8 *glyphArray = coverageTable + 4;
+            stbtt_uint16 glyphID;
+            m = (l + r) >> 1;
+            glyphID = ttUSHORT(glyphArray + 2 * m);
+            straw = glyphID;
+            if (needle < straw)
+               r = m - 1;
+            else if (needle > straw)
+               l = m + 1;
+            else {
+               return m;
             }
-        } break;
+         }
+         break;
+      }
 
-        case 2: {
-            stbtt_uint16 rangeCount = ttUSHORT(coverageTable + 2);
-            stbtt_uint8 *rangeArray = coverageTable + 4;
+      case 2: {
+         stbtt_uint16 rangeCount = ttUSHORT(coverageTable + 2);
+         stbtt_uint8 *rangeArray = coverageTable + 4;
 
-            // Binary search.
-            stbtt_int32 l=0, r=rangeCount-1, m;
-            int strawStart, strawEnd, needle=glyph;
-            while (l <= r) {
-                stbtt_uint8 *rangeRecord;
-                m = (l + r) >> 1;
-                rangeRecord = rangeArray + 6 * m;
-                strawStart = ttUSHORT(rangeRecord);
-                strawEnd = ttUSHORT(rangeRecord + 2);
-                if (needle < strawStart)
-                    r = m - 1;
-                else if (needle > strawEnd)
-                    l = m + 1;
-                else {
-                    stbtt_uint16 startCoverageIndex = ttUSHORT(rangeRecord + 4);
-                    return startCoverageIndex + glyph - strawStart;
-                }
+         // Binary search.
+         stbtt_int32 l=0, r=rangeCount-1, m;
+         int strawStart, strawEnd, needle=glyph;
+         while (l <= r) {
+            stbtt_uint8 *rangeRecord;
+            m = (l + r) >> 1;
+            rangeRecord = rangeArray + 6 * m;
+            strawStart = ttUSHORT(rangeRecord);
+            strawEnd = ttUSHORT(rangeRecord + 2);
+            if (needle < strawStart)
+               r = m - 1;
+            else if (needle > strawEnd)
+               l = m + 1;
+            else {
+               stbtt_uint16 startCoverageIndex = ttUSHORT(rangeRecord + 4);
+               return startCoverageIndex + glyph - strawStart;
             }
-        } break;
+         }
+         break;
+      }
 
-        default: {
-            // There are no other cases.
-            STBTT_assert(0);
-        } break;
-    }
+      default: return -1; // unsupported
+   }
 
-    return -1;
+   return -1;
 }
 
 static stbtt_int32  stbtt__GetGlyphClass(stbtt_uint8 *classDefTable, int glyph)
 {
-    stbtt_uint16 classDefFormat = ttUSHORT(classDefTable);
-    switch(classDefFormat)
-    {
-        case 1: {
-            stbtt_uint16 startGlyphID = ttUSHORT(classDefTable + 2);
-            stbtt_uint16 glyphCount = ttUSHORT(classDefTable + 4);
-            stbtt_uint8 *classDef1ValueArray = classDefTable + 6;
+   stbtt_uint16 classDefFormat = ttUSHORT(classDefTable);
+   switch (classDefFormat)
+   {
+      case 1: {
+         stbtt_uint16 startGlyphID = ttUSHORT(classDefTable + 2);
+         stbtt_uint16 glyphCount = ttUSHORT(classDefTable + 4);
+         stbtt_uint8 *classDef1ValueArray = classDefTable + 6;
 
-            if (glyph >= startGlyphID && glyph < startGlyphID + glyphCount)
-                return (stbtt_int32)ttUSHORT(classDef1ValueArray + 2 * (glyph - startGlyphID));
+         if (glyph >= startGlyphID && glyph < startGlyphID + glyphCount)
+            return (stbtt_int32)ttUSHORT(classDef1ValueArray + 2 * (glyph - startGlyphID));
+         break;
+      }
 
-            classDefTable = classDef1ValueArray + 2 * glyphCount;
-        } break;
+      case 2: {
+         stbtt_uint16 classRangeCount = ttUSHORT(classDefTable + 2);
+         stbtt_uint8 *classRangeRecords = classDefTable + 4;
 
-        case 2: {
-            stbtt_uint16 classRangeCount = ttUSHORT(classDefTable + 2);
-            stbtt_uint8 *classRangeRecords = classDefTable + 4;
+         // Binary search.
+         stbtt_int32 l=0, r=classRangeCount-1, m;
+         int strawStart, strawEnd, needle=glyph;
+         while (l <= r) {
+            stbtt_uint8 *classRangeRecord;
+            m = (l + r) >> 1;
+            classRangeRecord = classRangeRecords + 6 * m;
+            strawStart = ttUSHORT(classRangeRecord);
+            strawEnd = ttUSHORT(classRangeRecord + 2);
+            if (needle < strawStart)
+               r = m - 1;
+            else if (needle > strawEnd)
+               l = m + 1;
+            else
+               return (stbtt_int32)ttUSHORT(classRangeRecord + 4);
+         }
+         break;
+      }
 
-            // Binary search.
-            stbtt_int32 l=0, r=classRangeCount-1, m;
-            int strawStart, strawEnd, needle=glyph;
-            while (l <= r) {
-                stbtt_uint8 *classRangeRecord;
-                m = (l + r) >> 1;
-                classRangeRecord = classRangeRecords + 6 * m;
-                strawStart = ttUSHORT(classRangeRecord);
-                strawEnd = ttUSHORT(classRangeRecord + 2);
-                if (needle < strawStart)
-                    r = m - 1;
-                else if (needle > strawEnd)
-                    l = m + 1;
-                else
-                    return (stbtt_int32)ttUSHORT(classRangeRecord + 4);
-            }
+      default:
+         return -1; // Unsupported definition type, return an error.
+   }
 
-            classDefTable = classRangeRecords + 6 * classRangeCount;
-        } break;
-
-        default: {
-            // There are no other cases.
-            STBTT_assert(0);
-        } break;
-    }
-
-    return -1;
+   // "All glyphs not assigned to a class fall into class 0". (OpenType spec)
+   return 0;
 }
 
 // Define to STBTT_assert(x) if you want to break on unimplemented formats.
 #define STBTT_GPOS_TODO_assert(x)
 
-static stbtt_int32  stbtt__GetGlyphGPOSInfoAdvance(const stbtt_fontinfo *info, int glyph1, int glyph2)
+static stbtt_int32 stbtt__GetGlyphGPOSInfoAdvance(const stbtt_fontinfo *info, int glyph1, int glyph2)
 {
-    stbtt_uint16 lookupListOffset;
-    stbtt_uint8 *lookupList;
-    stbtt_uint16 lookupCount;
-    stbtt_uint8 *data;
-    stbtt_int32 i;
+   stbtt_uint16 lookupListOffset;
+   stbtt_uint8 *lookupList;
+   stbtt_uint16 lookupCount;
+   stbtt_uint8 *data;
+   stbtt_int32 i, sti;
+   
+   // Variables moved outside loops for better performance
+   stbtt_uint16 lookupOffset;
+   stbtt_uint8 *lookupTable;
+   stbtt_uint16 lookupType;
+   stbtt_uint16 subTableCount;
+   stbtt_uint8 *subTableOffsets;
+   stbtt_uint16 subtableOffset;
+   stbtt_uint8 *table;
+   stbtt_uint16 posFormat;
+   stbtt_uint16 coverageOffset;
+   stbtt_int32 coverageIndex;
+   
+   // Case 1 variables
+   stbtt_int32 l, r, m;
+   int straw, needle;
+   stbtt_uint16 valueFormat1, valueFormat2;
+   stbtt_int32 valueRecordPairSizeInBytes;
+   stbtt_uint16 pairSetCount;
+   stbtt_uint16 pairPosOffset;
+   stbtt_uint8 *pairValueTable;
+   stbtt_uint16 pairValueCount;
+   stbtt_uint8 *pairValueArray;
+   stbtt_uint16 secondGlyph;
+   stbtt_uint8 *pairValue;
+   stbtt_int16 xAdvance;
+   
+   // Case 2 variables
+   stbtt_uint16 classDef1Offset, classDef2Offset;
+   int glyph1class, glyph2class;
+   stbtt_uint16 class1Count, class2Count;
+   stbtt_uint8 *class1Records, *class2Records;
 
-    if (!info->gpos) return 0;
+   if (!info->gpos) return 0;
 
-    data = info->data + info->gpos;
+   data = info->data + info->gpos;
 
-    if (ttUSHORT(data+0) != 1) return 0; // Major version 1
-    if (ttUSHORT(data+2) != 0) return 0; // Minor version 0
+   if (ttUSHORT(data+0) != 1) return 0; // Major version 1
+   if (ttUSHORT(data+2) != 0) return 0; // Minor version 0
 
-    lookupListOffset = ttUSHORT(data+8);
-    lookupList = data + lookupListOffset;
-    lookupCount = ttUSHORT(lookupList);
+   lookupListOffset = ttUSHORT(data+8);
+   lookupList = data + lookupListOffset;
+   lookupCount = ttUSHORT(lookupList);
 
-    for (i=0; i<lookupCount; ++i) {
-        stbtt_uint16 lookupOffset = ttUSHORT(lookupList + 2 + 2 * i);
-        stbtt_uint8 *lookupTable = lookupList + lookupOffset;
+   for (i=0; i<lookupCount; ++i) {
+      lookupOffset = ttUSHORT(lookupList + 2 + 2 * i);
+      lookupTable = lookupList + lookupOffset;
 
-        stbtt_uint16 lookupType = ttUSHORT(lookupTable);
-        stbtt_uint16 subTableCount = ttUSHORT(lookupTable + 4);
-        stbtt_uint8 *subTableOffsets = lookupTable + 6;
-        switch(lookupType) {
-            case 2: { // Pair Adjustment Positioning Subtable
-                stbtt_int32 sti;
-                for (sti=0; sti<subTableCount; sti++) {
-                    stbtt_uint16 subtableOffset = ttUSHORT(subTableOffsets + 2 * sti);
-                    stbtt_uint8 *table = lookupTable + subtableOffset;
-                    stbtt_uint16 posFormat = ttUSHORT(table);
-                    stbtt_uint16 coverageOffset = ttUSHORT(table + 2);
-                    stbtt_int32 coverageIndex = stbtt__GetCoverageIndex(table + coverageOffset, glyph1);
-                    if (coverageIndex == -1) continue;
+      lookupType = ttUSHORT(lookupTable);
+      subTableCount = ttUSHORT(lookupTable + 4);
+      subTableOffsets = lookupTable + 6;
+      if (lookupType != 2) // Pair Adjustment Positioning Subtable
+         continue;
 
-                    switch (posFormat) {
-                        case 1: {
-                            stbtt_int32 l, r, m;
-                            int straw, needle;
-                            stbtt_uint16 valueFormat1 = ttUSHORT(table + 4);
-                            stbtt_uint16 valueFormat2 = ttUSHORT(table + 6);
-                            stbtt_int32 valueRecordPairSizeInBytes = 2;
-                            stbtt_uint16 pairSetCount = ttUSHORT(table + 8);
-                            stbtt_uint16 pairPosOffset = ttUSHORT(table + 10 + 2 * coverageIndex);
-                            stbtt_uint8 *pairValueTable = table + pairPosOffset;
-                            stbtt_uint16 pairValueCount = ttUSHORT(pairValueTable);
-                            stbtt_uint8 *pairValueArray = pairValueTable + 2;
-                            // TODO: Support more formats.
-                            STBTT_GPOS_TODO_assert(valueFormat1 == 4);
-                            if (valueFormat1 != 4) return 0;
-                            STBTT_GPOS_TODO_assert(valueFormat2 == 0);
-                            if (valueFormat2 != 0) return 0;
+      for (sti=0; sti<subTableCount; sti++) {
+         subtableOffset = ttUSHORT(subTableOffsets + 2 * sti);
+         table = lookupTable + subtableOffset;
+         posFormat = ttUSHORT(table);
+         coverageOffset = ttUSHORT(table + 2);
+         coverageIndex = stbtt__GetCoverageIndex(table + coverageOffset, glyph1);
+         if (coverageIndex == -1) continue;
 
-                            STBTT_assert(coverageIndex < pairSetCount);
-                            STBTT__NOTUSED(pairSetCount);
+         switch (posFormat) {
+            case 1: {
+               valueFormat1 = ttUSHORT(table + 4);
+               valueFormat2 = ttUSHORT(table + 6);
+               if (valueFormat1 == 4 && valueFormat2 == 0) { // Support more formats?
+                  valueRecordPairSizeInBytes = 2;
+                  pairSetCount = ttUSHORT(table + 8);
+                  pairPosOffset = ttUSHORT(table + 10 + 2 * coverageIndex);
+                  pairValueTable = table + pairPosOffset;
+                  pairValueCount = ttUSHORT(pairValueTable);
+                  pairValueArray = pairValueTable + 2;
 
-                            needle=glyph2;
-                            r=pairValueCount-1;
-                            l=0;
+                  if (coverageIndex >= pairSetCount) return 0;
 
-                            // Binary search.
-                            while (l <= r) {
-                                stbtt_uint16 secondGlyph;
-                                stbtt_uint8 *pairValue;
-                                m = (l + r) >> 1;
-                                pairValue = pairValueArray + (2 + valueRecordPairSizeInBytes) * m;
-                                secondGlyph = ttUSHORT(pairValue);
-                                straw = secondGlyph;
-                                if (needle < straw)
-                                    r = m - 1;
-                                else if (needle > straw)
-                                    l = m + 1;
-                                else {
-                                    stbtt_int16 xAdvance = ttSHORT(pairValue + 2);
-                                    return xAdvance;
-                                }
-                            }
-                        } break;
+                  needle=glyph2;
+                  r=pairValueCount-1;
+                  l=0;
 
-                        case 2: {
-                            stbtt_uint16 valueFormat1 = ttUSHORT(table + 4);
-                            stbtt_uint16 valueFormat2 = ttUSHORT(table + 6);
+                  // Binary search.
+                  while (l <= r) {
+                     m = (l + r) >> 1;
+                     pairValue = pairValueArray + (2 + valueRecordPairSizeInBytes) * m;
+                     secondGlyph = ttUSHORT(pairValue);
+                     straw = secondGlyph;
+                     if (needle < straw)
+                        r = m - 1;
+                     else if (needle > straw)
+                        l = m + 1;
+                     else {
+                        xAdvance = ttSHORT(pairValue + 2);
+                        return xAdvance;
+                     }
+                  }
+               } else
+                  return 0;
+               break;
+            }
 
-                            stbtt_uint16 classDef1Offset = ttUSHORT(table + 8);
-                            stbtt_uint16 classDef2Offset = ttUSHORT(table + 10);
-                            int glyph1class = stbtt__GetGlyphClass(table + classDef1Offset, glyph1);
-                            int glyph2class = stbtt__GetGlyphClass(table + classDef2Offset, glyph2);
+            case 2: {
+               valueFormat1 = ttUSHORT(table + 4);
+               valueFormat2 = ttUSHORT(table + 6);
+               if (valueFormat1 == 4 && valueFormat2 == 0) { // Support more formats?
+                  classDef1Offset = ttUSHORT(table + 8);
+                  classDef2Offset = ttUSHORT(table + 10);
+                  glyph1class = stbtt__GetGlyphClass(table + classDef1Offset, glyph1);
+                  glyph2class = stbtt__GetGlyphClass(table + classDef2Offset, glyph2);
 
-                            stbtt_uint16 class1Count = ttUSHORT(table + 12);
-                            stbtt_uint16 class2Count = ttUSHORT(table + 14);
-                            STBTT_assert(glyph1class < class1Count);
-                            STBTT_assert(glyph2class < class2Count);
+                  class1Count = ttUSHORT(table + 12);
+                  class2Count = ttUSHORT(table + 14);
 
-                            // TODO: Support more formats.
-                            STBTT_GPOS_TODO_assert(valueFormat1 == 4);
-                            if (valueFormat1 != 4) return 0;
-                            STBTT_GPOS_TODO_assert(valueFormat2 == 0);
-                            if (valueFormat2 != 0) return 0;
+                  if (glyph1class < 0 || glyph1class >= class1Count) return 0; // malformed
+                  if (glyph2class < 0 || glyph2class >= class2Count) return 0; // malformed
 
-                            if (glyph1class >= 0 && glyph1class < class1Count && glyph2class >= 0 && glyph2class < class2Count) {
-                                stbtt_uint8 *class1Records = table + 16;
-                                stbtt_uint8 *class2Records = class1Records + 2 * (glyph1class * class2Count);
-                                stbtt_int16 xAdvance = ttSHORT(class2Records + 2 * glyph2class);
-                                return xAdvance;
-                            }
-                        } break;
-
-                        default: {
-                            // There are no other cases.
-                            STBTT_assert(0);
-                            break;
-                        };
-                    }
-                }
-                break;
-            };
+                  class1Records = table + 16;
+                  class2Records = class1Records + 2 * (glyph1class * class2Count);
+                  xAdvance = ttSHORT(class2Records + 2 * glyph2class);
+                  return xAdvance;
+               } else
+                  return 0;
+               break;
+            }
 
             default:
-                // TODO: Implement other stuff.
-                break;
-        }
-    }
+               return 0; // Unsupported position format
+         }
+      }
+   }
 
-    return 0;
+   return 0;
 }
 
 STBTT_DEF int  stbtt_GetGlyphKernAdvance(const stbtt_fontinfo *info, int g1, int g2)
@@ -2540,8 +2728,7 @@ STBTT_DEF int  stbtt_GetGlyphKernAdvance(const stbtt_fontinfo *info, int g1, int
 
    if (info->gpos)
       xAdvance += stbtt__GetGlyphGPOSInfoAdvance(info, g1, g2);
-
-   if (info->kern)
+   else if (info->kern)
       xAdvance += stbtt__GetGlyphKernInfoAdvance(info, g1, g2);
 
    return xAdvance;
@@ -2602,6 +2789,45 @@ STBTT_DEF void stbtt_FreeShape(const stbtt_fontinfo *info, stbtt_vertex *v)
    STBTT_free(v, info->userdata);
 }
 
+STBTT_DEF stbtt_uint8 *stbtt_FindSVGDoc(const stbtt_fontinfo *info, int gl)
+{
+   int i;
+   stbtt_uint8 *data = info->data;
+   stbtt_uint8 *svg_doc_list = data + stbtt__get_svg((stbtt_fontinfo *) info);
+
+   int numEntries = ttUSHORT(svg_doc_list);
+   stbtt_uint8 *svg_docs = svg_doc_list + 2;
+
+   for(i=0; i<numEntries; i++) {
+      stbtt_uint8 *svg_doc = svg_docs + (12 * i);
+      if ((gl >= ttUSHORT(svg_doc)) && (gl <= ttUSHORT(svg_doc + 2)))
+         return svg_doc;
+   }
+   return 0;
+}
+
+STBTT_DEF int stbtt_GetGlyphSVG(const stbtt_fontinfo *info, int gl, const char **svg)
+{
+   stbtt_uint8 *data = info->data;
+   stbtt_uint8 *svg_doc;
+
+   if (info->svg == 0)
+      return 0;
+
+   svg_doc = stbtt_FindSVGDoc(info, gl);
+   if (svg_doc != NULL) {
+      *svg = (char *) data + info->svg + ttULONG(svg_doc + 4);
+      return ttULONG(svg_doc + 8);
+   } else {
+      return 0;
+   }
+}
+
+STBTT_DEF int stbtt_GetCodepointSVG(const stbtt_fontinfo *info, int unicode_codepoint, const char **svg)
+{
+   return stbtt_GetGlyphSVG(info, stbtt_FindGlyphIndex(info, unicode_codepoint), svg);
+}
+
 //////////////////////////////////////////////////////////////////////////////
 //
 // antialiasing software rasterizer
@@ -2724,10 +2950,10 @@ typedef struct stbtt__active_edge
 static stbtt__active_edge *stbtt__new_active(stbtt__hheap *hh, stbtt__edge *e, int off_x, float start_point, void *userdata)
 {
    stbtt__active_edge *z = (stbtt__active_edge *) stbtt__hheap_alloc(hh, sizeof(*z), userdata);
-   float dxdy = (e->x1 - e->x0) / (e->y1 - e->y0);
-   STBTT_assert(z != NULL);
+   const float dxdy = (e->x1 - e->x0) / (e->y1 - e->y0);
+   //STBTT_assert(z != NULL);
    if (!z) return z;
-   
+
    // round dx down to avoid overshooting
    if (dxdy < 0)
       z->dx = -STBTT_ifloor(STBTT_FIX * -dxdy);
@@ -2746,8 +2972,8 @@ static stbtt__active_edge *stbtt__new_active(stbtt__hheap *hh, stbtt__edge *e, i
 static stbtt__active_edge *stbtt__new_active(stbtt__hheap *hh, stbtt__edge *e, int off_x, float start_point, void *userdata)
 {
    stbtt__active_edge *z = (stbtt__active_edge *) stbtt__hheap_alloc(hh, sizeof(*z), userdata);
-   float dxdy = (e->x1 - e->x0) / (e->y1 - e->y0);
-   STBTT_assert(z != NULL);
+   const float dxdy = (e->x1 - e->x0) / (e->y1 - e->y0);
+   //STBTT_assert(z != NULL);
    //STBTT_assert(e->y0 <= start_point);
    if (!z) return z;
    z->fdx = dxdy;
@@ -2772,17 +2998,21 @@ static void stbtt__fill_active_edges(unsigned char *scanline, int len, stbtt__ac
 {
    // non-zero winding fill
    int x0=0, w=0;
+   
+   // Variables moved outside loop for better performance
+   int x1;
+   int i, j;
 
    while (e) {
       if (w == 0) {
          // if we're currently at zero, we need to record the edge start point
          x0 = e->x; w += e->direction;
       } else {
-         int x1 = e->x; w += e->direction;
+         x1 = e->x; w += e->direction;
          // if we went to zero, we need to draw
          if (w == 0) {
-            int i = x0 >> STBTT_FIXSHIFT;
-            int j = x1 >> STBTT_FIXSHIFT;
+            i = x0 >> STBTT_FIXSHIFT;
+            j = x1 >> STBTT_FIXSHIFT;
 
             if (i < len && j >= 0) {
                if (i == j) {
@@ -2805,7 +3035,7 @@ static void stbtt__fill_active_edges(unsigned char *scanline, int len, stbtt__ac
             }
          }
       }
-      
+
       e = e->next;
    }
 }
@@ -2819,6 +3049,14 @@ static void stbtt__rasterize_sorted_edges(stbtt__bitmap *result, stbtt__edge *e,
    int s; // vertical subsample index
    unsigned char scanline_data[512], *scanline;
 
+   // Variables moved outside loops for better performance
+   float scan_y;
+   stbtt__active_edge **step;
+   stbtt__active_edge *z;
+   int changed;
+   stbtt__active_edge *t, *q;
+   stbtt__active_edge *p;
+
    if (result->w > 512)
       scanline = (unsigned char *) STBTT_malloc(result->w, userdata);
    else
@@ -2831,16 +3069,16 @@ static void stbtt__rasterize_sorted_edges(stbtt__bitmap *result, stbtt__edge *e,
       STBTT_memset(scanline, 0, result->w);
       for (s=0; s < vsubsample; ++s) {
          // find center of pixel for this scanline
-         float scan_y = y + 0.5f;
-         stbtt__active_edge **step = &active;
+         scan_y = y + 0.5f;
+         step = &active;
 
          // update all active edges;
          // remove all active edges that terminate before the center of this scanline
          while (*step) {
-            stbtt__active_edge * z = *step;
+            z = *step;
             if (z->ey <= scan_y) {
                *step = z->next; // delete from list
-               STBTT_assert(z->direction);
+               //STBTT_assert(z->direction);
                z->direction = 0;
                stbtt__hheap_free(&hh, z);
             } else {
@@ -2851,12 +3089,12 @@ static void stbtt__rasterize_sorted_edges(stbtt__bitmap *result, stbtt__edge *e,
 
          // resort the list if needed
          for(;;) {
-            int changed=0;
+            changed=0;
             step = &active;
             while (*step && (*step)->next) {
                if ((*step)->x > (*step)->next->x) {
-                  stbtt__active_edge *t = *step;
-                  stbtt__active_edge *q = t->next;
+                  t = *step;
+                  q = t->next;
 
                   t->next = q->next;
                   q->next = t;
@@ -2871,7 +3109,7 @@ static void stbtt__rasterize_sorted_edges(stbtt__bitmap *result, stbtt__edge *e,
          // insert all edges that start before the center of this scanline -- omit ones that also end on this scanline
          while (e->y0 <= scan_y) {
             if (e->y1 > scan_y) {
-               stbtt__active_edge *z = stbtt__new_active(&hh, e, off_x, scan_y, userdata);
+               z = stbtt__new_active(&hh, e, off_x, scan_y, userdata);
                if (z != NULL) {
                   // find insertion point
                   if (active == NULL)
@@ -2882,7 +3120,7 @@ static void stbtt__rasterize_sorted_edges(stbtt__bitmap *result, stbtt__edge *e,
                      active = z;
                   } else {
                      // find thing to insert AFTER
-                     stbtt__active_edge *p = active;
+                     p = active;
                      while (p->next && p->next->x < z->x)
                         p = p->next;
                      // at this point, p->next->x is NOT < z->x
@@ -2917,8 +3155,8 @@ static void stbtt__rasterize_sorted_edges(stbtt__bitmap *result, stbtt__edge *e,
 static void stbtt__handle_clipped_edge(float *scanline, int x, stbtt__active_edge *e, float x0, float y0, float x1, float y1)
 {
    if (y0 == y1) return;
-   STBTT_assert(y0 < y1);
-   STBTT_assert(e->sy <= e->ey);
+   //STBTT_assert(y0 < y1);
+   //STBTT_assert(e->sy <= e->ey);
    if (y0 > e->ey) return;
    if (y1 < e->sy) return;
    if (y0 < e->sy) {
@@ -2930,39 +3168,69 @@ static void stbtt__handle_clipped_edge(float *scanline, int x, stbtt__active_edg
       y1 = e->ey;
    }
 
-   if (x0 == x)
-      STBTT_assert(x1 <= x+1);
-   else if (x0 == x+1)
-      STBTT_assert(x1 >= x);
-   else if (x0 <= x)
-      STBTT_assert(x1 <= x);
-   else if (x0 >= x+1)
-      STBTT_assert(x1 >= x+1);
-   else
-      STBTT_assert(x1 >= x && x1 <= x+1);
+   //if (x0 == x)
+   //   //STBTT_assert(x1 <= x+1);
+   //else if (x0 == x+1)
+   //   //STBTT_assert(x1 >= x);
+   //else if (x0 <= x)
+   //   //STBTT_assert(x1 <= x);
+   //else if (x0 >= x+1)
+   //   //STBTT_assert(x1 >= x+1);
+   //else
+   //   //STBTT_assert(x1 >= x && x1 <= x+1);
 
    if (x0 <= x && x1 <= x)
       scanline[x] += e->direction * (y1-y0);
    else if (x0 >= x+1 && x1 >= x+1)
       ;
    else {
-      STBTT_assert(x0 >= x && x0 <= x+1 && x1 >= x && x1 <= x+1);
+      //STBTT_assert(x0 >= x && x0 <= x+1 && x1 >= x && x1 <= x+1);
       scanline[x] += e->direction * (y1-y0) * (1-((x0-x)+(x1-x))/2); // coverage = 1 - average x position
    }
 }
 
+static float stbtt__sized_trapezoid_area(float height, float top_width, float bottom_width)
+{
+   //STBTT_assert(top_width >= 0);
+   //STBTT_assert(bottom_width >= 0);
+   return (top_width + bottom_width) / 2.0f * height;
+}
+
+static float stbtt__position_trapezoid_area(float height, float tx0, float tx1, float bx0, float bx1)
+{
+   return stbtt__sized_trapezoid_area(height, tx1 - tx0, bx1 - bx0);
+}
+
+static float stbtt__sized_triangle_area(float height, float width)
+{
+   return height * width / 2;
+}
+
 static void stbtt__fill_active_edges_new(float *scanline, float *scanline_fill, int len, stbtt__active_edge *e, float y_top)
 {
    float y_bottom = y_top+1;
+   
+   // Variables moved outside loops for better performance
+   float x0, dx, xb, x_top, x_bottom;
+   float sy0, sy1, dy;
+   float height;
+   int x, x1, x2;
+   float y_crossing, y_final, step, sign, area;
+   float t;
+   float y0, y1, y2, y3;
+
+   float x1_clip;
+   float x2_clip;
+   float x3;
 
    while (e) {
       // brute force every pixel
 
       // compute intersection points with top & bottom
-      STBTT_assert(e->ey >= y_top);
+      //STBTT_assert(e->ey >= y_top);
 
       if (e->fdx == 0) {
-         float x0 = e->fx;
+         x0 = e->fx;
          if (x0 < len) {
             if (x0 >= 0) {
                stbtt__handle_clipped_edge(scanline,(int) x0,e, x0,y_top, x0,y_bottom);
@@ -2972,13 +3240,11 @@ static void stbtt__fill_active_edges_new(float *scanline, float *scanline_fill,
             }
          }
       } else {
-         float x0 = e->fx;
-         float dx = e->fdx;
-         float xb = x0 + dx;
-         float x_top, x_bottom;
-         float sy0,sy1;
-         float dy = e->fdy;
-         STBTT_assert(e->sy <= y_bottom && e->ey >= y_top);
+         x0 = e->fx;
+         dx = e->fdx;
+         xb = x0 + dx;
+         dy = e->fdy;
+         //STBTT_assert(e->sy <= y_bottom && e->ey >= y_top);
 
          // compute endpoints of line segment clipped to this scanline (if the
          // line segment starts on this scanline. x0 is the intersection of the
@@ -3002,51 +3268,97 @@ static void stbtt__fill_active_edges_new(float *scanline, float *scanline_fill,
             // from here on, we don't have to range check x values
 
             if ((int) x_top == (int) x_bottom) {
-               float height;
                // simple case, only spans one pixel
-               int x = (int) x_top;
-               height = sy1 - sy0;
-               STBTT_assert(x >= 0 && x < len);
-               scanline[x] += e->direction * (1-((x_top - x) + (x_bottom-x))/2)  * height;
-               scanline_fill[x] += e->direction * height; // everything right of this pixel is filled
+               x = (int) x_top;
+               height = (sy1 - sy0) * e->direction;
+               //STBTT_assert(x >= 0 && x < len);
+               scanline[x]      += stbtt__position_trapezoid_area(height, x_top, x+1.0f, x_bottom, x+1.0f);
+               scanline_fill[x] += height; // everything right of this pixel is filled
             } else {
-               int x,x1,x2;
-               float y_crossing, step, sign, area;
                // covers 2+ pixels
                if (x_top > x_bottom) {
                   // flip scanline vertically; signed area is the same
-                  float t;
                   sy0 = y_bottom - (sy0 - y_top);
                   sy1 = y_bottom - (sy1 - y_top);
-                  t = sy0, sy0 = sy1, sy1 = t;
-                  t = x_bottom, x_bottom = x_top, x_top = t;
+                  t = sy0; sy0 = sy1; sy1 = t;
+                  t = x_bottom; x_bottom = x_top; x_top = t;
                   dx = -dx;
                   dy = -dy;
-                  t = x0, x0 = xb, xb = t;
+                  t = x0; x0 = xb; xb = t;
                }
+               //STBTT_assert(dy >= 0);
+               //STBTT_assert(dx >= 0);
 
                x1 = (int) x_top;
                x2 = (int) x_bottom;
                // compute intersection with y axis at x1+1
-               y_crossing = (x1+1 - x0) * dy + y_top;
+               y_crossing = y_top + dy * (x1+1 - x0);
+
+               // compute intersection with y axis at x2
+               y_final = y_top + dy * (x2 - x0);
+
+               //           x1    x_top                            x2    x_bottom
+               //     y_top  +------|-----+------------+------------+--------|---+------------+
+               //            |            |            |            |            |            |
+               //            |            |            |            |            |            |
+               //       sy0  |      Txxxxx|............|............|............|............|
+               // y_crossing |            *xxxxx.......|............|............|............|
+               //            |            |     xxxxx..|............|............|............|
+               //            |            |     /-   xx*xxxx........|............|............|
+               //            |            | dy <       |    xxxxxx..|............|............|
+               //   y_final  |            |     \-     |          xx*xxx.........|............|
+               //       sy1  |            |            |            |   xxxxxB...|............|
+               //            |            |            |            |            |            |
+               //            |            |            |            |            |            |
+               //  y_bottom  +------------+------------+------------+------------+------------+
+               //
+               // goal is to measure the area covered by '.' in each pixel
+
+               // if x2 is right at the right edge of x1, y_crossing can blow up, github #1057
+               // @TODO: maybe test against sy1 rather than y_bottom?
+               if (y_crossing > y_bottom)
+                  y_crossing = y_bottom;
 
                sign = e->direction;
-               // area of the rectangle covered from y0..y_crossing
-               area = sign * (y_crossing-sy0);
-               // area of the triangle (x_top,y0), (x+1,y0), (x+1,y_crossing)
-               scanline[x1] += area * (1-((x_top - x1)+(x1+1-x1))/2);
 
-               step = sign * dy;
+               // area of the rectangle covered from sy0..y_crossing
+               area = sign * (y_crossing-sy0);
+
+               // area of the triangle (x_top,sy0), (x1+1,sy0), (x1+1,y_crossing)
+               scanline[x1] += stbtt__sized_triangle_area(area, x1+1 - x_top);
+
+               // check if final y_crossing is blown up; no test case for this
+               if (y_final > y_bottom) {
+                  y_final = y_bottom;
+                  dy = (y_final - y_crossing ) / (x2 - (x1+1)); // if denom=0, y_final = y_crossing, so y_final <= y_bottom
+               }
+
+               // in second pixel, area covered by line segment found in first pixel
+               // is always a rectangle 1 wide * the height of that line segment; this
+               // is exactly what the variable 'area' stores. it also gets a contribution
+               // from the line segment within it. the THIRD pixel will get the first
+               // pixel's rectangle contribution, the second pixel's rectangle contribution,
+               // and its own contribution. the 'own contribution' is the same in every pixel except
+               // the leftmost and rightmost, a trapezoid that slides down in each pixel.
+               // the second pixel's contribution to the third pixel will be the
+               // rectangle 1 wide times the height change in the second pixel, which is dy.
+
+               step = sign * dy * 1; // dy is dy/dx, change in y for every 1 change in x,
+               // which multiplied by 1-pixel-width is how much pixel area changes for each step in x
+               // so the area advances by 'step' every time
+
                for (x = x1+1; x < x2; ++x) {
-                  scanline[x] += area + step/2;
+                  scanline[x] += area + step/2; // area of trapezoid is 1*step/2
                   area += step;
                }
-               y_crossing += dy * (x2 - (x1+1));
+               //STBTT_assert(STBTT_fabs(area) <= 1.01f); // accumulated error from area += step unless we round step down
+               //STBTT_assert(sy1 > y_final-0.01f);
 
-               STBTT_assert(STBTT_fabs(area) <= 1.01f);
-
-               scanline[x2] += area + sign * (1-((x2-x2)+(x_bottom-x2))/2) * (sy1-y_crossing);
+               // area covered in the last pixel is the rectangle from all the pixels to the left,
+               // plus the trapezoid filled by the line segment in this pixel all the way to the right edge
+               scanline[x2] += area + sign * stbtt__position_trapezoid_area(sy1-y_final, (float) x2, x2+1.0f, x_bottom, x2+1.0f);
 
+               // the rest of the line is filled based on the total height of the line segment in this pixel
                scanline_fill[x2] += sign * (sy1-sy0);
             }
          } else {
@@ -3054,7 +3366,9 @@ static void stbtt__fill_active_edges_new(float *scanline, float *scanline_fill,
             // clipping logic. since this does not match the intended use
             // of this library, we use a different, very slow brute
             // force implementation
-            int x;
+            // note though that this does happen some of the time because
+            // x_top and x_bottom can be extrapolated at the top & bottom of
+            // the shape and actually lie outside the bounding box
             for (x=0; x < len; ++x) {
                // cases:
                //
@@ -3070,38 +3384,38 @@ static void stbtt__fill_active_edges_new(float *scanline, float *scanline_fill,
                // that, we need to explicitly produce segments based on x positions.
 
                // rename variables to clearly-defined pairs
-               float y0 = y_top;
-               float x1 = (float) (x);
-               float x2 = (float) (x+1);
-               float x3 = xb;
-               float y3 = y_bottom;
+               y0 = y_top;
+               x1_clip = (float) (x);
+               x2_clip = (float) (x+1);
+               x3 = xb;
+               y3 = y_bottom;
 
                // x = e->x + e->dx * (y-y_top)
                // (y-y_top) = (x - e->x) / e->dx
                // y = (x - e->x) / e->dx + y_top
-               float y1 = (x - x0) / dx + y_top;
-               float y2 = (x+1 - x0) / dx + y_top;
+               y1 = (x - x0) / dx + y_top;
+               y2 = (x+1 - x0) / dx + y_top;
 
-               if (x0 < x1 && x3 > x2) {         // three segments descending down-right
-                  stbtt__handle_clipped_edge(scanline,x,e, x0,y0, x1,y1);
-                  stbtt__handle_clipped_edge(scanline,x,e, x1,y1, x2,y2);
-                  stbtt__handle_clipped_edge(scanline,x,e, x2,y2, x3,y3);
-               } else if (x3 < x1 && x0 > x2) {  // three segments descending down-left
-                  stbtt__handle_clipped_edge(scanline,x,e, x0,y0, x2,y2);
-                  stbtt__handle_clipped_edge(scanline,x,e, x2,y2, x1,y1);
-                  stbtt__handle_clipped_edge(scanline,x,e, x1,y1, x3,y3);
-               } else if (x0 < x1 && x3 > x1) {  // two segments across x, down-right
-                  stbtt__handle_clipped_edge(scanline,x,e, x0,y0, x1,y1);
-                  stbtt__handle_clipped_edge(scanline,x,e, x1,y1, x3,y3);
-               } else if (x3 < x1 && x0 > x1) {  // two segments across x, down-left
-                  stbtt__handle_clipped_edge(scanline,x,e, x0,y0, x1,y1);
-                  stbtt__handle_clipped_edge(scanline,x,e, x1,y1, x3,y3);
-               } else if (x0 < x2 && x3 > x2) {  // two segments across x+1, down-right
-                  stbtt__handle_clipped_edge(scanline,x,e, x0,y0, x2,y2);
-                  stbtt__handle_clipped_edge(scanline,x,e, x2,y2, x3,y3);
-               } else if (x3 < x2 && x0 > x2) {  // two segments across x+1, down-left
-                  stbtt__handle_clipped_edge(scanline,x,e, x0,y0, x2,y2);
-                  stbtt__handle_clipped_edge(scanline,x,e, x2,y2, x3,y3);
+               if (x0 < x1_clip && x3 > x2_clip) {         // three segments descending down-right
+                  stbtt__handle_clipped_edge(scanline,x,e, x0,y0, x1_clip,y1);
+                  stbtt__handle_clipped_edge(scanline,x,e, x1_clip,y1, x2_clip,y2);
+                  stbtt__handle_clipped_edge(scanline,x,e, x2_clip,y2, x3,y3);
+               } else if (x3 < x1_clip && x0 > x2_clip) {  // three segments descending down-left
+                  stbtt__handle_clipped_edge(scanline,x,e, x0,y0, x2_clip,y2);
+                  stbtt__handle_clipped_edge(scanline,x,e, x2_clip,y2, x1_clip,y1);
+                  stbtt__handle_clipped_edge(scanline,x,e, x1_clip,y1, x3,y3);
+               } else if (x0 < x1_clip && x3 > x1_clip) {  // two segments across x, down-right
+                  stbtt__handle_clipped_edge(scanline,x,e, x0,y0, x1_clip,y1);
+                  stbtt__handle_clipped_edge(scanline,x,e, x1_clip,y1, x3,y3);
+               } else if (x3 < x1_clip && x0 > x1_clip) {  // two segments across x, down-left
+                  stbtt__handle_clipped_edge(scanline,x,e, x0,y0, x1_clip,y1);
+                  stbtt__handle_clipped_edge(scanline,x,e, x1_clip,y1, x3,y3);
+               } else if (x0 < x2_clip && x3 > x2_clip) {  // two segments across x+1, down-right
+                  stbtt__handle_clipped_edge(scanline,x,e, x0,y0, x2_clip,y2);
+                  stbtt__handle_clipped_edge(scanline,x,e, x2_clip,y2, x3,y3);
+               } else if (x3 < x2_clip && x0 > x2_clip) {  // two segments across x+1, down-left
+                  stbtt__handle_clipped_edge(scanline,x,e, x0,y0, x2_clip,y2);
+                  stbtt__handle_clipped_edge(scanline,x,e, x2_clip,y2, x3,y3);
                } else {  // one segment
                   stbtt__handle_clipped_edge(scanline,x,e, x0,y0, x3,y3);
                }
@@ -3120,6 +3434,14 @@ static void stbtt__rasterize_sorted_edges(stbtt__bitmap *result, stbtt__edge *e,
    int y,j=0, i;
    float scanline_data[129], *scanline, *scanline2;
 
+   // Variables moved outside loops for better performance
+   float scan_y_top, scan_y_bottom;
+   stbtt__active_edge **step;
+   stbtt__active_edge *z;
+   float sum;
+   float k;
+   int m;
+
    STBTT__NOTUSED(vsubsample);
 
    if (result->w > 64)
@@ -3134,9 +3456,9 @@ static void stbtt__rasterize_sorted_edges(stbtt__bitmap *result, stbtt__edge *e,
 
    while (j < result->h) {
       // find center of pixel for this scanline
-      float scan_y_top    = y + 0.0f;
-      float scan_y_bottom = y + 1.0f;
-      stbtt__active_edge **step = &active;
+      scan_y_top    = y + 0.0f;
+      scan_y_bottom = y + 1.0f;
+      step = &active;
 
       STBTT_memset(scanline , 0, result->w*sizeof(scanline[0]));
       STBTT_memset(scanline2, 0, (result->w+1)*sizeof(scanline[0]));
@@ -3144,10 +3466,10 @@ static void stbtt__rasterize_sorted_edges(stbtt__bitmap *result, stbtt__edge *e,
       // update all active edges;
       // remove all active edges that terminate before the top of this scanline
       while (*step) {
-         stbtt__active_edge * z = *step;
+         z = *step;
          if (z->ey <= scan_y_top) {
             *step = z->next; // delete from list
-            STBTT_assert(z->direction);
+            //STBTT_assert(z->direction);
             z->direction = 0;
             stbtt__hheap_free(&hh, z);
          } else {
@@ -3158,7 +3480,7 @@ static void stbtt__rasterize_sorted_edges(stbtt__bitmap *result, stbtt__edge *e,
       // insert all edges that start before the bottom of this scanline
       while (e->y0 <= scan_y_bottom) {
          if (e->y0 != e->y1) {
-            stbtt__active_edge *z = stbtt__new_active(&hh, e, off_x, scan_y_top, userdata);
+            z = stbtt__new_active(&hh, e, off_x, scan_y_top, userdata);
             if (z != NULL) {
                if (j == 0 && off_y != 0) {
                   if (z->ey < scan_y_top) {
@@ -3166,7 +3488,7 @@ static void stbtt__rasterize_sorted_edges(stbtt__bitmap *result, stbtt__edge *e,
                      z->ey = scan_y_top;
                   }
                }
-               STBTT_assert(z->ey >= scan_y_top); // if we get really unlucky a tiny bit of an edge can be out of bounds
+               //STBTT_assert(z->ey >= scan_y_top); // if we get really unlucky a tiny bit of an edge can be out of bounds
                // insert at front
                z->next = active;
                active = z;
@@ -3180,10 +3502,8 @@ static void stbtt__rasterize_sorted_edges(stbtt__bitmap *result, stbtt__edge *e,
          stbtt__fill_active_edges_new(scanline, scanline2+1, result->w, active, scan_y_top);
 
       {
-         float sum = 0;
+         sum = 0;
          for (i=0; i < result->w; ++i) {
-            float k;
-            int m;
             sum += scanline2[i];
             k = scanline[i] + sum;
             k = (float) STBTT_fabs(k)*255 + 0.5f;
@@ -3195,7 +3515,7 @@ static void stbtt__rasterize_sorted_edges(stbtt__bitmap *result, stbtt__edge *e,
       // advance all the edges
       step = &active;
       while (*step) {
-         stbtt__active_edge *z = *step;
+         z = *step;
          z->fx += z->fdx; // advance to position for current scanline
          step = &((*step)->next); // advance through list
       }
@@ -3209,6 +3529,7 @@ static void stbtt__rasterize_sorted_edges(stbtt__bitmap *result, stbtt__edge *e,
    if (scanline != scanline_data)
       STBTT_free(scanline, userdata);
 }
+
 #else
 #error "Unrecognized value of STBTT_RASTERIZER_VERSION"
 #endif
@@ -3218,12 +3539,15 @@ static void stbtt__rasterize_sorted_edges(stbtt__bitmap *result, stbtt__edge *e,
 static void stbtt__sort_edges_ins_sort(stbtt__edge *p, int n)
 {
    int i,j;
+   int c;
+   stbtt__edge t;
    for (i=1; i < n; ++i) {
-      stbtt__edge t = p[i], *a = &t;
+      t = p[i];
+      stbtt__edge *a = &t;
       j = i;
       while (j > 0) {
          stbtt__edge *b = &p[j-1];
-         int c = STBTT__COMPARE(a,b);
+         c = STBTT__COMPARE(a,b);
          if (!c) break;
          p[j] = p[j-1];
          --j;
@@ -3235,11 +3559,11 @@ static void stbtt__sort_edges_ins_sort(stbtt__edge *p, int n)
 
 static void stbtt__sort_edges_quicksort(stbtt__edge *p, int n)
 {
+   stbtt__edge t;
+   int c01,c12,c,m,i,j;
+   int z;
    /* threshold for transitioning to insertion sort */
    while (n > 12) {
-      stbtt__edge t;
-      int c01,c12,c,m,i,j;
-
       /* compute median of three */
       m = n >> 1;
       c01 = STBTT__COMPARE(&p[0],&p[m]);
@@ -3247,7 +3571,7 @@ static void stbtt__sort_edges_quicksort(stbtt__edge *p, int n)
       /* if 0 >= mid >= end, or 0 < mid < end, then use mid */
       if (c01 != c12) {
          /* otherwise, we'll need to swap something else to middle */
-         int z;
+         
          c = STBTT__COMPARE(&p[0],&p[n-1]);
          /* 0>mid && mid<n:  0>n => n; 0<n => 0 */
          /* 0<mid && mid>n:  0>n => 0; 0<n => n */
@@ -3330,12 +3654,13 @@ static void stbtt__rasterize(stbtt__bitmap *result, stbtt__point *pts, int *wcou
    n = 0;
 
    m=0;
+   int a, b;
    for (i=0; i < windings; ++i) {
       stbtt__point *p = pts + m;
       m += wcount[i];
       j = wcount[i]-1;
       for (k=0; k < wcount[i]; j=k++) {
-         int a=k,b=j;
+         a=k,b=j;
          // skip the edge if horizontal
          if (p[j].y == p[k].y)
             continue;
@@ -3457,9 +3782,10 @@ static stbtt__point *stbtt_FlattenCurves(stbtt_vertex *vertices, int num_verts,
       return 0;
    }
 
+   float x,y;
    // make two passes through the points so we don't need to realloc
    for (pass=0; pass < 2; ++pass) {
-      float x=0,y=0;
+      x=0,y=0;
       if (pass == 1) {
          points = (stbtt__point *) STBTT_malloc(num_points * sizeof(points[0]), userdata);
          if (points == NULL) goto error;
@@ -3533,7 +3859,7 @@ STBTT_DEF unsigned char *stbtt_GetGlyphBitmapSubpixel(const stbtt_fontinfo *info
 {
    int ix0,iy0,ix1,iy1;
    stbtt__bitmap gbm;
-   stbtt_vertex *vertices;   
+   stbtt_vertex *vertices;
    int num_verts = stbtt_GetGlyphShape(info, glyph, &vertices);
 
    if (scale_x == 0) scale_x = scale_y;
@@ -3556,7 +3882,7 @@ STBTT_DEF unsigned char *stbtt_GetGlyphBitmapSubpixel(const stbtt_fontinfo *info
    if (height) *height = gbm.h;
    if (xoff  ) *xoff   = ix0;
    if (yoff  ) *yoff   = iy0;
-   
+
    if (gbm.w && gbm.h) {
       gbm.pixels = (unsigned char *) STBTT_malloc(gbm.w * gbm.h, info->userdata);
       if (gbm.pixels) {
@@ -3567,7 +3893,7 @@ STBTT_DEF unsigned char *stbtt_GetGlyphBitmapSubpixel(const stbtt_fontinfo *info
    }
    STBTT_free(vertices, info->userdata);
    return gbm.pixels;
-}   
+}
 
 STBTT_DEF unsigned char *stbtt_GetGlyphBitmap(const stbtt_fontinfo *info, float scale_x, float scale_y, int glyph, int *width, int *height, int *xoff, int *yoff)
 {
@@ -3579,7 +3905,7 @@ STBTT_DEF void stbtt_MakeGlyphBitmapSubpixel(const stbtt_fontinfo *info, unsigne
    int ix0,iy0;
    stbtt_vertex *vertices;
    int num_verts = stbtt_GetGlyphShape(info, glyph, &vertices);
-   stbtt__bitmap gbm;   
+   stbtt__bitmap gbm;
 
    stbtt_GetGlyphBitmapBoxSubpixel(info, glyph, scale_x, scale_y, shift_x, shift_y, &ix0,&iy0,0,0);
    gbm.pixels = output;
@@ -3601,7 +3927,7 @@ STBTT_DEF void stbtt_MakeGlyphBitmap(const stbtt_fontinfo *info, unsigned char *
 STBTT_DEF unsigned char *stbtt_GetCodepointBitmapSubpixel(const stbtt_fontinfo *info, float scale_x, float scale_y, float shift_x, float shift_y, int codepoint, int *width, int *height, int *xoff, int *yoff)
 {
    return stbtt_GetGlyphBitmapSubpixel(info, scale_x, scale_y,shift_x,shift_y, stbtt_FindGlyphIndex(info,codepoint), width,height,xoff,yoff);
-}   
+}
 
 STBTT_DEF void stbtt_MakeCodepointBitmapSubpixelPrefilter(const stbtt_fontinfo *info, unsigned char *output, int out_w, int out_h, int out_stride, float scale_x, float scale_y, float shift_x, float shift_y, int oversample_x, int oversample_y, float *sub_x, float *sub_y, int codepoint)
 {
@@ -3616,7 +3942,7 @@ STBTT_DEF void stbtt_MakeCodepointBitmapSubpixel(const stbtt_fontinfo *info, uns
 STBTT_DEF unsigned char *stbtt_GetCodepointBitmap(const stbtt_fontinfo *info, float scale_x, float scale_y, int codepoint, int *width, int *height, int *xoff, int *yoff)
 {
    return stbtt_GetCodepointBitmapSubpixel(info, scale_x, scale_y, 0.0f,0.0f, codepoint, width,height,xoff,yoff);
-}   
+}
 
 STBTT_DEF void stbtt_MakeCodepointBitmap(const stbtt_fontinfo *info, unsigned char *output, int out_w, int out_h, int out_stride, float scale_x, float scale_y, int codepoint)
 {
@@ -3658,8 +3984,8 @@ static int stbtt_BakeFontBitmap_internal(unsigned char *data, int offset,  // fo
          y = bottom_y, x = 1; // advance to next row
       if (y + gh + 1 >= ph) // check if it fits vertically AFTER potentially moving to next row
          return -i;
-      STBTT_assert(x+gw < pw);
-      STBTT_assert(y+gh < ph);
+      //STBTT_assert(x+gw < pw);
+      //STBTT_assert(y+gh < ph);
       stbtt_MakeGlyphBitmap(&f, pixels+x+y*pw, gw,gh,pw, scale,scale, g);
       chardata[i].x0 = (stbtt_int16) x;
       chardata[i].y0 = (stbtt_int16) y;
@@ -3741,7 +4067,7 @@ static void stbrp_init_target(stbrp_context *con, int pw, int ph, stbrp_node *no
    con->y = 0;
    con->bottom_y = 0;
    STBTT__NOTUSED(nodes);
-   STBTT__NOTUSED(num_nodes);   
+   STBTT__NOTUSED(num_nodes);
 }
 
 static void stbrp_pack_rects(stbrp_context *con, stbrp_rect *rects, int num_rects)
@@ -3813,8 +4139,8 @@ STBTT_DEF void stbtt_PackEnd  (stbtt_pack_context *spc)
 
 STBTT_DEF void stbtt_PackSetOversampling(stbtt_pack_context *spc, unsigned int h_oversample, unsigned int v_oversample)
 {
-   STBTT_assert(h_oversample <= STBTT_MAX_OVERSAMPLE);
-   STBTT_assert(v_oversample <= STBTT_MAX_OVERSAMPLE);
+   //STBTT_assert(h_oversample <= STBTT_MAX_OVERSAMPLE);
+   //STBTT_assert(v_oversample <= STBTT_MAX_OVERSAMPLE);
    if (h_oversample <= STBTT_MAX_OVERSAMPLE)
       spc->h_oversample = h_oversample;
    if (v_oversample <= STBTT_MAX_OVERSAMPLE)
@@ -3833,10 +4159,10 @@ static void stbtt__h_prefilter(unsigned char *pixels, int w, int h, int stride_i
    unsigned char buffer[STBTT_MAX_OVERSAMPLE];
    int safe_w = w - kernel_width;
    int j;
+   int i;
+   unsigned int total;
    STBTT_memset(buffer, 0, STBTT_MAX_OVERSAMPLE); // suppress bogus warning from VS2013 -analyze
    for (j=0; j < h; ++j) {
-      int i;
-      unsigned int total;
       STBTT_memset(buffer, 0, kernel_width);
 
       total = 0;
@@ -3881,7 +4207,7 @@ static void stbtt__h_prefilter(unsigned char *pixels, int w, int h, int stride_i
       }
 
       for (; i < w; ++i) {
-         STBTT_assert(pixels[i] == 0);
+         //STBTT_assert(pixels[i] == 0);
          total -= buffer[i & STBTT__OVER_MASK];
          pixels[i] = (unsigned char) (total / kernel_width);
       }
@@ -3895,10 +4221,10 @@ static void stbtt__v_prefilter(unsigned char *pixels, int w, int h, int stride_i
    unsigned char buffer[STBTT_MAX_OVERSAMPLE];
    int safe_h = h - kernel_width;
    int j;
+   int i;
+   unsigned int total;
    STBTT_memset(buffer, 0, STBTT_MAX_OVERSAMPLE); // suppress bogus warning from VS2013 -analyze
    for (j=0; j < w; ++j) {
-      int i;
-      unsigned int total;
       STBTT_memset(buffer, 0, kernel_width);
 
       total = 0;
@@ -3943,7 +4269,7 @@ static void stbtt__v_prefilter(unsigned char *pixels, int w, int h, int stride_i
       }
 
       for (; i < h; ++i) {
-         STBTT_assert(pixels[i*stride_in_bytes] == 0);
+         //STBTT_assert(pixels[i*stride_in_bytes] == 0);
          total -= buffer[i & STBTT__OVER_MASK];
          pixels[i*stride_in_bytes] = (unsigned char) (total / kernel_width);
       }
@@ -3967,19 +4293,21 @@ static float stbtt__oversample_shift(int oversample)
 // rects array must be big enough to accommodate all characters in the given ranges
 STBTT_DEF int stbtt_PackFontRangesGatherRects(stbtt_pack_context *spc, const stbtt_fontinfo *info, stbtt_pack_range *ranges, int num_ranges, stbrp_rect *rects)
 {
-   int i,j,k;
-
-   k=0;
+   int i,j;
+   int missing_glyph_added = 0;
+   float fh, scale;
+   int x0,y0,x1,y1;
+   int k=0;
+   int codepoint, glyph;
    for (i=0; i < num_ranges; ++i) {
-      float fh = ranges[i].font_size;
-      float scale = fh > 0 ? stbtt_ScaleForPixelHeight(info, fh) : stbtt_ScaleForMappingEmToPixels(info, -fh);
+      fh = ranges[i].font_size;
+      scale = fh > 0 ? stbtt_ScaleForPixelHeight(info, fh) : stbtt_ScaleForMappingEmToPixels(info, -fh);
       ranges[i].h_oversample = (unsigned char) spc->h_oversample;
       ranges[i].v_oversample = (unsigned char) spc->v_oversample;
       for (j=0; j < ranges[i].num_chars; ++j) {
-         int x0,y0,x1,y1;
-         int codepoint = ranges[i].array_of_unicode_codepoints == NULL ? ranges[i].first_unicode_codepoint_in_range + j : ranges[i].array_of_unicode_codepoints[j];
-         int glyph = stbtt_FindGlyphIndex(info, codepoint);
-         if (glyph == 0 && spc->skip_missing) {
+         codepoint = ranges[i].array_of_unicode_codepoints == NULL ? ranges[i].first_unicode_codepoint_in_range + j : ranges[i].array_of_unicode_codepoints[j];
+         glyph = stbtt_FindGlyphIndex(info, codepoint);
+         if (glyph == 0 && (spc->skip_missing || missing_glyph_added)) {
             rects[k].w = rects[k].h = 0;
          } else {
             stbtt_GetGlyphBitmapBoxSubpixel(info,glyph,
@@ -3989,6 +4317,8 @@ STBTT_DEF int stbtt_PackFontRangesGatherRects(stbtt_pack_context *spc, const stb
                                             &x0,&y0,&x1,&y1);
             rects[k].w = (stbrp_coord) (x1-x0 + spc->padding + spc->h_oversample-1);
             rects[k].h = (stbrp_coord) (y1-y0 + spc->padding + spc->v_oversample-1);
+            if (glyph == 0)
+               missing_glyph_added = 1;
          }
          ++k;
       }
@@ -4023,17 +4353,22 @@ STBTT_DEF void stbtt_MakeGlyphBitmapSubpixelPrefilter(const stbtt_fontinfo *info
 // rects array must be big enough to accommodate all characters in the given ranges
 STBTT_DEF int stbtt_PackFontRangesRenderIntoRects(stbtt_pack_context *spc, const stbtt_fontinfo *info, stbtt_pack_range *ranges, int num_ranges, stbrp_rect *rects)
 {
-   int i,j,k, return_value = 1;
+   int i,j,k, missing_glyph = -1, return_value = 1;
 
    // save current values
    int old_h_over = spc->h_oversample;
    int old_v_over = spc->v_oversample;
+   float fh, scale;
+   float recip_h,recip_v,sub_x,sub_y;
+
+   int advance, lsb, x0,y0,x1,y1;
+   int codepoint, glyph;
 
    k = 0;
    for (i=0; i < num_ranges; ++i) {
-      float fh = ranges[i].font_size;
-      float scale = fh > 0 ? stbtt_ScaleForPixelHeight(info, fh) : stbtt_ScaleForMappingEmToPixels(info, -fh);
-      float recip_h,recip_v,sub_x,sub_y;
+      fh = ranges[i].font_size;
+      scale = fh > 0 ? stbtt_ScaleForPixelHeight(info, fh) : stbtt_ScaleForMappingEmToPixels(info, -fh);
+
       spc->h_oversample = ranges[i].h_oversample;
       spc->v_oversample = ranges[i].v_oversample;
       recip_h = 1.0f / spc->h_oversample;
@@ -4044,9 +4379,8 @@ STBTT_DEF int stbtt_PackFontRangesRenderIntoRects(stbtt_pack_context *spc, const
          stbrp_rect *r = &rects[k];
          if (r->was_packed && r->w != 0 && r->h != 0) {
             stbtt_packedchar *bc = &ranges[i].chardata_for_range[j];
-            int advance, lsb, x0,y0,x1,y1;
-            int codepoint = ranges[i].array_of_unicode_codepoints == NULL ? ranges[i].first_unicode_codepoint_in_range + j : ranges[i].array_of_unicode_codepoints[j];
-            int glyph = stbtt_FindGlyphIndex(info, codepoint);
+            codepoint = ranges[i].array_of_unicode_codepoints == NULL ? ranges[i].first_unicode_codepoint_in_range + j : ranges[i].array_of_unicode_codepoints[j];
+            glyph = stbtt_FindGlyphIndex(info, codepoint);
             stbrp_coord pad = (stbrp_coord) spc->padding;
 
             // pad on left and top
@@ -4088,6 +4422,13 @@ STBTT_DEF int stbtt_PackFontRangesRenderIntoRects(stbtt_pack_context *spc, const
             bc->yoff     =       (float)  y0 * recip_v + sub_y;
             bc->xoff2    =                (x0 + r->w) * recip_h + sub_x;
             bc->yoff2    =                (y0 + r->h) * recip_v + sub_y;
+
+            if (glyph == 0)
+               missing_glyph = j;
+         } else if (spc->skip_missing) {
+            return_value = 0;
+         } else if (r->was_packed && r->w == 0 && r->h == 0 && missing_glyph >= 0) {
+            ranges[i].chardata_for_range[j] = ranges[i].chardata_for_range[missing_glyph];
          } else {
             return_value = 0; // if any fail, report failure
          }
@@ -4126,7 +4467,7 @@ STBTT_DEF int stbtt_PackFontRanges(stbtt_pack_context *spc, const unsigned char
    n = 0;
    for (i=0; i < num_ranges; ++i)
       n += ranges[i].num_chars;
-         
+
    rects = (stbrp_rect *) STBTT_malloc(sizeof(*rects) * n, spc->user_allocator_context);
    if (rects == NULL)
       return 0;
@@ -4137,7 +4478,7 @@ STBTT_DEF int stbtt_PackFontRanges(stbtt_pack_context *spc, const unsigned char
    n = stbtt_PackFontRangesGatherRects(spc, &info, ranges, num_ranges, rects);
 
    stbtt_PackFontRangesPackRects(spc, rects, n);
-  
+
    return_value = stbtt_PackFontRangesRenderIntoRects(spc, &info, ranges, num_ranges, rects);
 
    STBTT_free(rects, spc->user_allocator_context);
@@ -4279,38 +4620,43 @@ static int stbtt__compute_crossings_x(float x, float y, int nverts, stbtt_vertex
    float orig[2], ray[2] = { 1, 0 };
    float y_frac;
    int winding = 0;
-
-   orig[0] = x;
-   orig[1] = y;
-
+   
+   // Variables moved outside the loop for better performance
+   int x0, x1, y0, y1;  // Used in both vline and vcurve cases
+   float x_inter;       // Used for intersection calculation
+   int x2, y2;          // Used in vcurve case
+   int ax, ay, by;      // Used for bounding box calculations
+   float q0[2], q1[2], q2[2];  // Bezier curve points
+   float hits[2][2];    // Ray intersection results
+   int num_hits;        // Number of intersections found
+   
    // make sure y never passes through a vertex of the shape
    y_frac = (float) STBTT_fmod(y, 1.0f);
    if (y_frac < 0.01f)
       y += 0.01f;
    else if (y_frac > 0.99f)
       y -= 0.01f;
+   orig[0] = x;
    orig[1] = y;
-
+   
    // test a ray from (-infinity,y) to (x,y)
    for (i=0; i < nverts; ++i) {
       if (verts[i].type == STBTT_vline) {
-         int x0 = (int) verts[i-1].x, y0 = (int) verts[i-1].y;
-         int x1 = (int) verts[i  ].x, y1 = (int) verts[i  ].y;
+         x0 = (int) verts[i-1].x; y0 = (int) verts[i-1].y;
+         x1 = (int) verts[i  ].x; y1 = (int) verts[i  ].y;
          if (y > STBTT_min(y0,y1) && y < STBTT_max(y0,y1) && x > STBTT_min(x0,x1)) {
-            float x_inter = (y - y0) / (y1 - y0) * (x1-x0) + x0;
-            if (x_inter < x)  
+            x_inter = (y - y0) / (y1 - y0) * (x1-x0) + x0;
+            if (x_inter < x)
                winding += (y0 < y1) ? 1 : -1;
          }
       }
       if (verts[i].type == STBTT_vcurve) {
-         int x0 = (int) verts[i-1].x , y0 = (int) verts[i-1].y ;
-         int x1 = (int) verts[i  ].cx, y1 = (int) verts[i  ].cy;
-         int x2 = (int) verts[i  ].x , y2 = (int) verts[i  ].y ;
-         int ax = STBTT_min(x0,STBTT_min(x1,x2)), ay = STBTT_min(y0,STBTT_min(y1,y2));
-         int by = STBTT_max(y0,STBTT_max(y1,y2));
+         x0 = (int) verts[i-1].x ; y0 = (int) verts[i-1].y ;
+         x1 = (int) verts[i  ].cx; y1 = (int) verts[i  ].cy;
+         x2 = (int) verts[i  ].x ; y2 = (int) verts[i  ].y ;
+         ax = STBTT_min(x0,STBTT_min(x1,x2)); ay = STBTT_min(y0,STBTT_min(y1,y2));
+         by = STBTT_max(y0,STBTT_max(y1,y2));
          if (y > ay && y < by && x > ax) {
-            float q0[2],q1[2],q2[2];
-            float hits[2][2];
             q0[0] = (float)x0;
             q0[1] = (float)y0;
             q1[0] = (float)x1;
@@ -4323,12 +4669,12 @@ static int stbtt__compute_crossings_x(float x, float y, int nverts, stbtt_vertex
                x1 = (int)verts[i  ].x;
                y1 = (int)verts[i  ].y;
                if (y > STBTT_min(y0,y1) && y < STBTT_max(y0,y1) && x > STBTT_min(x0,x1)) {
-                  float x_inter = (y - y0) / (y1 - y0) * (x1-x0) + x0;
-                  if (x_inter < x)  
+                  x_inter = (y - y0) / (y1 - y0) * (x1-x0) + x0;
+                  if (x_inter < x)
                      winding += (y0 < y1) ? 1 : -1;
                }
             } else {
-               int num_hits = stbtt__ray_intersect_bezier(orig, ray, q0, q1, q2, hits);
+               num_hits = stbtt__ray_intersect_bezier(orig, ray, q0, q1, q2, hits);
                if (num_hits >= 1)
                   if (hits[0][0] < 0)
                      winding += (hits[0][1] < 0 ? -1 : 1);
@@ -4336,10 +4682,10 @@ static int stbtt__compute_crossings_x(float x, float y, int nverts, stbtt_vertex
                   if (hits[1][0] < 0)
                      winding += (hits[1][1] < 0 ? -1 : 1);
             }
-         } 
+         }
       }
    }
-   return winding;
+   return winding;  // Fixed: was "wi" in original
 }
 
 static float stbtt__cuberoot( float x )
@@ -4350,35 +4696,35 @@ static float stbtt__cuberoot( float x )
       return  (float) STBTT_pow( x,1.0f/3.0f);
 }
 
-// x^3 + c*x^2 + b*x + a = 0
+// x^3 + a*x^2 + b*x + c = 0
 static int stbtt__solve_cubic(float a, float b, float c, float* r)
 {
-	float s = -a / 3;
-	float p = b - a*a / 3;
-	float q = a * (2*a*a - 9*b) / 27 + c;
+   float s = -a / 3;
+   float p = b - a*a / 3;
+   float q = a * (2*a*a - 9*b) / 27 + c;
    float p3 = p*p*p;
-	float d = q*q + 4*p3 / 27;
-	if (d >= 0) {
-		float z = (float) STBTT_sqrt(d);
-		float u = (-q + z) / 2;
-		float v = (-q - z) / 2;
-		u = stbtt__cuberoot(u);
-		v = stbtt__cuberoot(v);
-		r[0] = s + u + v;
-		return 1;
-	} else {
-	   float u = (float) STBTT_sqrt(-p/3);
-	   float v = (float) STBTT_acos(-STBTT_sqrt(-27/p3) * q / 2) / 3; // p3 must be negative, since d is negative
-	   float m = (float) STBTT_cos(v);
+   float d = q*q + 4*p3 / 27;
+   if (d >= 0) {
+      float z = (float) STBTT_sqrt(d);
+      float u = (-q + z) / 2;
+      float v = (-q - z) / 2;
+      u = stbtt__cuberoot(u);
+      v = stbtt__cuberoot(v);
+      r[0] = s + u + v;
+      return 1;
+   } else {
+      float u = (float) STBTT_sqrt(-p/3);
+      float v = (float) STBTT_acos(-STBTT_sqrt(-27/p3) * q / 2) / 3; // p3 must be negative, since d is negative
+      float m = (float) STBTT_cos(v);
       float n = (float) STBTT_cos(v-3.141592/2)*1.732050808f;
-	   r[0] = s + u * 2 * m;
-	   r[1] = s - u * (m + n);
-	   r[2] = s - u * (m - n);
+      r[0] = s + u * 2 * m;
+      r[1] = s - u * (m + n);
+      r[2] = s - u * (m - n);
 
       //STBTT_assert( STBTT_fabs(((r[0]+a)*r[0]+b)*r[0]+c) < 0.05f);  // these asserts may not be safe at all scales, though they're in bezier t parameter units so maybe?
       //STBTT_assert( STBTT_fabs(((r[1]+a)*r[1]+b)*r[1]+c) < 0.05f);
       //STBTT_assert( STBTT_fabs(((r[2]+a)*r[2]+b)*r[2]+c) < 0.05f);
-   	return 3;
+      return 3;
    }
 }
 
@@ -4389,12 +4735,7 @@ STBTT_DEF unsigned char * stbtt_GetGlyphSDF(const stbtt_fontinfo *info, float sc
    int w,h;
    unsigned char *data;
 
-   // if one scale is 0, use same scale for both
-   if (scale_x == 0) scale_x = scale_y;
-   if (scale_y == 0) {
-      if (scale_x == 0) return NULL;  // if both scales are 0, return NULL
-      scale_y = scale_x;
-   }
+   if (scale == 0) return NULL;
 
    stbtt_GetGlyphBitmapBoxSubpixel(info, glyph, scale, scale, 0.0f,0.0f, &ix0,&iy0,&ix1,&iy1);
 
@@ -4417,29 +4758,52 @@ STBTT_DEF unsigned char * stbtt_GetGlyphSDF(const stbtt_fontinfo *info, float sc
 
    // invert for y-downwards bitmaps
    scale_y = -scale_y;
-      
+
    {
+      // distance from singular values (in the same units as the pixel grid)
+      const float eps = 1./1024, eps2 = eps*eps;
       int x,y,i,j;
       float *precompute;
       stbtt_vertex *verts;
       int num_verts = stbtt_GetGlyphShape(info, glyph, &verts);
+      
+      // Variables moved outside loops for better performance
+      float val;
+      float min_dist;
+      float sx, sy;
+      float x_gspace, y_gspace;
+      int winding;
+      float x0, y0, x1, y1, x2, y2;
+      float dist, dist2;
+      float dx, dy, px, py, t;
+      float box_x0, box_y0, box_x1, box_y1;
+      int num;
+      float ax, ay, bx, by, mx, my;
+      float res[3];
+      float it;
+      float a_inv;
+      float a, b, c, d;
+      float discriminant, root;
+      
       data = (unsigned char *) STBTT_malloc(w * h, info->userdata);
       precompute = (float *) STBTT_malloc(num_verts * sizeof(float), info->userdata);
 
+      float len2;
+
       for (i=0,j=num_verts-1; i < num_verts; j=i++) {
          if (verts[i].type == STBTT_vline) {
-            float x0 = verts[i].x*scale_x, y0 = verts[i].y*scale_y;
-            float x1 = verts[j].x*scale_x, y1 = verts[j].y*scale_y;
-            float dist = (float) STBTT_sqrt((x1-x0)*(x1-x0) + (y1-y0)*(y1-y0));
-            precompute[i] = (dist == 0) ? 0.0f : 1.0f / dist;
+            x0 = verts[i].x*scale_x; y0 = verts[i].y*scale_y;
+            x1 = verts[j].x*scale_x; y1 = verts[j].y*scale_y;
+            dist = (float) STBTT_sqrt((x1-x0)*(x1-x0) + (y1-y0)*(y1-y0));
+            precompute[i] = (dist < eps) ? 0.0f : 1.0f / dist;
          } else if (verts[i].type == STBTT_vcurve) {
-            float x2 = verts[j].x *scale_x, y2 = verts[j].y *scale_y;
-            float x1 = verts[i].cx*scale_x, y1 = verts[i].cy*scale_y;
-            float x0 = verts[i].x *scale_x, y0 = verts[i].y *scale_y;
-            float bx = x0 - 2*x1 + x2, by = y0 - 2*y1 + y2;
-            float len2 = bx*bx + by*by;
-            if (len2 != 0.0f)
-               precompute[i] = 1.0f / (bx*bx + by*by);
+            x2 = verts[j].x *scale_x; y2 = verts[j].y *scale_y;
+            x1 = verts[i].cx*scale_x; y1 = verts[i].cy*scale_y;
+            x0 = verts[i].x *scale_x; y0 = verts[i].y *scale_y;
+            bx = x0 - 2*x1 + x2; by = y0 - 2*y1 + y2;
+            len2 = bx*bx + by*by;
+            if (len2 >= eps2)
+               precompute[i] = 1.0f / len2;
             else
                precompute[i] = 0.0f;
          } else
@@ -4448,86 +4812,87 @@ STBTT_DEF unsigned char * stbtt_GetGlyphSDF(const stbtt_fontinfo *info, float sc
 
       for (y=iy0; y < iy1; ++y) {
          for (x=ix0; x < ix1; ++x) {
-            float val;
-            float min_dist = 999999.0f;
-            float sx = (float) x + 0.5f;
-            float sy = (float) y + 0.5f;
-            float x_gspace = (sx / scale_x);
-            float y_gspace = (sy / scale_y);
+            min_dist = 999999.0f;
+            sx = (float) x + 0.5f;
+            sy = (float) y + 0.5f;
+            x_gspace = (sx / scale_x);
+            y_gspace = (sy / scale_y);
 
-            int winding = stbtt__compute_crossings_x(x_gspace, y_gspace, num_verts, verts); // @OPTIMIZE: this could just be a rasterization, but needs to be line vs. non-tesselated curves so a new path
+            winding = stbtt__compute_crossings_x(x_gspace, y_gspace, num_verts, verts); // @OPTIMIZE: this could just be a rasterization, but needs to be line vs. non-tesselated curves so a new path
 
             for (i=0; i < num_verts; ++i) {
-               float x0 = verts[i].x*scale_x, y0 = verts[i].y*scale_y;
+               x0 = verts[i].x*scale_x; y0 = verts[i].y*scale_y;
 
-               // check against every point here rather than inside line/curve primitives -- @TODO: wrong if multiple 'moves' in a row produce a garbage point, and given culling, probably more efficient to do within line/curve
-               float dist2 = (x0-sx)*(x0-sx) + (y0-sy)*(y0-sy);
-               if (dist2 < min_dist*min_dist)
-                  min_dist = (float) STBTT_sqrt(dist2);
+               if (verts[i].type == STBTT_vline && precompute[i] != 0.0f) {
+                  x1 = verts[i-1].x*scale_x; y1 = verts[i-1].y*scale_y;
 
-               if (verts[i].type == STBTT_vline) {
-                  float x1 = verts[i-1].x*scale_x, y1 = verts[i-1].y*scale_y;
+                  dist2 = (x0-sx)*(x0-sx) + (y0-sy)*(y0-sy);
+                  if (dist2 < min_dist*min_dist)
+                     min_dist = (float) STBTT_sqrt(dist2);
 
                   // coarse culling against bbox
                   //if (sx > STBTT_min(x0,x1)-min_dist && sx < STBTT_max(x0,x1)+min_dist &&
                   //    sy > STBTT_min(y0,y1)-min_dist && sy < STBTT_max(y0,y1)+min_dist)
-                  float dist = (float) STBTT_fabs((x1-x0)*(y0-sy) - (y1-y0)*(x0-sx)) * precompute[i];
-                  STBTT_assert(i != 0);
+                  dist = (float) STBTT_fabs((x1-x0)*(y0-sy) - (y1-y0)*(x0-sx)) * precompute[i];
+                  //STBTT_assert(i != 0);
                   if (dist < min_dist) {
                      // check position along line
                      // x' = x0 + t*(x1-x0), y' = y0 + t*(y1-y0)
                      // minimize (x'-sx)*(x'-sx)+(y'-sy)*(y'-sy)
-                     float dx = x1-x0, dy = y1-y0;
-                     float px = x0-sx, py = y0-sy;
+                     dx = x1-x0; dy = y1-y0;
+                     px = x0-sx; py = y0-sy;
                      // minimize (px+t*dx)^2 + (py+t*dy)^2 = px*px + 2*px*dx*t + t^2*dx*dx + py*py + 2*py*dy*t + t^2*dy*dy
                      // derivative: 2*px*dx + 2*py*dy + (2*dx*dx+2*dy*dy)*t, set to 0 and solve
-                     float t = -(px*dx + py*dy) / (dx*dx + dy*dy);
+                     t = -(px*dx + py*dy) / (dx*dx + dy*dy);
                      if (t >= 0.0f && t <= 1.0f)
                         min_dist = dist;
                   }
                } else if (verts[i].type == STBTT_vcurve) {
-                  float x2 = verts[i-1].x *scale_x, y2 = verts[i-1].y *scale_y;
-                  float x1 = verts[i  ].cx*scale_x, y1 = verts[i  ].cy*scale_y;
-                  float box_x0 = STBTT_min(STBTT_min(x0,x1),x2);
-                  float box_y0 = STBTT_min(STBTT_min(y0,y1),y2);
-                  float box_x1 = STBTT_max(STBTT_max(x0,x1),x2);
-                  float box_y1 = STBTT_max(STBTT_max(y0,y1),y2);
+                  x2 = verts[i-1].x *scale_x; y2 = verts[i-1].y *scale_y;
+                  x1 = verts[i  ].cx*scale_x; y1 = verts[i  ].cy*scale_y;
+                  box_x0 = STBTT_min(STBTT_min(x0,x1),x2);
+                  box_y0 = STBTT_min(STBTT_min(y0,y1),y2);
+                  box_x1 = STBTT_max(STBTT_max(x0,x1),x2);
+                  box_y1 = STBTT_max(STBTT_max(y0,y1),y2);
                   // coarse culling against bbox to avoid computing cubic unnecessarily
                   if (sx > box_x0-min_dist && sx < box_x1+min_dist && sy > box_y0-min_dist && sy < box_y1+min_dist) {
-                     int num=0;
-                     float ax = x1-x0, ay = y1-y0;
-                     float bx = x0 - 2*x1 + x2, by = y0 - 2*y1 + y2;
-                     float mx = x0 - sx, my = y0 - sy;
-                     float res[3] = {0.0, 0.0, 0.0};
-                     float px,py,t,it;
-                     float a_inv = precompute[i];
+                     num=0;
+                     ax = x1-x0; ay = y1-y0;
+                     bx = x0 - 2*x1 + x2; by = y0 - 2*y1 + y2;
+                     mx = x0 - sx; my = y0 - sy;
+                     res[0] = 0.f; res[1] = 0.f; res[2] = 0.f;
+                     a_inv = precompute[i];
                      if (a_inv == 0.0) { // if a_inv is 0, it's 2nd degree so use quadratic formula
-                        float a = 3*(ax*bx + ay*by);
-                        float b = 2*(ax*ax + ay*ay) + (mx*bx+my*by);
-                        float c = mx*ax+my*ay;
-                        if (a == 0.0) { // if a is 0, it's linear
-                           if (b != 0.0) {
+                        a = 3*(ax*bx + ay*by);
+                        b = 2*(ax*ax + ay*ay) + (mx*bx+my*by);
+                        c = mx*ax+my*ay;
+                        if (STBTT_fabs(a) < eps2) { // if a is 0, it's linear
+                           if (STBTT_fabs(b) >= eps2) {
                               res[num++] = -c/b;
                            }
                         } else {
-                           float discriminant = b*b - 4*a*c;
+                           discriminant = b*b - 4*a*c;
                            if (discriminant < 0)
                               num = 0;
                            else {
-                              float root = (float) STBTT_sqrt(discriminant);
+                              root = (float) STBTT_sqrt(discriminant);
                               res[0] = (-b - root)/(2*a);
                               res[1] = (-b + root)/(2*a);
                               num = 2; // don't bother distinguishing 1-solution case, as code below will still work
                            }
                         }
                      } else {
-                        float b = 3*(ax*bx + ay*by) * a_inv; // could precompute this as it doesn't depend on sample point
-                        float c = (2*(ax*ax + ay*ay) + (mx*bx+my*by)) * a_inv;
-                        float d = (mx*ax+my*ay) * a_inv;
+                        b = 3*(ax*bx + ay*by) * a_inv; // could precompute this as it doesn't depend on sample point
+                        c = (2*(ax*ax + ay*ay) + (mx*bx+my*by)) * a_inv;
+                        d = (mx*ax+my*ay) * a_inv;
                         num = stbtt__solve_cubic(b, c, d, res);
                      }
+                     dist2 = (x0-sx)*(x0-sx) + (y0-sy)*(y0-sy);
+                     if (dist2 < min_dist*min_dist)
+                        min_dist = (float) STBTT_sqrt(dist2);
+
                      if (num >= 1 && res[0] >= 0.0f && res[0] <= 1.0f) {
-                        t = res[0], it = 1.0f - t;
+                        t = res[0]; it = 1.0f - t;
                         px = it*it*x0 + 2*t*it*x1 + t*t*x2;
                         py = it*it*y0 + 2*t*it*y1 + t*t*y2;
                         dist2 = (px-sx)*(px-sx) + (py-sy)*(py-sy);
@@ -4535,7 +4900,7 @@ STBTT_DEF unsigned char * stbtt_GetGlyphSDF(const stbtt_fontinfo *info, float sc
                            min_dist = (float) STBTT_sqrt(dist2);
                      }
                      if (num >= 2 && res[1] >= 0.0f && res[1] <= 1.0f) {
-                        t = res[1], it = 1.0f - t;
+                        t = res[1]; it = 1.0f - t;
                         px = it*it*x0 + 2*t*it*x1 + t*t*x2;
                         py = it*it*y0 + 2*t*it*y1 + t*t*y2;
                         dist2 = (px-sx)*(px-sx) + (py-sy)*(py-sy);
@@ -4543,7 +4908,7 @@ STBTT_DEF unsigned char * stbtt_GetGlyphSDF(const stbtt_fontinfo *info, float sc
                            min_dist = (float) STBTT_sqrt(dist2);
                      }
                      if (num >= 3 && res[2] >= 0.0f && res[2] <= 1.0f) {
-                        t = res[2], it = 1.0f - t;
+                        t = res[2]; it = 1.0f - t;
                         px = it*it*x0 + 2*t*it*x1 + t*t*x2;
                         py = it*it*y0 + 2*t*it*y1 + t*t*y2;
                         dist2 = (px-sx)*(px-sx) + (py-sy)*(py-sy);
@@ -4567,7 +4932,7 @@ STBTT_DEF unsigned char * stbtt_GetGlyphSDF(const stbtt_fontinfo *info, float sc
       STBTT_free(verts, info->userdata);
    }
    return data;
-}   
+}
 
 STBTT_DEF unsigned char * stbtt_GetCodepointSDF(const stbtt_fontinfo *info, float scale, int codepoint, int padding, unsigned char onedge_value, float pixel_dist_scale, int *width, int *height, int *xoff, int *yoff)
 {
@@ -4585,13 +4950,18 @@ STBTT_DEF void stbtt_FreeSDF(unsigned char *bitmap, void *userdata)
 //
 
 // check if a utf8 string contains a prefix which is the utf16 string; if so return length of matching utf8 string
-static stbtt_int32 stbtt__CompareUTF8toUTF16_bigendian_prefix(stbtt_uint8 *s1, stbtt_int32 len1, stbtt_uint8 *s2, stbtt_int32 len2) 
+static stbtt_int32 stbtt__CompareUTF8toUTF16_bigendian_prefix(stbtt_uint8 *s1, stbtt_int32 len1, stbtt_uint8 *s2, stbtt_int32 len2)
 {
    stbtt_int32 i=0;
-
+   
+   // Variables moved outside the loop for better performance
+   stbtt_uint16 ch;
+   stbtt_uint32 c;
+   stbtt_uint16 ch2;
+   
    // convert utf16 to utf8 and compare the results while converting
    while (len2) {
-      stbtt_uint16 ch = s2[0]*256 + s2[1];
+      ch = s2[0]*256 + s2[1];
       if (ch < 0x80) {
          if (i >= len1) return -1;
          if (s1[i++] != ch) return -1;
@@ -4600,8 +4970,7 @@ static stbtt_int32 stbtt__CompareUTF8toUTF16_bigendian_prefix(stbtt_uint8 *s1, s
          if (s1[i++] != 0xc0 + (ch >> 6)) return -1;
          if (s1[i++] != 0x80 + (ch & 0x3f)) return -1;
       } else if (ch >= 0xd800 && ch < 0xdc00) {
-         stbtt_uint32 c;
-         stbtt_uint16 ch2 = s2[2]*256 + s2[3];
+         ch2 = s2[2]*256 + s2[3];
          if (i+3 >= len1) return -1;
          c = ((ch - 0xd800) << 10) + (ch2 - 0xdc00) + 0x10000;
          if (s1[i++] != 0xf0 + (c >> 18)) return -1;
@@ -4624,7 +4993,7 @@ static stbtt_int32 stbtt__CompareUTF8toUTF16_bigendian_prefix(stbtt_uint8 *s1, s
    return i;
 }
 
-static int stbtt_CompareUTF8toUTF16_bigendian_internal(char *s1, int len1, char *s2, int len2) 
+static int stbtt_CompareUTF8toUTF16_bigendian_internal(char *s1, int len1, char *s2, int len2)
 {
    return len1 == stbtt__CompareUTF8toUTF16_bigendian_prefix((stbtt_uint8*) s1, len1, (stbtt_uint8*) s2, len2);
 }
@@ -4641,8 +5010,9 @@ STBTT_DEF const char *stbtt_GetFontNameString(const stbtt_fontinfo *font, int *l
 
    count = ttUSHORT(fc+nm+2);
    stringOffset = nm + ttUSHORT(fc+nm+4);
+   stbtt_uint32 loc;
    for (i=0; i < count; ++i) {
-      stbtt_uint32 loc = nm + 6 + 12 * i;
+      loc = nm + 6 + 12 * i;
       if (platformID == ttUSHORT(fc+loc+0) && encodingID == ttUSHORT(fc+loc+2)
           && languageID == ttUSHORT(fc+loc+4) && nameID == ttUSHORT(fc+loc+6)) {
          *length = ttUSHORT(fc+loc+8);
@@ -4657,21 +5027,28 @@ static int stbtt__matchpair(stbtt_uint8 *fc, stbtt_uint32 nm, stbtt_uint8 *name,
    stbtt_int32 i;
    stbtt_int32 count = ttUSHORT(fc+nm+2);
    stbtt_int32 stringOffset = nm + ttUSHORT(fc+nm+4);
-
+   
+   // Variables moved outside the loop for better performance
+   stbtt_uint32 loc;
+   stbtt_int32 id;
+   stbtt_int32 platform, encoding, language;
+   stbtt_int32 slen, off;
+   stbtt_int32 matchlen;
+   
    for (i=0; i < count; ++i) {
-      stbtt_uint32 loc = nm + 6 + 12 * i;
-      stbtt_int32 id = ttUSHORT(fc+loc+6);
+      loc = nm + 6 + 12 * i;
+      id = ttUSHORT(fc+loc+6);
       if (id == target_id) {
          // find the encoding
-         stbtt_int32 platform = ttUSHORT(fc+loc+0), encoding = ttUSHORT(fc+loc+2), language = ttUSHORT(fc+loc+4);
-
+         platform = ttUSHORT(fc+loc+0);
+         encoding = ttUSHORT(fc+loc+2);
+         language = ttUSHORT(fc+loc+4);
          // is this a Unicode encoding?
          if (platform == 0 || (platform == 3 && encoding == 1) || (platform == 3 && encoding == 10)) {
-            stbtt_int32 slen = ttUSHORT(fc+loc+8);
-            stbtt_int32 off = ttUSHORT(fc+loc+10);
-
+            slen = ttUSHORT(fc+loc+8);
+            off = ttUSHORT(fc+loc+10);
             // check if there's a prefix match
-            stbtt_int32 matchlen = stbtt__CompareUTF8toUTF16_bigendian_prefix(name, nlen, fc+stringOffset+off,slen);
+            matchlen = stbtt__CompareUTF8toUTF16_bigendian_prefix(name, nlen, fc+stringOffset+off,slen);
             if (matchlen >= 0) {
                // check for target_id+1 immediately following, with same encoding & language
                if (i+1 < count && ttUSHORT(fc+loc+12+6) == next_id && ttUSHORT(fc+loc+12) == platform && ttUSHORT(fc+loc+12+2) == encoding && ttUSHORT(fc+loc+12+4) == language) {
@@ -4692,7 +5069,6 @@ static int stbtt__matchpair(stbtt_uint8 *fc, stbtt_uint32 nm, stbtt_uint8 *name,
                }
             }
          }
-
          // @TODO handle other encodings
       }
    }
@@ -4730,9 +5106,9 @@ static int stbtt__matches(stbtt_uint8 *fc, stbtt_uint32 offset, stbtt_uint8 *nam
 
 static int stbtt_FindMatchingFont_internal(unsigned char *font_collection, char *name_utf8, stbtt_int32 flags)
 {
-   stbtt_int32 i;
+   stbtt_int32 i, off;
    for (i=0;;++i) {
-      stbtt_int32 off = stbtt_GetFontOffsetForIndex(font_collection, i);
+      off = stbtt_GetFontOffsetForIndex(font_collection, i);
       if (off < 0) return off;
       if (stbtt__matches((stbtt_uint8 *) font_collection, off, (stbtt_uint8*) name_utf8, flags))
          return off;
@@ -4753,7 +5129,7 @@ STBTT_DEF int stbtt_BakeFontBitmap(const unsigned char *data, int offset,
 
 STBTT_DEF int stbtt_GetFontOffsetForIndex(const unsigned char *data, int index)
 {
-   return stbtt_GetFontOffsetForIndex_internal((unsigned char *) data, index);   
+   return stbtt_GetFontOffsetForIndex_internal((unsigned char *) data, index);
 }
 
 STBTT_DEF int stbtt_GetNumberOfFonts(const unsigned char *data)
@@ -4785,6 +5161,12 @@ STBTT_DEF int stbtt_CompareUTF8toUTF16_bigendian(const char *s1, int len1, const
 
 // FULL VERSION HISTORY
 //
+//   1.25 (2021-07-11) many fixes
+//   1.24 (2020-02-05) fix warning
+//   1.23 (2020-02-02) query SVG data for glyphs; query whole kerning table (but only kern not GPOS)
+//   1.22 (2019-08-11) minimize missing-glyph duplication; fix kerning if both 'GPOS' and 'kern' are defined
+//   1.21 (2019-02-25) fix warning
+//   1.20 (2019-02-07) PackFontRange skips missing codepoints; GetScaleFontVMetrics()
 //   1.19 (2018-02-11) OpenType GPOS kerning (horizontal only), STBTT_fmod
 //   1.18 (2018-01-29) add missing function
 //   1.17 (2017-07-23) make more arguments const; doc fix
@@ -4846,38 +5228,38 @@ This software is available under 2 licenses -- choose whichever you prefer.
 ------------------------------------------------------------------------------
 ALTERNATIVE A - MIT License
 Copyright (c) 2017 Sean Barrett
-Permission is hereby granted, free of charge, to any person obtaining a copy of 
-this software and associated documentation files (the "Software"), to deal in 
-the Software without restriction, including without limitation the rights to 
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies 
-of the Software, and to permit persons to whom the Software is furnished to do 
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
 so, subject to the following conditions:
-The above copyright notice and this permission notice shall be included in all 
+The above copyright notice and this permission notice shall be included in all
 copies or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ------------------------------------------------------------------------------
 ALTERNATIVE B - Public Domain (www.unlicense.org)
 This is free and unencumbered software released into the public domain.
-Anyone is free to copy, modify, publish, use, compile, sell, or distribute this 
-software, either in source code form or as a compiled binary, for any purpose, 
+Anyone is free to copy, modify, publish, use, compile, sell, or distribute this
+software, either in source code form or as a compiled binary, for any purpose,
 commercial or non-commercial, and by any means.
-In jurisdictions that recognize copyright laws, the author or authors of this 
-software dedicate any and all copyright interest in the software to the public 
-domain. We make this dedication for the benefit of the public at large and to 
-the detriment of our heirs and successors. We intend this dedication to be an 
-overt act of relinquishment in perpetuity of all present and future rights to 
+In jurisdictions that recognize copyright laws, the author or authors of this
+software dedicate any and all copyright interest in the software to the public
+domain. We make this dedication for the benefit of the public at large and to
+the detriment of our heirs and successors. We intend this dedication to be an
+overt act of relinquishment in perpetuity of all present and future rights to
 this software under copyright law.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
-AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN 
-ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION 
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ------------------------------------------------------------------------------
 */
\ No newline at end of file
diff --git a/Source/sys-clk/overlay/lib/libultrahand/libtesla/include/tesla.hpp b/Source/sys-clk/overlay/lib/libultrahand/libtesla/include/tesla.hpp
new file mode 100644
index 00000000..2bcc7b72
--- /dev/null
+++ b/Source/sys-clk/overlay/lib/libultrahand/libtesla/include/tesla.hpp
@@ -0,0 +1,13881 @@
+/********************************************************************************
+ * Custom Fork Information
+ * 
+ * File: tesla.hpp
+ * Author: ppkantorski
+ * Description: 
+ *   This file serves as the core logic for the Ultrahand Overlay project's custom fork
+ *   of libtesla, an overlay executor. Within this file, you will find a collection of
+ *   functions, menu structures, and interaction logic designed to facilitate the
+ *   smooth execution and flexible customization of overlays within the project.
+ *
+ *   For the latest updates and contributions, visit the project's GitHub repository.
+ *   (GitHub Repository: https://github.com/ppkantorski/Ultrahand-Overlay)
+ *
+ *   Note: Please be aware that this notice cannot be altered or removed. It is a part
+ *   of the project's documentation and must remain intact.
+ *
+ *  Copyright (c) 2024 ppkantorski
+ ********************************************************************************/
+
+/**
+ * Copyright (C) 2020 werwolv
+ *
+ * This file is part of libtesla.
+ *
+ * libtesla is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * libtesla is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with libtesla.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#pragma once
+
+
+#include <ultra.hpp>
+#include <switch.h>
+#include <arm_neon.h>
+
+#include <strings.h>
+#include <math.h>
+
+#if !IS_LAUNCHER_DIRECTIVE
+#include <filesystem> // unused, but preserved for projects that might need it
+#endif
+
+#include <algorithm>
+#include <cstring>
+#include <cwctype>
+#include <string>
+#include <functional>
+#include <type_traits>
+#include <mutex>
+#include <shared_mutex>
+#include <memory>
+//#include <chrono> // despite being commented out, it must still be being imported via other libs
+#include <list>
+#include <stack>
+#include <map>
+//#include <barrier>
+
+
+// Define this makro before including tesla.hpp in your main file. If you intend
+// to use the tesla.hpp header in more than one source file, only define it once!
+// #define TESLA_INIT_IMPL
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-function"
+
+#ifdef TESLA_INIT_IMPL
+    #define STB_TRUETYPE_IMPLEMENTATION
+#endif
+#include "stb_truetype.h"
+
+#pragma GCC diagnostic pop
+
+#define ELEMENT_BOUNDS(elem) elem->getX(), elem->getY(), elem->getWidth(), elem->getHeight()
+
+#define ASSERT_EXIT(x) if (R_FAILED(x)) std::exit(1)
+#define ASSERT_FATAL(x) if (Result res = x; R_FAILED(res)) fatalThrow(res)
+
+#define PACKED __attribute__((packed))
+#define ALWAYS_INLINE inline __attribute__((always_inline))
+
+/// Evaluates an expression that returns a result, and returns the result if it would fail.
+#define TSL_R_TRY(resultExpr)           \
+    ({                                  \
+        const auto result = resultExpr; \
+        if (R_FAILED(result)) {         \
+            return result;              \
+        }                               \
+    })
+
+using namespace std::literals::string_literals;
+using namespace std::literals::chrono_literals; // potentially unused, restored for softare compatibility
+
+#if IS_STATUS_MONITOR_DIRECTIVE
+//struct GlyphInfo {
+//    u8* pointer;
+//    int width;
+//    int height;
+//};
+
+struct KeyPairHash {
+    std::size_t operator()(const std::pair<int, float>& key) const {
+        // Combine hashes of both components
+        union returnValue {
+            char c[8];
+            std::size_t s;
+        } value;
+        memcpy(&value.c[0], &key.first, 4);
+        memcpy(&value.c[4], &key.second, 4);
+        return value.s;
+    }
+};
+
+// Custom equality comparison for int-float pairs
+struct KeyPairEqual {
+    bool operator()(const std::pair<int, float>& lhs, const std::pair<int, float>& rhs) const {
+        //static constexpr float epsilon = 0.00001f;
+        return lhs.first == rhs.first && 
+            std::abs(lhs.second - rhs.second) < 0.00001f;
+    }
+};
+
+//std::unordered_map<std::pair<s32, float>, GlyphInfo, KeyPairHash, KeyPairEqual> cache;
+
+u8 TeslaFPS = 60;
+//u8 alphabackground = 0xD;
+volatile bool triggerExitNow = false;
+volatile bool isRendering = false;
+volatile bool delayUpdate = false;
+volatile bool pendingExit = false;
+volatile bool wasRendering = false;
+
+LEvent renderingStopEvent;
+bool FullMode = true;
+bool deactivateOriginalFooter = false;
+//bool fontCache = true;
+bool disableJumpTo = false;
+
+// Check for mini/micro mode flags
+//bool isMiniOrMicroMode = false;
+inline std::string lastMode;
+inline std::set<std::string> overlayModes = {"full", "mini", "micro", "fps_graph", "fps_counter", "game_resolutions"};
+
+bool isValidOverlayMode() {
+    return overlayModes.count(lastMode) > 0;
+}
+
+#endif
+
+#if USING_FPS_INDICATOR_DIRECTIVE
+float fps = 0.0;
+int frameCount = 0;
+double elapsedTime;
+#endif
+
+
+// Custom variables
+//static bool jumpToListItem = false;
+inline std::atomic<bool> jumpToTop{false};
+inline std::atomic<bool> jumpToBottom{false};
+inline std::atomic<bool> skipUp{false};
+inline std::atomic<bool> skipDown{false};
+inline u32 offsetWidthVar = 112;
+inline std::string g_overlayFilename;;
+inline std::string lastOverlayFilename;
+inline std::string lastOverlayMode;
+
+inline std::mutex jumpItemMutex;
+inline std::string jumpItemName;
+inline std::string jumpItemValue;
+inline std::atomic<bool> jumpItemExactMatch{true};
+
+inline std::atomic<bool> s_onLeftPage{false};
+inline std::atomic<bool> s_onRightPage{false};
+inline std::atomic<bool> screenshotsAreDisabled{false};
+inline std::atomic<bool> screenshotsAreForceDisabled{false};
+
+//#if IS_LAUNCHER_DIRECTIVE
+inline bool hideHidden = false;
+//#endif
+
+//inline std::atomic<bool> isLaunchingNextOverlay{false};
+inline std::atomic<bool> mainComboHasTriggered{false};
+inline std::atomic<bool> launchComboHasTriggered{false};
+
+
+
+// Sound triggering variables
+inline std::atomic<bool> triggerNavigationSound{false};
+inline std::atomic<bool> triggerEnterSound{false};
+inline std::atomic<bool> triggerExitSound{false};
+inline std::atomic<bool> triggerWallSound{false};
+inline std::atomic<bool> triggerOnSound{false};
+inline std::atomic<bool> triggerOffSound{false};
+inline std::atomic<bool> triggerSettingsSound{false};
+inline std::atomic<bool> triggerMoveSound{false};
+inline std::atomic<bool> disableSound{false};
+//inline std::atomic<bool> clearSoundCacheNow{false};
+inline std::atomic<bool> reloadSoundCacheNow{false};
+
+// Haptic triggering variables
+inline std::atomic<bool> triggerRumbleClick{false};
+inline std::atomic<bool> triggerRumbleDoubleClick{false};
+
+
+static inline void triggerNavigationFeedback() {
+    triggerRumbleClick.store(true, std::memory_order_release);
+    triggerNavigationSound.store(true, std::memory_order_release);
+}
+
+static inline void triggerEnterFeedback() {
+    triggerRumbleClick.store(true, std::memory_order_release);
+    triggerEnterSound.store(true, std::memory_order_release);
+}
+
+static inline void triggerExitFeedback() {
+    triggerRumbleDoubleClick.store(true, std::memory_order_release);
+    triggerExitSound.store(true, std::memory_order_release);
+}
+
+
+namespace tsl {
+
+    // Booleans
+    inline std::atomic<bool> clearGlyphCacheNow(false);
+
+    // Constants
+    
+    namespace cfg {
+        
+        constexpr u32 ScreenWidth = 1920;       ///< Width of the Screen
+        constexpr u32 ScreenHeight = 1080;      ///< Height of the Screen
+        constexpr u32 LayerMaxWidth = 1280;
+        constexpr u32 LayerMaxHeight = 720;
+        
+        extern u16 LayerWidth;                  ///< Width of the Tesla layer
+        extern u16 LayerHeight;                 ///< Height of the Tesla layer
+        extern u16 LayerPosX;                   ///< X position of the Tesla layer
+        extern u16 LayerPosY;                   ///< Y position of the Tesla layer
+        extern u16 FramebufferWidth;            ///< Width of the framebuffer
+        extern u16 FramebufferHeight;           ///< Height of the framebuffer
+        extern u64 launchCombo;                 ///< Overlay activation key combo
+        extern u64 launchCombo2;                 ///< Overlay activation key combo
+        
+    }
+    
+    /**
+     * @brief RGBA4444 Color structure
+     */
+    struct Color {
+        
+        union {
+            struct {
+                u16 r: 4, g: 4, b: 4, a: 4;
+            } PACKED;
+            u16 rgba;
+        };
+        
+        constexpr inline Color(u16 raw): rgba(raw) {}
+        constexpr inline Color(u8 r, u8 g, u8 b, u8 a): r(r), g(g), b(b), a(a) {}
+        
+    };
+    
+    //#if USING_WIDGET_DIRECTIVE
+    // Ultra-fast version - zero variables, optimized calculations
+    inline constexpr Color GradientColor(float temperature) {
+        if (temperature <= 35.0f) return Color(7, 7, 15, 0xFF);
+        if (temperature >= 65.0f) return Color(15, 0, 0, 0xFF);
+        
+        if (temperature < 45.0f) {
+            // Single calculation, avoid repetition
+            const float factor = (temperature - 35.0f) * 0.1f;
+            return Color(7 - 7 * factor, 7 + 8 * factor, 15 - 15 * factor, 0xFF);
+        }
+        
+        if (temperature < 55.0f) {
+            return Color(15 * (temperature - 45.0f) * 0.1f, 15, 0, 0xFF);
+        }
+        
+        return Color(15, 15 - 15 * (temperature - 55.0f) * 0.1f, 0, 0xFF);
+    }
+    //#endif
+
+
+    // Ultra-fast version - single variable, minimal branching
+    inline Color RGB888(const std::string& hexColor, size_t alpha = 15, const std::string& defaultHexColor = ult::whiteColor) {
+        const char* h = hexColor.size() == 6 ? hexColor.data() :
+                        hexColor.size() == 7 && hexColor[0] == '#' ? hexColor.data() + 1 :
+                        defaultHexColor.data();
+        
+        return Color(
+            (ult::hexMap[h[0]] << 4 | ult::hexMap[h[1]]) >> 4,
+            (ult::hexMap[h[2]] << 4 | ult::hexMap[h[3]]) >> 4,
+            (ult::hexMap[h[4]] << 4 | ult::hexMap[h[5]]) >> 4,
+            alpha
+        );
+    }
+    
+    
+    namespace style {
+        constexpr u32 ListItemDefaultHeight         = 70;       ///< Standard list item height
+        constexpr u32 MiniListItemDefaultHeight     = 40;       ///< Mini list item height
+        constexpr u32 TrackBarDefaultHeight         = 83;       ///< Standard track bar height
+        constexpr u8  ListItemHighlightSaturation   = 7;        ///< Maximum saturation of Listitem highlights
+        constexpr u8  ListItemHighlightLength       = 22;       ///< Maximum length of Listitem highlights
+        
+        namespace color {
+            constexpr Color ColorFrameBackground  = { 0x0, 0x0, 0x0, 0xD };   ///< Overlay frame background color
+            constexpr Color ColorTransparent      = { 0x0, 0x0, 0x0, 0x0 };   ///< Transparent color
+            constexpr Color ColorHighlight        = { 0x0, 0xF, 0xD, 0xF };   ///< Greenish highlight color
+            constexpr Color ColorFrame            = { 0x7, 0x7, 0x7, 0x7 };   ///< Outer boarder color // CUSTOM MODIFICATION
+            constexpr Color ColorHandle           = { 0x5, 0x5, 0x5, 0xF };   ///< Track bar handle color
+            constexpr Color ColorText             = { 0xF, 0xF, 0xF, 0xF };   ///< Standard text color
+            constexpr Color ColorDescription      = { 0xA, 0xA, 0xA, 0xF };   ///< Description text color
+            constexpr Color ColorHeaderBar        = { 0xC, 0xC, 0xC, 0xF };   ///< Category header rectangle color
+            constexpr Color ColorClickAnimation   = { 0x0, 0x2, 0x2, 0xF };   ///< Element click animation color
+        }
+    }
+
+    static bool overrideBackButton = false; // for properly overriding the automatic "go back" functionality of KEY_B button presses
+
+    // Theme color variable definitions
+    //static bool disableColorfulLogo = false;
+
+    
+    static Color logoColor1 = RGB888(ult::whiteColor);
+    static Color logoColor2 = RGB888("F7253E");
+    
+
+    static size_t defaultBackgroundAlpha = 13;
+    
+    static Color defaultBackgroundColor = RGB888(ult::blackColor, defaultBackgroundAlpha);
+    static Color defaultTextColor = RGB888(ult::whiteColor);
+    static Color notificationTextColor = RGB888(ult::whiteColor);
+    static Color headerTextColor = RGB888(ult::whiteColor);
+    static Color headerSeparatorColor = RGB888(ult::whiteColor);
+    static Color starColor = RGB888(ult::whiteColor);
+    static Color selectionStarColor = RGB888(ult::whiteColor);
+    static Color buttonColor = RGB888(ult::whiteColor);
+    static Color bottomTextColor = RGB888(ult::whiteColor);
+    static Color bottomSeparatorColor = RGB888(ult::whiteColor);
+    static Color topSeparatorColor = RGB888("404040");
+
+    static Color defaultOverlayColor = RGB888(ult::whiteColor);
+    static Color defaultPackageColor = RGB888(ult::whiteColor);//RGB888("#00FF00");
+    static Color defaultScriptColor = RGB888("FF33FF");
+    static Color clockColor = RGB888(ult::whiteColor);
+    static Color temperatureColor = RGB888(ult::whiteColor);
+    static Color batteryColor = RGB888("ffff45");
+    static Color batteryChargingColor = RGB888("00FF00");
+    static Color batteryLowColor = RGB888("FF0000");
+    static size_t widgetBackdropAlpha = 15;
+    static Color widgetBackdropColor = RGB888(ult::blackColor, widgetBackdropAlpha);
+
+    static Color overlayTextColor = RGB888(ult::whiteColor);
+    static Color ultOverlayTextColor = RGB888("9ed0ff");
+    static Color packageTextColor = RGB888(ult::whiteColor);
+    static Color ultPackageTextColor = RGB888("9ed0ff");
+
+    static Color bannerVersionTextColor = RGB888(ult::greyColor);
+    static Color overlayVersionTextColor = RGB888(ult::greyColor);
+    static Color ultOverlayVersionTextColor = RGB888("00FFDD");
+    static Color packageVersionTextColor = RGB888(ult::greyColor);
+    static Color ultPackageVersionTextColor = RGB888("00FFDD");
+    static Color onTextColor = RGB888("00FFDD");
+    static Color offTextColor = RGB888(ult::greyColor);
+    
+    #if IS_LAUNCHER_DIRECTIVE
+    static Color dynamicLogoRGB1 = RGB888("00E669");
+    static Color dynamicLogoRGB2 = RGB888("8080EA");
+    #endif
+
+    //static bool disableSelectionBG = false;
+    //static bool disableSelectionValueColor = false;
+    static bool invertBGClickColor = false;
+
+    static size_t selectionBGAlpha = 11;
+    static Color selectionBGColor = RGB888(ult::blackColor, selectionBGAlpha);
+
+    static Color highlightColor1 = RGB888("2288CC");
+    static Color highlightColor2 = RGB888("88FFFF");
+    static Color highlightColor3 = RGB888("FFFF45");
+    static Color highlightColor4 = RGB888("F7253E");
+
+    static Color highlightColor = tsl::style::color::ColorHighlight;
+    
+    static size_t clickAlpha = 7;
+    static Color clickColor = RGB888("3E25F7", clickAlpha);
+
+    static size_t progressAlpha = 7;
+    static Color progressColor = RGB888("253EF7", progressAlpha);
+
+    static Color trackBarColor = RGB888("555555");
+
+    static size_t separatorAlpha = 15;
+    static Color separatorColor = RGB888("404040", separatorAlpha);
+    static Color edgeSeparatorColor = RGB888("303030");
+
+    static Color textSeparatorColor = RGB888("404040");
+
+    static Color selectedTextColor = RGB888("9ed0ff");
+    static Color selectedValueTextColor = RGB888("FF7777");
+    static Color inprogressTextColor = RGB888(ult::whiteColor);
+    static Color invalidTextColor = RGB888("FF0000");
+    static Color clickTextColor = RGB888(ult::whiteColor);
+
+    static size_t tableBGAlpha = 14;
+    static Color tableBGColor = RGB888("2C2C2C", tableBGAlpha); //RGB888("303030", tableBGAlpha);
+    static Color sectionTextColor = RGB888(ult::whiteColor);
+    //static Color infoTextColor = RGB888("00FFDD");
+    static Color infoTextColor =RGB888("9ed0ff");
+    static Color warningTextColor = RGB888("FF7777");
+
+    static Color healthyRamTextColor = RGB888("00FF00");
+    static Color neutralRamTextColor = RGB888("FFAA00");
+    static Color badRamTextColor = RGB888("FF0000");
+
+    static Color trackBarSliderColor = RGB888("606060");
+    static Color trackBarSliderBorderColor = RGB888("505050");
+    static Color trackBarSliderMalleableColor = RGB888("A0A0A0");
+    static Color trackBarFullColor = RGB888("00FFDD");
+    static Color trackBarEmptyColor = RGB888("404040");
+    
+    static void initializeThemeVars() {
+        auto themeData = ult::getParsedDataFromIniFile(ult::THEME_CONFIG_INI_PATH);
+        if (themeData.count(ult::THEME_STR) == 0) return;
+        
+        auto& themeSection = themeData[ult::THEME_STR];
+        
+        auto getValue = [&](const char* key) -> const std::string& {
+            auto it = themeSection.find(key);
+            return it != themeSection.end() ? it->second : ult::defaultThemeSettingsMap[key];
+        };
+        
+        auto getColor = [&](const char* key, size_t alpha = 15) {
+            return RGB888(getValue(key), alpha);
+        };
+        
+        auto getAlpha = [&](const char* key) {
+            const auto& alphaStr = getValue(key);
+            return ult::stoi(alphaStr);
+        };
+        
+        #if IS_LAUNCHER_DIRECTIVE
+        logoColor1 = getColor("logo_color_1");
+        logoColor2 = getColor("logo_color_2");
+        dynamicLogoRGB1 = getColor("dynamic_logo_color_1");
+        dynamicLogoRGB2 = getColor("dynamic_logo_color_2");
+        #endif
+    
+        defaultBackgroundAlpha = getAlpha("bg_alpha");
+        defaultBackgroundColor = getColor("bg_color", defaultBackgroundAlpha);
+        defaultTextColor = getColor("text_color");
+        notificationTextColor = getColor("notification_text_color");
+        headerTextColor = getColor("header_text_color");
+        headerSeparatorColor = getColor("header_separator_color");
+        starColor = getColor("star_color");
+        selectionStarColor = getColor("selection_star_color");
+        buttonColor = getColor("bottom_button_color");
+        bottomTextColor = getColor("bottom_text_color");
+        bottomSeparatorColor = getColor("bottom_separator_color");
+        topSeparatorColor = getColor("top_separator_color");
+        defaultOverlayColor = getColor("default_overlay_color");
+        defaultPackageColor = getColor("default_package_color");
+        defaultScriptColor = getColor("default_script_color");
+        clockColor = getColor("clock_color");
+        temperatureColor = getColor("temperature_color");
+        batteryColor = getColor("battery_color");
+        batteryChargingColor = getColor("battery_charging_color");
+        batteryLowColor = getColor("battery_low_color");
+        widgetBackdropAlpha = getAlpha("widget_backdrop_alpha");
+        widgetBackdropColor = getColor("widget_backdrop_color", widgetBackdropAlpha);
+        overlayTextColor = getColor("overlay_text_color");
+        ultOverlayTextColor = getColor("ult_overlay_text_color");
+        packageTextColor = getColor("package_text_color");
+        ultPackageTextColor = getColor("ult_package_text_color");
+        bannerVersionTextColor = getColor("banner_version_text_color");
+        overlayVersionTextColor = getColor("overlay_version_text_color");
+        ultOverlayVersionTextColor = getColor("ult_overlay_version_text_color");
+        packageVersionTextColor = getColor("package_version_text_color");
+        ultPackageVersionTextColor = getColor("ult_package_version_text_color");
+        onTextColor = getColor("on_text_color");
+        offTextColor = getColor("off_text_color");
+        invertBGClickColor = (getValue("invert_bg_click_color") == ult::TRUE_STR);
+        selectionBGAlpha = getAlpha("selection_bg_alpha");
+        selectionBGColor = getColor("selection_bg_color", selectionBGAlpha);
+        highlightColor1 = getColor("highlight_color_1");
+        highlightColor2 = getColor("highlight_color_2");
+        highlightColor3 = getColor("highlight_color_3");
+        highlightColor4 = getColor("highlight_color_4");
+        clickAlpha = getAlpha("click_alpha");
+        clickColor = getColor("click_color", clickAlpha);
+        progressAlpha = getAlpha("progress_alpha");
+        progressColor = getColor("progress_color", progressAlpha);
+        trackBarColor = getColor("trackbar_color");
+        separatorAlpha = getAlpha("separator_alpha");
+        separatorColor = getColor("separator_color", separatorAlpha);
+        textSeparatorColor = getColor("text_separator_color");
+        selectedTextColor = getColor("selection_text_color");
+        selectedValueTextColor = getColor("selection_value_text_color");
+        inprogressTextColor = getColor("inprogress_text_color");
+        invalidTextColor = getColor("invalid_text_color");
+        clickTextColor = getColor("click_text_color");
+        tableBGAlpha = getAlpha("table_bg_alpha");
+        tableBGColor = getColor("table_bg_color", tableBGAlpha);
+        sectionTextColor = getColor("table_section_text_color");
+        infoTextColor = getColor("table_info_text_color");
+        warningTextColor = getColor("warning_text_color");
+        healthyRamTextColor = getColor("healthy_ram_text_color");
+        neutralRamTextColor = getColor("neutral_ram_text_color");
+        badRamTextColor = getColor("bad_ram_text_color");
+        trackBarSliderColor = getColor("trackbar_slider_color");
+        trackBarSliderBorderColor = getColor("trackbar_slider_border_color");
+        trackBarSliderMalleableColor = getColor("trackbar_slider_malleable_color");
+        trackBarFullColor = getColor("trackbar_full_color");
+        trackBarEmptyColor = getColor("trackbar_empty_color");
+    }
+    
+    #if !IS_LAUNCHER_DIRECTIVE
+    static void initializeUltrahandSettings() { // only needed for regular overlays
+        // Load INI data once instead of 4 separate file reads
+        auto ultrahandSection = ult::getKeyValuePairsFromSection(ult::ULTRAHAND_CONFIG_INI_PATH, ult::ULTRAHAND_PROJECT_NAME);
+        
+        // Helper lambda to safely get string values
+        auto getStringValue = [&](const std::string& key, const std::string& defaultValue = "") -> std::string {
+            if (ultrahandSection.count(key) > 0) {
+                return ultrahandSection.at(key);
+            }
+            return defaultValue;
+        };
+        
+        // Helper lambda to safely get boolean values
+        auto getBoolValue = [&](const std::string& key, bool defaultValue = false) -> bool {
+            if (ultrahandSection.count(key) > 0) {
+                return (ultrahandSection.at(key) == ult::TRUE_STR);
+            }
+            return defaultValue;
+        };
+        
+        // Get default language with fallback
+        std::string defaultLang = getStringValue(ult::DEFAULT_LANG_STR, "en");
+        if (defaultLang.empty()) {
+            defaultLang = "en";
+        }
+        
+        #ifdef UI_OVERRIDE_PATH
+        
+        std::string UI_PATH = UI_OVERRIDE_PATH;
+        ult::preprocessPath(UI_PATH);
+        const std::string NEW_THEME_CONFIG_INI_PATH = UI_PATH+"theme.ini";
+        const std::string NEW_WALLPAPER_PATH = UI_PATH+"wallpaper.rgba";
+                  
+        const std::string TRANSLATION_JSON_PATH = UI_PATH+"lang/"+defaultLang+".json";
+        if (ult::isFileOrDirectory(NEW_THEME_CONFIG_INI_PATH))
+            ult::THEME_CONFIG_INI_PATH = NEW_THEME_CONFIG_INI_PATH; // Override theme path (optional)
+        if (ult::isFileOrDirectory(NEW_WALLPAPER_PATH))
+            ult::WALLPAPER_PATH = NEW_WALLPAPER_PATH; // Override wallpaper path (optional)
+        if (ult::isFileOrDirectory(TRANSLATION_JSON_PATH))
+            ult::loadTranslationsFromJSON(TRANSLATION_JSON_PATH); // load translations (optional)
+        #endif
+        
+        // Set Ultrahand Globals using loaded section (defaults match initialization function)
+        ult::useLaunchCombos = getBoolValue("launch_combos", true);       // TRUE_STR default
+        ult::useNotifications = getBoolValue("notifications", true);       // TRUE_STR default
+        if (ult::useNotifications && !ult::isFile(ult::NOTIFICATIONS_FLAG_FILEPATH)) {
+            FILE* file = std::fopen((ult::NOTIFICATIONS_FLAG_FILEPATH).c_str(), "w");
+            if (file) {
+                std::fclose(file);
+            }
+        } else {
+            ult::deleteFileOrDirectory(ult::NOTIFICATIONS_FLAG_FILEPATH);
+        }
+        ult::useSoundEffects = getBoolValue("sound_effects", false);
+        ult::useHapticFeedback = getBoolValue("haptic_feedback", false);
+
+        ult::useSwipeToOpen = getBoolValue("swipe_to_open", true);        // TRUE_STR default
+        ult::useOpaqueScreenshots = getBoolValue("opaque_screenshots", true); // TRUE_STR default
+        
+        ultrahandSection.clear();
+
+        const std::string langFile = ult::LANG_PATH+defaultLang+".json";
+        if (ult::isFileOrDirectory(langFile))
+            ult::parseLanguage(langFile);
+    }
+    #endif
+    
+    
+    // Declarations
+    
+    /**
+     * @brief Direction in which focus moved before landing on
+     *        the currently focused element
+     */
+    enum class FocusDirection {
+        None,                       ///< Focus was placed on the element programatically without user input
+        Up,                         ///< Focus moved upwards
+        Down,                       ///< Focus moved downwards
+        Left,                       ///< Focus moved from left to rigth
+        Right                       ///< Focus moved from right to left
+    };
+    
+    /**
+     * @brief Current input controll mode
+     *
+     */
+    enum class InputMode {
+        Controller,                 ///< Input from controller
+        Touch,                      ///< Touch input
+        TouchScroll                 ///< Moving/scrolling touch input
+    };
+    
+    class Overlay;
+    namespace elm { class Element; }
+    
+    namespace impl {
+        
+        /**
+         * @brief Overlay launch parameters
+         */
+        enum class LaunchFlags : u8 {
+            None = 0,                       ///< Do nothing special at launch
+            CloseOnExit        = BIT(0)     ///< Close the overlay the last Gui gets poped from the stack
+        };
+        
+        static constexpr LaunchFlags operator|(LaunchFlags lhs, LaunchFlags rhs) {
+            return static_cast<LaunchFlags>(u8(lhs) | u8(rhs));
+        }
+        
+        
+        
+    }
+    
+    static void goBack(u32 count = 1);
+
+    static void pop(u32 count = 1);
+    
+    static void setNextOverlay(const std::string& ovlPath, std::string args = "");
+    
+    template<typename TOverlay, impl::LaunchFlags launchFlags = impl::LaunchFlags::CloseOnExit>
+    int loop(int argc, char** argv);
+    
+    // Helpers
+    
+    namespace hlp {
+
+        /**
+         * @brief Wrapper for service initialization
+         *
+         * @param f wrapped function
+         */
+        template<typename F>
+        static inline void doWithSmSession(F f) {
+            smInitialize();
+            f();
+            smExit();
+        }
+        
+        /**
+         * @brief Wrapper for sd card access using stdio
+         * @note Consider using raw fs calls instead as they are faster and need less space
+         *
+         * @param f wrapped function
+         */
+        template<typename F>
+        static inline void doWithSDCardHandle(F f) {
+            fsdevMountSdmc();
+            f();
+            fsdevUnmountDevice("sdmc");
+        }
+        
+        /**
+         * @brief Guard that will execute a passed function at the end of the current scope
+         *
+         * @param f wrapped function
+         */
+        template<typename F>
+        class ScopeGuard {
+            ScopeGuard(const ScopeGuard&) = delete;
+            ScopeGuard& operator=(const ScopeGuard&) = delete;
+            private:
+                F f;
+                bool canceled = false;
+            public:
+                ALWAYS_INLINE ScopeGuard(F f) : f(std::move(f)) { }
+                ALWAYS_INLINE ~ScopeGuard() { if (!canceled) { f(); } }
+                void dismiss() { canceled = true; }
+        };
+        
+        /**
+         * @brief libnx hid:sys shim that gives or takes away frocus to or from the process with the given aruid
+         *
+         * @param enable Give focus or take focus
+         * @param aruid Aruid of the process to focus/unfocus
+         * @return Result Result
+         */
+        static Result hidsysEnableAppletToGetInput(bool enable, u64 aruid) {
+            const struct {
+                u8 permitInput;
+                u64 appletResourceUserId;
+            } in = { enable != 0, aruid };
+            
+            return serviceDispatchIn(hidsysGetServiceSession(), 503, in);
+        }
+        
+        static Result viAddToLayerStack(ViLayer *layer, ViLayerStack stack) {
+            const struct {
+                u32 stack;
+                u64 layerId;
+            } in = { stack, layer->layer_id };
+            
+            return serviceDispatchIn(viGetSession_IManagerDisplayService(), 6000, in);
+        }
+
+        /**
+         * @brief Remove layer from layer stack
+         */
+        static Result viRemoveFromLayerStack(ViLayer *layer, ViLayerStack stack) {
+            const struct {
+                u32 stack;
+                u64 layerId;
+            } in = { stack, layer->layer_id };
+            
+            // Service command 6001 is commonly used for remove operations
+            // If this doesn't work, try 6002, 6010, or other nearby values
+            return serviceDispatchIn(viGetSession_IManagerDisplayService(), 6001, in);
+        }
+        
+        /**
+         * @brief Toggles focus between the Tesla overlay and the rest of the system
+         *
+         * @param enabled Focus Tesla?
+         */
+        static void requestForeground(bool enabled, bool updateGlobalFlag = true) {
+            if (updateGlobalFlag)
+                ult::currentForeground.store(enabled, std::memory_order_release);
+
+            u64 applicationAruid = 0, appletAruid = 0;
+            
+            for (u64 programId = 0x0100000000001000UL; programId < 0x0100000000001020UL; programId++) {
+                pmdmntGetProcessId(&appletAruid, programId);
+                
+                if (appletAruid != 0)
+                    hidsysEnableAppletToGetInput(!enabled, appletAruid);
+            }
+            
+
+            pmdmntGetApplicationProcessId(&applicationAruid);
+            hidsysEnableAppletToGetInput(!enabled, applicationAruid);
+            
+            hidsysEnableAppletToGetInput(true, 0);
+        }
+        
+
+        
+        namespace ini {
+            
+            /**
+             * @brief Ini file type
+             */
+            using IniData = std::map<std::string, std::map<std::string, std::string>>;
+            
+            /**
+             * @brief Parses a ini string
+             * 
+             * @param str String to parse
+             * @return Parsed data
+             * // Modified to be "const std" instead of just "std"
+             */
+            static IniData parseIni(const std::string &str) {
+                //IniData iniData;
+                //
+                //auto lines = split(str, '\n');
+                //
+                //std::string lastHeader = "";
+                //for (auto& line : lines) {
+                //    line.erase(std::remove_if(line.begin(), line.end(), ::isspace), line.end());
+                //    
+                //    if (line[0] == '[' && line[line.size() - 1] == ']') {
+                //        lastHeader = line.substr(1, line.size() - 2);
+                //        iniData.emplace(lastHeader, std::map<std::string, std::string>{});
+                //    }
+                //    else if (auto keyValuePair = split(line, '='); keyValuePair.size() == 2) {
+                //        iniData[lastHeader].emplace(keyValuePair[0], keyValuePair[1]);
+                //    }
+                //}
+                
+                return ult::parseIni(str);
+            }
+            
+            /**
+             * @brief Unparses ini data into a string
+             *
+             * @param iniData Ini data
+             * @return Ini string
+             */
+            static std::string unparseIni(const IniData &iniData) {
+                std::string result;
+                bool addSectionGap = false;
+            
+                for (const auto &section : iniData) {
+                    if (addSectionGap) {
+                        result += '\n';
+                    }
+                    result += '[' + section.first + "]\n";
+                    for (const auto &keyValue : section.second) {
+                        result += keyValue.first + '=' + keyValue.second + '\n';
+                    }
+                    addSectionGap = true;
+                }
+            
+                return result;
+            }
+
+            
+            /**
+             * @brief Read Tesla settings file
+             *
+             * @return Settings data
+             */
+            static IniData readOverlaySettings(auto& CONFIG_FILE) {
+                /* Open Sd card filesystem. */
+                FsFileSystem fsSdmc;
+                if (R_FAILED(fsOpenSdCardFileSystem(&fsSdmc)))
+                    return {};
+                hlp::ScopeGuard fsGuard([&] { fsFsClose(&fsSdmc); });
+                
+                /* Open config file. */
+                FsFile fileConfig;
+                if (R_FAILED(fsFsOpenFile(&fsSdmc, CONFIG_FILE, FsOpenMode_Read, &fileConfig)))
+                    return {};
+                hlp::ScopeGuard fileGuard([&] { fsFileClose(&fileConfig); });
+                
+                /* Get config file size. */
+                s64 configFileSize;
+                if (R_FAILED(fsFileGetSize(&fileConfig, &configFileSize)))
+                    return {};
+                
+                /* Read and parse config file. */
+                std::string configFileData(configFileSize, '\0');
+                u64 readSize;
+                Result rc = fsFileRead(&fileConfig, 0, configFileData.data(), configFileSize, FsReadOption_None, &readSize);
+                if (R_FAILED(rc) || readSize != static_cast<u64>(configFileSize))
+                    return {};
+                
+                return ult::parseIni(configFileData);
+            }
+            
+            /**
+             * @brief Replace Tesla settings file with new data
+             *
+             * @param iniData new data
+             */
+            static void writeOverlaySettings(IniData const &iniData, auto& CONFIG_FILE) {
+                /* Open Sd card filesystem. */
+                FsFileSystem fsSdmc;
+                if (R_FAILED(fsOpenSdCardFileSystem(&fsSdmc)))
+                    return;
+                hlp::ScopeGuard fsGuard([&] { fsFsClose(&fsSdmc); });
+                
+                /* Open config file. */
+                FsFile fileConfig;
+                if (R_FAILED(fsFsOpenFile(&fsSdmc, CONFIG_FILE, FsOpenMode_Write, &fileConfig)))
+                    return;
+                hlp::ScopeGuard fileGuard([&] { fsFileClose(&fileConfig); });
+                
+                const std::string iniString = unparseIni(iniData);
+                
+                fsFileWrite(&fileConfig, 0, iniString.c_str(), iniString.length(), FsWriteOption_Flush);
+            }
+            
+            /**
+             * @brief Merge and save changes into Tesla settings file
+             *
+             * @param changes setting values to add or update
+             */
+            static void updateOverlaySettings(IniData const &changes, auto& CONFIG_FILE) {
+                hlp::ini::IniData iniData = hlp::ini::readOverlaySettings(CONFIG_FILE);
+                for (auto &section : changes) {
+                    for (auto &keyValue : section.second) {
+                        iniData[section.first][keyValue.first] = keyValue.second;
+                    }
+                }
+                writeOverlaySettings(iniData, CONFIG_FILE);
+            }
+            
+        }
+        
+        /**
+         * @brief Decodes a key string into it's key code
+         *
+         * @param value Key string
+         * @return Key code
+         */
+        static u64 stringToKeyCode(const std::string& value) {
+            for (const auto& keyInfo : ult::KEYS_INFO) {
+                if (strcasecmp(value.c_str(), keyInfo.name) == 0)
+                    return keyInfo.key;
+            }
+            return 0;
+        }
+        
+        
+        /**
+         * @brief Decodes a combo string into key codes
+         *
+         * @param value Combo string
+         * @return Key codes
+         */
+        static u64 comboStringToKeys(const std::string &value) {
+            u64 keyCombo = 0x00;
+            for (std::string key : ult::split(ult::removeWhiteSpaces(value), '+')) { // CUSTOM MODIFICATION (bug fix)
+                keyCombo |= hlp::stringToKeyCode(key);
+            }
+            return keyCombo;
+        }
+        
+        /**
+         * @brief Encodes key codes into a combo string
+         *
+         * @param keys Key codes
+         * @return Combo string
+         */
+        static std::string keysToComboString(u64 keys) {
+            if (keys == 0) return "";  // Early return for empty input
+        
+            std::string result;
+            bool first = true;
+        
+            for (const auto &keyInfo : ult::KEYS_INFO) {
+                if (keys & keyInfo.key) {
+                    if (!first) {
+                        result += "+";
+                    }
+                    result += keyInfo.name;
+                    first = false;
+                }
+            }
+        
+            return result;
+        }
+
+        inline static std::mutex comboMutex;
+
+        // Function to load key combo mappings from both overlays.ini and packages.ini
+        static void loadEntryKeyCombos() {
+            std::lock_guard<std::mutex> lock(comboMutex);
+            ult::g_entryCombos.clear();
+        
+            // Load overlay combos from overlays.ini
+            auto overlayData = ult::getParsedDataFromIniFile(ult::OVERLAYS_INI_FILEPATH);
+            std::string fullPath;
+            u64 keys;
+
+            std::vector<std::string> modeList, comboList;
+            for (auto& [fileName, settings] : overlayData) {
+                fullPath = ult::OVERLAY_PATH + fileName;
+        
+                // 1) main key_combo
+                if (auto it = settings.find(ult::KEY_COMBO_STR); it != settings.end() && !it->second.empty()) {
+                    keys = hlp::comboStringToKeys(it->second);
+                    if (keys) ult::g_entryCombos[keys] = { fullPath, "" };
+                }
+        
+                // 2) per-mode combos
+                auto modesIt = settings.find("mode_args");
+                auto argsIt  = settings.find("mode_combos");
+                if (modesIt != settings.end()) {
+                    modeList  = ult::splitIniList(modesIt->second);
+                    comboList = (argsIt != settings.end())
+                                   ? ult::splitIniList(argsIt->second)
+                                   : std::vector<std::string>();
+                    if (comboList.size() < modeList.size())
+                        comboList.resize(modeList.size());
+        
+                    for (size_t i = 0; i < modeList.size(); ++i) {
+                        const std::string& comboStr = comboList[i];
+                        if (comboStr.empty()) continue;
+                        keys = hlp::comboStringToKeys(comboStr);
+                        if (!keys) continue;
+                        // launchArg is the *mode* (i.e. modeList[i])
+                        ult::g_entryCombos[keys] = { fullPath, modeList[i] };
+                    }
+                }
+            }
+        
+            // Load package combos from packages.ini
+            auto packageData = ult::getParsedDataFromIniFile(ult::PACKAGES_INI_FILEPATH);
+            for (auto& [packageName, settings] : packageData) {
+                // Only handle main key_combo for packages (no modes for packages)
+                if (auto it = settings.find(ult::KEY_COMBO_STR); it != settings.end() && !it->second.empty()) {
+                    keys = hlp::comboStringToKeys(it->second);
+                    //std::string tmpPackageName = packageName;
+                    //ult::removeQuotes(packageName);
+                    if (keys) ult::g_entryCombos[keys] = { ult::OVERLAY_PATH + "ovlmenu.ovl", "--package " + packageName};
+                }
+            }
+        }
+        
+        // Function to check if a key combination matches any overlay key combo
+        static OverlayCombo getEntryForKeyCombo(u64 keys) {
+            std::lock_guard<std::mutex> lock(comboMutex);
+            if (auto it = ult::g_entryCombos.find(keys); it != ult::g_entryCombos.end())
+                return it->second;
+            return { "", "" };
+        }
+
+    }
+    
+
+
+    // Renderer
+    
+    namespace gfx {
+        
+        extern "C" u64 __nx_vi_layer_id;
+        
+
+        struct ScissoringConfig {
+            u32 x, y, w, h, x_max, y_max;
+        };
+        
+
+        // Forward declarations
+        class Renderer;
+        
+
+        #ifdef UI_OVERRIDE_PATH
+        inline static std::shared_mutex s_translationCacheMutex;
+        #endif
+        class FontManager {
+        public:
+            struct Glyph {
+                stbtt_fontinfo *currFont;
+                float currFontSize;
+                int bounds[4];
+                int xAdvance;
+                u8 *glyphBmp;
+                int width, height;
+                
+                // Add destructor to ensure cleanup
+                ~Glyph() {
+                    if (glyphBmp) {
+                        stbtt_FreeBitmap(glyphBmp, nullptr);
+                        glyphBmp = nullptr;
+                    }
+                }
+                
+                // Prevent copying to avoid double-free
+                Glyph(const Glyph&) = delete;
+                Glyph& operator=(const Glyph&) = delete;
+                
+                // Allow moving
+                Glyph(Glyph&& other) noexcept 
+                    : currFont(other.currFont), currFontSize(other.currFontSize)
+                    , xAdvance(other.xAdvance), glyphBmp(other.glyphBmp)
+                    , width(other.width), height(other.height) {
+                    memcpy(bounds, other.bounds, sizeof(bounds));
+                    other.glyphBmp = nullptr; // Prevent double-free
+                }
+                
+                Glyph& operator=(Glyph&& other) noexcept {
+                    if (this != &other) {
+                        if (glyphBmp) {
+                            stbtt_FreeBitmap(glyphBmp, nullptr);
+                        }
+                        currFont = other.currFont;
+                        currFontSize = other.currFontSize;
+                        xAdvance = other.xAdvance;
+                        glyphBmp = other.glyphBmp;
+                        width = other.width;
+                        height = other.height;
+                        memcpy(bounds, other.bounds, sizeof(bounds));
+                        other.glyphBmp = nullptr;
+                    }
+                    return *this;
+                }
+                
+                Glyph() : currFont(nullptr), currFontSize(0.0f), xAdvance(0), 
+                          glyphBmp(nullptr), width(0), height(0) {
+                    std::memset(bounds, 0, sizeof(bounds));
+                }
+            };
+
+            struct FontMetrics {
+                int ascent, descent, lineGap;
+                int lineHeight; // ascent - descent + lineGap
+                stbtt_fontinfo* font;
+                float fontSize;
+                
+                FontMetrics() : ascent(0), descent(0), lineGap(0), lineHeight(0), font(nullptr), fontSize(0.0f) {}
+                
+                FontMetrics(stbtt_fontinfo* f, float size) : font(f), fontSize(size) {
+                    if (font) {
+                        stbtt_GetFontVMetrics(font, &ascent, &descent, &lineGap);
+                        const float scale = stbtt_ScaleForPixelHeight(font, fontSize);
+                        ascent = static_cast<int>(ascent * scale);
+                        descent = static_cast<int>(descent * scale);
+                        lineGap = static_cast<int>(lineGap * scale);
+                        lineHeight = ascent - descent + lineGap;
+                    } else {
+                        ascent = descent = lineGap = lineHeight = 0;
+                    }
+                }
+            };
+
+            enum class CacheType {
+                Regular,
+                Notification,
+                Persistent
+            };
+            
+        private:
+            inline static std::shared_mutex s_cacheMutex;
+            inline static std::mutex s_initMutex;
+            
+            // Existing caches
+            inline static std::unordered_map<u64, std::shared_ptr<Glyph>> s_sharedGlyphCache;
+            //inline static std::unordered_map<u64, std::shared_ptr<Glyph>> s_persistentGlyphCache;
+            
+            // NEW: Notification-specific cache
+            inline static std::unordered_map<u64, std::shared_ptr<Glyph>> s_notificationGlyphCache;
+            
+            // Font metrics cache
+            inline static std::unordered_map<u64, FontMetrics> s_fontMetricsCache;
+            
+            // Add cache size limits
+            static constexpr size_t MAX_CACHE_SIZE = 600;
+            static constexpr size_t CLEANUP_THRESHOLD = 500;
+            static constexpr size_t MAX_NOTIFICATION_CACHE_SIZE = 200; // Separate limit for notifications
+            
+            // font handles & state
+            inline static stbtt_fontinfo* s_stdFont     = nullptr;
+            inline static stbtt_fontinfo* s_localFont   = nullptr;
+            inline static stbtt_fontinfo* s_extFont     = nullptr;
+            inline static bool             s_hasLocalFont = false;
+            inline static bool             s_initialized  = false;
+            
+            // Fix cache key generation to prevent collisions
+            static u64 generateCacheKey(u32 character, bool monospace, u32 fontSize) {
+                // Use more bits for fontSize and separate monospace bit
+                u64 key = static_cast<u64>(character);
+                key = (key << 32) | static_cast<u64>(fontSize);
+                if (monospace) {
+                    key |= (1ULL << 63); // Use the highest bit for monospace
+                }
+                return key;
+            }
+
+            // Generate cache key for font metrics
+            static u64 generateFontMetricsCacheKey(stbtt_fontinfo* font, u32 fontSize) {
+                // Use pointer address as font identifier and fontSize
+                const u64 fontKey = reinterpret_cast<uintptr_t>(font);
+                return (fontKey << 32) | static_cast<u64>(fontSize);
+            }
+            
+            // Cleanup old entries when cache gets too large
+            static void cleanupOldEntries() {
+                if (s_sharedGlyphCache.size() <= CLEANUP_THRESHOLD) return;
+                
+                // Simple cleanup: remove oldest entries
+                // In a real implementation, you might want LRU or other strategies
+                const size_t toRemove = s_sharedGlyphCache.size() - CLEANUP_THRESHOLD;
+                auto it = s_sharedGlyphCache.begin();
+                for (size_t i = 0; i < toRemove && it != s_sharedGlyphCache.end(); ++i) {
+                    it = s_sharedGlyphCache.erase(it);
+                }
+            }
+
+            // NEW: Cleanup notification cache when it gets too large
+            static void cleanupNotificationCache() {
+                if (s_notificationGlyphCache.size() <= MAX_NOTIFICATION_CACHE_SIZE) return;
+                
+                const size_t toRemove = s_notificationGlyphCache.size() - (MAX_NOTIFICATION_CACHE_SIZE / 2);
+                auto it = s_notificationGlyphCache.begin();
+                for (size_t i = 0; i < toRemove && it != s_notificationGlyphCache.end(); ++i) {
+                    it = s_notificationGlyphCache.erase(it);
+                }
+            }
+
+            // NEW: Internal unified glyph creation method
+            static std::shared_ptr<Glyph> getOrCreateGlyphInternal(u32 character, bool monospace, u32 fontSize, CacheType cacheType) {
+                const u64 key = generateCacheKey(character, monospace, fontSize);
+                
+                // Select target cache based on type
+                std::unordered_map<u64, std::shared_ptr<Glyph>>* targetCache;
+                switch (cacheType) {
+                    case CacheType::Notification:
+                        targetCache = &s_notificationGlyphCache;
+                        break;
+                    //case CacheType::Persistent:
+                    //    targetCache = &s_persistentGlyphCache;
+                    //    break;
+                    default:
+                        targetCache = &s_sharedGlyphCache;
+                        break;
+                }
+                
+                // First, try to find in target cache with shared lock
+                {
+                    std::shared_lock<std::shared_mutex> readLock(s_cacheMutex);
+                    
+                    if (!s_initialized) return nullptr;
+                    
+                    // Check target cache first
+                    auto it = targetCache->find(key);
+                    if (it != targetCache->end()) {
+                        return it->second;
+                    }
+                    
+                    // For notification cache, also check persistent cache (but not regular cache)
+                    // For regular cache, also check persistent cache (existing behavior)
+                    //if (cacheType != CacheType::Persistent) {
+                    //    auto persistentIt = s_persistentGlyphCache.find(key);
+                    //    if (persistentIt != s_persistentGlyphCache.end()) {
+                    //        return persistentIt->second;
+                    //    }
+                    //}
+                }
+                
+                // Glyph not found, need to create it with exclusive lock
+                std::unique_lock<std::shared_mutex> writeLock(s_cacheMutex);
+                
+                if (!s_initialized) return nullptr;
+                
+                // Double-check pattern for target cache
+                auto it = targetCache->find(key);
+                if (it != targetCache->end()) {
+                    return it->second;
+                }
+                
+                // Double-check persistent cache
+                //if (cacheType != CacheType::Persistent) {
+                //    auto persistentIt = s_persistentGlyphCache.find(key);
+                //    if (persistentIt != s_persistentGlyphCache.end()) {
+                //        return persistentIt->second;
+                //    }
+                //}
+                
+                // Check cache size and cleanup if needed
+                if (cacheType == CacheType::Regular && s_sharedGlyphCache.size() >= MAX_CACHE_SIZE) {
+                    cleanupOldEntries();
+                } else if (cacheType == CacheType::Notification && s_notificationGlyphCache.size() >= MAX_NOTIFICATION_CACHE_SIZE) {
+                    cleanupNotificationCache();
+                }
+                
+                // Create new glyph
+                auto glyph = std::make_shared<Glyph>();
+                glyph->currFont = selectFontForCharacterUnsafe(character);
+                if (!glyph->currFont) {
+                    return nullptr;
+                }
+                
+                glyph->currFontSize = stbtt_ScaleForPixelHeight(glyph->currFont, fontSize);
+                
+                stbtt_GetCodepointBitmapBoxSubpixel(glyph->currFont, character, 
+                    glyph->currFontSize, glyph->currFontSize, 0, 0, 
+                    &glyph->bounds[0], &glyph->bounds[1], &glyph->bounds[2], &glyph->bounds[3]);
+                
+                s32 yAdvance = 0;
+                stbtt_GetCodepointHMetrics(glyph->currFont, monospace ? 'W' : character, 
+                                          &glyph->xAdvance, &yAdvance);
+                
+                glyph->glyphBmp = stbtt_GetCodepointBitmap(glyph->currFont, 
+                    glyph->currFontSize, glyph->currFontSize, character, 
+                    &glyph->width, &glyph->height, nullptr, nullptr);
+                
+                // Store in target cache
+                (*targetCache)[key] = glyph;
+                
+                return glyph;
+            }
+            
+        public:
+            // NEW: Preload and persist specific characters
+            //static void preloadPersistentGlyphs(const std::string& characters, u32 fontSize, bool monospace = false) {
+            //    std::unique_lock<std::shared_mutex> writeLock(s_cacheMutex);
+            //    
+            //    if (!s_initialized) return;
+            //    
+            //    // Convert UTF-8 string to UTF-32 codepoints
+            //    #pragma GCC diagnostic push
+            //    #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+            //    
+            //    std::wstring_convert<std::codecvt_utf8<char32_t>, char32_t> converter;
+            //    const std::u32string codepoints = converter.from_bytes(characters);
+            //    
+            //    #pragma GCC diagnostic pop
+            //    
+            //    s32 yAdvance;
+            //    for (char32_t character : codepoints) {
+            //        const u64 key = generateCacheKey(character, monospace, fontSize);
+            //
+            //        if (s_persistentGlyphCache.find(key) != s_persistentGlyphCache.end()) {
+            //            continue;
+            //        }
+            //
+            //        auto glyph = std::make_shared<Glyph>();
+            //        glyph->currFont = selectFontForCharacterUnsafe(character);
+            //        if (!glyph->currFont) continue;
+            //
+            //        glyph->currFontSize = stbtt_ScaleForPixelHeight(glyph->currFont, fontSize);
+            //
+            //        stbtt_GetCodepointBitmapBoxSubpixel(glyph->currFont, character,
+            //                                            glyph->currFontSize, glyph->currFontSize, 0, 0,
+            //                                            &glyph->bounds[0], &glyph->bounds[1], &glyph->bounds[2], &glyph->bounds[3]);
+            //
+            //        yAdvance = 0;
+            //        stbtt_GetCodepointHMetrics(glyph->currFont, monospace ? 'W' : character,
+            //                                  &glyph->xAdvance, &yAdvance);
+            //
+            //        glyph->glyphBmp = stbtt_GetCodepointBitmap(glyph->currFont,
+            //                                                   glyph->currFontSize, glyph->currFontSize, character,
+            //                                                   &glyph->width, &glyph->height, nullptr, nullptr);
+            //
+            //        s_persistentGlyphCache[key] = glyph;
+            //    }
+            //}
+        
+
+            static void initializeFonts(stbtt_fontinfo* stdFont, stbtt_fontinfo* localFont, 
+                                      stbtt_fontinfo* extFont, bool hasLocalFont) {
+                std::lock_guard<std::mutex> initLock(s_initMutex);
+                std::unique_lock<std::shared_mutex> cacheLock(s_cacheMutex);
+                
+                s_stdFont = stdFont;
+                s_localFont = localFont;
+                s_extFont = extFont;
+                s_hasLocalFont = hasLocalFont;
+                s_initialized = true;
+            }
+            
+            static stbtt_fontinfo* selectFontForCharacter(u32 character) {
+                std::shared_lock<std::shared_mutex> lock(s_cacheMutex);
+                
+                if (!s_initialized) return nullptr;
+                
+                if (stbtt_FindGlyphIndex(s_extFont, character)) {
+                    return s_extFont;
+                } else if (s_hasLocalFont && stbtt_FindGlyphIndex(s_localFont, character) != 0) {
+                    return s_localFont;
+                }
+                return s_stdFont;
+            }
+
+            // Get font metrics with caching
+            static FontMetrics getFontMetrics(stbtt_fontinfo* font, u32 fontSize) {
+                if (!font) return FontMetrics();
+
+                const u64 key = generateFontMetricsCacheKey(font, fontSize);
+                
+                // First, try to find existing metrics with shared lock
+                {
+                    std::shared_lock<std::shared_mutex> readLock(s_cacheMutex);
+                    auto it = s_fontMetricsCache.find(key);
+                    if (it != s_fontMetricsCache.end()) {
+                        return it->second;
+                    }
+                }
+                
+                // Metrics not found, need to create them with exclusive lock
+                std::unique_lock<std::shared_mutex> writeLock(s_cacheMutex);
+                
+                // Double-check pattern
+                auto it = s_fontMetricsCache.find(key);
+                if (it != s_fontMetricsCache.end()) {
+                    return it->second;
+                }
+                
+                // Create new font metrics
+                FontMetrics metrics(font, static_cast<float>(fontSize));
+                s_fontMetricsCache[key] = metrics;
+                
+                return metrics;
+            }
+
+            // Convenience method to get font metrics for a character (selects appropriate font)
+            static FontMetrics getFontMetricsForCharacter(u32 character, u32 fontSize) {
+                stbtt_fontinfo* font = selectFontForCharacter(character);
+                return getFontMetrics(font, fontSize);
+            }
+            
+            // UPDATED: Regular glyph method - now uses internal method
+            static std::shared_ptr<Glyph> getOrCreateGlyph(u32 character, bool monospace, u32 fontSize) {
+                return getOrCreateGlyphInternal(character, monospace, fontSize, CacheType::Regular);
+            }
+
+            // NEW: Notification-specific glyph method
+            static std::shared_ptr<Glyph> getOrCreateNotificationGlyph(u32 character, bool monospace, u32 fontSize) {
+                return getOrCreateGlyphInternal(character, monospace, fontSize, CacheType::Notification);
+            }
+
+            // NEW: Clear only the notification cache
+            static void clearNotificationCache() {
+                std::unique_lock<std::shared_mutex> cacheLock(s_cacheMutex);
+                s_notificationGlyphCache.clear();
+                s_notificationGlyphCache.rehash(0);
+            }
+            
+            static void clearCache() {
+                // Note: This is now safe because any code holding a shared_ptr
+                // will keep the Glyph alive even after the cache is cleared
+                std::unique_lock<std::shared_mutex> cacheLock(s_cacheMutex);
+                s_sharedGlyphCache.clear();
+                s_sharedGlyphCache.rehash(0);
+                s_fontMetricsCache.clear(); // Also clear font metrics cache
+                s_fontMetricsCache.rehash(0);
+            }
+
+            static void clearAllCaches() {
+                std::unique_lock<std::shared_mutex> cacheLock(s_cacheMutex);
+                s_sharedGlyphCache.clear();
+                s_sharedGlyphCache.rehash(0);
+                //s_persistentGlyphCache.clear();
+                //s_persistentGlyphCache.rehash(0);
+                s_notificationGlyphCache.clear();
+                s_notificationGlyphCache.rehash(0);
+                s_fontMetricsCache.clear();
+                s_fontMetricsCache.rehash(0);
+            }
+            
+            static void cleanup() {
+                std::lock_guard<std::mutex> initLock(s_initMutex);
+                std::unique_lock<std::shared_mutex> cacheLock(s_cacheMutex);
+                
+                s_sharedGlyphCache.clear();
+                s_sharedGlyphCache.rehash(0);
+                //s_persistentGlyphCache.clear();
+                //s_persistentGlyphCache.rehash(0);
+                s_notificationGlyphCache.clear();
+                s_notificationGlyphCache.rehash(0);
+                s_fontMetricsCache.clear();
+                s_initialized = false;
+                s_stdFont = nullptr;
+                s_localFont = nullptr;
+                s_extFont = nullptr;
+                s_hasLocalFont = false;
+            }
+            
+            static size_t getCacheSize() {
+                std::shared_lock<std::shared_mutex> lock(s_cacheMutex);
+                return s_sharedGlyphCache.size();
+            }
+
+            static size_t getFontMetricsCacheSize() {
+                std::shared_lock<std::shared_mutex> lock(s_cacheMutex);
+                return s_fontMetricsCache.size();
+            }
+            
+            static bool isInitialized() {
+                std::shared_lock<std::shared_mutex> lock(s_cacheMutex);
+                return s_initialized;
+            }
+
+            //static size_t getPersistentCacheSize() {
+            //    std::shared_lock<std::shared_mutex> lock(s_cacheMutex);
+            //    return s_persistentGlyphCache.size();
+            //}
+
+            // NEW: Get notification cache size
+            static size_t getNotificationCacheSize() {
+                std::shared_lock<std::shared_mutex> lock(s_cacheMutex);
+                return s_notificationGlyphCache.size();
+            }
+            
+            // Add memory usage monitoring
+            static size_t getMemoryUsage() {
+                std::shared_lock<std::shared_mutex> lock(s_cacheMutex);
+                size_t totalMemory = 0;
+                
+                // Regular cache
+                for (const auto& pair : s_sharedGlyphCache) {
+                    const auto& glyph = pair.second;
+                    if (glyph && glyph->glyphBmp) {
+                        totalMemory += glyph->width * glyph->height;
+                    }
+                }
+                
+                // Persistent cache
+                //for (const auto& pair : s_persistentGlyphCache) {
+                //    const auto& glyph = pair.second;
+                //    if (glyph && glyph->glyphBmp) {
+                //        totalMemory += glyph->width * glyph->height;
+                //    }
+                //}
+
+                // Notification cache
+                for (const auto& pair : s_notificationGlyphCache) {
+                    const auto& glyph = pair.second;
+                    if (glyph && glyph->glyphBmp) {
+                        totalMemory += glyph->width * glyph->height;
+                    }
+                }
+                
+                return totalMemory;
+            }
+            
+        private:
+            static stbtt_fontinfo* selectFontForCharacterUnsafe(u32 character) {
+                if (!s_initialized) return nullptr;
+                
+                if (stbtt_FindGlyphIndex(s_extFont, character)) {
+                    return s_extFont;
+                } else if (s_hasLocalFont && stbtt_FindGlyphIndex(s_localFont, character) != 0) {
+                    return s_localFont;
+                }
+                return s_stdFont;
+            }
+        };
+
+        
+        // Static member definitions
+        //std::shared_mutex FontManager::s_cacheMutex;
+        //std::mutex FontManager::s_initMutex;
+        //std::unordered_map<u64, std::unique_ptr<FontManager::Glyph>> FontManager::s_sharedGlyphCache;
+        //stbtt_fontinfo* FontManager::s_stdFont = nullptr;
+        //stbtt_fontinfo* FontManager::s_localFont = nullptr;
+        //stbtt_fontinfo* FontManager::s_extFont = nullptr;
+        //bool FontManager::s_hasLocalFont = false;
+        //bool FontManager::s_initialized = false;
+        
+        // Updated thread-safe calculateStringWidth function
+        static float calculateStringWidth(const std::string& originalString, const float fontSize, const bool monospace = false) {
+            if (originalString.empty() || !FontManager::isInitialized()) {
+                return 0.0f;
+            }
+            
+            // Thread-safe translation cache access
+            std::string text;
+            #ifdef UI_OVERRIDE_PATH
+            {
+                std::shared_lock<std::shared_mutex> readLock(s_translationCacheMutex);
+                auto translatedIt = ult::translationCache.find(originalString);
+                if (translatedIt != ult::translationCache.end()) {
+                    text = translatedIt->second;
+                } else {
+                    // Don't insert anything, just fallback to original string
+                    text = originalString;
+                }
+            }
+            #else
+            text = originalString;
+            #endif
+            
+            // CRITICAL: Use the same data types as drawString
+            s32 maxWidth = 0;
+            s32 currentLineWidth = 0;
+            ssize_t codepointWidth;
+            u32 currCharacter = 0;
+            
+            // Convert fontSize to u32 to match drawString behavior
+            const u32 fontSizeInt = static_cast<u32>(fontSize);
+            
+            auto itStrEnd = text.cend();
+            auto itStr = text.cbegin();
+            
+            // Fast ASCII check
+            bool isAsciiOnly = true;
+            for (unsigned char c : text) {
+                if (c > 127) {
+                    isAsciiOnly = false;
+                    break;
+                }
+            }
+            
+            while (itStr != itStrEnd) {
+                // Decode UTF-8 codepoint
+                if (isAsciiOnly) {
+                    currCharacter = static_cast<u32>(*itStr);
+                    codepointWidth = 1;
+                } else {
+                    codepointWidth = decode_utf8(&currCharacter, reinterpret_cast<const u8*>(&(*itStr)));
+                    if (codepointWidth <= 0) break;
+                }
+                
+                itStr += codepointWidth;
+                
+                // Handle newlines
+                if (currCharacter == '\n') {
+                    maxWidth = std::max(currentLineWidth, maxWidth);
+                    currentLineWidth = 0;
+                    continue;
+                }
+                
+                // Use u32 fontSize to match drawString - now thread-safe
+                std::shared_ptr<FontManager::Glyph> glyph = FontManager::getOrCreateGlyph(currCharacter, monospace, fontSizeInt);
+                if (!glyph) continue;
+                
+                // CRITICAL: Use the same calculation as drawString
+                currentLineWidth += static_cast<s32>(glyph->xAdvance * glyph->currFontSize);
+            }
+            
+            // Final width calculation
+            maxWidth = std::max(currentLineWidth, maxWidth);
+            return static_cast<float>(maxWidth);
+        }
+
+        static std::pair<int, int> getUnderscanPixels();
+
+        /**
+         * @brief Manages the Tesla layer and draws raw data to the screen
+         */
+        class Renderer final {
+        public:
+
+            using Glyph = FontManager::Glyph;
+
+            Renderer& operator=(Renderer&) = delete;
+            
+            friend class tsl::Overlay;
+            
+            /**
+             * @brief Gets the renderer instance
+             *
+             * @return Renderer
+             */
+            inline static Renderer& get() {
+                static Renderer renderer;
+                
+                return renderer;
+            }
+            
+            stbtt_fontinfo m_stdFont, m_localFont, m_extFont;
+            bool m_hasLocalFont = false;
+
+            /**
+             * @brief Handles opacity of drawn colors for fadeout. Pass all colors through this function in order to apply opacity properly
+             *
+             * @param c Original color
+             * @return Color with applied opacity
+             */
+            static inline Color a(const Color& c) {
+                const u8 opacity_limit = static_cast<u8>(0xF * Renderer::s_opacity);
+                return (c.rgba & 0x0FFF) | (static_cast<u16>(
+                    ult::disableTransparency
+                        ? (ult::useOpaqueScreenshots
+                               ? 0xF                       // fully opaque when both flags on
+                               : (c.a > 0xE ? c.a : 0xE)) // clamp to 14, keep lower values
+                        : (c.a < opacity_limit ? c.a : opacity_limit) // normal fade logic
+                ) << 12);
+            }
+
+            static inline Color aWithOpacity(const Color& c) {
+                const u8 opacity_limit = static_cast<u8>(0xF * Renderer::s_opacity);
+                return (c.rgba & 0x0FFF) | (static_cast<u16>(
+                    ult::disableTransparency
+                        ? 0xF                       // fully opaque when both flags on
+                        : (c.a < opacity_limit ? c.a : opacity_limit) // normal fade logic
+                ) << 12);
+            }
+
+            static inline Color a2(const Color& c) {
+                const u8 opacity_limit = static_cast<u8>(0xF);
+                return (c.rgba & 0x0FFF) | (static_cast<u16>(
+                    ult::disableTransparency
+                        ? (ult::useOpaqueScreenshots
+                               ? 0xF                       // fully opaque when both flags on
+                               : (c.a > 0xE ? c.a : 0xE)) // clamp to 14, keep lower values
+                        : (c.a < opacity_limit ? c.a : opacity_limit) // normal fade logic
+                ) << 12);
+            }
+            
+            /**
+             * @brief Enables scissoring, discarding of any draw outside the given boundaries
+             *
+             * @param x x pos
+             * @param y y pos
+             * @param w Width
+             * @param h Height
+             */
+            inline void enableScissoring(const u32 x, const u32 y, const u32 w, const u32 h) {
+                this->m_scissoringStack.emplace(x, y, w, h, x+w, y+h);
+            }
+            
+            /**
+             * @brief Disables scissoring
+             */
+            inline void disableScissoring() {
+                this->m_scissoringStack.pop();
+            }
+            
+            
+            // Drawing functions
+            
+            /**
+             * @brief Draw a single pixel onto the screen
+             *
+             * @param x X pos
+             * @param y Y pos
+             * @param color Color
+             */
+            inline void setPixel(const u32 x, const u32 y, const Color& color) {
+                const u32 offset = this->getPixelOffset(x, y);
+                if (offset != UINT32_MAX) [[likely]] {
+                    Color* framebuffer = static_cast<Color*>(this->getCurrentFramebuffer());
+                    framebuffer[offset] = color;
+                }
+            }
+
+            inline void setPixelAtOffset(const u32 offset, const Color& color) {
+                Color* framebuffer = static_cast<Color*>(this->getCurrentFramebuffer());
+                framebuffer[offset] = color;
+            }
+
+
+            
+            /**
+             * @brief Blends two colors
+             *
+             * @param src Source color
+             * @param dst Destination color
+             * @param alpha Opacity
+             * @return Blended color
+             */
+            static constexpr u8 inv_alpha_table[16] = {15,14,13,12,11,10,9,8,7,6,5,4,3,2,1,0};
+            
+            inline u8 __attribute__((always_inline)) blendColor(const u8 src, const u8 dst, const u8 alpha) {
+                return ((src * inv_alpha_table[alpha]) + (dst * alpha)) >> 4;
+            }
+            
+            /**
+             * @brief Draws a single source blended pixel onto the screen
+             *
+             * @param x X pos
+             * @param y Y pos
+             * @param color Color
+             */
+            inline void setPixelBlendSrc(const u32 x, const u32 y, const Color& color) {
+                const u32 offset = this->getPixelOffset(x, y);
+                if (offset == UINT32_MAX) [[unlikely]]
+                    return;
+                
+                Color* framebuffer = static_cast<Color*>(this->getCurrentFramebuffer());
+                const Color src = framebuffer[offset];
+                
+                // Direct write instead of calling setPixel
+                framebuffer[offset] = Color(
+                    blendColor(src.r, color.r, color.a),
+                    blendColor(src.g, color.g, color.a),
+                    blendColor(src.b, color.b, color.a),
+                    src.a
+                );
+            }
+            
+
+            // Compromise version - keep framebuffer lookup but inline the rest
+            inline void setPixelBlendDst(const u32 x, const u32 y, const Color& color) {
+                const u32 offset = this->getPixelOffset(x, y);
+                if (offset == UINT32_MAX) [[unlikely]]
+                    return;
+                
+                Color* framebuffer = static_cast<Color*>(this->getCurrentFramebuffer());
+                const Color src = framebuffer[offset];
+                
+                // Direct write instead of calling setPixel
+                framebuffer[offset] = Color(
+                    blendColor(src.r, color.r, color.a),
+                    blendColor(src.g, color.g, color.a),
+                    blendColor(src.b, color.b, color.a),
+                    (color.a + (src.a * (0xF - color.a) >> 4))
+                );
+            }
+
+            // Batch version for setPixelBlendDst
+            inline void setPixelBlendDstBatch(const u32 baseX, const u32 baseY, 
+                                              const u8 red[16], const u8 green[16], 
+                                              const u8 blue[16], const u8 alpha[16], 
+                                              const s32 count) {
+                // All variables moved outside the loop
+                const u16* framebuffer = static_cast<const u16*>(this->getCurrentFramebuffer());
+                u32 offset;
+                u8 currentAlpha;
+                u8 invAlpha;
+                Color src = {0}, end = {0};
+                u32 currentX;
+                
+                for (s32 i = 0; i < count; ++i) {
+                    // Early exit for transparent pixels
+                    currentAlpha = alpha[i];
+                    if (currentAlpha == 0)
+                        continue;
+                    
+                    currentX = baseX + i;
+                    offset = this->getPixelOffset(currentX, baseY);
+                    if (offset == UINT32_MAX) [[unlikely]]
+                        continue;
+                    
+                    // Direct framebuffer access and color construction
+                    src = framebuffer[offset];
+                    invAlpha = 0xF - currentAlpha;
+                    
+                    // Direct member assignment instead of constructor
+                    end.r = blendColor(src.r, red[i], currentAlpha);
+                    end.g = blendColor(src.g, green[i], currentAlpha);
+                    end.b = blendColor(src.b, blue[i], currentAlpha);
+                    end.a = (currentAlpha + (src.a * invAlpha >> 4));
+                    
+                    this->setPixelAtOffset(offset, end);
+                }
+            }
+
+
+            /**
+             * @brief Draws a rectangle of given sizes
+             *
+             * @param x X pos
+             * @param y Y pos
+             * @param w Width
+             * @param h Height
+             * @param color Color
+             */
+            inline void drawRect(const s32 x, const s32 y, const s32 w, const s32 h, const Color& color) {
+                // Early exit for invalid dimensions
+                //if (w <= 0 || h <= 0) return;
+                
+                // Calculate clipped bounds
+                const s32 x_start = x < 0 ? 0 : x;
+                const s32 y_start = y < 0 ? 0 : y;
+                const s32 x_end = (x + w > cfg::FramebufferWidth) ? cfg::FramebufferWidth : x + w;
+                const s32 y_end = (y + h > cfg::FramebufferHeight) ? cfg::FramebufferHeight : y + h;
+                
+                // Early exit if completely outside bounds
+                if (x_start >= x_end || y_start >= y_end) [[unlikely]] return;
+                
+
+                // Draw row by row for better cache locality
+                for (s32 yi = y_start; yi < y_end; ++yi) {
+                    for (s32 xi = x_start; xi < x_end; ++xi) {
+                        this->setPixelBlendDst(xi, yi, color);
+                    }
+                }
+            }
+
+            /**
+             * @brief Worker function for multithreaded rectangle drawing
+             * @param x_start Start X coordinate
+             * @param x_end End X coordinate  
+             * @param y_start Start Y coordinate for this thread
+             * @param y_end End Y coordinate for this thread
+             * @param color Color to draw
+             */
+            inline void processRectChunk(const s32 x_start, const s32 x_end, const s32 y_start, const s32 y_end, const Color& color) {
+                for (s32 yi = y_start; yi < y_end; ++yi) {
+                    for (s32 xi = x_start; xi < x_end; ++xi) {
+                        this->setPixelBlendDst(xi, yi, color);
+                    }
+                }
+            }
+        
+
+            /**
+             * @brief Draws a rectangle of given sizes (Multi-threaded)
+             *
+             * @param x X pos
+             * @param y Y pos
+             * @param w Width
+             * @param h Height
+             * @param color Color
+             */
+            inline void drawRectMultiThreaded(const s32 x, const s32 y, const s32 w, const s32 h, const Color& color) {
+                // Early exit for invalid dimensions
+                if (w <= 0 || h <= 0) return;
+                
+                // Calculate clipped bounds
+                const s32 x_start = x < 0 ? 0 : x;
+                const s32 y_start = y < 0 ? 0 : y;
+                const s32 x_end = (x + w > cfg::FramebufferWidth) ? cfg::FramebufferWidth : x + w;
+                const s32 y_end = (y + h > cfg::FramebufferHeight) ? cfg::FramebufferHeight : y + h;
+                
+                // Early exit if completely outside bounds
+                if (x_start >= x_end || y_start >= y_end) return;
+                
+                // Calculate visible dimensions
+                const s32 visibleHeight = y_end - y_start;
+                
+                // Calculate chunk size - divide rows among threads
+                const s32 chunkSize = std::max(1, visibleHeight / static_cast<s32>(ult::numThreads));
+                
+                // Launch threads using ult::renderThreads array
+                for (unsigned i = 0; i < static_cast<unsigned>(ult::numThreads); ++i) {
+                    const s32 startRow = y_start + (i * chunkSize);
+                    const s32 endRow = (i == static_cast<unsigned>(ult::numThreads) - 1) ? 
+                                      y_end : 
+                                      std::min(startRow + chunkSize, y_end);
+                    
+                    // Skip threads that have no work
+                    if (startRow >= endRow) {
+                        ult::renderThreads[i] = std::thread([](){}); // Empty thread (still needed for joining)
+                        continue;
+                    }
+                    
+                    // Use member function instead of lambda - much faster
+                    ult::renderThreads[i] = std::thread(&Renderer::processRectChunk, this, 
+                                                       x_start, x_end, startRow, endRow, color);
+                }
+                
+                // Join all ult::renderThreads
+                for (auto& t : ult::renderThreads) {
+                    t.join();
+                }
+            }
+
+
+            /**
+             * @brief Draws a rectangle of given sizes with empty filling
+             * 
+             * @param x X pos 
+             * @param y Y pos
+             * @param w Width
+             * @param h Height
+             * @param color Color
+             */
+            inline void drawEmptyRect(s32 x, s32 y, s32 w, s32 h, Color color) {
+                // Only precompute values that are actually reused
+                const s32 x_end = x + w - 1;
+                const s32 y_end = y + h - 1;
+                
+                // Early exit for completely out-of-bounds rectangles
+                if (x_end < 0 || y_end < 0 || x >= cfg::FramebufferWidth || y >= cfg::FramebufferHeight) [[unlikely]] {
+                    return;
+                }
+                
+                // Early exit for degenerate rectangles
+                //if (w <= 0 || h <= 0) {
+                //    return;
+                //}
+                
+                // These are reused for both horizontal lines
+                const s32 line_x_start = x < 0 ? 0 : x;
+                const s32 line_x_end = x_end >= cfg::FramebufferWidth ? cfg::FramebufferWidth - 1 : x_end;
+                
+                // Draw top horizontal line
+                if (y >= 0 && y < cfg::FramebufferHeight) {
+                    for (s32 xi = line_x_start; xi <= line_x_end; ++xi) {
+                        this->setPixelBlendDst(xi, y, color);
+                    }
+                }
+                
+                // Draw bottom horizontal line (only if different from top)
+                if (h > 1 && y_end >= 0 && y_end < cfg::FramebufferHeight) {
+                    for (s32 xi = line_x_start; xi <= line_x_end; ++xi) {
+                        this->setPixelBlendDst(xi, y_end, color);
+                    }
+                }
+                
+                // Draw vertical lines only if there's space between horizontal lines
+                if (h > 2) {
+                    // These are reused for both vertical lines
+                    const s32 line_y_start = (y + 1) < 0 ? 0 : (y + 1);
+                    const s32 line_y_end = (y_end - 1) >= cfg::FramebufferHeight ? cfg::FramebufferHeight - 1 : (y_end - 1);
+                    
+                    // Only proceed if there are actually vertical pixels to draw
+                    if (line_y_start <= line_y_end) {
+                        // Left vertical line
+                        if (x >= 0 && x < cfg::FramebufferWidth) {
+                            for (s32 yi = line_y_start; yi <= line_y_end; ++yi) {
+                                this->setPixelBlendDst(x, yi, color);
+                            }
+                        }
+                        
+                        // Right vertical line (only if different from left)
+                        if (w > 1 && x_end >= 0 && x_end < cfg::FramebufferWidth) {
+                            for (s32 yi = line_y_start; yi <= line_y_end; ++yi) {
+                                this->setPixelBlendDst(x_end, yi, color);
+                            }
+                        }
+                    }
+                }
+            }
+
+            /**
+             * @brief Draws a line
+             * 
+             * @param x0 Start X pos 
+             * @param y0 Start Y pos
+             * @param x1 End X pos
+             * @param y1 End Y pos
+             * @param color Color
+             */
+            inline void drawLine(s32 x0, s32 y0, s32 x1, s32 y1, Color color) {
+                // Early exit for single point
+                if (x0 == x1 && y0 == y1) {
+                    if (x0 >= 0 && y0 >= 0 && x0 < cfg::FramebufferWidth && y0 < cfg::FramebufferHeight) {
+                        this->setPixelBlendDst(x0, y0, color);
+                    }
+                    return;
+                }
+                
+                // Calculate deltas
+                const s32 dx = x1 - x0;
+                const s32 dy = y1 - y0;
+                
+                // Calculate absolute deltas and steps
+                const s32 abs_dx = dx < 0 ? -dx : dx;
+                const s32 abs_dy = dy < 0 ? -dy : dy;
+                const s32 step_x = dx < 0 ? -1 : 1;
+                const s32 step_y = dy < 0 ? -1 : 1;
+                
+                // Bresenham's algorithm
+                s32 x = x0, y = y0;
+                s32 error = abs_dx - abs_dy;
+                s32 error2;
+
+                while (true) {
+                    // Bounds check and draw pixel
+                    if (x >= 0 && y >= 0 && x < cfg::FramebufferWidth && y < cfg::FramebufferHeight) {
+                        this->setPixelBlendDst(x, y, color);
+                    }
+                    
+                    // Check if we've reached the end point
+                    if (x == x1 && y == y1) break;
+                    
+                    // Calculate error and step
+                    error2 = error << 1;  // error * 2
+                    
+                    if (error2 > -abs_dy) {
+                        error -= abs_dy;
+                        x += step_x;
+                    }
+                    if (error2 < abs_dx) {
+                        error += abs_dx;
+                        y += step_y;
+                    }
+                }
+            }
+
+            /**
+             * @brief Draws a dashed line
+             * 
+             * @param x0 Start X pos 
+             * @param y0 Start Y pos
+             * @param x1 End X pos
+             * @param y1 End Y pos
+             * @param line_width How long one line can be
+             * @param color Color
+             */
+            inline void drawDashedLine(s32 x0, s32 y0, s32 x1, s32 y1, s32 line_width, Color color) {
+                // Source of formula: https://www.cc.gatech.edu/grads/m/Aaron.E.McClennen/Bresenham/code.html
+
+                const s32 x_min = std::min(x0, x1);
+                const s32 x_max = std::max(x0, x1);
+                const s32 y_min = std::min(y0, y1);
+                const s32 y_max = std::max(y0, y1);
+
+                if (x_min < 0 || y_min < 0 || x_min >= cfg::FramebufferWidth || y_min >= cfg::FramebufferHeight)
+                    return;
+
+                const s32 dx = x_max - x_min;
+                const s32 dy = y_max - y_min;
+                s32 d = 2 * dy - dx;
+
+                const s32 incrE = 2*dy;
+                const s32 incrNE = 2*(dy - dx);
+
+                this->setPixelBlendDst(x_min, y_min, color);
+
+                s32 x = x_min;
+                s32 y = y_min;
+                s32 rendered = 0;
+
+                while(x < x1) {
+                    if (d <= 0) {
+                        d += incrE;
+                        x++;
+                    }
+                    else {
+                        d += incrNE;
+                        x++;
+                        y++;
+                    }
+                    rendered++;
+                    if (x < 0 || y < 0 || x >= cfg::FramebufferWidth || y >= cfg::FramebufferHeight)
+                        continue;
+                    if (x <= x_max && y <= y_max) {
+                        if (rendered > 0 && rendered < line_width) {
+                            this->setPixelBlendDst(x, y, color);
+                        }
+                        else if (rendered > 0 && rendered >= line_width) {
+                            rendered *= -1;
+                        }
+                    }
+                } 
+                    
+            }
+            
+            inline void drawCircle(const s32 centerX, const s32 centerY, const u16 radius, const bool filled, const Color& color) {
+                s32 x = radius;
+                s32 y = 0;
+                s32 radiusError = 0;
+                s32 xChange = 1 - (radius << 1);
+                s32 yChange = 0;
+                
+                while (x >= y) {
+                    if (filled) {
+                        for (s32 i = centerX - x; i <= centerX + x; i++) {
+                            this->setPixelBlendDst(i, centerY + y, color);
+                            this->setPixelBlendDst(i, centerY - y, color);
+                        }
+                        
+                        for (s32 i = centerX - y; i <= centerX + y; i++) {
+                            this->setPixelBlendDst(i, centerY + x, color);
+                            this->setPixelBlendDst(i, centerY - x, color);
+                        }
+                    } else {
+                        this->setPixelBlendDst(centerX + x, centerY + y, color);
+                        this->setPixelBlendDst(centerX + y, centerY + x, color);
+                        this->setPixelBlendDst(centerX - y, centerY + x, color);
+                        this->setPixelBlendDst(centerX - x, centerY + y, color);
+                        this->setPixelBlendDst(centerX - x, centerY - y, color);
+                        this->setPixelBlendDst(centerX - y, centerY - x, color);
+                        this->setPixelBlendDst(centerX + y, centerY - x, color);
+                        this->setPixelBlendDst(centerX + x, centerY - y, color);
+                    }
+                    
+                    y++;
+                    radiusError += yChange;
+                    yChange += 2;
+                    
+                    if (((radiusError << 1) + xChange) > 0) {
+                        x--;
+                        radiusError += xChange;
+                        xChange += 2;
+                    }
+                }
+            }
+            
+            inline void drawBorderedRoundedRect(const s32 x, const s32 y, const s32 width, const s32 height, const s32 thickness, const s32 radius, const Color& highlightColor) {
+                const s32 startX = x + 4;
+                const s32 startY = y;
+                const s32 adjustedWidth = width - 12;
+                const s32 adjustedHeight = height + 1;
+                
+                // Pre-calculate corner positions
+                const s32 leftCornerX = startX;
+                const s32 rightCornerX = x + width - 9;
+                const s32 topCornerY = startY;
+                const s32 bottomCornerY = startY + height;
+                
+                // Draw borders (unchanged for exact visual match)
+                this->drawRect(startX, startY - thickness, adjustedWidth, thickness, highlightColor); // Top border
+                this->drawRect(startX, startY + adjustedHeight, adjustedWidth, thickness, highlightColor); // Bottom border
+                this->drawRect(startX - thickness, startY, thickness, adjustedHeight, highlightColor); // Left border
+                this->drawRect(startX + adjustedWidth, startY, thickness, adjustedHeight, highlightColor); // Right border
+                
+                // Optimized filled quarter circle drawing - all 4 corners in one pass
+                s32 cx = radius;
+                s32 cy = 0;
+                s32 radiusError = 0;
+                s32 xChange = 1 - (radius << 1);
+                s32 yChange = 0;
+                
+                while (cx >= cy) {
+                    // Draw horizontal spans for all 4 corners simultaneously
+                    // Upper-left corner (quadrant 2) - two horizontal lines
+                    for (s32 i = leftCornerX - cx; i <= leftCornerX; i++) {
+                        this->setPixelBlendDst(i, topCornerY - cy, highlightColor);
+                    }
+                    for (s32 i = leftCornerX - cy; i <= leftCornerX; i++) {
+                        this->setPixelBlendDst(i, topCornerY - cx, highlightColor);
+                    }
+                    
+                    // Lower-left corner (quadrant 3) - two horizontal lines
+                    for (s32 i = leftCornerX - cx; i <= leftCornerX; i++) {
+                        this->setPixelBlendDst(i, bottomCornerY + cy, highlightColor);
+                    }
+                    for (s32 i = leftCornerX - cy; i <= leftCornerX; i++) {
+                        this->setPixelBlendDst(i, bottomCornerY + cx, highlightColor);
+                    }
+                    
+                    // Upper-right corner (quadrant 1) - two horizontal lines
+                    for (s32 i = rightCornerX; i <= rightCornerX + cx; i++) {
+                        this->setPixelBlendDst(i, topCornerY - cy, highlightColor);
+                    }
+                    for (s32 i = rightCornerX; i <= rightCornerX + cy; i++) {
+                        this->setPixelBlendDst(i, topCornerY - cx, highlightColor);
+                    }
+                    
+                    // Lower-right corner (quadrant 4) - two horizontal lines
+                    for (s32 i = rightCornerX; i <= rightCornerX + cx; i++) {
+                        this->setPixelBlendDst(i, bottomCornerY + cy, highlightColor);
+                    }
+                    for (s32 i = rightCornerX; i <= rightCornerX + cy; i++) {
+                        this->setPixelBlendDst(i, bottomCornerY + cx, highlightColor);
+                    }
+                    
+                    // Bresenham circle algorithm step
+                    cy++;
+                    radiusError += yChange;
+                    yChange += 2;
+                    
+                    if (((radiusError << 1) + xChange) > 0) {
+                        cx--;
+                        radiusError += xChange;
+                        xChange += 2;
+                    }
+                }
+            }
+
+
+            // Pre-compute all horizontal spans for the entire shape
+            struct HorizontalSpan {
+                s32 start_x, end_x;
+            };
+
+            // Define processChunk as a static member function
+            // Optimized processRoundedRectChunk - assumes bounds checking done by caller
+            static void processRoundedRectChunk(Renderer* self, const s32 x, const s32 y, const s32 w, const s32 h, 
+                                               const s32 radius, const Color& color, const s32 startRow, const s32 endRow) {
+                // Original rectangle bounds
+                const s32 orig_x = x, orig_y = y;
+                const s32 orig_x_end = x + w, orig_y_end = y + h;
+                
+                // Calculate clipping bounds
+                const s32 clip_x = std::max(0, x);
+                const s32 clip_x_end = std::min(static_cast<s32>(cfg::FramebufferWidth), x + w);
+                
+                // Use ORIGINAL coordinates to determine corner regions
+                const s32 orig_x_left = orig_x + radius, orig_x_right = orig_x_end - radius;
+                const s32 orig_y_top = orig_y + radius, orig_y_bottom = orig_y_end - radius;
+                const s32 r2 = radius * radius;
+                const u8 red = color.r, green = color.g, blue = color.b, alpha = color.a;
+            
+                alignas(64) u8 redArray[512], greenArray[512], blueArray[512], alphaArray[512];
+                for (s32 i = 0; i < 512; i += 8) {
+                    redArray[i] = redArray[i+1] = redArray[i+2] = redArray[i+3] = 
+                    redArray[i+4] = redArray[i+5] = redArray[i+6] = redArray[i+7] = red;
+                    greenArray[i] = greenArray[i+1] = greenArray[i+2] = greenArray[i+3] = 
+                    greenArray[i+4] = greenArray[i+5] = greenArray[i+6] = greenArray[i+7] = green;
+                    blueArray[i] = blueArray[i+1] = blueArray[i+2] = blueArray[i+3] = 
+                    blueArray[i+4] = blueArray[i+5] = blueArray[i+6] = blueArray[i+7] = blue;
+                    alphaArray[i] = alphaArray[i+1] = alphaArray[i+2] = alphaArray[i+3] = 
+                    alphaArray[i+4] = alphaArray[i+5] = alphaArray[i+6] = alphaArray[i+7] = alpha;
+                }
+                
+                s32 orig_span_start, orig_span_end;
+                s32 dx;
+                for (s32 y_current = startRow; y_current < endRow; ++y_current) {
+                    // Skip if outside original rectangle bounds
+                    if (y_current < orig_y || y_current >= orig_y_end) continue;
+                    
+                    
+                    
+                    if (y_current >= orig_y_top && y_current < orig_y_bottom) {
+                        // Middle section - full width
+                        orig_span_start = orig_x;
+                        orig_span_end = orig_x_end;
+                    } else {
+                        // Corner section
+                        const s32 dy_abs = (y_current < orig_y_top) ? (orig_y_top - y_current) : (y_current - orig_y_bottom);
+                        const s32 dy2 = dy_abs * dy_abs;
+                        if (dy2 > r2) continue;
+            
+                        // Compute dx using integer square root approximation
+                        dx = 0;
+                        const s32 t = r2 - dy2;
+                        while (dx * dx <= t) {
+                            dx++;
+                        }
+                        dx--; // Get the largest dx where dx^2 + dy2 <= r2
+            
+                        // Calculate the span for this row in the original rectangle
+                        orig_span_start = std::max(orig_x_left - dx, orig_x);
+                        orig_span_end = std::min(orig_x_right + dx, orig_x_end);
+                    }
+            
+                    // Clip the original span to visible bounds
+                    const s32 span_start = std::max(orig_span_start, clip_x);
+                    const s32 span_end = std::min(orig_span_end, clip_x_end);
+            
+                    if (span_start >= span_end) continue;
+            
+                    // Batch rendering
+                    for (s32 x_pos = span_start; x_pos < span_end; x_pos += 512) {
+                        self->setPixelBlendDstBatch(x_pos, y_current, redArray, greenArray, blueArray, alphaArray, std::min(512, span_end - x_pos));
+                    }
+                }
+            }
+
+
+
+            /**
+             * @brief Draws a rounded rectangle of given sizes and corner radius (Multi-threaded)
+             *
+             * @param x X pos
+             * @param y Y pos
+             * @param w Width
+             * @param h Height
+             * @param radius Corner radius
+             * @param color Color
+             */
+            inline void drawRoundedRectMultiThreaded(const s32 x, const s32 y, const s32 w, const s32 h, const s32 radius, const Color& color) {
+                if (w <= 0 || h <= 0) return;
+                
+                // Get framebuffer bounds for early exit check
+                const s32 fb_width = static_cast<s32>(cfg::FramebufferWidth);
+                const s32 fb_height = static_cast<s32>(cfg::FramebufferHeight);
+                
+                // Calculate clipped bounds for early exit check
+                const s32 clampedX = std::max(0, x);
+                const s32 clampedY = std::max(0, y);
+                const s32 clampedXEnd = std::min(fb_width, x + w);
+                const s32 clampedYEnd = std::min(fb_height, y + h);
+                
+                // Early exit if nothing to draw after clamping
+                if (clampedX >= clampedXEnd || clampedY >= clampedYEnd) return;
+                
+                // Calculate visible dimensions
+                const s32 visibleHeight = clampedYEnd - clampedY;
+                
+                // Dynamic chunk size based on visible rectangle height
+                const s32 chunkSize = std::max(1, visibleHeight / (static_cast<s32>(ult::numThreads) * 2));
+                std::atomic<s32> currentRow(clampedY);
+                
+                auto threadTask = [&]() {
+                    s32 startRow, endRow;
+                    while ((startRow = currentRow.fetch_add(chunkSize)) < clampedYEnd) {
+                        endRow = std::min(startRow + chunkSize, clampedYEnd);
+                        processRoundedRectChunk(this, x, y, w, h, radius, color, startRow, endRow);
+                    }
+                };
+                
+                // Launch threads using ult::renderThreads array
+                for (unsigned i = 0; i < static_cast<unsigned>(ult::numThreads); ++i) {
+                    ult::renderThreads[i] = std::thread(threadTask);
+                }
+                
+                // Join all ult::renderThreads
+                for (auto& t : ult::renderThreads) {
+                    t.join();
+                }
+            }
+            
+            /**
+             * @brief Draws a rounded rectangle of given sizes and corner radius (Single-threaded)
+             *
+             * @param x X pos
+             * @param y Y pos
+             * @param w Width
+             * @param h Height
+             * @param radius Corner radius
+             * @param color Color
+             */
+            inline void drawRoundedRectSingleThreaded(const s32 x, const s32 y, const s32 w, const s32 h, const s32 radius, const Color& color) {
+                if (w <= 0 || h <= 0) return;
+                
+                // Get framebuffer bounds for early exit check
+                const s32 fb_width = static_cast<s32>(cfg::FramebufferWidth);
+                const s32 fb_height = static_cast<s32>(cfg::FramebufferHeight);
+                
+                // Calculate clipped bounds for early exit check
+                const s32 clampedX = std::max(0, x);
+                const s32 clampedY = std::max(0, y);
+                const s32 clampedXEnd = std::min(fb_width, x + w);
+                const s32 clampedYEnd = std::min(fb_height, y + h);
+                
+                // Early exit if nothing to draw after clamping
+                if (clampedX >= clampedXEnd || clampedY >= clampedYEnd) return;
+                
+                processRoundedRectChunk(this, x, y, w, h, radius, color, clampedY, clampedYEnd);
+            }
+            
+            std::function<void(s32, s32, s32, s32, s32, Color)> drawRoundedRect;
+            inline void updateDrawFunction() {
+                if (ult::expandedMemory) {
+                    drawRoundedRect = [this](s32 x, s32 y, s32 w, s32 h, s32 radius, Color color) {
+                        drawRoundedRectMultiThreaded(x, y, w, h, radius, color);
+                    };
+                } else {
+                    drawRoundedRect = [this](s32 x, s32 y, s32 w, s32 h, s32 radius, Color color) {
+                        drawRoundedRectSingleThreaded(x, y, w, h, radius, color);
+                    };
+                }
+            }
+            
+                                    
+            inline void drawUniformRoundedRect(const s32 x, const s32 y, const s32 w, const s32 h, const Color& color) {
+                // Early exit for degenerate cases
+                //if (w <= 0 || h <= 0) return;
+                
+                // Calculate radius and bounds
+                const s32 radius = h >> 1;  // h / 2
+                //if (radius <= 0) return;
+                
+                // Get framebuffer bounds
+                const s32 fb_width = cfg::FramebufferWidth;
+                const s32 fb_height = cfg::FramebufferHeight;
+                
+                // Calculate clipped drawing bounds
+                const s32 clip_left = std::max(0, x);
+                const s32 clip_top = std::max(0, y);
+                const s32 clip_right = std::min(fb_width, x + w);
+                const s32 clip_bottom = std::min(fb_height, y + h);
+                
+                // Early exit if completely clipped
+                if (clip_left >= clip_right || clip_top >= clip_bottom) return;
+                
+                // Shape parameters
+                const s32 center_y = y + radius;
+                const s32 rect_left = x + radius;
+                const s32 rect_right = x + w - radius;
+                const s32 radius_sq = radius * radius;
+                
+                // Choose drawing method based on alpha
+                const bool fullOpacity = (color.a == 0xF);
+                
+                // Pre-compute variables
+                s32 y_curr, x_curr;
+                s32 dy, dy_sq, x_offset_sq;
+                s32 x_offset, row_start, row_end;
+                //u32 pixel_offset;
+                
+                // Main drawing loop
+                for (y_curr = clip_top; y_curr < clip_bottom; ++y_curr) {
+                    dy = y_curr - center_y;
+                    dy_sq = dy * dy;
+                    
+                    // Skip rows outside the shape
+                    if (dy_sq > radius_sq) continue;
+                    
+                    // Calculate horizontal extent for this row
+                    x_offset_sq = radius_sq - dy_sq;
+                    
+                    // Fast integer square root with better rounding
+                    if (radius <= 32) {
+                        // Direct calculation for small values
+                        x_offset = 0;
+                        while (x_offset * x_offset <= x_offset_sq) {
+                            x_offset++;
+                        }
+                        // More intelligent step-back: only if we're significantly over
+                        // This reduces the "flat edge" appearance
+                        if (x_offset > 0) {
+                            s32 current_sq = x_offset * x_offset;
+                            s32 prev_sq = (x_offset - 1) * (x_offset - 1);
+                            // Only step back if we're closer to the previous value
+                            if (current_sq - x_offset_sq > x_offset_sq - prev_sq) {
+                                x_offset--;
+                            }
+                        }
+                    } else {
+                        // Newton's method for larger values (converges in ~4 iterations)
+                        x_offset = radius; // Initial guess
+                        for (int i = 0; i < 4; ++i) {
+                            x_offset = (x_offset + x_offset_sq / x_offset) >> 1;
+                        }
+                        // Ensure we're close to the actual value
+                        while ((x_offset + 1) * (x_offset + 1) <= x_offset_sq) x_offset++;
+                        while (x_offset * x_offset > x_offset_sq) x_offset--;
+                    }
+                    
+                    // Calculate row bounds
+                    row_start = rect_left - x_offset;
+                    row_end = rect_right + x_offset;
+                    
+                    // Clip to visible area
+                    row_start = std::max(row_start, clip_left);
+                    row_end = std::min(row_end, clip_right);
+                    
+                    if (row_start >= row_end) continue;
+                    
+                    // Draw the row
+                    if (fullOpacity) {
+                        for (x_curr = row_start; x_curr < row_end; ++x_curr) {
+                    
+                            const u32 offset = this->getPixelOffset((u32)x_curr, (u32)y_curr);
+                            if (offset == UINT32_MAX) continue;
+                    
+                            this->setPixelAtOffset(offset, color);
+                        }
+                    } else {
+                        for (x_curr = row_start; x_curr < row_end; ++x_curr) {
+                    
+                            const u32 offset = this->getPixelOffset((u32)x_curr, (u32)y_curr);
+                            if (offset == UINT32_MAX) continue;
+                    
+                            // you can keep using the existing blended helper which already checks UINT32_MAX
+                            this->setPixelBlendDst((u32)x_curr, (u32)y_curr, color);
+                        }
+                    }
+                }
+            }
+                        
+            // Struct for batch pixel processing with better alignment
+            struct alignas(64) PixelBatch {
+                s32 baseX, baseY;
+                u8 red[32], green[32], blue[32], alpha[32];  // Doubled for 32-pixel batches
+                s32 count;
+            };
+            
+            // Batch pixel setter - process multiple pixels at once if available
+            inline void setPixelBatchBlendSrc(const s32 baseX, const s32 baseY, const PixelBatch& batch) {
+                // If your graphics system supports batch operations, use them here
+                // Otherwise fall back to individual calls
+                for (s32 i = 0; i < batch.count; ++i) {
+                    setPixelBlendSrc(baseX + i, baseY, {
+                        batch.red[i], batch.green[i], batch.blue[i], batch.alpha[i]
+                    });
+                }
+            }
+
+            // Fixed compilation errors - simplified SIMD version
+            static constexpr uint8x16_t lut = {0, 17, 34, 51, 68, 85, 102, 119, 136, 153, 170, 187, 204, 221, 238, 255};
+            const uint8x16_t mask_low = vdupq_n_u8(0x0F);
+            // Pre-computed lookup table for 4-bit to 8-bit conversion
+            static constexpr u8 expand4to8[16] = {
+                0, 17, 34, 51, 68, 85, 102, 119, 136, 153, 170, 187, 204, 221, 238, 255
+            };
+            
+
+            inline void processBMPChunk(const s32 x, const s32 y, const s32 screenW, const u8 *preprocessedData, 
+                                           const s32 startRow, const s32 endRow, const u8 globalAlphaLimit) {
+                const s32 bytesPerRow = screenW * 2;
+                const s32 endX16 = screenW & ~15;
+                
+                // Create SIMD vector for alpha limit
+                const uint8x16_t alpha_limit_vec = vdupq_n_u8(globalAlphaLimit);
+                
+                // Pre-declare all variables outside loops
+                const u8 *rowPtr;
+                s32 baseY;
+                s32 x1;
+                const u8* ptr;
+                uint8x16x2_t packed;
+                uint8x16_t high1, low1, high2, low2;
+                uint8x16_t red, green, blue, alpha;
+                alignas(16) u8 red_vals[16], green_vals[16], blue_vals[16], alpha_vals[16];
+                s32 baseX;
+                s32 pixelX;
+                u32 offset;
+                Color color = {0}, src = {0}, end = {0};
+                const u16* framebuffer;
+                u8 p1, p2;
+                
+                for (s32 y1 = startRow; y1 < endRow; ++y1) {
+                    rowPtr = preprocessedData + (y1 * bytesPerRow);
+                    baseY = y + y1;
+                    
+                    x1 = 0;
+                    
+                    // SIMD processing for 16 pixels at once
+                    for (; x1 < endX16; x1 += 16) {
+                        ptr = rowPtr + (x1 << 1);
+                        packed = vld2q_u8(ptr);
+                        
+                        // Expand 4-bit to 8-bit values
+                        high1 = vshrq_n_u8(packed.val[0], 4);
+                        low1  = vandq_u8(packed.val[0], mask_low);
+                        high2 = vshrq_n_u8(packed.val[1], 4);
+                        low2  = vandq_u8(packed.val[1], mask_low);
+                        
+                        red   = vqtbl1q_u8(lut, high1);
+                        green = vqtbl1q_u8(lut, low1);
+                        blue  = vqtbl1q_u8(lut, high2);
+                        alpha = vqtbl1q_u8(lut, low2);
+                        
+                        // Apply alpha limit using SIMD min operation
+                        alpha = vminq_u8(alpha, alpha_limit_vec);
+                        
+                        // Store to arrays and process individually
+                        vst1q_u8(red_vals, red);
+                        vst1q_u8(green_vals, green); 
+                        vst1q_u8(blue_vals, blue);
+                        vst1q_u8(alpha_vals, alpha);
+                        
+                        baseX = x + x1;
+                        
+                        // Process 16 pixels with minimal function call overhead
+                        for (int i = 0; i < 16; ++i) {
+                            // Skip transparent pixels
+                            if (alpha_vals[i] == 0) continue;
+                            
+                            pixelX = baseX + i;
+                            offset = this->getPixelOffset(pixelX, baseY);
+                            
+                            if (offset != UINT32_MAX) {
+                                color = {red_vals[i], green_vals[i], blue_vals[i], alpha_vals[i]};
+                                
+                                framebuffer = static_cast<const u16*>(this->getCurrentFramebuffer());
+                                src = Color(framebuffer[offset]);
+                                
+                                end = {
+                                    blendColor(src.r, color.r, color.a),
+                                    blendColor(src.g, color.g, color.a), 
+                                    blendColor(src.b, color.b, color.a),
+                                    src.a
+                                };
+                            
+                                this->setPixelAtOffset(offset, end);
+                            }
+                        }
+                    }
+                    
+                    // Handle remaining pixels (less than 16) with pre-computed alpha limit
+                    for (; x1 < screenW; ++x1) {
+                        p1 = rowPtr[x1 << 1];
+                        p2 = rowPtr[(x1 << 1) + 1];
+                        
+                        u8 alpha = expand4to8[p2 & 0x0F];
+                        alpha = (alpha < globalAlphaLimit) ? alpha : globalAlphaLimit;
+                        
+                        setPixelBlendSrc(x + x1, baseY, {
+                            expand4to8[p1 >> 4], expand4to8[p1 & 0x0F],
+                            expand4to8[p2 >> 4], alpha
+                        });
+                    }
+                }
+                
+                ult::inPlotBarrier.arrive_and_wait();
+            }
+
+
+            /**
+             * @brief Draws a scaled RGBA8888 bitmap from memory
+             *
+             * @param x X start position
+             * @param y Y start position
+             * @param w Bitmap width (original width of the bitmap)
+             * @param h Bitmap height (original height of the bitmap)
+             * @param bmp Pointer to bitmap data
+             * @param screenW Target screen width
+             * @param screenH Target screen height
+             */
+
+            //inline void drawBitmapRGBA4444(const s32 x, const s32 y, const s32 screenW, const s32 screenH, const u8 *preprocessedData) {
+            //    s32 startRow;
+            //    
+            //    // Divide rows among ult::renderThreads
+            //    //s32 chunkSize = (screenH + ult::numThreads - 1) / ult::numThreads;
+            //    for (unsigned i = 0; i < ult::numThreads; ++i) {
+            //        startRow = i * ult::bmpChunkSize;
+            //        //s32 endRow = std::min(startRow + ult::bmpChunkSize, screenH);
+            //        
+            //        // Bind the member function and create the thread
+            //        ult::renderThreads[i] = std::thread(std::bind(&tsl::gfx::Renderer::processBMPChunk, this, x, y, screenW, preprocessedData, startRow, std::min(startRow + ult::bmpChunkSize, screenH)));
+            //    }
+            //    
+            //    // Join all ult::renderThreads
+            //    for (auto& t : ult::renderThreads) {
+            //        t.join();
+            //    }
+            //}
+
+            inline void drawBitmapRGBA4444(const s32 x, const s32 y, const s32 screenW, const s32 screenH, 
+                                           const u8 *preprocessedData, float opacity = 1.0f) {
+                // Pre-compute alpha limit once
+                const u8 globalAlphaLimit = static_cast<u8>(0xF * opacity);
+                
+                s32 startRow;
+                
+                for (unsigned i = 0; i < ult::numThreads; ++i) {
+                    startRow = i * ult::bmpChunkSize;
+                    
+                    // Pass the alpha limit to each thread
+                    ult::renderThreads[i] = std::thread(std::bind(&tsl::gfx::Renderer::processBMPChunk, 
+                        this, x, y, screenW, preprocessedData, startRow, 
+                        std::min(startRow + ult::bmpChunkSize, screenH), globalAlphaLimit));
+                }
+            
+                // Join all threads
+                for (auto& t : ult::renderThreads) {
+                    t.join();
+                }
+            }
+
+
+
+            //inline void drawWallpaper() {
+            //    if (!ult::expandedMemory || ult::refreshWallpaper.load(std::memory_order_acquire)) {
+            //        return;
+            //    }
+            //    
+            //    ult::inPlot.store(true, std::memory_order_release);
+            //    
+            //    if (!ult::wallpaperData.empty() && 
+            //        !ult::refreshWallpaper.load(std::memory_order_acquire) && 
+            //        ult::correctFrameSize) {
+            //        drawBitmapRGBA4444(0, 0, cfg::FramebufferWidth, cfg::FramebufferHeight, ult::wallpaperData.data());
+            //    }
+            //    
+            //    ult::inPlot.store(false, std::memory_order_release);
+            //}
+
+            inline void drawWallpaper() {
+                if (!ult::expandedMemory || ult::refreshWallpaper.load(std::memory_order_acquire)) {
+                    return;
+                }
+                
+                ult::inPlot.store(true, std::memory_order_release);
+                
+                if (!ult::wallpaperData.empty() && 
+                    !ult::refreshWallpaper.load(std::memory_order_acquire) && 
+                    ult::correctFrameSize) {
+                    // Use the renderer's opacity directly
+                    drawBitmapRGBA4444(0, 0, cfg::FramebufferWidth, cfg::FramebufferHeight, 
+                                      ult::wallpaperData.data(), Renderer::s_opacity);
+                }
+                
+                ult::inPlot.store(false, std::memory_order_release);
+            }
+
+
+            /**
+             * @brief Draws a RGBA8888 bitmap from memory
+             *
+             * @param x X start position
+             * @param y Y start position
+             * @param w Bitmap width
+             * @param h Bitmap height
+             * @param bmp Pointer to bitmap data
+             */
+            inline void drawBitmap(s32 x, s32 y, s32 w, s32 h, const u8 *bmp) {
+                if (w <= 0 || h <= 0) [[unlikely]] return;
+                
+                const u8* __restrict__ src = bmp;
+                
+                s32 px;
+
+                // Completely unroll small bitmaps for maximum speed
+                if (w <= 8 && h <= 8) [[likely]] {
+                    // Specialized path for small bitmaps (icons, etc.)
+                    for (s32 py = 0; py < h; ++py) {
+                        const s32 rowY = y + py;
+                        px = x;
+                        
+                        // Unroll inner loop completely for small widths
+                        switch(w) {
+                            case 8: goto pixel8;
+                            case 7: goto pixel7;
+                            case 6: goto pixel6;
+                            case 5: goto pixel5;
+                            case 4: goto pixel4;
+                            case 3: goto pixel3;
+                            case 2: goto pixel2;
+                            case 1: goto pixel1;
+                            default: break;
+                        }
+                        
+                        pixel8: {
+                            const Color c = {static_cast<u8>(src[0] >> 4), static_cast<u8>(src[1] >> 4), 
+                                           static_cast<u8>(src[2] >> 4), static_cast<u8>(src[3] >> 4)};
+                            setPixelBlendSrc(px++, rowY, a(c)); src += 4;
+                        }
+                        pixel7: {
+                            const Color c = {static_cast<u8>(src[0] >> 4), static_cast<u8>(src[1] >> 4), 
+                                           static_cast<u8>(src[2] >> 4), static_cast<u8>(src[3] >> 4)};
+                            setPixelBlendSrc(px++, rowY, a(c)); src += 4;
+                        }
+                        pixel6: {
+                            const Color c = {static_cast<u8>(src[0] >> 4), static_cast<u8>(src[1] >> 4), 
+                                           static_cast<u8>(src[2] >> 4), static_cast<u8>(src[3] >> 4)};
+                            setPixelBlendSrc(px++, rowY, a(c)); src += 4;
+                        }
+                        pixel5: {
+                            const Color c = {static_cast<u8>(src[0] >> 4), static_cast<u8>(src[1] >> 4), 
+                                           static_cast<u8>(src[2] >> 4), static_cast<u8>(src[3] >> 4)};
+                            setPixelBlendSrc(px++, rowY, a(c)); src += 4;
+                        }
+                        pixel4: {
+                            const Color c = {static_cast<u8>(src[0] >> 4), static_cast<u8>(src[1] >> 4), 
+                                           static_cast<u8>(src[2] >> 4), static_cast<u8>(src[3] >> 4)};
+                            setPixelBlendSrc(px++, rowY, a(c)); src += 4;
+                        }
+                        pixel3: {
+                            const Color c = {static_cast<u8>(src[0] >> 4), static_cast<u8>(src[1] >> 4), 
+                                           static_cast<u8>(src[2] >> 4), static_cast<u8>(src[3] >> 4)};
+                            setPixelBlendSrc(px++, rowY, a(c)); src += 4;
+                        }
+                        pixel2: {
+                            const Color c = {static_cast<u8>(src[0] >> 4), static_cast<u8>(src[1] >> 4), 
+                                           static_cast<u8>(src[2] >> 4), static_cast<u8>(src[3] >> 4)};
+                            setPixelBlendSrc(px++, rowY, a(c)); src += 4;
+                        }
+                        pixel1: {
+                            const Color c = {static_cast<u8>(src[0] >> 4), static_cast<u8>(src[1] >> 4), 
+                                           static_cast<u8>(src[2] >> 4), static_cast<u8>(src[3] >> 4)};
+                            setPixelBlendSrc(px, rowY, a(c)); src += 4;
+                        }
+                    }
+                    return;
+                }
+                
+                // Fallback to vectorized version for larger bitmaps
+                const s32 vectorWidth = w & ~7; // Process 8 pixels at a time
+                const s32 remainder = w & 7;
+                
+                for (s32 py = 0; py < h; ++py) {
+                    const s32 rowY = y + py;
+                    px = x;
+                    
+                    // Process 8 pixels at once (cache-friendly)
+                    for (s32 i = 0; i < vectorWidth; i += 8) {
+                        // Prefetch next cache line
+                        __builtin_prefetch(src + 64, 0, 3);
+                        
+                        // Process 8 pixels with minimal overhead
+                        for (int j = 0; j < 8; ++j) {
+                            const Color c = {static_cast<u8>(src[0] >> 4), static_cast<u8>(src[1] >> 4), 
+                                           static_cast<u8>(src[2] >> 4), static_cast<u8>(src[3] >> 4)};
+                            setPixelBlendSrc(px++, rowY, (c));
+                            src += 4;
+                        }
+                    }
+                    
+                    // Handle remainder
+                    for (s32 i = 0; i < remainder; ++i) {
+                        const Color c = {static_cast<u8>(src[0] >> 4), static_cast<u8>(src[1] >> 4), 
+                                       static_cast<u8>(src[2] >> 4), static_cast<u8>(src[3] >> 4)};
+                        setPixelBlendSrc(px++, rowY, (c));
+                        src += 4;
+                    }
+                }
+            }
+            
+            /**
+             * @brief Fills the entire layer with a given color
+             *
+             * @param color Color
+             */
+            inline void fillScreen(const Color& color) {
+                std::fill_n(static_cast<Color*>(this->getCurrentFramebuffer()), this->getFramebufferSize() / sizeof(Color), color);
+            }
+            
+            /**
+             * @brief Clears the layer (With transparency)
+             *
+             */
+            inline void clearScreen() {
+                this->fillScreen(Color(0x0, 0x0, 0x0, 0x0)); // Fully transparent
+            }
+            
+            const stbtt_fontinfo& getStandardFont() const {
+                return m_stdFont;
+            }
+                    
+            
+            // Optimized unified drawString method with thread safety
+            inline std::pair<s32, s32> drawString(const std::string& originalString, bool monospace, 
+                                                  const s32 x, const s32 y, const u32 fontSize, 
+                                                  const Color& defaultColor, const ssize_t maxWidth = 0, 
+                                                  bool draw = true,
+                                                  const Color* highlightColor = nullptr,
+                                                  const std::vector<std::string>* specialSymbols = nullptr,
+                                                  const u32 highlightStartChar = 0,
+                                                  const u32 highlightEndChar = 0,
+                                                  const bool useNotificationCache = false) { // NEW parameter
+                
+                // Thread-safe translation cache access
+                std::string text;
+                #if defined(UI_OVERRIDE_PATH)// && (!defined(IS_STATUS_MONITOR) || (IS_STATUS_MONITOR == 0))
+                {
+                    std::shared_lock<std::shared_mutex> readLock(s_translationCacheMutex);
+                    auto translatedIt = ult::translationCache.find(originalString);
+                    if (translatedIt != ult::translationCache.end()) {
+                        text = translatedIt->second;
+                    } else {
+                        // Don't insert anything, just fallback to original string
+                        text = originalString;
+                    }
+                }
+                #else
+                text = originalString;
+                #endif
+                
+                if (text.empty() || fontSize == 0) return {0, 0};
+                
+                const float maxWidthLimit = maxWidth > 0 ? x + maxWidth : std::numeric_limits<float>::max();
+                
+                // Check if highlighting is enabled (both highlight color and delimiters must be provided)
+                const bool highlightingEnabled = highlightColor && highlightStartChar != 0 && highlightEndChar != 0;
+                
+                // Get font metrics for consistent line height using a standard character
+                // This ensures consistent line spacing regardless of which specific characters are used
+                const auto fontMetrics = FontManager::getFontMetricsForCharacter('A', fontSize);
+                const s32 lineHeight = static_cast<s32>(fontMetrics.lineHeight);
+                
+                // Fast ASCII check with early exit
+                bool isAsciiOnly = true;
+                const char* textPtr = text.data();
+                const char* textEnd = textPtr + text.size();
+                for (const char* p = textPtr; p < textEnd; ++p) {
+                    if (static_cast<unsigned char>(*p) > 127) {
+                        isAsciiOnly = false;
+                        break;
+                    }
+                }
+                
+                s32 maxX = x, currX = x, currY = y;  // Changed to s32 for consistency
+                s32 maxY = y + lineHeight;           // Initialize with at least one line height
+                bool inHighlight = false;
+                const Color* currentColor = &defaultColor;
+                
+                // Pre-declare variables used in loops to avoid repeated allocations
+                u32 currCharacter;
+                ssize_t codepointWidth;
+                std::shared_ptr<FontManager::Glyph> glyph;
+                bool symbolProcessed;
+                size_t remainingLength;
+                u32 symChar;
+                ssize_t symWidth;
+                size_t i;
+                
+                // Main processing loop with pointer arithmetic for ASCII optimization
+                if (isAsciiOnly && !specialSymbols) {
+                    // Fast ASCII-only path
+                    for (const char* p = textPtr; p < textEnd && currX < maxWidthLimit; ++p) {
+                        currCharacter = static_cast<u32>(*p);
+                        
+                        // Handle highlighting with configurable delimiters
+                        if (highlightingEnabled) {
+                            if (currCharacter == highlightStartChar) {
+                                inHighlight = true;
+                            } else if (currCharacter == highlightEndChar) {
+                                inHighlight = false;
+                            }
+                            currentColor = (currCharacter == highlightStartChar || currCharacter == highlightEndChar) ? 
+                                          &defaultColor : (inHighlight ? highlightColor : &defaultColor);
+                        }
+                        
+                        // Handle newline
+                        if (currCharacter == '\n') {
+                            maxX = std::max(currX, maxX);
+                            currX = x;
+                            currY += lineHeight;  // Use consistent line height
+                            maxY = std::max(maxY, currY + lineHeight);  // Update maxY for new line
+                            continue;
+                        }
+                        
+                        // Get glyph (now thread-safe)
+                        // Get glyph - UPDATED to use notification cache when requested
+                        if (useNotificationCache) {
+                            glyph = FontManager::getOrCreateNotificationGlyph(currCharacter, monospace, fontSize);
+                        } else {
+                            glyph = FontManager::getOrCreateGlyph(currCharacter, monospace, fontSize);
+                        }
+                        if (!glyph) continue;
+                        
+                        // Track maximum Y position reached using consistent line height
+                        maxY = std::max(maxY, currY + lineHeight);
+                        
+                        // Render if needed
+                        if (draw && glyph->glyphBmp && currCharacter > 32) { // Space is 32
+                            renderGlyph(glyph, currX, currY, *currentColor);
+                        }
+                        
+                        currX += static_cast<s32>(glyph->xAdvance * glyph->currFontSize);
+                    }
+                } else {
+                    // UTF-8 path with special symbols support
+                    auto itStr = text.cbegin();
+                    const auto itStrEnd = text.cend();
+                    
+                    while (itStr != itStrEnd && currX < maxWidthLimit) {
+                        // Check for special symbols first
+                        symbolProcessed = false;
+                        if (specialSymbols) {
+                            remainingLength = itStrEnd - itStr;
+                            for (const auto& symbol : *specialSymbols) {
+                                if (remainingLength >= symbol.length() &&
+                                    std::equal(symbol.begin(), symbol.end(), itStr)) {
+                                    
+                                    // Process special symbol
+                                    for (i = 0; i < symbol.length(); ) {
+                                        symWidth = decode_utf8(&symChar, 
+                                            reinterpret_cast<const u8*>(&symbol[i]));
+                                        if (symWidth <= 0) break;
+                                        
+                                        if (symChar == '\n') {
+                                            maxX = std::max(currX, maxX);
+                                            currX = x;
+                                            currY += lineHeight;  // Use consistent line height
+                                            maxY = std::max(maxY, currY + lineHeight);  // Update maxY for new line
+                                        } else {
+                                            glyph = FontManager::getOrCreateGlyph(symChar, monospace, fontSize);
+                                            if (glyph) {
+                                                // Track maximum Y position reached using consistent line height
+                                                maxY = std::max(maxY, currY + lineHeight);
+                                                
+                                                if (draw && glyph->glyphBmp && symChar > 32) {
+                                                    renderGlyph(glyph, currX, currY, *highlightColor);
+                                                }
+                                                currX += static_cast<s32>(glyph->xAdvance * glyph->currFontSize);
+                                            }
+                                        }
+                                        i += symWidth;
+                                    }
+                                    itStr += symbol.length();
+                                    symbolProcessed = true;
+                                    break;
+                                }
+                            }
+                        }
+                        
+                        if (symbolProcessed) continue;
+                        
+                        // Decode character
+                        if (isAsciiOnly) {
+                            currCharacter = static_cast<u32>(*itStr);
+                            codepointWidth = 1;
+                        } else {
+                            codepointWidth = decode_utf8(&currCharacter, reinterpret_cast<const u8*>(&(*itStr)));
+                            if (codepointWidth <= 0) break;
+                        }
+                        
+                        itStr += codepointWidth;
+                        
+                        // Handle highlighting with configurable delimiters
+                        if (highlightingEnabled) {
+                            if (currCharacter == highlightStartChar) {
+                                inHighlight = true;
+                            } else if (currCharacter == highlightEndChar) {
+                                inHighlight = false;
+                            }
+                            currentColor = (currCharacter == highlightStartChar || currCharacter == highlightEndChar) ? 
+                                          &defaultColor : (inHighlight ? highlightColor : &defaultColor);
+                        }
+                        
+                        // Handle newline
+                        if (currCharacter == '\n') {
+                            maxX = std::max(currX, maxX);
+                            currX = x;
+                            currY += lineHeight;  // Use consistent line height
+                            maxY = std::max(maxY, currY + lineHeight);  // Update maxY for new line
+                            continue;
+                        }
+                        
+                        // Get glyph (now thread-safe)
+                        glyph = FontManager::getOrCreateGlyph(currCharacter, monospace, fontSize);
+                        if (!glyph) continue;
+                        
+                        // Track maximum Y position reached using consistent line height
+                        maxY = std::max(maxY, currY + lineHeight);
+                        
+                        // Render if needed
+                        if (draw && glyph->glyphBmp && currCharacter > 32) {
+                            renderGlyph(glyph, currX, currY, *currentColor);
+                        }
+                        
+                        currX += static_cast<s32>(glyph->xAdvance * glyph->currFontSize);
+                    }
+                }
+                
+                maxX = std::max(currX, maxX);
+                // Return consistent height based on proper font metrics
+                return {maxX - x, maxY - y};
+            }
+
+            inline std::pair<s32, s32> drawNotificationString(const std::string& text, bool monospace, 
+                                                              const s32 x, const s32 y, const u32 fontSize, 
+                                                              const Color& defaultColor, const ssize_t maxWidth = 0, 
+                                                              bool draw = true,
+                                                              const Color* highlightColor = nullptr,
+                                                              const std::vector<std::string>* specialSymbols = nullptr,
+                                                              const u32 highlightStartChar = 0,
+                                                              const u32 highlightEndChar = 0) {
+                return drawString(text, monospace, x, y, fontSize, defaultColor, maxWidth, draw, 
+                                 highlightColor, specialSymbols, highlightStartChar, highlightEndChar, true);
+            }
+            
+            // Convenience wrappers for backward compatibility
+            inline std::pair<s32, s32> drawStringWithHighlight(const std::string& text, bool monospace, 
+                                                              s32 x, s32 y, const u32 fontSize, 
+                                                              const Color& defaultColor, 
+                                                              const Color& specialColor, 
+                                                              const ssize_t maxWidth = 0,
+                                                              const u32 startChar = '(',
+                                                              const u32 endChar = ')') {
+                return drawString(text, monospace, x, y, fontSize, defaultColor, maxWidth, true, &specialColor, nullptr, startChar, endChar);
+            }
+            
+            inline std::pair<s32, s32> drawStringWithColoredSections(const std::string& text, bool monospace,
+                                                    const std::vector<std::string>& specialSymbols, 
+                                                    s32 x, const s32 y, const u32 fontSize, 
+                                                    const Color& defaultColor, 
+                                                    const Color& specialColor) {
+                return drawString(text, monospace, x, y, fontSize, defaultColor, 0, true, &specialColor, &specialSymbols);
+            }
+            
+            // Calculate string dimensions without drawing
+            inline std::pair<s32, s32> getTextDimensions(const std::string& text, bool monospace, 
+                                                         const u32 fontSize, const ssize_t maxWidth = 0) {
+                return drawString(text, monospace, 0, 0, fontSize, Color{0,0,0,0}, maxWidth, false);
+            }
+
+            inline std::pair<s32, s32> getNotificationTextDimensions(const std::string& text, bool monospace, 
+                                                                     const u32 fontSize, const ssize_t maxWidth = 0) {
+                return drawString(text, monospace, 0, 0, fontSize, Color{0,0,0,0}, maxWidth, false, 
+                                 nullptr, nullptr, 0, 0, true);
+            }
+            
+            // Thread-safe limitStringLength using the unified cache
+            inline std::string limitStringLength(const std::string& originalString, const bool monospace, 
+                                               const u32 fontSize, const s32 maxLength) {  // Changed fontSize to u32
+                
+                // Thread-safe translation cache access
+                std::string text;
+                #ifdef UI_OVERRIDE_PATH
+                {
+                    std::shared_lock<std::shared_mutex> readLock(s_translationCacheMutex);
+                    auto translatedIt = ult::translationCache.find(originalString);
+                    if (translatedIt != ult::translationCache.end()) {
+                        text = translatedIt->second;
+                    } else {
+                        // Don't insert anything, just fallback to original string
+                        text = originalString;
+                    }
+                }
+                #else
+                text = originalString;
+                #endif
+                
+                if (text.size() < 2) return text;
+                
+                // Get ellipsis width using shared cache (now thread-safe)
+                static constexpr u32 ellipsisChar = 0x2026;
+                std::shared_ptr<FontManager::Glyph> ellipsisGlyph = FontManager::getOrCreateGlyph(ellipsisChar, monospace, fontSize);
+                if (!ellipsisGlyph) return text;
+                
+                // Fixed: Use consistent s32 calculation like other functions
+                const s32 ellipsisWidth = static_cast<s32>(ellipsisGlyph->xAdvance * ellipsisGlyph->currFontSize);
+                const s32 maxWidthWithoutEllipsis = maxLength - ellipsisWidth;
+                
+                if (maxWidthWithoutEllipsis <= 0) {
+                    return "…"; // If there's no room for text, just return ellipsis
+                }
+                
+                // Calculate width incrementally
+                s32 currX = 0;
+                auto itStr = text.cbegin();
+                const auto itStrEnd = text.cend();
+                auto lastValidPos = itStr;
+                
+                // Fast ASCII check
+                bool isAsciiOnly = true;
+                for (unsigned char c : text) {
+                    if (c > 127) {
+                        isAsciiOnly = false;
+                        break;
+                    }
+                }
+                
+                // Move variable declarations outside the loop
+                u32 currCharacter;
+                ssize_t codepointWidth;
+                s32 charWidth;
+                size_t bytePos;
+
+                while (itStr != itStrEnd) {
+                    // Decode UTF-8 codepoint
+                    if (isAsciiOnly) {
+                        currCharacter = static_cast<u32>(*itStr);
+                        codepointWidth = 1;
+                    } else {
+                        codepointWidth = decode_utf8(&currCharacter, reinterpret_cast<const u8*>(&(*itStr)));
+                        if (codepointWidth <= 0) break;
+                    }
+                    
+                    // FontManager::getOrCreateGlyph is now thread-safe
+                    std::shared_ptr<FontManager::Glyph> glyph = FontManager::getOrCreateGlyph(currCharacter, monospace, fontSize);
+                    if (!glyph) {
+                        itStr += codepointWidth;
+                        continue;
+                    }
+                    
+                    // Fixed: Use consistent s32 calculation
+                    charWidth = static_cast<s32>(glyph->xAdvance * glyph->currFontSize);
+                    
+                    if (currX + charWidth > maxWidthWithoutEllipsis) {
+                        // Calculate the byte position for substring
+                        bytePos = std::distance(text.cbegin(), lastValidPos);
+                        return text.substr(0, bytePos) + "…";
+                    }
+                    
+                    currX += charWidth;
+                    itStr += codepointWidth;
+                    lastValidPos = itStr;
+                }
+                
+                return text;
+            }
+
+            inline void setLayerPos(u32 x, u32 y) {
+                //const float ratio = 1.5;
+                //u32 maxX = cfg::ScreenWidth - (int)(ratio * cfg::FramebufferWidth);
+                //u32 maxY = cfg::ScreenHeight - (int)(ratio * cfg::FramebufferHeight);
+                if (x > cfg::ScreenWidth - (int)(1.5 * cfg::FramebufferWidth) || y > cfg::ScreenHeight - (int)(1.5 * cfg::FramebufferHeight)) {
+                    return;
+                }
+                setLayerPosImpl(x, y);
+            }
+
+            void updateLayerSize() {
+                const auto [horizontalUnderscanPixels, verticalUnderscanPixels] = getUnderscanPixels();
+                
+                // Recalculate layer dimensions with new underscan values
+                cfg::LayerWidth  = cfg::ScreenWidth * (float(cfg::FramebufferWidth) / float(cfg::LayerMaxWidth));
+                cfg::LayerHeight = cfg::ScreenHeight * (float(cfg::FramebufferHeight) / float(cfg::LayerMaxHeight));
+                
+                // Apply underscan adjustments
+                if (ult::DefaultFramebufferWidth == 1280 && ult::DefaultFramebufferHeight == 28) {
+                    cfg::LayerHeight += cfg::ScreenHeight/720. * verticalUnderscanPixels;
+                } else if (ult::correctFrameSize) {
+                    cfg::LayerWidth += horizontalUnderscanPixels;
+                }
+                
+                // Update position if using right alignment
+                if (ult::useRightAlignment && ult::correctFrameSize) {
+                    ult::layerEdge = (1280 - 448);
+                }
+                
+                // Update the existing layer with new dimensions
+                viSetLayerSize(&this->m_layer, cfg::LayerWidth, cfg::LayerHeight);
+                
+                // Update position if using right alignment
+                if (ult::useRightAlignment && ult::correctFrameSize) {
+                    viSetLayerPosition(&this->m_layer, 1280-32 - horizontalUnderscanPixels, 0);
+                    viSetLayerSize(&this->m_layer, cfg::LayerWidth, cfg::LayerHeight);
+                    viSetLayerPosition(&this->m_layer, 1280-32 - horizontalUnderscanPixels, 0);
+                }
+                // ADD THIS: Update position for micro mode bottom positioning
+                else if (ult::DefaultFramebufferWidth == 1280 && ult::DefaultFramebufferHeight == 28 && cfg::LayerPosY > 500) {
+                    // Only adjust if already positioned at bottom (LayerPosY > 500 indicates bottom positioning)
+                    const u32 targetY = !verticalUnderscanPixels ? 1038 : 1038- (cfg::ScreenHeight/720. * verticalUnderscanPixels) +0.5;
+                    viSetLayerPosition(&this->m_layer, 0, targetY);
+                    viSetLayerSize(&this->m_layer, cfg::LayerWidth, cfg::LayerHeight);
+                    viSetLayerPosition(&this->m_layer, 0, targetY);
+                }
+            }
+
+            static Renderer& getRenderer() {
+                return get();
+            }
+
+            inline void setLayerPosImpl(u32 x, u32 y) {
+                // Get the underscan pixel values for both horizontal and vertical borders
+                //const auto [horizontalUnderscanPixels, verticalUnderscanPixels] = getUnderscanPixels();
+                
+                // Simply set the position to what was requested - no automatic right alignment
+                cfg::LayerPosX = x;
+                cfg::LayerPosY = y;
+                
+                ASSERT_FATAL(viSetLayerPosition(&this->m_layer, cfg::LayerPosX, cfg::LayerPosY));
+            }
+
+
+        #if USING_WIDGET_DIRECTIVE
+            // Method to draw clock, temperatures, and battery percentage
+            inline void drawWidget() {
+                static time_t lastTimeUpdate = 0;
+                static char timeStr[20];
+                static char PCB_temperatureStr[10];
+                static char SOC_temperatureStr[10];
+                static char chargeString[6];
+                static time_t lastSensorUpdate = 0;
+                
+                const bool showAnyWidget = !(ult::hideBattery && ult::hidePCBTemp && ult::hideSOCTemp && ult::hideClock);
+                
+                // Draw separator and backdrop if showing any widget
+                if (showAnyWidget) {
+                    drawRect(239, 15 + 2 - 2, 1, 64 + 2, topSeparatorColor);
+                    if (!ult::hideWidgetBackdrop) {
+                        drawUniformRoundedRect(
+                            247, 15 + 2 - 2,
+                            (ult::extendedWidgetBackdrop
+                                ? tsl::cfg::FramebufferWidth - 255
+                                : tsl::cfg::FramebufferWidth - 215),
+                            64 + 2, widgetBackdropColor
+                        );
+                    }
+                }
+                
+                // Calculate base Y offset
+                size_t y_offset = ((ult::hideBattery && ult::hidePCBTemp && ult::hideSOCTemp) || ult::hideClock)
+                                  ? (55 + 2 - 1)
+                                  : (44 + 2 - 1);
+                
+                // Constants for centering calculations
+                const int backdropCenterX = 247 + ((tsl::cfg::FramebufferWidth - 255) >> 1);
+                
+                time_t currentTime = time(nullptr);
+                
+                // Draw clock
+                if (!ult::hideClock) {
+                    if (currentTime != lastTimeUpdate || ult::languageWasChanged.load(std::memory_order_acquire)) {
+                        strftime(timeStr, sizeof(timeStr), ult::datetimeFormat.c_str(), localtime(&currentTime));
+                        ult::localizeTimeStr(timeStr);
+                        lastTimeUpdate = currentTime;
+                    }
+                    
+                    const int timeWidth = getTextDimensions(timeStr, false, 20).first;
+                    
+                    if (ult::centerWidgetAlignment) {
+                        // Centered alignment
+                        drawString(timeStr, false, backdropCenterX - (timeWidth >> 1), y_offset, 20, clockColor);
+                    } else {
+                        // Right alignment
+                        drawString(timeStr, false, tsl::cfg::FramebufferWidth - timeWidth - 25, y_offset, 20, clockColor);
+                    }
+                    
+                    y_offset += 22;
+                }
+                
+                // Update sensor data every second
+                if ((currentTime - lastSensorUpdate) >= 1) {
+                    if (!ult::hideSOCTemp) {
+                        float socTemp = 0.0f;
+                        ult::ReadSocTemperature(&socTemp);
+                        ult::SOC_temperature.store(socTemp, std::memory_order_release);
+                        snprintf(
+                            SOC_temperatureStr, sizeof(SOC_temperatureStr),
+                            "%d°C",
+                            static_cast<int>(round(ult::SOC_temperature.load(std::memory_order_acquire)))
+                        );
+                    }
+                    
+                    if (!ult::hidePCBTemp) {
+                        float pcbTemp = 0.0f;
+                        ult::ReadPcbTemperature(&pcbTemp);
+                        ult::PCB_temperature.store(pcbTemp, std::memory_order_release);
+                        snprintf(
+                            PCB_temperatureStr, sizeof(PCB_temperatureStr),
+                            "%d°C",
+                            static_cast<int>(round(ult::PCB_temperature.load(std::memory_order_acquire)))
+                        );
+                    }
+                    
+                    if (!ult::hideBattery) {
+                        uint32_t bc = 0;
+                        bool charging = false;
+                        ult::powerGetDetails(&bc, &charging);
+                        bc = std::min(bc, 100U);
+                        ult::batteryCharge.store(bc, std::memory_order_release);
+                        ult::isCharging.store(charging, std::memory_order_release);
+                        snprintf(chargeString, sizeof(chargeString), "%u%%", bc);
+                    }
+                    
+                    lastSensorUpdate = currentTime;
+                }
+                
+                if (ult::centerWidgetAlignment) {
+                    // CENTERED ALIGNMENT
+                    int totalWidth = 0;
+                    int socWidth = 0, pcbWidth = 0, chargeWidth = 0;
+                    bool hasMultiple = false;
+                    
+                    const float socTemp = ult::SOC_temperature.load(std::memory_order_acquire);
+                    const float pcbTemp = ult::PCB_temperature.load(std::memory_order_acquire);
+                    const uint32_t batteryCharge = ult::batteryCharge.load(std::memory_order_acquire);
+                    const bool charging = ult::isCharging.load(std::memory_order_acquire);
+                    
+                    if (!ult::hideSOCTemp && socTemp > 0.0f) {
+                        socWidth = getTextDimensions(SOC_temperatureStr, false, 20).first;
+                        totalWidth += socWidth;
+                        hasMultiple = true;
+                    }
+                    if (!ult::hidePCBTemp && pcbTemp > 0.0f) {
+                        pcbWidth = getTextDimensions(PCB_temperatureStr, false, 20).first;
+                        if (hasMultiple) totalWidth += 5;
+                        totalWidth += pcbWidth;
+                        hasMultiple = true;
+                    }
+                    if (!ult::hideBattery && batteryCharge > 0) {
+                        chargeWidth = getTextDimensions(chargeString, false, 20).first;
+                        if (hasMultiple) totalWidth += 5;
+                        totalWidth += chargeWidth;
+                    }
+                    
+                    int currentX = backdropCenterX - (totalWidth >> 1);
+                    if (socWidth > 0) {
+                        drawString(
+                            SOC_temperatureStr, false, currentX, y_offset, 20,
+                            ult::dynamicWidgetColors
+                                ? tsl::GradientColor(socTemp)
+                                : temperatureColor
+                        );
+                        currentX += socWidth + 5;
+                    }
+                    if (pcbWidth > 0) {
+                        drawString(
+                            PCB_temperatureStr, false, currentX, y_offset, 20,
+                            ult::dynamicWidgetColors
+                                ? tsl::GradientColor(pcbTemp)
+                                : temperatureColor
+                        );
+                        currentX += pcbWidth + 5;
+                    }
+                    if (chargeWidth > 0) {
+                        const Color batteryColorToUse = charging
+                            ? batteryChargingColor
+                            : (batteryCharge < 20 ? batteryLowColor : batteryColor);
+                        drawString(chargeString, false, currentX, y_offset, 20, batteryColorToUse);
+                    }
+                    
+                } else {
+                    // RIGHT ALIGNMENT
+                    int chargeWidth = 0, pcbWidth = 0, socWidth = 0;
+                    const float pcbTemp = ult::PCB_temperature.load(std::memory_order_acquire);
+                    const float socTemp = ult::SOC_temperature.load(std::memory_order_acquire);
+                    const uint32_t batteryCharge = ult::batteryCharge.load(std::memory_order_acquire);
+                    const bool charging = ult::isCharging.load(std::memory_order_acquire);
+                    
+                    if (!ult::hideBattery && batteryCharge > 0) {
+                        const Color batteryColorToUse = charging
+                            ? batteryChargingColor
+                            : (batteryCharge < 20 ? batteryLowColor : batteryColor);
+                        chargeWidth = getTextDimensions(chargeString, false, 20).first;
+                        drawString(
+                            chargeString, false,
+                            tsl::cfg::FramebufferWidth - chargeWidth - 25,
+                            y_offset, 20, batteryColorToUse
+                        );
+                    }
+                    
+                    int offset = 0;
+                    if (!ult::hidePCBTemp && pcbTemp > 0.0f) {
+                        if (!ult::hideBattery) offset -= 5;
+                        pcbWidth = getTextDimensions(PCB_temperatureStr, false, 20).first;
+                        drawString(
+                            PCB_temperatureStr, false,
+                            tsl::cfg::FramebufferWidth + offset - pcbWidth - chargeWidth - 25,
+                            y_offset, 20,
+                            ult::dynamicWidgetColors
+                                ? tsl::GradientColor(pcbTemp)
+                                : defaultTextColor
+                        );
+                    }
+                    if (!ult::hideSOCTemp && socTemp > 0.0f) {
+                        if (!ult::hidePCBTemp || !ult::hideBattery) offset -= 5;
+                        socWidth = getTextDimensions(SOC_temperatureStr, false, 20).first;
+                        drawString(
+                            SOC_temperatureStr, false,
+                            tsl::cfg::FramebufferWidth + offset - socWidth - pcbWidth - chargeWidth - 25,
+                            y_offset, 20,
+                            ult::dynamicWidgetColors
+                                ? tsl::GradientColor(socTemp)
+                                : defaultTextColor
+                        );
+                    }
+                }
+            }
+        #endif
+
+            // Single unified glyph cache for all text operations
+            //inline static std::unordered_map<u64, Glyph> s_unifiedGlyphCache;
+            
+            // Helper to select appropriate font for a character
+            inline std::shared_ptr<FontManager::Glyph> getOrCreateGlyph(u32 character, bool monospace, u32 fontSize) {
+                return FontManager::getOrCreateGlyph(character, monospace, fontSize);
+            }
+            
+            inline stbtt_fontinfo* selectFontForCharacter(u32 character) {
+                return FontManager::selectFontForCharacter(character);
+            }
+            
+            // Optimized glyph rendering
+            inline void renderGlyph(std::shared_ptr<FontManager::Glyph> glyph, float x, float y, const Color& color) {
+                if (!glyph->glyphBmp || color.a == 0) return;
+                
+                const s32 xPos = static_cast<s32>(x + glyph->bounds[0]);
+                const s32 yPos = static_cast<s32>(y + glyph->bounds[1]);
+                
+                // Quick bounds check
+                if (xPos >= cfg::FramebufferWidth || yPos >= cfg::FramebufferHeight ||
+                    xPos + glyph->width <= 0 || yPos + glyph->height <= 0) return;
+                
+                // Calculate clipping
+                const s32 startX = std::max(0, -xPos);
+                const s32 startY = std::max(0, -yPos);
+                const s32 endX = std::min(glyph->width, static_cast<s32>(cfg::FramebufferWidth) - xPos);
+                const s32 endY = std::min(glyph->height, static_cast<s32>(cfg::FramebufferHeight) - yPos);
+                
+                // Move variable declarations outside loops
+                const s32 simdEnd = std::min(endX, (startX + 7) & ~7);
+                s32 bmpX;
+                uint8_t alpha;
+                s32 pixelX;
+                //Color tmpColor = {0};
+                
+                // Render with optimized inner loop
+                const uint8_t* bmpPtr = glyph->glyphBmp + startY * glyph->width;
+                for (s32 bmpY = startY; bmpY < endY; ++bmpY) {
+                    const s32 pixelY = yPos + bmpY;
+                    bmpX = startX;
+                    
+                    // Process 8 pixels at once
+                    for (; bmpX < simdEnd; ++bmpX) {
+                        alpha = bmpPtr[bmpX] >> 4;
+                        if (alpha) {
+                            pixelX = xPos + bmpX;
+                            if (alpha == 0xF) {
+                                this->setPixel(pixelX, pixelY, color);
+                            } else {
+                                this->setPixelBlendDst(pixelX, pixelY, Color(color.r, color.g, color.b, alpha));
+                            }
+                        }
+                    }
+                    
+                    // Process remaining pixels
+                    for (; bmpX < endX; ++bmpX) {
+                        alpha = bmpPtr[bmpX] >> 4;
+                        if (alpha) {
+                            pixelX = xPos + bmpX;
+                            if (alpha == 0xF) {
+                                this->setPixel(pixelX, pixelY, color);
+                            } else {
+                                this->setPixelBlendDst(pixelX, pixelY, Color(color.r, color.g, color.b, alpha));
+                            }
+                        }
+                    }
+                    bmpPtr += glyph->width;
+                }
+            }
+
+
+            /**
+             * @brief Adds the layer from screenshot and recording stacks
+             */
+            inline void addScreenshotStacks(bool forceDisable = true) {
+                tsl::hlp::viAddToLayerStack(&this->m_layer, ViLayerStack_Screenshot);
+                tsl::hlp::viAddToLayerStack(&this->m_layer, ViLayerStack_Recording);
+                screenshotsAreDisabled.store(false, std::memory_order_release);
+                if (forceDisable)
+                    screenshotsAreForceDisabled.store(false, std::memory_order_release);
+            }
+
+            /**
+             * @brief Removes the layer from screenshot and recording stacks
+             */
+            inline void removeScreenshotStacks(bool forceDisable = true) {
+                tsl::hlp::viRemoveFromLayerStack(&this->m_layer, ViLayerStack_Screenshot);
+                tsl::hlp::viRemoveFromLayerStack(&this->m_layer, ViLayerStack_Recording);
+                screenshotsAreDisabled.store(true, std::memory_order_release);
+                if (forceDisable)
+                    screenshotsAreForceDisabled.store(true, std::memory_order_release);
+            }
+            
+        private:
+            Renderer() {
+                updateDrawFunction();
+            }
+            
+            /**
+             * @brief Sets the opacity of the layer
+             *
+             * @param opacity Opacity
+             */
+            inline static void setOpacity(float opacity) {
+                opacity = std::clamp(opacity, 0.0F, 1.0F);
+                
+                Renderer::s_opacity = opacity;
+            }
+            
+            bool m_initialized = false;
+            ViDisplay m_display;
+            ViLayer m_layer;
+            Event m_vsyncEvent;
+            
+            NWindow m_window;
+            Framebuffer m_framebuffer;
+            void *m_currentFramebuffer = nullptr;
+            
+            std::stack<ScissoringConfig> m_scissoringStack;
+            
+
+            static inline float s_opacity = 1.0F;
+            
+            
+            /**
+             * @brief Get the current framebuffer address
+             *
+             * @return Framebuffer address
+             */
+            inline void* getCurrentFramebuffer() {
+                return this->m_currentFramebuffer;
+            }
+            
+            /**
+             * @brief Get the next framebuffer address
+             *
+             * @return Next framebuffer address
+             */
+            inline void* getNextFramebuffer() {
+                return static_cast<u8*>(this->m_framebuffer.buf) + this->getNextFramebufferSlot() * this->getFramebufferSize();
+            }
+            
+            /**
+             * @brief Get the framebuffer size
+             *
+             * @return Framebuffer size
+             */
+            inline size_t getFramebufferSize() {
+                return this->m_framebuffer.fb_size;
+            }
+            
+            /**
+             * @brief Get the number of framebuffers in use
+             *
+             * @return Number of framebuffers
+             */
+            inline size_t getFramebufferCount() {
+                return this->m_framebuffer.num_fbs;
+            }
+            
+            /**
+             * @brief Get the currently used framebuffer's slot
+             *
+             * @return Slot
+             */
+            inline u8 getCurrentFramebufferSlot() {
+                return this->m_window.cur_slot;
+            }
+            
+            /**
+             * @brief Get the next framebuffer's slot
+             *
+             * @return Next slot
+             */
+            inline u8 getNextFramebufferSlot() {
+                return (this->getCurrentFramebufferSlot() + 1) % this->getFramebufferCount();
+            }
+            
+            /**
+             * @brief Waits for the vsync event
+             *
+             */
+            inline void waitForVSync() {
+                eventWait(&this->m_vsyncEvent, UINT64_MAX);
+            }
+            
+            /**
+             * @brief Decodes a x and y coordinate into a offset into the swizzled framebuffer
+             *
+             * @param x X pos
+             * @param y Y Pos
+             * @return Offset
+             */
+
+            inline u32 __attribute__((always_inline)) getPixelOffset(const u32 x, const u32 y) {
+                // Check for scissoring boundaries
+                if (!this->m_scissoringStack.empty()) {
+                    const auto& currScissorConfig = this->m_scissoringStack.top();
+                    if (x < currScissorConfig.x || y < currScissorConfig.y || 
+                        x >= currScissorConfig.x_max || 
+                        y >= currScissorConfig.y_max) {
+                        return UINT32_MAX;
+                    }
+                }
+                
+                return ((((y & 127) >> 4) + ((x >> 5) << 3) + ((y >> 7) * offsetWidthVar)) << 9) +
+                       ((y & 8) << 5) + ((x & 16) << 3) + ((y & 6) << 4) + 
+                       ((x & 8) << 1) + ((y & 1) << 3) + (x & 7);
+            }
+
+            
+            /**
+             * @brief Initializes the renderer and layers
+             *
+             */
+            void init() {
+                // Get the underscan pixel values for both horizontal and vertical borders
+                const auto [horizontalUnderscanPixels, verticalUnderscanPixels] = getUnderscanPixels();
+                //int horizontalUnderscanPixels = 0;
+
+                
+                ult::useRightAlignment = (ult::parseValueFromIniSection(ult::ULTRAHAND_CONFIG_INI_PATH, ult::ULTRAHAND_PROJECT_NAME, "right_alignment") == ult::TRUE_STR);
+
+                //cfg::LayerPosX = 1280-32;
+                cfg::LayerPosX = 0;
+                cfg::LayerPosY = 0;
+                cfg::FramebufferWidth  = ult::DefaultFramebufferWidth;
+                cfg::FramebufferHeight = ult::DefaultFramebufferHeight;
+
+                offsetWidthVar = (((cfg::FramebufferWidth / 2) >> 4) << 3);
+
+                ult::correctFrameSize = (cfg::FramebufferWidth == 448 && cfg::FramebufferHeight == 720); // for detecting the correct Overlay display size
+                if (ult::useRightAlignment && ult::correctFrameSize) {
+                    cfg::LayerPosX = 1280-32 - horizontalUnderscanPixels;
+                    ult::layerEdge = (1280-448);
+                }
+
+                cfg::LayerWidth  = cfg::ScreenWidth * (float(cfg::FramebufferWidth) / float(cfg::LayerMaxWidth));
+                cfg::LayerHeight = cfg::ScreenHeight * (float(cfg::FramebufferHeight) / float(cfg::LayerMaxHeight));
+
+                // Apply underscanning offset
+                if (ult::DefaultFramebufferWidth == 1280 && ult::DefaultFramebufferHeight == 28) // for status monitor micro mode
+                    cfg::LayerHeight += cfg::ScreenHeight/720. *verticalUnderscanPixels;
+                else if (ult::correctFrameSize)
+                    cfg::LayerWidth += horizontalUnderscanPixels;
+
+                // NEW: Scale down to 1/4 size (0.5x in each dimension)
+                //static constexpr float scaleFactor = 0.5f;
+                //cfg::LayerWidth *= scaleFactor;
+                //cfg::LayerHeight *= scaleFactor;
+                
+                if (this->m_initialized)
+                    return;
+
+                //s32 layerZ = 0;
+                
+                tsl::hlp::doWithSmSession([this, horizontalUnderscanPixels]{
+
+                    ASSERT_FATAL(viInitialize(ViServiceType_Manager));
+                    ASSERT_FATAL(viOpenDefaultDisplay(&this->m_display));
+                    ASSERT_FATAL(viGetDisplayVsyncEvent(&this->m_display, &this->m_vsyncEvent));
+                    ASSERT_FATAL(viCreateManagedLayer(&this->m_display, static_cast<ViLayerFlags>(0), 0, &__nx_vi_layer_id));
+                    ASSERT_FATAL(viCreateLayer(&this->m_display, &this->m_layer));
+                    ASSERT_FATAL(viSetLayerScalingMode(&this->m_layer, ViScalingMode_FitToLayer));
+                    
+                    //if (s32 layerZ = 0; R_SUCCEEDED(viGetZOrderCountMax(&this->m_display, &layerZ)) && layerZ > 0)
+                    //    ASSERT_FATAL(viSetLayerZ(&this->m_layer, layerZ));
+
+                    if (horizontalUnderscanPixels == 0) {
+                        s32 layerZ = 0;
+                        if (R_SUCCEEDED(viGetZOrderCountMax(&this->m_display, &layerZ)) && layerZ > 0) {
+                            ASSERT_FATAL(viSetLayerZ(&this->m_layer, layerZ));
+                        }
+                        else {
+                            ASSERT_FATAL(viSetLayerZ(&this->m_layer, 255)); // max value 255 as fallback
+                        }
+                    } else {
+                        ASSERT_FATAL(viSetLayerZ(&this->m_layer, 34)); // 34 is the edge for underscanning
+                    }
+
+                    ASSERT_FATAL(tsl::hlp::viAddToLayerStack(&this->m_layer, ViLayerStack_Default));
+                    ASSERT_FATAL(tsl::hlp::viAddToLayerStack(&this->m_layer, ViLayerStack_Screenshot));
+                    ASSERT_FATAL(tsl::hlp::viAddToLayerStack(&this->m_layer, ViLayerStack_Recording));
+                    ASSERT_FATAL(tsl::hlp::viAddToLayerStack(&this->m_layer, ViLayerStack_Arbitrary));
+                    ASSERT_FATAL(tsl::hlp::viAddToLayerStack(&this->m_layer, ViLayerStack_LastFrame));
+                    ASSERT_FATAL(tsl::hlp::viAddToLayerStack(&this->m_layer, ViLayerStack_Null));
+                    ASSERT_FATAL(tsl::hlp::viAddToLayerStack(&this->m_layer, ViLayerStack_ApplicationForDebug));
+                    ASSERT_FATAL(tsl::hlp::viAddToLayerStack(&this->m_layer, ViLayerStack_Lcd));
+                    
+                    ASSERT_FATAL(viSetLayerSize(&this->m_layer, cfg::LayerWidth, cfg::LayerHeight));
+                    ASSERT_FATAL(viSetLayerPosition(&this->m_layer, cfg::LayerPosX, cfg::LayerPosY));
+                    ASSERT_FATAL(nwindowCreateFromLayer(&this->m_window, &this->m_layer));
+                    ASSERT_FATAL(framebufferCreate(&this->m_framebuffer, &this->m_window, cfg::FramebufferWidth, cfg::FramebufferHeight, PIXEL_FORMAT_RGBA_4444, 2));
+                    ASSERT_FATAL(setInitialize());
+                    ASSERT_FATAL(this->initFonts());
+                    setExit();
+                });
+                
+                this->m_initialized = true;
+            }
+            
+            /**
+             * @brief Exits the renderer and layer
+             *
+             */
+            void exit() {
+                if (!this->m_initialized)
+                    return;
+                
+                // Cleanup shared font manager
+                FontManager::cleanup();
+
+                framebufferClose(&this->m_framebuffer);
+                nwindowClose(&this->m_window);
+                viDestroyManagedLayer(&this->m_layer);
+                viCloseDisplay(&this->m_display);
+                eventClose(&this->m_vsyncEvent);
+                viExit();
+            }
+            
+            /**
+             * @brief Initializes Nintendo's shared fonts. Default and Extended
+             *
+             * @return Result
+             */
+            Result initFonts() {
+                PlFontData stdFontData, localFontData, extFontData;
+                
+                // Nintendo's default font
+                TSL_R_TRY(plGetSharedFontByType(&stdFontData, PlSharedFontType_Standard));
+                
+                u8 *fontBuffer = reinterpret_cast<u8*>(stdFontData.address);
+                stbtt_InitFont(&this->m_stdFont, fontBuffer, stbtt_GetFontOffsetForIndex(fontBuffer, 0));
+                
+                u64 languageCode;
+                if (R_SUCCEEDED(setGetSystemLanguage(&languageCode))) {
+                    // Check if need localization font
+                    SetLanguage setLanguage;
+                    TSL_R_TRY(setMakeLanguage(languageCode, &setLanguage));
+                    this->m_hasLocalFont = true;
+                    switch (setLanguage) {
+                    case SetLanguage_ZHCN:
+                    case SetLanguage_ZHHANS:
+                        TSL_R_TRY(plGetSharedFontByType(&localFontData, PlSharedFontType_ChineseSimplified));
+                        break;
+                    case SetLanguage_KO:
+                        TSL_R_TRY(plGetSharedFontByType(&localFontData, PlSharedFontType_KO));
+                        break;
+                    case SetLanguage_ZHTW:
+                    case SetLanguage_ZHHANT:
+                        TSL_R_TRY(plGetSharedFontByType(&localFontData, PlSharedFontType_ChineseTraditional));
+                        break;
+                    default:
+                        this->m_hasLocalFont = false;
+                        break;
+                    }
+                    
+                    if (this->m_hasLocalFont) {
+                        fontBuffer = reinterpret_cast<u8*>(localFontData.address);
+                        stbtt_InitFont(&this->m_localFont, fontBuffer, stbtt_GetFontOffsetForIndex(fontBuffer, 0));
+                    }
+                }
+                
+                // Nintendo's extended font containing a bunch of icons
+                TSL_R_TRY(plGetSharedFontByType(&extFontData, PlSharedFontType_NintendoExt));
+                
+                fontBuffer = reinterpret_cast<u8*>(extFontData.address);
+                stbtt_InitFont(&this->m_extFont, fontBuffer, stbtt_GetFontOffsetForIndex(fontBuffer, 0));
+                
+                // Initialize the shared font manager
+                FontManager::initializeFonts(&this->m_stdFont, &this->m_localFont, 
+                                           &this->m_extFont, this->m_hasLocalFont);
+                
+                return 0;
+            }
+            
+
+            /**
+             * @brief Start a new frame
+             * @warning Don't call this more than once before calling \ref endFrame
+             */
+            inline void startFrame() {
+                this->m_currentFramebuffer = framebufferBegin(&this->m_framebuffer, nullptr);
+            }
+            
+            /**
+             * @brief End the current frame
+             * @warning Don't call this before calling \ref startFrame once
+             */
+            inline void endFrame() {
+            #if IS_STATUS_MONITOR_DIRECTIVE
+                if (isRendering) {
+                    static u32 lastFPS = 0;
+                    static u64 cachedIntervalNs = 1000000000ULL / 60; // Default to 60 FPS
+            
+                    u32 fps = TeslaFPS;
+                    if (__builtin_expect(fps != lastFPS, 0)) {
+                        cachedIntervalNs = (fps > 0) ? (1000000000ULL / fps) : cachedIntervalNs;
+                        lastFPS = fps;
+                    }
+            
+                    // Frame pacing before VSync
+                    leventWait(&renderingStopEvent, cachedIntervalNs);
+                }
+            #endif
+            
+                // Then hardware sync
+                this->waitForVSync();
+                framebufferEnd(&this->m_framebuffer);
+                this->m_currentFramebuffer = nullptr;
+            
+                if (tsl::clearGlyphCacheNow.exchange(false)) {
+                    tsl::gfx::FontManager::clearCache();
+                }
+            }
+
+
+        };
+
+        static std::pair<int, int> getUnderscanPixels() {
+            if (!ult::consoleIsDocked()) {
+                return {0, 0};
+            }
+            
+            // Retrieve the TV settings
+            SetSysTvSettings tvSettings;
+            Result res = setsysGetTvSettings(&tvSettings);
+            if (R_FAILED(res)) {
+                // Handle error: return default underscan or log error
+                return {0, 0};
+            }
+            
+            // The underscan value might not be a percentage, we need to interpret it correctly
+            const u32 underscanValue = tvSettings.underscan;
+            
+            // Convert the underscan value to a fraction. Assuming 0 means no underscan and larger values represent
+            // greater underscan. Adjust this formula based on actual observed behavior or documentation.
+            const float underscanPercentage = 1.0f - (underscanValue / 100.0f);
+            
+            // Original dimensions of the full 720p image (1280x720)
+            const float originalWidth = 1280;
+            const float originalHeight = 720;
+            
+            // Adjust the width and height based on the underscan percentage
+            const float adjustedWidth = (originalWidth * underscanPercentage);
+            const float adjustedHeight = (originalHeight * underscanPercentage);
+            
+            // Calculate the underscan in pixels (left/right and top/bottom)
+            const int horizontalUnderscanPixels = (originalWidth - adjustedWidth);
+            const int verticalUnderscanPixels = (originalHeight - adjustedHeight);
+            
+            return {horizontalUnderscanPixels, verticalUnderscanPixels};
+        }
+
+    }
+    
+    
+    // Elements
+    
+    namespace elm {
+        
+        enum class TouchEvent {
+            Touch,
+            Hold,
+            Scroll,
+            Release,
+            None
+        };
+        
+        /**
+         * @brief The top level Element of the libtesla UI library
+         * @note When creating your own elements, extend from this or one of it's sub classes
+         */
+        class Element {
+        public:
+            
+            Element() {}
+            virtual ~Element() {
+                m_clickListener = {};   // frees captures immediately
+            }
+            
+            bool m_isTable = false;  // Default to false for non-table elements
+            bool m_isItem = true;
+            
+
+            u64 t_ns;  // Changed from chrono::duration to nanoseconds
+            u8 saturation;
+            float progress;
+            
+            s32 x, y;
+            s32 amplitude;
+            u64 m_animationStartTime; // Changed from chrono::time_point to nanoseconds
+            
+            virtual bool isTable() const {
+                return m_isTable;
+            }
+
+            virtual bool isItem() const {
+                return m_isItem;
+            }
+
+            /**
+             * @brief Handles focus requesting
+             * @note This function should return the element to focus.
+             *       When this element should be focused, return `this`.
+             *       When one of it's child should be focused, return `this->child->requestFocus(oldFocus, direction)`
+             *       When this element is not focusable, return `nullptr`
+             *
+             * @param oldFocus Previously focused element
+             * @param direction Direction in which focus moved. \ref FocusDirection::None is passed for the initial load
+             * @return Element to focus
+             */
+            virtual inline Element* requestFocus(Element *oldFocus, FocusDirection direction) {
+                return nullptr;
+            }
+            
+            /**
+             * @brief Function called when a joycon button got pressed
+             *
+             * @param keys Keys pressed in the last frame
+             * @return true when button press has been consumed
+             * @return false when button press should be passed on to the parent
+             */
+            virtual inline bool onClick(u64 keys) {
+                return m_clickListener(keys);
+            }
+            
+            /**
+             * @brief Called once per frame with the latest HID inputs
+             *
+             * @param keysDown Buttons pressed in the last frame
+             * @param keysHeld Buttons held down longer than one frame
+             * @param touchInput Last touch position
+             * @param leftJoyStick Left joystick position
+             * @param rightJoyStick Right joystick position
+             * @return Weather or not the input has been consumed
+             */
+            virtual inline bool handleInput(u64 keysDown, u64 keysHeld, const HidTouchState &touchPos, HidAnalogStickState joyStickPosLeft, HidAnalogStickState joyStickPosRight) {
+                return false;
+            }
+            
+            /**
+             * @brief Function called when the element got touched
+             * @todo Not yet implemented
+             *
+             * @param x X pos
+             * @param y Y pos
+             * @return true when touch input has been consumed
+             * @return false when touch input should be passed on to the parent
+             */
+            virtual inline bool onTouch(TouchEvent event, s32 currX, s32 currY, s32 prevX, s32 prevY, s32 initialX, s32 initialY) {
+                return false;
+            }
+            
+            /**
+             * @brief Called once per frame to draw the element
+             * @warning Do not call this yourself. Use \ref Element::frame(gfx::Renderer *renderer)
+             *
+             * @param renderer Renderer
+             */
+            virtual void draw(gfx::Renderer *renderer) = 0;
+            
+            /**
+             * @brief Called when the underlying Gui gets created and after calling \ref Gui::invalidate() to calculate positions and boundaries of the element
+             * @warning Do not call this yourself. Use \ref Element::invalidate()
+             *
+             * @param parentX Parent X pos
+             * @param parentY Parent Y pos
+             * @param parentWidth Parent Width
+             * @param parentHeight Parent Height
+             */
+            virtual inline void layout(u16 parentX, u16 parentY, u16 parentWidth, u16 parentHeight) = 0;
+            
+            /**
+             * @brief Draws highlighting and the element itself
+             * @note When drawing children of a element in \ref Element::draw(gfx::Renderer *renderer), use `this->child->frame(renderer)` instead of calling draw directly
+             *
+             * @param renderer
+             */
+            void inline frame(gfx::Renderer *renderer) {
+                
+                if (this->m_focused) {
+                    renderer->enableScissoring(0, ult::activeHeaderHeight, tsl::cfg::FramebufferWidth, tsl::cfg::FramebufferHeight-73-ult::activeHeaderHeight);
+                    this->drawFocusBackground(renderer);
+                    this->drawHighlight(renderer);
+                    renderer->disableScissoring();
+                }
+                
+                this->draw(renderer);
+            }
+            
+            /**
+             * @brief Forces a layout recreation of a element
+             *
+             */
+            void inline invalidate() {
+                const auto& parent = this->getParent();
+                
+                if (parent == nullptr)
+                    this->layout(0, 0, cfg::FramebufferWidth, cfg::FramebufferHeight);
+                else
+                    this->layout(ELEMENT_BOUNDS(parent));
+            }
+            
+            /**
+             * @brief Shake the highlight in the given direction to signal that the focus cannot move there
+             *
+             * @param direction Direction to shake highlight in
+             */
+            void inline shakeHighlight(FocusDirection direction) {
+                this->m_highlightShaking = true;
+                this->m_highlightShakingDirection = direction;
+                this->m_highlightShakingStartTime = armTicksToNs(armGetSystemTick()); // Changed
+                if (direction != FocusDirection::None && m_isItem) {
+                    triggerRumbleClick.store(true, std::memory_order_release);
+                    triggerWallSound.store(true, std::memory_order_release);
+                }
+            }
+            
+            /**
+             * @brief Triggers the blue click animation to signal a element has been clicked on
+             *
+             */
+            void inline triggerClickAnimation() {
+                this->m_clickAnimationProgress = tsl::style::ListItemHighlightLength;
+                this->m_animationStartTime = armTicksToNs(armGetSystemTick()); // Changed
+            }
+
+
+            
+            /**
+             * @brief Resets the click animation progress, canceling the animation
+             */
+            void inline resetClickAnimation() {
+                this->m_clickAnimationProgress = 0;
+            }
+            
+            /**
+             * @brief Draws the blue highlight animation when clicking on a button
+             * @note Override this if you have a element that e.g requires a non-rectangular animation or a different color
+             *
+             * @param renderer Renderer
+             */
+            virtual void drawClickAnimation(gfx::Renderer *renderer) {
+                if (!m_isItem)
+                    return;
+                if (ult::useSelectionBG) {
+                    if (ult::expandedMemory)
+                        renderer->drawRectMultiThreaded(this->getX() + x + 4, this->getY() + y, this->getWidth() - 8, this->getHeight(), aWithOpacity(selectionBGColor)); // CUSTOM MODIFICATION 
+                    else
+                        renderer->drawRect(this->getX() + x + 4, this->getY() + y, this->getWidth() - 8, this->getHeight(), aWithOpacity(selectionBGColor));
+                }
+            
+                saturation = tsl::style::ListItemHighlightSaturation * (float(this->m_clickAnimationProgress) / float(tsl::style::ListItemHighlightLength));
+            
+                Color animColor = {0xF,0xF,0xF,0xF};
+                if (invertBGClickColor) {
+                    const u8 inverted = 15-saturation;
+                    animColor = {inverted, inverted, inverted, selectionBGColor.a};
+                } else {
+                    animColor = {saturation, saturation, saturation, selectionBGColor.a};
+                }
+                if (ult::expandedMemory)
+                    renderer->drawRectMultiThreaded(ELEMENT_BOUNDS(this), aWithOpacity(animColor));
+                else
+                    renderer->drawRect(ELEMENT_BOUNDS(this), aWithOpacity(animColor));
+            
+                // Cache time calculation - only compute once
+                static u64 lastTimeUpdate = 0;
+                static double cachedProgress = 0.0;
+                const u64 currentTime_ns = armTicksToNs(armGetSystemTick());
+                
+                // Only recalculate progress if enough time has passed (reduce computation frequency)
+                if (currentTime_ns - lastTimeUpdate > 16666666) { // ~60 FPS update rate
+                    //double time_seconds = currentTime_ns / 1000000000.0;
+                    cachedProgress = (std::cos(2.0 * ult::_M_PI * std::fmod(currentTime_ns / 1000000000.0 - 0.25, 1.0)) + 1.0) / 2.0;
+                    lastTimeUpdate = currentTime_ns;
+                }
+                progress = cachedProgress;
+                
+                Color clickColor1 = highlightColor1;
+                Color clickColor2 = clickColor;
+                
+                if (progress >= 0.5) {
+                    clickColor1 = clickColor;
+                    clickColor2 = highlightColor2;
+                }
+                
+                // Combine color interpolation into single calculation
+                highlightColor = {
+                    static_cast<u8>((clickColor1.r - clickColor2.r) * progress + clickColor2.r),
+                    static_cast<u8>((clickColor1.g - clickColor2.g) * progress + clickColor2.g),
+                    static_cast<u8>((clickColor1.b - clickColor2.b) * progress + clickColor2.b),
+                    0xF
+                };
+                
+                x = 0;
+                y = 0;
+                if (this->m_highlightShaking) {
+                    t_ns = currentTime_ns - this->m_highlightShakingStartTime;
+                    if (t_ns >= 100000000) // 100ms in nanoseconds
+                        this->m_highlightShaking = false;
+                    else {
+                        // Use faster random generation if available, or cache amplitude
+                        static int cachedAmplitude = std::rand() % 5 + 5;
+                        if (t_ns % 10000000 == 0) // Update amplitude less frequently
+                            cachedAmplitude = std::rand() % 5 + 5;
+                        amplitude = cachedAmplitude;
+                        
+                        const int shakeOffset = shakeAnimation(t_ns, amplitude);
+                        switch (this->m_highlightShakingDirection) {
+                            case FocusDirection::Up:    y = -shakeOffset; break;
+                            case FocusDirection::Down:  y = shakeOffset; break;
+                            case FocusDirection::Left:  x = -shakeOffset; break;
+                            case FocusDirection::Right: x = shakeOffset; break;
+                            default: break;
+                        }
+                        
+                        x = std::clamp(x, -amplitude, amplitude);
+                        y = std::clamp(y, -amplitude, amplitude);
+                    }
+                }
+                
+                renderer->drawBorderedRoundedRect(this->getX() + x, this->getY() + y, this->getWidth() +4, this->getHeight(), 5, 5, a(highlightColor));
+            }
+            
+            /**
+             * @brief Draws the back background when a element is highlighted
+             * @note Override this if you have a element that e.g requires a non-rectangular focus
+             *
+             * @param renderer Renderer
+             */
+            virtual void drawFocusBackground(gfx::Renderer *renderer) {
+                if (this->m_clickAnimationProgress > 0) {
+                    this->drawClickAnimation(renderer);
+            
+                    // Single time calculation and direct millisecond conversion
+                    //const double elapsed_ms = (armTicksToNs(armGetSystemTick()) - this->m_animationStartTime) * 0.000001; // Direct conversion
+            
+                    // Direct calculation without intermediate multiplication
+                    this->m_clickAnimationProgress = tsl::style::ListItemHighlightLength * (1.0f - ((armTicksToNs(armGetSystemTick()) - this->m_animationStartTime) * 0.000001) * 0.002f); // 0.002f = 1/500
+            
+                    // Clamp to 0 in one operation
+                    if (this->m_clickAnimationProgress < 0) {
+                        this->m_clickAnimationProgress = 0;
+                    }
+                }
+            }
+            
+            /**
+             * @brief Draws the blue boarder when a element is highlighted
+             * @note Override this if you have a element that e.g requires a non-rectangular focus
+             *
+             * @param renderer Renderer
+             */
+            virtual void drawHighlight(gfx::Renderer *renderer) { // CUSTOM MODIFICATION start
+                if (!m_isItem)
+                    return;
+                
+                // Use cached time calculation from drawClickAnimation if possible
+                static u64 lastHighlightUpdate = 0;
+                static double cachedHighlightProgress = 0.0;
+                const u64 currentTime_ns = armTicksToNs(armGetSystemTick());
+                
+                // Update progress at 60 FPS rate with high-precision calculation
+                if (currentTime_ns - lastHighlightUpdate > 16666666) {
+                    // High precision time calculation - matches original timing exactly
+                    //double time_seconds = currentTime_ns * 0.000000001; // Direct conversion like original
+                    
+                    // Match original calculation exactly but with higher precision
+                    cachedHighlightProgress = (std::cos(2.0 * ult::_M_PI * std::fmod(currentTime_ns * 0.000000001 - 0.25, 1.0)) + 1.0) * 0.5;
+                    
+                    lastHighlightUpdate = currentTime_ns;
+                }
+                progress = cachedHighlightProgress;
+            
+                // Cache the interpreter state check result to avoid atomic load overhead
+                static bool lastInterpreterState = false;
+                static u64 lastInterpreterCheck = 0;
+                if (currentTime_ns - lastInterpreterCheck > 50000000) { // Check every 50ms
+                    lastInterpreterState = ult::runningInterpreter.load(std::memory_order_acquire);
+                    lastInterpreterCheck = currentTime_ns;
+                }
+            
+                if (lastInterpreterState) {
+                    // High precision floating point color interpolation for interpreter colors
+                    highlightColor = {
+                        static_cast<u8>(highlightColor4.r + (highlightColor3.r - highlightColor4.r) * progress + 0.5),
+                        static_cast<u8>(highlightColor4.g + (highlightColor3.g - highlightColor4.g) * progress + 0.5),
+                        static_cast<u8>(highlightColor4.b + (highlightColor3.b - highlightColor4.b) * progress + 0.5),
+                        0xF
+                    };
+                } else {
+                    // High precision floating point color interpolation for normal colors
+                    highlightColor = {
+                        static_cast<u8>(highlightColor2.r + (highlightColor1.r - highlightColor2.r) * progress + 0.5),
+                        static_cast<u8>(highlightColor2.g + (highlightColor1.g - highlightColor2.g) * progress + 0.5),
+                        static_cast<u8>(highlightColor2.b + (highlightColor1.b - highlightColor2.b) * progress + 0.5),
+                        0xF
+                    };
+                }
+                
+                x = 0;
+                y = 0;
+                
+                if (this->m_highlightShaking) {
+                    t_ns = currentTime_ns - this->m_highlightShakingStartTime;
+                    if (t_ns >= 100000000) // 100ms in nanoseconds
+                        this->m_highlightShaking = false;
+                    else {
+                        // Use cached amplitude like in drawClickAnimation
+                        static int cachedAmplitude = std::rand() % 5 + 5;
+                        if (t_ns % 10000000 == 0)
+                            cachedAmplitude = std::rand() % 5 + 5;
+                        amplitude = cachedAmplitude;
+                        
+                        const int shakeOffset = shakeAnimation(t_ns, amplitude);
+                        switch (this->m_highlightShakingDirection) {
+                            case FocusDirection::Up:    y = -shakeOffset; break;
+                            case FocusDirection::Down:  y = shakeOffset; break;
+                            case FocusDirection::Left:  x = -shakeOffset; break;
+                            case FocusDirection::Right: x = shakeOffset; break;
+                            default: break;
+                        }
+                        
+                        x = std::clamp(x, -amplitude, amplitude);
+                        y = std::clamp(y, -amplitude, amplitude);
+                    }
+                }
+                
+                if (this->m_clickAnimationProgress == 0) {
+                    if (ult::useSelectionBG) {
+                        if (ult::expandedMemory)
+                            renderer->drawRectMultiThreaded(this->getX() + x + 4, this->getY() + y, this->getWidth() - 12 +4, this->getHeight(), aWithOpacity(selectionBGColor)); // CUSTOM MODIFICATION 
+                        else
+                            renderer->drawRect(this->getX() + x + 4, this->getY() + y, this->getWidth() - 12 +4, this->getHeight(), aWithOpacity(selectionBGColor));
+                    }
+            
+                    #if IS_LAUNCHER_DIRECTIVE
+                    // Determine the active percentage to use
+                    const float activePercentage = ult::displayPercentage.load(std::memory_order_acquire);
+                    if (activePercentage > 0){
+                        if (ult::expandedMemory)
+                            renderer->drawRectMultiThreaded(this->getX() + x + 4, this->getY() + y, (this->getWidth()- 12 +4)*(activePercentage * 0.01f), this->getHeight(), aWithOpacity(progressColor)); // Direct percentage conversion
+                        else
+                            renderer->drawRect(this->getX() + x + 4, this->getY() + y, (this->getWidth()- 12 +4)*(activePercentage * 0.01f), this->getHeight(), aWithOpacity(progressColor)); // Direct percentage conversion
+                    }
+                    #endif
+            
+                    renderer->drawBorderedRoundedRect(this->getX() + x, this->getY() + y, this->getWidth() +4, this->getHeight(), 5, 5, a(highlightColor));
+                }
+                
+                ult::onTrackBar.store(false, std::memory_order_release);
+            }
+            
+            
+            
+            /**
+             * @brief Sets the boundaries of this view
+             *
+             * @param x Start X pos
+             * @param y Start Y pos
+             * @param width Width
+             * @param height Height
+             */
+            inline void setBoundaries(s32 x, s32 y, s32 width, s32 height) {
+                this->m_x = x;
+                this->m_y = y;
+                this->m_width = width;
+                this->m_height = height;
+            }
+            
+            /**
+             * @brief Adds a click listener to the element
+             *
+             * @param clickListener Click listener called with keys that were pressed last frame. Callback should return true if keys got consumed
+             */
+            virtual inline void setClickListener(std::function<bool(u64 keys)> clickListener) {
+                this->m_clickListener = clickListener;
+            }
+            
+            /**
+             * @brief Gets the element's X position
+             *
+             * @return X position
+             */
+            inline s32 getX() { return this->m_x; }
+            /**
+             * @brief Gets the element's Y position
+             *
+             * @return Y position
+             */
+            inline s32 getY() { return this->m_y; }
+            /**
+             * @brief Gets the element's Width
+             *
+             * @return Width
+             */
+            inline s32 getWidth() { return this->m_width;  }
+            /**
+             * @brief Gets the element's Height
+             *
+             * @return Height
+             */
+            inline s32 getHeight() { return this->m_height; }
+            
+            inline s32 getTopBound() { return this->getY(); }
+            inline s32 getLeftBound() { return this->getX(); }
+            inline s32 getRightBound() { return this->getX() + this->getWidth(); }
+            inline s32 getBottomBound() { return this->getY() + this->getHeight(); }
+            
+            /**
+             * @brief Check if the coordinates are in the elements bounds
+             *
+             * @return true if coordinates are in bounds, false otherwise
+             */
+            bool inBounds(s32 touchX, s32 touchY) {
+                //static u32 ult::layerEdge = cfg::LayerPosX == 0 ? 0 : (1280-448);
+                return touchX >= this->getLeftBound() + int(ult::layerEdge) && touchX <= this->getRightBound() + int(ult::layerEdge) && touchY >= this->getTopBound() && touchY <= this->getBottomBound();
+            }
+            
+            /**
+             * @brief Sets the element's parent
+             * @note This is required to handle focus and button downpassing properly
+             *
+             * @param parent Parent
+             */
+            inline void setParent(Element *parent) { this->m_parent = parent; }
+            
+            /**
+             * @brief Get the element's parent
+             *
+             * @return Parent
+             */
+            inline Element* getParent() { return this->m_parent; }
+            
+
+            virtual inline std::vector<Element*> getChildren() const {
+                return {}; // Return empty vector for simplicity
+            }
+
+            /**
+             * @brief Marks this element as focused or unfocused to draw the highlight
+             *
+             * @param focused Focused
+             */
+            virtual inline void setFocused(bool focused) {
+                this->m_focused = focused;
+                this->m_clickAnimationProgress = 0;
+            }
+
+            virtual bool matchesJumpCriteria(const std::string& jumpText, const std::string& jumpValue, bool contains) const {
+                return false; // Default implementation for non-ListItem elements
+            }
+            
+            
+            static InputMode getInputMode() { return Element::s_inputMode; }
+            
+            static void setInputMode(InputMode mode) { Element::s_inputMode = mode; }
+            
+        protected:
+            constexpr static inline auto a = &gfx::Renderer::a;
+            constexpr static inline auto aWithOpacity = &gfx::Renderer::aWithOpacity;
+            bool m_focused = false;
+            u8 m_clickAnimationProgress = 0;
+            
+            // Highlight shake animation
+            bool m_highlightShaking = false;
+            u64 m_highlightShakingStartTime; // Changed from chrono::time_point to nanoseconds
+            FocusDirection m_highlightShakingDirection;
+            
+            static inline InputMode s_inputMode;
+            
+            /**
+             * @brief Shake animation calculation based on a damped sine wave
+             *
+             * @param t_ns Passed time in nanoseconds
+             * @param a Amplitude
+             * @return Damped sine wave output
+             */
+            inline int shakeAnimation(u64 t_ns, float a) {
+                //float w = 0.2F;
+                //float tau = 0.05F;
+                
+                // Convert nanoseconds to microseconds for the calculation
+                const int t_us = t_ns / 1000;
+                
+                return roundf(a * exp(-(0.05F * t_us) * sin(0.2F * t_us)));
+            }
+            
+        private:
+            friend class Gui;
+            
+            s32 m_x = 0, m_y = 0, m_width = 0, m_height = 0;
+            Element *m_parent = nullptr;
+            std::vector<Element*> m_children;
+            std::function<bool(u64 keys)> m_clickListener = [](u64) { return false; };
+        };
+
+        /**
+         * @brief A Element that exposes the renderer directly to draw custom views easily
+         */
+        class CustomDrawer : public Element {
+        public:
+            /**
+             * @brief Constructor
+             * @note This element should only be used to draw static things the user cannot interact with e.g info text, images, etc.
+             *
+             * @param renderFunc Callback that will be called once every frame to draw this view
+             */
+            CustomDrawer(std::function<void(gfx::Renderer* r, s32 x, s32 y, s32 w, s32 h)> renderFunc) : Element(), m_renderFunc(renderFunc) {
+                m_isItem = false;
+                m_isTable = true;
+            }
+
+            virtual ~CustomDrawer() {}
+            
+            virtual void draw(gfx::Renderer* renderer) override {
+                //renderer->enableScissoring(ELEMENT_BOUNDS(this));
+                this->m_renderFunc(renderer, ELEMENT_BOUNDS(this));
+                //renderer->disableScissoring();
+            }
+            
+            virtual void layout(u16 parentX, u16 parentY, u16 parentWidth, u16 parentHeight) override {
+                
+            }
+            
+        private:
+            std::function<void(gfx::Renderer*, s32 x, s32 y, s32 w, s32 h)> m_renderFunc;
+        };
+    //#endif
+
+        /**
+         * @brief A Element that exposes the renderer directly to draw custom views easily
+         */
+        class TableDrawer : public Element {
+        public:
+            TableDrawer(std::function<void(gfx::Renderer* r, s32 x, s32 y, s32 w, s32 h)> renderFunc, bool _hideTableBackground, size_t _endGap, bool _isScrollable = false)
+                : Element(), m_renderFunc(renderFunc), hideTableBackground(_hideTableBackground), endGap(_endGap), isScrollable(_isScrollable) {
+                    m_isTable = isScrollable;  // Mark this element as a table
+                    m_isItem = false;
+                }
+            
+            virtual ~TableDrawer() {}
+
+            virtual void draw(gfx::Renderer* renderer) override {
+
+                renderer->enableScissoring(0, 88, tsl::cfg::FramebufferWidth, tsl::cfg::FramebufferHeight - 73 - 97 +2+5);
+                
+                if (!hideTableBackground)
+                    renderer->drawRoundedRect(this->getX() + 4+2, this->getY()-4-1, this->getWidth() +2 + 1, this->getHeight() + 20 - endGap+2, 10.0, aWithOpacity(tableBGColor));
+                
+                m_renderFunc(renderer, this->getX() + 4, this->getY(), this->getWidth() + 4, this->getHeight());
+                
+                renderer->disableScissoring();
+            }
+            
+            virtual void layout(u16 parentX, u16 parentY, u16 parentWidth, u16 parentHeight) override {}
+
+
+            virtual bool onClick(u64 keys) {
+                return false;
+            }
+            
+            virtual Element* requestFocus(Element *oldFocus, FocusDirection direction) override {
+                return nullptr;
+            }
+        
+        private:
+            std::function<void(gfx::Renderer*, s32 x, s32 y, s32 w, s32 h)> m_renderFunc;
+            bool hideTableBackground = false;
+            size_t endGap = 3;
+            bool isScrollable = false;
+        };
+
+
+        #if IS_LAUNCHER_DIRECTIVE
+        // Simple utility function to draw the dynamic "Ultra" part of the logo
+        static s32 drawDynamicUltraText(gfx::Renderer* renderer, s32 startX, s32 y, u32 fontSize, 
+                                       const tsl::Color& staticColor, bool useNotificationMethod = false) {
+            static constexpr double cycleDuration = 1.6;
+            s32 currentX = startX;
+            
+            if (ult::useDynamicLogo) {
+                const u64 currentTime_ns = armTicksToNs(armGetSystemTick());
+                const double currentTimeCount = static_cast<double>(currentTime_ns) / 1000000000.0;
+                const double timeBase = std::fmod(currentTimeCount, cycleDuration);
+                const double waveScale = 2.0 * ult::_M_PI / cycleDuration;
+                static constexpr double phaseShift = ult::_M_PI / 2.0;
+                
+                float countOffset = 0;
+                for (const char letter : ult::SPLIT_PROJECT_NAME_1) {
+                    const double wavePhase = waveScale * (timeBase + static_cast<double>(countOffset));
+                    const double rawProgress = std::cos(wavePhase - phaseShift);
+                    
+                    const double normalizedProgress = (rawProgress + 1.0) * 0.5;
+                    const double smoothedProgress = normalizedProgress * normalizedProgress * (3.0 - 2.0 * normalizedProgress);
+                    const double ultraSmoothProgress = smoothedProgress * smoothedProgress * (3.0 - 2.0 * smoothedProgress);
+                    
+                    const double blend = std::max(0.0, std::min(1.0, ultraSmoothProgress));
+                    
+                    const tsl::Color highlightColor = {
+                        static_cast<u8>(dynamicLogoRGB1.r + (dynamicLogoRGB2.r - dynamicLogoRGB1.r) * blend + 0.5),
+                        static_cast<u8>(dynamicLogoRGB1.g + (dynamicLogoRGB2.g - dynamicLogoRGB1.g) * blend + 0.5),
+                        static_cast<u8>(dynamicLogoRGB1.b + (dynamicLogoRGB2.b - dynamicLogoRGB1.b) * blend + 0.5),
+                        15
+                    };
+                    
+                    const std::string letterStr(1, letter);
+                    if (useNotificationMethod) {
+                        //const auto [letterWidth, letterHeight] = renderer->drawNotificationString(letterStr, false, currentX, y, fontSize, highlightColor);
+                        currentX += renderer->drawNotificationString(letterStr, false, currentX, y, fontSize, highlightColor).first;
+                    } else {
+                        currentX += renderer->drawString(letterStr, false, currentX, y, fontSize, highlightColor).first;
+                    }
+                    countOffset -= static_cast<float>(cycleDuration / 8.0);
+                }
+            } else {
+                // Static rendering
+                for (const char letter : ult::SPLIT_PROJECT_NAME_1) {
+                    const std::string letterStr(1, letter);
+                    if (useNotificationMethod) {
+                        //const auto [letterWidth, letterHeight] = renderer->drawNotificationString(letterStr, false, currentX, y, fontSize, staticColor);
+                        currentX += renderer->drawNotificationString(letterStr, false, currentX, y, fontSize, staticColor).first;
+                    } else {
+                        currentX += renderer->drawString(letterStr, false, currentX, y, fontSize, staticColor).first;
+                    }
+                }
+            }
+            
+            return currentX;
+        }
+        
+        // Utility function to calculate width of the Ultra text (for notification centering)
+        static s32 calculateUltraTextWidth(gfx::Renderer* renderer, u32 fontSize, bool useNotificationMethod = false) {
+            s32 totalWidth = 0;
+            
+            if (ult::useDynamicLogo) {
+                // Calculate width by measuring each character for dynamic rendering
+                for (const char letter : ult::SPLIT_PROJECT_NAME_1) {
+                    const std::string letterStr(1, letter);
+                    if (useNotificationMethod) {
+                        //const auto [lw, lh] = renderer->getNotificationTextDimensions(letterStr, false, fontSize);
+                        totalWidth += renderer->getNotificationTextDimensions(letterStr, false, fontSize).first;
+                    } else {
+                        //const auto [lw, lh] = renderer->getTextDimensions(letterStr, false, fontSize);
+                        totalWidth += renderer->getTextDimensions(letterStr, false, fontSize).first;
+                    }
+                }
+            } else {
+                // Static rendering - measure the whole string at once
+                if (useNotificationMethod) {
+                    //const auto [uw, uh] = renderer->getNotificationTextDimensions(ult::SPLIT_PROJECT_NAME_1, false, fontSize);
+                    totalWidth = renderer->getNotificationTextDimensions(ult::SPLIT_PROJECT_NAME_1, false, fontSize).first;
+                } else {
+                    //const auto [uw, uh] = renderer->getTextDimensions(ult::SPLIT_PROJECT_NAME_1, false, fontSize);
+                    totalWidth = renderer->getTextDimensions(ult::SPLIT_PROJECT_NAME_1, false, fontSize).first;
+                }
+            }
+            
+            return totalWidth;
+        }
+
+        #endif
+
+        struct TopCache {
+            std::string title;
+            std::string subtitle;
+            tsl::Color titleColor{0xF, 0xF, 0xF, 0xF}; // white by default
+            bool widgetDrawn = false;
+            bool useDynamicLogo = false;
+            bool disabled = false;
+        };
+        
+        struct BottomCache {
+            std::string bottomText;
+            float backWidth = 0.0f;
+            float selectWidth = 0.0f;
+            float nextPageWidth = 0.0f;
+            bool disabled = false;
+        };
+        
+        // Global or namespace-level variable
+        inline TopCache g_cachedTop;
+        inline BottomCache g_cachedBottom;
+
+        inline std::atomic<bool> g_disableMenuCacheOnReturn = false;
+
+        /**
+         * @brief The base frame which can contain another view
+         *
+         */
+        class OverlayFrame : public Element {
+        public:
+            /**
+             * @brief Constructor
+             *
+             * @param title Name of the Overlay drawn bolt at the top
+             * @param subtitle Subtitle drawn bellow the title e.g version number
+             */
+            std::string m_title;
+            std::string m_subtitle;
+        
+            bool m_noClickableItems;
+        
+        #if IS_LAUNCHER_DIRECTIVE
+            std::string m_menuMode; // CUSTOM MODIFICATION
+            std::string m_colorSelection; // CUSTOM MODIFICATION
+            std::string m_pageLeftName; // CUSTOM MODIFICATION
+            std::string m_pageRightName; // CUSTOM MODIFICATION
+            
+            
+            tsl::Color titleColor = {0xF,0xF,0xF,0xF};
+            float letterWidth;
+        #endif
+
+        #if USING_WIDGET_DIRECTIVE
+            bool m_showWidget = false;
+        #endif
+        
+            float x, y;
+            int offset, y_offset;
+            int fontSize;
+
+        #if IS_LAUNCHER_DIRECTIVE
+            OverlayFrame(const std::string& title, const std::string& subtitle, const bool& _noClickableItems=false, const std::string& menuMode = "", const std::string& colorSelection = "", const std::string& pageLeftName = "", const std::string& pageRightName = "")
+                : Element(), m_title(title), m_subtitle(subtitle), m_noClickableItems(_noClickableItems), m_menuMode(menuMode), m_colorSelection(colorSelection), m_pageLeftName(pageLeftName), m_pageRightName(pageRightName) {
+        #else
+            OverlayFrame(const std::string& title, const std::string& subtitle, const bool& _noClickableItems=false)
+                : Element(), m_title(title), m_subtitle(subtitle), m_noClickableItems(_noClickableItems) {
+        #endif
+                    ult::activeHeaderHeight = 97;
+                    ult::loadWallpaperFileWhenSafe();
+                    m_isItem = false;
+                    disableSound.store(false, std::memory_order_release);
+                }
+        
+            ~OverlayFrame() {
+                delete m_contentElement;
+                
+                // Check if returning from a list that disabled caching
+                if (g_disableMenuCacheOnReturn.exchange(false, std::memory_order_acq_rel)) {
+                    g_cachedTop.disabled = true;
+                    g_cachedBottom.disabled = true;
+                }
+            }
+        
+        #if USING_FPS_INDICATOR_DIRECTIVE
+            // Function to calculate FPS
+            inline float updateFPS(double currentTimeCount) {
+                static double lastUpdateTime = currentTimeCount;
+                static int frameCount = 0;
+                static float fps = 0.0f;
+            
+                ++frameCount;
+                const double elapsedTime = currentTimeCount - lastUpdateTime;
+            
+                if (elapsedTime >= 1.0) { // Update FPS every second
+                    fps = frameCount / static_cast<float>(elapsedTime);
+                    lastUpdateTime = currentTimeCount;
+                    frameCount = 0;
+                }
+                return fps;
+            }
+        #endif
+            
+            // CUSTOM SECTION START
+            void draw(gfx::Renderer *renderer) override {
+                if (!ult::themeIsInitialized.exchange(true, std::memory_order_acq_rel)) {
+                    tsl::initializeThemeVars();
+                }
+                
+            
+                renderer->fillScreen(a(defaultBackgroundColor));
+                renderer->drawWallpaper();
+                
+                y = 50;
+                offset = 0;
+                
+            #if IS_LAUNCHER_DIRECTIVE
+                // Current interpreter state (atomic<bool>)
+                const bool interpreterIsRunningNow = ult::runningInterpreter.load(std::memory_order_acquire) && (ult::downloadPercentage.load(std::memory_order_acquire) != -1 || ult::unzipPercentage.load(std::memory_order_acquire) != -1 || ult::copyPercentage.load(std::memory_order_acquire) != -1);
+                
+                if (m_noClickableItems != ult::noClickableItems.load(std::memory_order_acquire)) {
+                    ult::noClickableItems.store(m_noClickableItems, std::memory_order_release);
+                }
+            
+                const bool isUltrahandMenu = (m_title == ult::CAPITAL_ULTRAHAND_PROJECT_NAME && 
+                                        m_subtitle.find("Ultrahand Package") == std::string::npos && 
+                                        m_subtitle.find("Ultrahand Script") == std::string::npos);
+                
+                // Determine if we should use cached data (first frame of new overlay)
+                const bool useCachedTop = !g_cachedTop.disabled && 
+                                          !g_cachedTop.title.empty() && 
+                                          (g_cachedTop.title != m_title || g_cachedTop.subtitle != m_subtitle);
+                
+                // Use cached or current data for rendering
+                const std::string& renderTitle = useCachedTop ? g_cachedTop.title : m_title;
+                const std::string& renderSubtitle = useCachedTop ? g_cachedTop.subtitle : m_subtitle;
+                const tsl::Color& renderTitleColor = useCachedTop ? g_cachedTop.titleColor : titleColor;
+                const bool renderUseDynamicLogo = useCachedTop ? g_cachedTop.useDynamicLogo : ult::useDynamicLogo;
+                
+                const bool renderIsUltrahandMenu = (renderTitle == ult::CAPITAL_ULTRAHAND_PROJECT_NAME && 
+                                                     renderSubtitle.find("Ultrahand Package") == std::string::npos && 
+                                                     renderSubtitle.find("Ultrahand Script") == std::string::npos);
+                
+                if (renderIsUltrahandMenu) {
+            #if USING_WIDGET_DIRECTIVE
+                    if (useCachedTop) {
+                        if (g_cachedTop.widgetDrawn) {
+                            renderer->drawWidget();
+                        }
+                    } else {
+                        renderer->drawWidget();
+                    }
+            #endif
+            
+                    if (ult::touchingMenu.load(std::memory_order_acquire) && ult::inMainMenu.load(std::memory_order_acquire)) {
+                        renderer->drawRoundedRect(0.0f + 7, 12.0f, 245.0f - 13, 73.0f, 10.0f, a(clickColor));
+                    }
+                    
+                    x = 20;
+                    fontSize = 42;
+                    offset = 6;
+                    
+                    if (renderUseDynamicLogo) {
+                        x = drawDynamicUltraText(renderer, x, y + offset, fontSize, logoColor1, false);
+                    } else {
+                        for (const char letter : ult::SPLIT_PROJECT_NAME_1) {
+                            const std::string letterStr(1, letter);
+                            x += renderer->drawString(letterStr, false, x, y + offset, fontSize, logoColor1).first;
+                        }
+                    }
+                    
+                    renderer->drawString(ult::SPLIT_PROJECT_NAME_2, false, x, y + offset, fontSize, (logoColor2));
+                    
+                } else {
+                    if (useCachedTop) {
+                        if (g_cachedTop.widgetDrawn) {
+                            renderer->drawWidget();
+                        }
+                    } else {
+                        if (m_showWidget) {
+                            renderer->drawWidget();
+                        }
+                    }
+            
+                    x = 20;
+                    y = 52 - 2;
+                    fontSize = 32;
+            
+                    if (renderSubtitle.find("Ultrahand Script") != std::string::npos) {
+                        renderer->drawString(renderTitle, false, x, y, fontSize, (defaultScriptColor));
+                    } else {
+                        tsl::Color drawColor = defaultPackageColor; // Default to green
+                        
+                        if (!useCachedTop) {
+                            // Calculate color only if not using cache
+                            if (!m_colorSelection.empty()) {
+                                const char firstChar = m_colorSelection[0];
+                                const size_t len = m_colorSelection.length();
+                                
+                                // Fast path: check first char + length for unique combinations
+                                switch (firstChar) {
+                                    case 'g': // green
+                                        if (len == 5 && m_colorSelection.compare("green") == 0) {
+                                            drawColor = {0x0, 0xF, 0x0, 0xF};
+                                        }
+                                        break;
+                                    case 'r': // red
+                                        if (len == 3 && m_colorSelection.compare("red") == 0) {
+                                            drawColor = RGB888("#F7253E");
+                                        }
+                                        break;
+                                    case 'b': // blue
+                                        if (len == 4 && m_colorSelection.compare("blue") == 0) {
+                                            drawColor = {0x7, 0x7, 0xF, 0xF};
+                                        }
+                                        break;
+                                    case 'y': // yellow
+                                        if (len == 6 && m_colorSelection.compare("yellow") == 0) {
+                                            drawColor = {0xF, 0xF, 0x0, 0xF};
+                                        }
+                                        break;
+                                    case 'o': // orange
+                                        if (len == 6 && m_colorSelection.compare("orange") == 0) {
+                                            drawColor = {0xFF, 0xA5, 0x00, 0xFF};
+                                        }
+                                        break;
+                                    case 'p': // pink or purple
+                                        if (len == 4 && m_colorSelection.compare("pink") == 0) {
+                                            drawColor = {0xFF, 0x69, 0xB4, 0xFF};
+                                        } else if (len == 6 && m_colorSelection.compare("purple") == 0) {
+                                            drawColor = {0x80, 0x00, 0x80, 0xFF};
+                                        }
+                                        break;
+                                    case 'w': // white
+                                        if (len == 5 && m_colorSelection.compare("white") == 0) {
+                                            drawColor = {0xF, 0xF, 0xF, 0xF};
+                                        }
+                                        break;
+                                    case '#': // hex color
+                                        if (len == 7 && ult::isValidHexColor(m_colorSelection.substr(1))) {
+                                            drawColor = RGB888(m_colorSelection.substr(1));
+                                        }
+                                        break;
+                                }
+                            }
+                            titleColor = drawColor;
+                        } else {
+                            drawColor = renderTitleColor;
+                        }
+                        
+                        renderer->drawString(renderTitle, false, x, y, fontSize, (drawColor));
+                        y += 2;
+                    }
+                }
+                
+                static const std::vector<std::string> specialChars2 = {""};
+                if (renderTitle == ult::CAPITAL_ULTRAHAND_PROJECT_NAME) {
+                    renderer->drawStringWithColoredSections(ult::versionLabel, false, specialChars2, 20, y+25, 15, (bannerVersionTextColor), textSeparatorColor);
+                } else {
+                    std::string subtitle = renderSubtitle;
+                    const size_t pos = subtitle.find("?Ultrahand Script");
+                    if (pos != std::string::npos) {
+                        subtitle.erase(pos, 17); // "?Ultrahand Script".length() = 17
+                    }
+                    renderer->drawStringWithColoredSections(subtitle, false, specialChars2, 20, y+23, 15, (bannerVersionTextColor), textSeparatorColor);
+                }
+                
+                // Update top cache after rendering for next frame
+                g_cachedTop.title = m_title;
+                g_cachedTop.subtitle = m_subtitle;
+                g_cachedTop.titleColor = titleColor;
+                g_cachedTop.useDynamicLogo = ult::useDynamicLogo;
+                // Store whether widget was ACTUALLY drawn this frame
+                if (isUltrahandMenu) {
+                    g_cachedTop.widgetDrawn = true;  // Ultrahand menu always shows widget
+                } else {
+                    g_cachedTop.widgetDrawn = m_showWidget;  // Other menus use m_showWidget
+                }
+                g_cachedTop.disabled = false;
+            
+            #else
+                // NON-LAUNCHER PATH WITH CACHE SUPPORT
+                if (m_noClickableItems != ult::noClickableItems.load(std::memory_order_acquire)) {
+                    ult::noClickableItems.store(m_noClickableItems, std::memory_order_release);
+                }
+                
+                // Determine if we should use cached data (first frame of new overlay)
+                const bool useCachedTop = !g_cachedTop.disabled && 
+                                          !g_cachedTop.title.empty() && 
+                                          (g_cachedTop.title != m_title || g_cachedTop.subtitle != m_subtitle);
+                
+                // Use cached or current data for rendering
+                const std::string& renderTitle = useCachedTop ? g_cachedTop.title : m_title;
+                const std::string& renderSubtitle = useCachedTop ? g_cachedTop.subtitle : m_subtitle;
+                
+            #if USING_WIDGET_DIRECTIVE
+                if (useCachedTop) {
+                    if (g_cachedTop.widgetDrawn) {
+                        renderer->drawWidget();
+                    }
+                } else {
+                    if (m_showWidget)
+                        renderer->drawWidget();
+                }
+            #endif
+                
+                renderer->drawString(renderTitle, false, 20, 52-2, 32, (defaultOverlayColor));
+                renderer->drawString(renderSubtitle, false, 20, y+2+23+2, 15, (bannerVersionTextColor));
+                
+                // Update top cache after rendering for next frame
+                g_cachedTop.title = m_title;
+                g_cachedTop.subtitle = m_subtitle;
+                g_cachedTop.titleColor = {0xF, 0xF, 0xF, 0xF};
+            #if USING_WIDGET_DIRECTIVE
+                g_cachedTop.widgetDrawn = m_showWidget;
+            #else
+                g_cachedTop.widgetDrawn = false;
+            #endif
+                g_cachedTop.useDynamicLogo = false;
+                g_cachedTop.disabled = false;
+            #endif
+            
+                renderer->drawRect(15, tsl::cfg::FramebufferHeight - 73, tsl::cfg::FramebufferWidth - 30, 1, a(bottomSeparatorColor));
+            
+                // Compute gap width once from GAP_1 and derive halfGap
+                const float gapWidth = renderer->getTextDimensions(ult::GAP_1, false, 23).first;
+                
+                // Calculate text widths for buttons depending on launch mode and interpreter state
+            #if IS_LAUNCHER_DIRECTIVE
+                const float backTextWidth = renderer->getTextDimensions(
+                    "\uE0E1" + ult::GAP_2 + (!interpreterIsRunningNow ? ult::BACK : ult::HIDE), false, 23).first;
+                const float selectTextWidth = renderer->getTextDimensions(
+                    "\uE0E0" + ult::GAP_2 + (!interpreterIsRunningNow ? ult::OK : ult::CANCEL), false, 23).first;
+            #else
+                const float backTextWidth = renderer->getTextDimensions(
+                    "\uE0E1" + ult::GAP_2 + ult::BACK, false, 23).first;
+                const float selectTextWidth = renderer->getTextDimensions(
+                    "\uE0E0" + ult::GAP_2 + ult::OK, false, 23).first;
+            #endif
+                
+                const float _halfGap = gapWidth / 2.0f;
+                if (_halfGap != ult::halfGap.load(std::memory_order_acquire))
+                    ult::halfGap.store(_halfGap, std::memory_order_release);
+            
+                // Total button widths include half-gap padding on both sides
+                const float _backWidth = backTextWidth + gapWidth;
+                if (_backWidth != ult::backWidth.load(std::memory_order_acquire))
+                    ult::backWidth.store(_backWidth, std::memory_order_release);
+                const float _selectWidth = selectTextWidth + gapWidth;
+                if (_selectWidth != ult::selectWidth.load(std::memory_order_acquire))
+                    ult::selectWidth.store(_selectWidth, std::memory_order_release);
+                
+                // Set initial button position
+                static constexpr float buttonStartX = 30;
+                const float buttonY = static_cast<float>(cfg::FramebufferHeight - 73 + 1);
+                
+                // Draw back button if touched
+                if (ult::touchingBack) {
+                    renderer->drawRoundedRect(buttonStartX+2 - _halfGap, buttonY, _backWidth-1, 73.0f, 10.0f, a(clickColor));
+                }
+                
+                // Draw select button (to the right of back) if touched
+                if (ult::touchingSelect.load(std::memory_order_acquire) && !m_noClickableItems) {
+                    renderer->drawRoundedRect(buttonStartX+2 - _halfGap + _backWidth+1, buttonY,
+                                              _selectWidth-2, 73.0f, 10.0f, a(clickColor));
+                }
+                
+            #if IS_LAUNCHER_DIRECTIVE
+                // Handle optional next page button when in launcher mode and appropriate conditions are met
+                if (!interpreterIsRunningNow && (ult::inMainMenu.load(std::memory_order_acquire) ||
+                                                 !m_pageLeftName.empty() || !m_pageRightName.empty())) {
+                    // Construct next-page label inline without creating temporary strings
+                    const float _nextPageWidth = renderer->getTextDimensions(
+                            !m_pageLeftName.empty() ? ("\uE0ED" + ult::GAP_2 + m_pageLeftName) :
+                            !m_pageRightName.empty() ? ("\uE0EE" + ult::GAP_2 + m_pageRightName) :
+                            (ult::inMainMenu.load(std::memory_order_acquire) ?
+                                (((m_menuMode.compare("packages") == 0) ?
+                                    (ult::usePageSwap ? "\uE0EE" : "\uE0ED") :
+                                    (ult::usePageSwap ? "\uE0ED" : "\uE0EE")) +
+                                ult::GAP_2 + (ult::inOverlaysPage.load(std::memory_order_acquire) ?
+                                    ult::PACKAGES : ult::OVERLAYS_ABBR)) :
+                                ""),
+                            false, 23).first + gapWidth;
+            
+                    if (_nextPageWidth != ult::nextPageWidth.load(std::memory_order_acquire))
+                        ult::nextPageWidth.store(_nextPageWidth, std::memory_order_release);
+                
+                    // Draw next-page button if touched
+                    if (ult::touchingNextPage.load(std::memory_order_acquire)) {
+                        float nextX = buttonStartX+2 - _halfGap + _backWidth +1;
+                        if (!m_noClickableItems)
+                            nextX += _selectWidth;
+                
+                        renderer->drawRoundedRect(nextX, buttonY,
+                                                  _nextPageWidth-2,
+                                                  73.0f, 10.0f, a(clickColor));
+                    }
+                }
+            #endif
+                
+            #if IS_LAUNCHER_DIRECTIVE
+                std::string currentBottomLine =
+                    "\uE0E1" + ult::GAP_2 +
+                    (interpreterIsRunningNow ? ult::HIDE : ult::BACK) + ult::GAP_1 +
+                    (!m_noClickableItems && !interpreterIsRunningNow
+                        ? "\uE0E0" + ult::GAP_2 + ult::OK + ult::GAP_1
+                        : "") +
+                    (interpreterIsRunningNow
+                        ? "\uE0E5" + ult::GAP_2 + ult::CANCEL + ult::GAP_1
+                        : "") +
+                    (!interpreterIsRunningNow
+                        ? (!ult::usePageSwap
+                            ? ((m_menuMode.compare("packages") == 0)
+                                ? "\uE0ED" + ult::GAP_2 + ult::OVERLAYS_ABBR
+                                : (m_menuMode.compare("overlays") == 0)
+                                    ? "\uE0EE" + ult::GAP_2 + ult::PACKAGES
+                                    : "")
+                            : ((m_menuMode.compare("packages") == 0)
+                                ? "\uE0EE" + ult::GAP_2 + ult::OVERLAYS_ABBR
+                                : (m_menuMode.compare("overlays") == 0)
+                                    ? "\uE0ED" + ult::GAP_2 + ult::PACKAGES
+                                    : ""))
+                        : "") +
+                    (!interpreterIsRunningNow && !m_pageLeftName.empty()
+                        ? "\uE0ED" + ult::GAP_2 + m_pageLeftName
+                        : !interpreterIsRunningNow && !m_pageRightName.empty()
+                            ? "\uE0EE" + ult::GAP_2 + m_pageRightName
+                            : "");
+            #else
+                std::string currentBottomLine =
+                    "\uE0E1" + ult::GAP_2 + ult::BACK + ult::GAP_1 +
+                    (!m_noClickableItems
+                        ? "\uE0E0" + ult::GAP_2 + ult::OK + ult::GAP_1
+                        : "");
+            #endif
+                
+                // Determine if we should use cached bottom text (first frame of new overlay)
+                const bool useCachedBottom = !g_cachedBottom.disabled && 
+                                              !g_cachedBottom.bottomText.empty() && 
+                                              g_cachedBottom.bottomText != currentBottomLine;
+                
+                const std::string& menuBottomLine = useCachedBottom ? g_cachedBottom.bottomText : currentBottomLine;
+                
+                // Render the text - it starts halfGap inside the first button, so edgePadding + halfGap
+                static const std::vector<std::string> specialChars = {"\uE0E1","\uE0E0","\uE0ED","\uE0EE","\uE0E5"};
+                renderer->drawStringWithColoredSections(menuBottomLine, false, specialChars, 
+                                                        buttonStartX, 693, 23, 
+                                                        (bottomTextColor), (buttonColor));
+                
+                // Update bottom cache after rendering for next frame
+                g_cachedBottom.bottomText = currentBottomLine;
+                g_cachedBottom.backWidth = _backWidth;
+                g_cachedBottom.selectWidth = _selectWidth;
+            #if IS_LAUNCHER_DIRECTIVE
+                g_cachedBottom.nextPageWidth = ult::nextPageWidth.load(std::memory_order_acquire);
+            #else
+                g_cachedBottom.nextPageWidth = 0.0f;
+            #endif
+                g_cachedBottom.disabled = false;
+            
+            #if USING_FPS_INDICATOR_DIRECTIVE
+                // Update and display FPS
+                const u64 currentTime_ns = armTicksToNs(armGetSystemTick());
+                const double currentTime_seconds = currentTime_ns / 1000000000.0;
+                const float currentFps = updateFPS(currentTime_seconds);
+            
+                static char fpsBuffer[32];
+                static float lastFps = -1.0f;
+                
+                // Only update string if FPS changed significantly
+                if (std::abs(currentFps - lastFps) > 0.1f) {
+                    snprintf(fpsBuffer, sizeof(fpsBuffer), "FPS: %.2f", currentFps);
+                    lastFps = currentFps;
+                }
+                static constexpr auto whiteColor = tsl::Color(0xF,0xF,0xF,0xF);
+                renderer->drawString(fpsBuffer, false, 20, tsl::cfg::FramebufferHeight - 60, 20, whiteColor);
+            #endif
+            
+                if (m_contentElement != nullptr)
+                    m_contentElement->frame(renderer);
+            
+                if (!ult::useRightAlignment)
+                    renderer->drawRect(447, 0, 448, 720, a(edgeSeparatorColor));
+                else
+                    renderer->drawRect(0, 0, 1, 720, a(edgeSeparatorColor));
+            
+            }
+            // CUSTOM SECTION END
+        
+            inline void layout(u16 parentX, u16 parentY, u16 parentWidth, u16 parentHeight) override {
+                setBoundaries(parentX, parentY, parentWidth, parentHeight);
+                
+                if (m_contentElement != nullptr) {
+                    m_contentElement->setBoundaries(parentX + 35, parentY + 97, parentWidth - 85, parentHeight - 73 - 105);
+                    m_contentElement->invalidate();
+                }
+            }
+            
+            inline Element* requestFocus(Element *oldFocus, FocusDirection direction) override {
+                return m_contentElement ? m_contentElement->requestFocus(oldFocus, direction) : nullptr;
+            }
+            
+            inline bool onTouch(TouchEvent event, s32 currX, s32 currY, s32 prevX, s32 prevY, s32 initialX, s32 initialY) {
+                // Discard touches outside bounds
+                if (!m_contentElement || !m_contentElement->inBounds(currX, currY))
+                    return false;
+                
+                return m_contentElement->onTouch(event, currX, currY, prevX, prevY, initialX, initialY);
+            }
+            
+            /**
+             * @brief Sets the content of the frame
+             *
+             * @param content Element
+             */
+            inline void setContent(Element *content) {
+                delete m_contentElement;
+                m_contentElement = content;
+                
+                if (content != nullptr) {
+                    m_contentElement->setParent(this);
+                    invalidate();
+                }
+            }
+            
+            /**
+             * @brief Changes the title of the menu
+             *
+             * @param title Title to change to
+             */
+            inline void setTitle(const std::string &title) {
+                m_title = title;
+            }
+            
+            /**
+             * @brief Changes the subtitle of the menu
+             *
+             * @param title Subtitle to change to
+             */
+            inline void setSubtitle(const std::string &subtitle) {
+                m_subtitle = subtitle;
+            }
+            
+        protected:
+            Element *m_contentElement = nullptr;
+        };
+        
+    #if IS_STATUS_MONITOR_DIRECTIVE
+
+        /**
+         * @brief The base frame which can contain another view
+         *
+         */
+        class HeaderOverlayFrame : public Element {
+        public:
+            /**
+             * @brief Constructor
+             *
+             * @param title Name of the Overlay drawn bolt at the top
+             * @param subtitle Subtitle drawn bellow the title e.g version number
+             */
+            std::string m_title;
+            std::string m_subtitle;
+            bool m_noClickableItems;
+
+            float x, y;
+            int offset, y_offset;
+            int fontSize;
+            
+        HeaderOverlayFrame(const std::string& title, const std::string& subtitle, const bool& _noClickableItems=false)
+            : Element(), m_title(title), m_subtitle(subtitle), m_noClickableItems(_noClickableItems) {
+                ult::activeHeaderHeight = 97;
+
+                if (FullMode)
+                    ult::loadWallpaperFileWhenSafe();
+                else
+                    svcSleepThread(250'000); // sleep thread for initial values to auto-load
+
+                m_isItem = false;
+            }
+
+            virtual ~HeaderOverlayFrame() {
+                if (this->m_contentElement != nullptr)
+                    delete this->m_contentElement;
+                
+                // Check if returning from a list that disabled caching
+                if (g_disableMenuCacheOnReturn.exchange(false, std::memory_order_acq_rel)) {
+                    g_cachedTop.disabled = true;
+                    g_cachedBottom.disabled = true;
+                }
+            }
+
+            
+            virtual void draw(gfx::Renderer *renderer) override {
+                if (!ult::themeIsInitialized.load(std::memory_order_acquire) && FullMode) {
+                    ult::themeIsInitialized.store(true, std::memory_order_release);
+                    tsl::initializeThemeVars();
+                }
+
+                if (m_noClickableItems != ult::noClickableItems.load(std::memory_order_acquire)) {
+                    ult::noClickableItems.store(m_noClickableItems, std::memory_order_release);
+                }
+                
+                
+                if (FullMode == true) {
+                    renderer->fillScreen(a(defaultBackgroundColor));
+                    if (lastMode.empty() || (lastMode.compare("returning") == 0))
+                        renderer->drawWallpaper();
+                } else {
+                    renderer->fillScreen({ 0x0, 0x0, 0x0, 0x0});
+                }
+                
+                y = 50;
+                offset = 0;
+                
+                // Determine if we should use cached data (first frame of new overlay)
+                const bool useCachedTop = !g_cachedTop.disabled && 
+                                          !g_cachedTop.title.empty() && 
+                                          (g_cachedTop.title != m_title || g_cachedTop.subtitle != m_subtitle);
+                
+                // Use cached or current data for rendering
+                const std::string& renderTitle = useCachedTop ? g_cachedTop.title : m_title;
+                const std::string& renderSubtitle = useCachedTop ? g_cachedTop.subtitle : m_subtitle;
+                
+                renderer->drawString(renderTitle, false, 20, 50, 32, (defaultOverlayColor));
+                renderer->drawString(renderSubtitle, false, 20, y+2+23+2, 15, (bannerVersionTextColor));
+                
+                if (FullMode == true)
+                    renderer->drawRect(15, tsl::cfg::FramebufferHeight - 73, tsl::cfg::FramebufferWidth - 30, 1, a(bottomSeparatorColor));
+                
+                // Set initial button position
+                static constexpr float buttonStartX = 30;
+                
+                if (FullMode && !deactivateOriginalFooter) {
+                    // Get the exact gap width from ult::GAP_1
+                    const auto gapWidth = renderer->getTextDimensions(ult::GAP_1, false, 23).first;
+                    const float _halfGap = gapWidth / 2.0f;
+                    if (_halfGap != ult::halfGap.load(std::memory_order_acquire))
+                        ult::halfGap.store(_halfGap, std::memory_order_release);
+                
+                    // Calculate text dimensions for buttons without gaps
+                    const auto backTextWidth = renderer->getTextDimensions("\uE0E1" + ult::GAP_2 + ult::BACK, false, 23).first;
+                    const auto selectTextWidth = renderer->getTextDimensions("\uE0E0" + ult::GAP_2 + ult::OK, false, 23).first;
+                
+                    // Update widths to include the half-gap padding on each side
+                    const float _backWidth = backTextWidth + gapWidth;
+                    if (_backWidth != ult::backWidth.load(std::memory_order_acquire))
+                        ult::backWidth.store(_backWidth, std::memory_order_release);
+                    const float _selectWidth = selectTextWidth + gapWidth;
+                    if (_selectWidth != ult::selectWidth.load(std::memory_order_acquire))
+                        ult::selectWidth.store(_selectWidth, std::memory_order_release);
+                
+                    const float buttonY = static_cast<float>(cfg::FramebufferHeight - 73 + 1);
+                
+                    // Draw back button rectangle
+                    if (ult::touchingBack.load(std::memory_order_acquire)) {
+                        renderer->drawRoundedRect(buttonStartX+2 - _halfGap, buttonY, _backWidth-1, 73.0f, 10.0f, a(clickColor));
+                    }
+                
+                    // Draw select button rectangle (starts right after back button)
+                    if (ult::touchingSelect.load(std::memory_order_acquire) && !m_noClickableItems) {
+                        renderer->drawRoundedRect(buttonStartX+2 - _halfGap + _backWidth+1, buttonY,
+                                                  _selectWidth-2, 73.0f, 10.0f, a(clickColor));
+                    }
+                }
+                
+                // Build current bottom line
+                const std::string currentBottomLine = 
+                    "\uE0E1" + ult::GAP_2 + ult::BACK + ult::GAP_1 +
+                    (!m_noClickableItems 
+                        ? "\uE0E0" + ult::GAP_2 + ult::OK + ult::GAP_1
+                        : "");
+                
+                // Determine if we should use cached bottom text (first frame of new overlay)
+                const bool useCachedBottom = !g_cachedBottom.disabled && 
+                                              !g_cachedBottom.bottomText.empty() && 
+                                              g_cachedBottom.bottomText != currentBottomLine;
+                
+                const std::string& menuBottomLine = useCachedBottom ? g_cachedBottom.bottomText : currentBottomLine;
+                
+                // Render the text with special character handling
+                if (!deactivateOriginalFooter)  {
+                    static const std::vector<std::string> specialChars = {"\uE0E1","\uE0E0","\uE0ED","\uE0EE","\uE0E5"};
+                    renderer->drawStringWithColoredSections(menuBottomLine, false, specialChars, buttonStartX, 693, 23, (bottomTextColor), (buttonColor));
+                }
+                
+                if (this->m_contentElement != nullptr)
+                    this->m_contentElement->frame(renderer);
+
+                if (FullMode) {
+                    if (!ult::useRightAlignment)
+                        renderer->drawRect(447, 0, 448, 720, a(edgeSeparatorColor));
+                    else
+                        renderer->drawRect(0, 0, 1, 720, a(edgeSeparatorColor));
+                }
+                
+                // Update top cache after rendering for next frame
+                g_cachedTop.title = m_title;
+                g_cachedTop.subtitle = m_subtitle;
+                g_cachedTop.titleColor = {0xF, 0xF, 0xF, 0xF}; // HeaderOverlayFrame uses default white
+                g_cachedTop.widgetDrawn = false;  // HeaderOverlayFrame doesn't use widgets
+                g_cachedTop.useDynamicLogo = false; // HeaderOverlayFrame doesn't use dynamic logo
+                g_cachedTop.disabled = false;
+                
+                // Update bottom cache after rendering for next frame
+                g_cachedBottom.bottomText = currentBottomLine;
+                g_cachedBottom.backWidth = ult::backWidth.load(std::memory_order_acquire);
+                g_cachedBottom.selectWidth = ult::selectWidth.load(std::memory_order_acquire);
+                g_cachedBottom.nextPageWidth = 0.0f;  // HeaderOverlayFrame doesn't use next page
+                g_cachedBottom.disabled = false;
+            }
+            
+
+            
+            virtual void layout(u16 parentX, u16 parentY, u16 parentWidth, u16 parentHeight) override {
+                this->setBoundaries(parentX, parentY, parentWidth, parentHeight);
+        
+                if (this->m_contentElement != nullptr) {
+                    //this->m_contentElement->setBoundaries(parentX + 35, parentY + 140, parentWidth - 85, parentHeight - 73 - 105); // CUSTOM MODIFICATION
+                    this->m_contentElement->setBoundaries(parentX + 35, parentY + ult::activeHeaderHeight, parentWidth - 85, parentHeight - 73 - 105);
+                    this->m_contentElement->invalidate();
+                }
+            }
+            virtual inline Element* requestFocus(Element *oldFocus, FocusDirection direction) override {
+                if (this->m_contentElement != nullptr)
+                    return this->m_contentElement->requestFocus(oldFocus, direction);
+                else
+                    return nullptr;
+            }
+            
+            virtual inline bool onTouch(TouchEvent event, s32 currX, s32 currY, s32 prevX, s32 prevY, s32 initialX, s32 initialY) {
+                // Discard touches outside bounds
+                if (!this->m_contentElement->inBounds(currX, currY))
+                    return false;
+                
+                if (this->m_contentElement != nullptr)
+                    return this->m_contentElement->onTouch(event, currX, currY, prevX, prevY, initialX, initialY);
+                else return false;
+            }
+            
+            /**
+             * @brief Sets the content of the frame
+             *
+             * @param content Element
+             */
+            inline void setContent(Element *content) {
+                if (this->m_contentElement != nullptr)
+                    delete this->m_contentElement;
+                
+                this->m_contentElement = content;
+                
+                if (content != nullptr) {
+                    this->m_contentElement->setParent(this);
+                    this->invalidate();
+                }
+            }
+            
+            /**
+             * @brief Changes the title of the menu
+             *
+             * @param title Title to change to
+             */
+            inline void setTitle(const std::string &title) {
+                this->m_title = title;
+            }
+            
+            /**
+             * @brief Changes the subtitle of the menu
+             *
+             * @param title Subtitle to change to
+             */
+            inline void setSubtitle(const std::string &subtitle) {
+                this->m_subtitle = subtitle;
+            }
+            
+        protected:
+            Element *m_contentElement = nullptr;
+            
+            //std::string m_title, m_subtitle;
+        };
+    #else
+        /**
+         * @brief The base frame which can contain another view with a customizable header
+         *
+         */
+        class HeaderOverlayFrame : public Element {
+        public:
+        #if USING_WIDGET_DIRECTIVE
+            bool m_showWidget = false;
+        #endif
+
+            HeaderOverlayFrame(u16 headerHeight = 175) : Element(), m_headerHeight(headerHeight) {
+                ult::activeHeaderHeight = headerHeight;
+                // Load the bitmap file into memory
+                ult::loadWallpaperFileWhenSafe();
+                m_isItem = false;
+
+            }
+            virtual ~HeaderOverlayFrame() {
+                if (this->m_contentElement != nullptr)
+                    delete this->m_contentElement;
+                
+                if (this->m_header != nullptr)
+                    delete this->m_header;
+            }
+            
+            virtual void draw(gfx::Renderer *renderer) override {
+                if (!ult::themeIsInitialized.exchange(true, std::memory_order_acq_rel)) {
+                    tsl::initializeThemeVars();
+                }
+            
+                renderer->fillScreen(a(defaultBackgroundColor));
+                renderer->drawWallpaper();
+                //renderer->drawRect(tsl::cfg::FramebufferWidth - 1, 0, 1, tsl::cfg::FramebufferHeight, a(0xF222));
+                renderer->drawRect(15, tsl::cfg::FramebufferHeight - 73, tsl::cfg::FramebufferWidth - 30, 1, a(bottomSeparatorColor));
+                
+                #if USING_WIDGET_DIRECTIVE
+                if (m_showWidget)
+                    renderer->drawWidget();
+                #endif
+
+                // Get the exact gap width from ult::GAP_1
+                const float gapWidth = renderer->getTextDimensions(ult::GAP_1, false, 23).first;
+                const float _halfGap = gapWidth / 2.0f;
+                if (_halfGap != ult::halfGap.load(std::memory_order_acquire))
+                    ult::halfGap.store(_halfGap, std::memory_order_release);
+            
+                // Calculate text dimensions for buttons without gaps
+                const float backTextWidth = renderer->getTextDimensions("\uE0E1" + ult::GAP_2 + ult::BACK, false, 23).first;
+                const float selectTextWidth = renderer->getTextDimensions("\uE0E0" + ult::GAP_2 + ult::OK, false, 23).first;
+            
+                // Store final widths with gap padding included
+                const float _backWidth = backTextWidth + gapWidth;
+                if (_backWidth != ult::backWidth.load(std::memory_order_acquire))
+                    ult::backWidth.store(_backWidth, std::memory_order_release);
+                const float _selectWidth = selectTextWidth + gapWidth;
+                if (_selectWidth != ult::selectWidth.load(std::memory_order_acquire))
+                    ult::selectWidth.store(_selectWidth, std::memory_order_release);
+            
+                // Set initial button position
+                static constexpr float buttonStartX = 30;
+                const float buttonY = static_cast<float>(cfg::FramebufferHeight - 73 + 1);
+            
+                // Draw back button rectangle
+                if (ult::touchingBack.load(std::memory_order_acquire)) {
+                    renderer->drawRoundedRect(buttonStartX+2 - _halfGap, buttonY, _backWidth-1, 73.0f, 10.0f, a(clickColor));
+                }
+            
+                // Draw select button rectangle
+                if (ult::touchingSelect.load(std::memory_order_acquire)) {
+                    renderer->drawRoundedRect(buttonStartX+2 - _halfGap + _backWidth+1, buttonY,
+                                              _selectWidth-2, 73.0f, 10.0f, a(clickColor));
+                }
+            
+                // Draw bottom text
+                const std::string menuBottomLine = "\uE0E1" + ult::GAP_2 + ult::BACK + ult::GAP_1 +
+                                                   "\uE0E0" + ult::GAP_2 + ult::OK + ult::GAP_1;
+                renderer->drawStringWithColoredSections(menuBottomLine, false,
+                                                        {"\uE0E1", "\uE0E0", "\uE0ED", "\uE0EE"},
+                                                        buttonStartX, 693, 23,
+                                                        bottomTextColor, buttonColor);
+            
+                if (this->m_header != nullptr)
+                    this->m_header->frame(renderer);
+            
+                if (this->m_contentElement != nullptr)
+                    this->m_contentElement->frame(renderer);
+
+                if (!ult::useRightAlignment)
+                    renderer->drawRect(447, 0, 448, 720, a(edgeSeparatorColor));
+                else
+                    renderer->drawRect(0, 0, 1, 720, a(edgeSeparatorColor));
+            }
+            
+            virtual inline void layout(u16 parentX, u16 parentY, u16 parentWidth, u16 parentHeight) override {
+                this->setBoundaries(parentX, parentY, parentWidth, parentHeight);
+                
+                if (this->m_contentElement != nullptr) {
+                    this->m_contentElement->setBoundaries(parentX + 35, parentY + this->m_headerHeight, parentWidth - 85, parentHeight - 73 - this->m_headerHeight -8);
+                    this->m_contentElement->invalidate();
+                }
+                
+                if (this->m_header != nullptr) {
+                    this->m_header->setBoundaries(parentX, parentY, parentWidth, this->m_headerHeight);
+                    this->m_header->invalidate();
+                }
+            }
+            
+            virtual inline bool onTouch(TouchEvent event, s32 currX, s32 currY, s32 prevX, s32 prevY, s32 initialX, s32 initialY) {
+                // Discard touches outside bounds
+                if (!this->m_contentElement->inBounds(currX, currY))
+                    return false;
+                
+                if (this->m_contentElement != nullptr)
+                    return this->m_contentElement->onTouch(event, currX, currY, prevX, prevY, initialX, initialY);
+                else return false;
+            }
+            
+            virtual inline Element* requestFocus(Element *oldFocus, FocusDirection direction) override {
+                if (this->m_contentElement != nullptr)
+                    return this->m_contentElement->requestFocus(oldFocus, direction);
+                else
+                    return nullptr;
+            }
+            
+            /**
+             * @brief Sets the content of the frame
+             *
+             * @param content Element
+             */
+            inline void setContent(Element *content) {
+                if (this->m_contentElement != nullptr)
+                    delete this->m_contentElement;
+                
+                this->m_contentElement = content;
+                
+                if (content != nullptr) {
+                    this->m_contentElement->setParent(this);
+                    this->invalidate();
+                }
+            }
+            
+            /**
+             * @brief Sets the header of the frame
+             *
+             * @param header Header custom drawer
+             */
+            inline void setHeader(CustomDrawer *header) {
+                if (this->m_header != nullptr)
+                    delete this->m_header;
+                
+                this->m_header = header;
+                
+                if (header != nullptr) {
+                    this->m_header->setParent(this);
+                    this->invalidate();
+                }
+            }
+            
+        protected:
+            Element *m_contentElement = nullptr;
+            CustomDrawer *m_header = nullptr;
+            
+            u16 m_headerHeight;
+        };
+    #endif
+        
+        /**
+         * @brief Single color rectangle element mainly used for debugging to visualize boundaries
+         *
+         */
+        class DebugRectangle : public Element {
+        public:
+            /**
+             * @brief Constructor
+             *
+             * @param color Color of the rectangle
+             */
+            DebugRectangle(Color color) : Element(), m_color(color) {
+                m_isItem = false;
+            }
+            virtual ~DebugRectangle() {}
+            
+            virtual void draw(gfx::Renderer *renderer) override {
+                renderer->drawRect(ELEMENT_BOUNDS(this), a(this->m_color));
+            }
+            
+            virtual void layout(u16 parentX, u16 parentY, u16 parentWidth, u16 parentHeight) override {}
+            
+        private:
+            Color m_color;
+        };
+
+
+        class ListItem; // forward declaration
+
+        static std::mutex s_lastFrameItemsMutex;
+        static std::vector<Element*> s_lastFrameItems;
+        static std::atomic<bool> s_isForwardCache(false); // NEW VARIABLE FOR FORWARD CACHING
+        static std::atomic<bool> s_hasValidFrame(false);
+        static std::atomic<s32> s_cachedTopBound{0};
+        static std::atomic<s32> s_cachedBottomBound{0};
+        static std::atomic<s32> s_cachedHeight{0};
+        static std::atomic<s32> s_cachedListHeight{0};
+        static std::atomic<s32> s_cachedActualContentBottom{0};
+        static std::atomic<bool> s_shouldDrawScrollbar(false);
+        static std::atomic<u32> s_cachedScrollbarHeight{0};
+        static std::atomic<u32> s_cachedScrollbarOffset{0};
+        static std::atomic<u32> s_cachedScrollbarX{0};
+        static std::atomic<u32> s_cachedScrollbarY{0};
+        static std::atomic<float> s_currentScrollVelocity{0};
+
+        static std::atomic<bool> s_directionalKeyReleased{false};
+        static std::atomic<bool> s_cacheForwardFrameOnce(true);
+        static std::atomic<bool> lastInternalTouchRelease(true);
+        static std::atomic<bool> s_hasClearedCache(false);
+
+        //static std::atomic<bool> s_skipCaching(false);
+
+        static std::mutex s_safeToSwapMutex;
+        //static std::mutex s_safeTransitionMutex;
+        static std::atomic<bool> s_safeToSwap{false};
+
+        static std::atomic<bool> fullDeconstruction{false};
+        static std::atomic<bool> skipDeconstruction{false};
+        static std::atomic<bool> skipOnce{false};
+
+        static std::atomic<bool> isTableScrolling{false};
+
+        class List : public Element {
+        
+        public:
+            List() : Element() {
+                if (fullDeconstruction.load(std::memory_order_acquire)) {
+                    return;
+                }
+
+                s_safeToSwap.store(false, std::memory_order_release);
+                //s_directionalKeyReleased.store(false, std::memory_order_release);
+                //std::lock_guard<std::mutex> lock(s_safeTransitionMutex);
+                //s_safeToSwap.store(false, std::memory_order_release);
+                
+                // Initialize instance state
+                m_hasForwardCached = false;
+                m_pendingJump = false;
+                m_cachingDisabled = false;
+                m_clearList = false;
+                m_focusedIndex = 0;
+                m_offset = 0;
+                m_nextOffset = 0;
+                m_listHeight = 0;
+                actualItemCount = 0;
+                m_isItem = false;
+
+                {
+                    std::lock_guard<std::mutex> lock(s_lastFrameItemsMutex);
+                    
+                    s_hasClearedCache.store(false, std::memory_order_release);
+                    
+                    if (skipDeconstruction.load(std::memory_order_acquire)) {
+                        purgePendingItems();
+                    } else {
+                        s_cacheForwardFrameOnce.store(true, std::memory_order_release);
+                        skipOnce.store(false, std::memory_order_release);
+                    }
+                }
+            }
+            
+            virtual ~List() {
+                if (fullDeconstruction.load(std::memory_order_acquire)) {
+                    std::lock_guard<std::mutex> lock(s_lastFrameItemsMutex);  // Add this
+                    
+                    purgePendingItems();
+                    
+                    if (s_isForwardCache.load(std::memory_order_acquire)) {
+                        clearStaticCacheUnsafe(true);
+                        s_isForwardCache.store(false, std::memory_order_release);
+                    } else {
+                        clearStaticCacheUnsafe();
+                    }
+                    clearItems();
+                    
+                    return;
+                }
+
+                s_safeToSwap.store(false, std::memory_order_release);
+                //s_directionalKeyReleased.store(false, std::memory_order_release);
+                //std::lock_guard<std::mutex> lock(s_safeTransitionMutex);
+                //s_safeToSwap.store(false, std::memory_order_release);
+            
+                // NOW take mutex for shared static variable operations
+                {
+                    std::lock_guard<std::mutex> lock(s_lastFrameItemsMutex);
+
+                    if (!skipDeconstruction.load(std::memory_order_acquire)) {
+                        purgePendingItems();
+                        
+                        if (!s_isForwardCache.load(std::memory_order_acquire)) {
+                            clearStaticCacheUnsafe();
+                            clearItems();
+                        }
+            
+                        s_isForwardCache.store(false, std::memory_order_release);
+                        s_cacheForwardFrameOnce.store(true, std::memory_order_release);
+                    }
+            
+                    if (m_cachingDisabled || (skipOnce.load(std::memory_order_acquire) && skipDeconstruction.load(std::memory_order_acquire))) {
+                        purgePendingItems();
+                        clearItems();
+                    } else if (skipDeconstruction.load(std::memory_order_acquire)) {
+                        skipOnce.store(true, std::memory_order_release);
+                    }
+                }
+            }
+            
+            
+            virtual void draw(gfx::Renderer* renderer) override {
+                if (fullDeconstruction.load(std::memory_order_acquire)) {
+                    return;
+                }
+
+                s_safeToSwap.store(false, std::memory_order_release);
+                std::lock_guard<std::mutex> lock(s_safeToSwapMutex);
+                //s_safeToSwap.store(false, std::memory_order_release);
+                
+                // Early exit optimizations
+                if (m_clearList) {
+                    if (!s_isForwardCache.load(std::memory_order_acquire)) {
+                        clearStaticCacheUnsafe();
+                        
+                    } else {
+                        clearStaticCacheUnsafe(true);
+                    }
+                    clearItems();
+                    s_isForwardCache.store(false, std::memory_order_release);
+                    s_cacheForwardFrameOnce.store(true, std::memory_order_release);
+                    return;
+                }
+                {
+                    std::lock_guard<std::mutex> lock(s_lastFrameItemsMutex);
+                    // Process pending operations in batch
+                    if (!m_itemsToAdd.empty()) addPendingItems();
+                    if (!m_itemsToRemove.empty()) removePendingItems();
+                }
+                
+                // Only lock when checking s_lastFrameItems.empty()
+                bool shouldResetCache = false;
+                {
+                    std::lock_guard<std::mutex> lock(s_lastFrameItemsMutex);
+                    if (!s_hasValidFrame.load(std::memory_order_acquire) && s_lastFrameItems.empty() && 
+                        !s_cacheForwardFrameOnce.load(std::memory_order_acquire)) {
+                        shouldResetCache = true;
+                    }
+                }
+                
+                if (shouldResetCache) {
+                    s_cacheForwardFrameOnce.store(true, std::memory_order_release);
+                }
+                
+                // This part is for fixing returning to Ultrahand without rendering that first frame skip
+                static bool checkOnce = true;
+                if (checkOnce && m_pendingJump && !s_hasValidFrame.load(std::memory_order_acquire) && 
+                    !s_isForwardCache.load(std::memory_order_acquire)) {
+                    checkOnce = false;
+                    return;
+                } else {
+                    static bool checkOnce2 = true;
+                    if (checkOnce2) {
+                        checkOnce = true;
+                        checkOnce2 = false;
+                    }
+                }
+                
+                // Check if we should render cached frame
+                if ((m_pendingJump || !m_hasForwardCached) && 
+                    (s_hasValidFrame.load(std::memory_order_acquire) || s_isForwardCache.load(std::memory_order_acquire))) {
+                    {
+                        std::lock_guard<std::mutex> lock(s_lastFrameItemsMutex);                    
+                        // Render using cached frame state if available
+                        renderCachedFrame(renderer);  // This method handles its own locking
+                        
+                        // Clear cache after rendering
+                        if (s_isForwardCache.load(std::memory_order_acquire))
+                            clearStaticCacheUnsafe(true);  // This method handles its own locking
+                        else
+                            clearStaticCacheUnsafe();      // This method handles its own locking
+                    }
+                    
+                    return;
+                }
+                
+                // Cache bounds for hot loop
+                const s32 topBound = getTopBound();
+                const s32 bottomBound = getBottomBound();
+                const s32 height = getHeight();
+                
+                renderer->enableScissoring(getLeftBound(), topBound-8, getWidth() + 8, height + 14);
+                
+                {
+                    std::lock_guard<std::mutex> lock(s_lastFrameItemsMutex);
+                    // Optimized visibility culling
+                    for (Element* entry : m_items) {
+                        if (entry->getBottomBound() > topBound && entry->getTopBound() < bottomBound) {
+                            entry->frame(renderer);
+                        }
+                    }
+                }
+
+                renderer->disableScissoring();
+                
+                // Draw scrollbar only when needed
+                if (m_listHeight > height) {
+                    drawScrollbar(renderer, height);
+                    updateScrollAnimation();
+                }
+                
+                // Handle caching operations - lock only for the critical section
+                {
+                    std::lock_guard<std::mutex> lock(s_lastFrameItemsMutex);
+                    
+                    if (!s_isForwardCache.load(std::memory_order_acquire) && s_hasValidFrame.load(std::memory_order_acquire)) {
+                        // Clear cache after rendering (this is called within the lock)
+                        clearStaticCacheUnsafe(); // New unsafe version for use within lock
+                        s_hasValidFrame.store(false, std::memory_order_release);
+                        s_cacheForwardFrameOnce.store(true, std::memory_order_release);
+                    }
+                    
+                    if (!m_cachingDisabled) {
+                        if (s_cacheForwardFrameOnce.load(std::memory_order_acquire) && 
+                            !s_hasValidFrame.load(std::memory_order_acquire)) {
+                            // Cache current frame (this is called within the lock)
+                            cacheCurrentFrameUnsafe(true); // New unsafe version for use within lock
+                            s_cacheForwardFrameOnce.store(false, std::memory_order_release);
+                            s_isForwardCache.store(true, std::memory_order_release);
+                            s_hasValidFrame.store(true, std::memory_order_release);
+                            m_hasForwardCached = true;
+                        }
+                        cacheCurrentScrollbar();
+                    }
+
+                    //if (m_cachingDisabled ||(s_hasValidFrame.load(std::memory_order_acquire) && s_isForwardCache.load(std::memory_order_acquire)))
+                    //    s_safeToSwap.store(true, std::memory_order_release);
+                }
+                s_safeToSwap.store(true, std::memory_order_release);
+            }
+
+            
+            virtual void layout(u16 parentX, u16 parentY, u16 parentWidth, u16 parentHeight) override {
+                s32 y = getY() - m_offset;
+                
+                // Position all items first (don't calculate m_listHeight here)
+                for (Element* entry : m_items) {
+                    entry->setBoundaries(getX(), y, getWidth(), entry->getHeight());
+                    entry->invalidate();
+                    y += entry->getHeight();
+                }
+
+                
+                // Calculate total height AFTER all invalidations are done
+                m_listHeight = BOTTOM_PADDING;
+                for (Element* entry : m_items) {
+                    m_listHeight += entry->getHeight();
+                }
+            }
+                                                
+            // Fixed onTouch method - prevents controller state corruption
+            virtual bool onTouch(TouchEvent event, s32 currX, s32 currY, s32 prevX, s32 prevY, s32 initialX, s32 initialY) override {
+                // Quick bounds check
+                if (!inBounds(currX, currY)) return false;
+                
+                // Forward to children first
+                for (Element* item : m_items) {
+                    if (item->onTouch(event, currX, currY, prevX, prevY, initialX, initialY)) {
+                        return true;
+                    }
+                }
+                
+                // Handle scrolling
+                if (event != TouchEvent::Release && Element::getInputMode() == InputMode::TouchScroll) {
+                    if (prevX && prevY) {
+                        m_nextOffset += (prevY - currY);
+                        m_nextOffset = std::clamp(m_nextOffset, 0.0f, static_cast<float>(m_listHeight - getHeight()));
+                        
+                        // Track that we're touch scrolling
+                        m_touchScrollActive = true;
+                    }
+                    return true;
+                }
+                
+                return false;
+            }
+            
+
+            inline void addItem(Element* element, u16 height = 0, ssize_t index = -1) {
+                if (!element) return;
+                
+                // First item optimization
+                if (actualItemCount == 0 && element->m_isItem) {
+                    auto* customDrawer = new tsl::elm::CustomDrawer([](gfx::Renderer*, s32, s32, s32, s32) {});
+                    customDrawer->setBoundaries(getX(), getY(), getWidth(), 29+4);
+                    customDrawer->setParent(this);
+                    customDrawer->invalidate();
+                    m_itemsToAdd.emplace_back(-1, customDrawer);
+                }
+        
+                if (height) {
+                    element->setBoundaries(getX(), getY(), getWidth(), height);
+                }
+        
+                element->setParent(this);
+                element->invalidate();
+                m_itemsToAdd.emplace_back(index, element);
+                ++actualItemCount;
+            }
+        
+            virtual void removeItem(Element *element) {
+                if (element) m_itemsToRemove.push_back(element);
+            }
+            
+            virtual void removeIndex(size_t index) {
+                if (index < m_items.size()) removeItem(m_items[index]);
+            }
+            
+            inline void clear() {
+                m_clearList = true;
+            }
+        
+            virtual Element* requestFocus(Element* oldFocus, FocusDirection direction) override {
+                if (m_clearList || !m_itemsToAdd.empty()) return nullptr;
+                
+                static bool delayedHandle = false;
+
+                // NEW: Handle pending jump to specific item
+                if (m_pendingJump && !delayedHandle) {
+                    delayedHandle = true;
+                    return handleJumpToItem(oldFocus);
+                } else if (m_pendingJump) {
+                    m_pendingJump = false;
+                    delayedHandle = false;
+                    return handleJumpToItem(oldFocus); // needs to be handled 2x for proper rendering
+                }
+                
+                if (jumpToBottom.exchange(false, std::memory_order_acq_rel))
+                    return handleJumpToBottom(oldFocus);
+                
+                if (jumpToTop.exchange(false, std::memory_order_acq_rel))
+                    return handleJumpToTop(oldFocus);
+                
+                if (skipDown.exchange(false, std::memory_order_acq_rel))
+                    return handleSkipDown(oldFocus);
+                
+                if (skipUp.exchange(false, std::memory_order_acq_rel))
+                    return handleSkipUp(oldFocus);
+
+            
+                if (direction == FocusDirection::None) {
+                    return handleInitialFocus(oldFocus);
+                }
+                else if (direction == FocusDirection::Down) {
+                    return handleDownFocus(oldFocus);
+                }
+                else if (direction == FocusDirection::Up) {
+                    return handleUpFocus(oldFocus);
+                }
+            
+                return oldFocus;
+            }
+
+            inline void jumpToItem(const std::string& text = "", const std::string& value = "", bool exactMatch=true) {
+
+                if (!text.empty() || !value.empty()) {
+                    m_pendingJump = true;
+                    m_jumpToText = text;
+                    m_jumpToValue = value;
+                    m_jumpToExactMatch = exactMatch;
+                }
+
+            }
+                        
+            virtual Element* getItemAtIndex(u32 index) {
+                return (m_items.size() <= index) ? nullptr : m_items[index];
+            }
+            
+            virtual s32 getIndexInList(Element *element) {
+                auto it = std::find(m_items.begin(), m_items.end(), element);
+                return (it == m_items.end()) ? -1 : static_cast<s32>(it - m_items.begin());
+            }
+        
+            virtual s32 getLastIndex() {
+                return static_cast<s32>(m_items.size()) - 1;
+            }
+            
+            virtual void setFocusedIndex(u32 index) {
+                if (m_items.size() > index) {
+                    m_focusedIndex = index;
+                    updateScrollOffset();
+                }
+            }
+            
+            inline void onDirectionalKeyReleased() {
+                m_hasWrappedInCurrentSequence = false;
+                m_lastNavigationResult = NavigationResult::None;
+                m_isHolding = false;
+                m_stoppedAtBoundary = false;
+                m_lastNavigationTime = 0;
+                m_lastScrollTime = 0;
+            }
+
+            inline void disableCaching() {
+                m_cachingDisabled = true;
+                //clearFrameCache();
+                g_disableMenuCacheOnReturn.store(true, std::memory_order_release);
+            }
+        
+        protected:
+
+            std::vector<Element*> m_items;
+            u16 m_focusedIndex = 0;
+            
+            float m_offset = 0, m_nextOffset = 0;
+            s32 m_listHeight = 0;
+            
+            bool m_clearList = false;
+            std::vector<Element*> m_itemsToRemove;
+            std::vector<std::pair<ssize_t, Element*>> m_itemsToAdd;
+            std::vector<float> prefixSums;
+            
+            // Instance identification
+            //const size_t m_instanceId;
+
+            // Enhanced navigation state tracking
+            bool m_justWrapped = false;
+            bool m_isHolding = false;
+            bool m_stoppedAtBoundary = false;
+            u64 m_lastNavigationTime = 0;
+            static constexpr u64 HOLD_THRESHOLD_NS = 100000000ULL;  // 100ms
+        
+            size_t actualItemCount = 0;
+
+            // Jump to navigation variables
+            std::string m_jumpToText;
+            std::string m_jumpToValue;
+            bool m_jumpToExactMatch = false;
+            bool m_pendingJump = false;
+            bool m_hasForwardCached = false;
+            bool m_cachingDisabled = false;  // New flag to disable caching
+            
+            //bool m_hasRenderedCache = false;
+
+            // Stack variables for hot path - reused to avoid allocations
+            u32 scrollbarHeight;
+            u32 scrollbarOffset;
+            u32 prevOffset;
+            static constexpr float SCROLLBAR_X_OFFSET = 21.0f;
+            static constexpr float SCROLLBAR_Y_OFFSET = 3.0f;
+            static constexpr float SCROLLBAR_HEIGHT_TRIM = 6.0f;
+            
+            //static constexpr float smoothingFactor = 0.15f;
+            //static constexpr float dampingFactor = 0.3f;
+            static constexpr float TABLE_SCROLL_STEP_SIZE = 10;
+            static constexpr float TABLE_SCROLL_STEP_SIZE_CLICK = 22;
+            static constexpr float BOTTOM_PADDING = 7.0f;
+            static constexpr float VIEW_CENTER_OFFSET = 7.0f;
+
+            u64 m_lastScrollTime = 0;
+
+            float m_scrollVelocity = 0.0f;
+            
+            bool m_touchScrollActive = false;
+
+            enum class NavigationResult {
+                None,
+                Success,
+                HitBoundary,
+                Wrapped
+            };
+            
+            bool m_hasWrappedInCurrentSequence = false;
+            NavigationResult m_lastNavigationResult = NavigationResult::None;
+        
+        private:
+
+            // Thread-safe versions (handle their own locking)
+            static void clearStaticCache(bool preservePointers = false) {
+                std::lock_guard<std::mutex> lock(s_lastFrameItemsMutex);
+                clearStaticCacheUnsafe(preservePointers);
+            }
+            
+            void cacheCurrentFrame(bool preservePointers = false) {
+                std::lock_guard<std::mutex> lock(s_lastFrameItemsMutex);
+                cacheCurrentFrameUnsafe(preservePointers);
+            }
+
+        
+            static void clearStaticCacheUnsafe(bool preservePointers = false) {
+                //std::lock_guard<std::mutex> lock(s_lastFrameItemsMutex);
+                if (!preservePointers) {
+                    // Normal case: delete elements and clear
+                    for (Element* el : s_lastFrameItems) {
+                        delete el;
+                    }
+                }
+            
+                s_lastFrameItems.clear();
+                //s_lastFrameItems.shrink_to_fit();
+            
+                // CRITICAL: Always reset these, even for forward cache!
+                s_hasValidFrame.store(false, std::memory_order_release);  // This MUST be false after clearing
+                s_isForwardCache.store(false, std::memory_order_release);
+                
+                s_cachedTopBound.store(0, std::memory_order_release);
+                s_cachedBottomBound.store(0, std::memory_order_release);
+                s_cachedHeight.store(0, std::memory_order_release);
+                s_cachedListHeight.store(0, std::memory_order_release);
+                s_cachedActualContentBottom.store(0, std::memory_order_release);
+            
+                s_shouldDrawScrollbar.store(false, std::memory_order_release);
+                s_cachedScrollbarHeight.store(0, std::memory_order_release);
+                s_cachedScrollbarOffset.store(0, std::memory_order_release);
+                s_cachedScrollbarX.store(0, std::memory_order_release);
+                s_cachedScrollbarY.store(0, std::memory_order_release);
+            }
+                    
+            void cacheCurrentFrameUnsafe(bool preservePointers = false) {
+                //std::lock_guard<std::mutex> lock(s_lastFrameItemsMutex);
+                if (!preservePointers) {
+                    for (Element* el : s_lastFrameItems) delete el;
+                }
+            
+                s_lastFrameItems = m_items;
+            
+                // Store new cache values using atomic stores
+                s_cachedTopBound.store(getTopBound(), std::memory_order_release);
+                s_cachedBottomBound.store(getBottomBound(), std::memory_order_release);
+                s_cachedHeight.store(getHeight(), std::memory_order_release);
+                s_cachedListHeight.store(m_listHeight, std::memory_order_release);
+            
+                if (preservePointers)
+                    s_isForwardCache.store(true, std::memory_order_release);
+            
+                s_hasValidFrame.store(true, std::memory_order_release);
+            }
+            
+            void cacheCurrentScrollbar() {
+                const s32 cachedHeight = s_cachedHeight.load(std::memory_order_acquire);
+                const s32 cachedListHeight = s_cachedListHeight.load(std::memory_order_acquire);
+            
+                s_shouldDrawScrollbar.store((cachedListHeight > cachedHeight), std::memory_order_release);
+            
+                if (s_shouldDrawScrollbar.load(std::memory_order_acquire)) {
+                    const float viewHeight  = static_cast<float>(cachedHeight);
+                    const float totalHeight = static_cast<float>(cachedListHeight);
+                    const u32   maxScroll   = std::max(static_cast<u32>(totalHeight - viewHeight), 1u);
+            
+                    u32 scrollbarHeight = std::min(
+                        static_cast<u32>((viewHeight * viewHeight) / totalHeight),
+                        static_cast<u32>(viewHeight)
+                    );
+            
+                    u32 scrollbarOffset = std::min(
+                        static_cast<u32>((m_offset / maxScroll) * (viewHeight - scrollbarHeight)),
+                        static_cast<u32>(viewHeight - scrollbarHeight) // corrected potential bug
+                    );
+            
+                    scrollbarHeight -= SCROLLBAR_HEIGHT_TRIM;
+            
+                    s_cachedScrollbarHeight.store(scrollbarHeight, std::memory_order_release);
+                    s_cachedScrollbarOffset.store(scrollbarOffset, std::memory_order_release);
+                    s_cachedScrollbarX.store(getRightBound() + SCROLLBAR_X_OFFSET, std::memory_order_release);
+                    s_cachedScrollbarY.store(getY() + scrollbarOffset + SCROLLBAR_Y_OFFSET, std::memory_order_release);
+                }
+            }
+                                                
+            void renderCachedFrame(gfx::Renderer* renderer) {
+                const s32 cachedTopBound    = s_cachedTopBound.load(std::memory_order_acquire);
+                const s32 cachedBottomBound = s_cachedBottomBound.load(std::memory_order_acquire);
+                const s32 cachedHeight      = s_cachedHeight.load(std::memory_order_acquire);
+            
+                renderer->enableScissoring(getLeftBound(), cachedTopBound - 8, getWidth() + 8, cachedHeight + 14);
+            
+                for (Element* entry : s_lastFrameItems) {
+                    if (entry &&
+                        entry->getBottomBound() > cachedTopBound &&
+                        entry->getTopBound() < cachedBottomBound) {
+                        entry->frame(renderer);
+                    }
+                }
+            
+                renderer->disableScissoring();
+            
+                if (s_shouldDrawScrollbar.load(std::memory_order_acquire)) {
+                    const u32 scrollbarX      = s_cachedScrollbarX.load(std::memory_order_acquire);
+                    const u32 scrollbarY      = s_cachedScrollbarY.load(std::memory_order_acquire);
+                    const u32 scrollbarHeight = s_cachedScrollbarHeight.load(std::memory_order_acquire);
+            
+                    renderer->drawRect(scrollbarX, scrollbarY, 5, scrollbarHeight, a(trackBarColor));
+                    renderer->drawCircle(scrollbarX + 2, scrollbarY, 2, true, a(trackBarColor));
+                    renderer->drawCircle(scrollbarX + 2, scrollbarY + scrollbarHeight, 2, true, a(trackBarColor));
+                }
+            }
+            
+
+            void clearItems() {
+
+                for (Element* item : m_items) delete item;
+                m_items = {};
+                //m_items.clear();
+                //m_items.shrink_to_fit();
+                m_offset = 0;
+                m_focusedIndex = 0;
+                invalidate();
+                m_clearList = false;
+                actualItemCount = 0;
+            }
+            
+            void addPendingItems() {
+                for (auto [index, element] : m_itemsToAdd) {
+                    element->invalidate();
+                    if (index >= 0 && static_cast<size_t>(index) < m_items.size()) {
+                        m_items.insert(m_items.begin() + index, element);
+                    } else {
+                        m_items.push_back(element);
+                    }
+                }
+                m_itemsToAdd = {};
+                //m_itemsToAdd.clear();
+                //m_itemsToAdd.shrink_to_fit();
+                invalidate();
+                updateScrollOffset();
+            }
+            
+            void removePendingItems() {
+                //size_t index;
+                for (Element* element : m_itemsToRemove) {
+                    auto it = std::find(m_items.begin(), m_items.end(), element);
+                    if (it != m_items.end()) {
+                        const size_t index = static_cast<size_t>(it - m_items.begin());
+                        m_items.erase(it);
+                        if (m_focusedIndex >= index && m_focusedIndex > 0) {
+                            --m_focusedIndex;
+                        }
+                        delete element;
+                    }
+                }
+                m_itemsToRemove = {};
+                //m_itemsToRemove.clear();
+                //m_itemsToRemove.shrink_to_fit();
+                invalidate();
+                updateScrollOffset();
+            }
+
+            void purgePendingItems() {
+                for (auto& [_, element] : m_itemsToAdd) {
+                    if (element) { element->invalidate(); delete element; }
+                }
+                m_itemsToAdd = {};
+                //m_itemsToAdd.clear();
+                //m_itemsToAdd.shrink_to_fit();
+                
+                //size_t index;
+                for (Element* element : m_itemsToRemove) {
+                    auto it = std::find(m_items.begin(), m_items.end(), element);
+                    if (it != m_items.end()) {
+                        //index = static_cast<std::size_t>(it - m_items.begin());
+                        const u16 index16 = static_cast<u16>(static_cast<std::size_t>(it - m_items.begin()));
+                        element->invalidate();
+                        delete element;
+                        m_items.erase(it);
+            
+                        constexpr u16 noFocus = static_cast<u16>(0xFFFF);
+                        if (m_focusedIndex == index16)
+                            m_focusedIndex = noFocus;
+                        else if (m_focusedIndex != noFocus && m_focusedIndex > index16)
+                            --m_focusedIndex;
+                    }
+                }
+                m_itemsToRemove = {};
+               //m_itemsToRemove.clear();
+               //m_itemsToRemove.shrink_to_fit();
+            
+                invalidate();
+                updateScrollOffset();
+            }
+
+            
+            void drawScrollbar(gfx::Renderer* renderer, s32 height) {
+                const float viewHeight = static_cast<float>(height);
+                const float totalHeight = static_cast<float>(m_listHeight);
+                const u32 maxScrollableHeight = std::max(static_cast<u32>(totalHeight - viewHeight), 1u);
+                
+                scrollbarHeight = std::min(static_cast<u32>((viewHeight * viewHeight) / totalHeight), 
+                                         static_cast<u32>(viewHeight));
+                
+                scrollbarOffset = std::min(static_cast<u32>((m_offset / maxScrollableHeight) * (viewHeight - scrollbarHeight)), 
+                                         static_cast<u32>(viewHeight - scrollbarHeight));
+        
+                const u32 scrollbarX = getRightBound() + SCROLLBAR_X_OFFSET;
+                const u32 scrollbarY = getY() + scrollbarOffset+SCROLLBAR_Y_OFFSET;
+
+                scrollbarHeight -= SCROLLBAR_HEIGHT_TRIM; // shorten very slightly
+        
+                renderer->drawRect(scrollbarX, scrollbarY, 5, scrollbarHeight, a(trackBarColor));
+                renderer->drawCircle(scrollbarX + 2, scrollbarY, 2, true, a(trackBarColor));
+                renderer->drawCircle(scrollbarX + 2, scrollbarY + scrollbarHeight, 2, true, a(trackBarColor));
+            }
+
+            
+            inline void updateScrollAnimation() {
+                if (Element::getInputMode() == InputMode::Controller) {
+                    // Clear touch flag when in controller mode
+                    m_touchScrollActive = false;
+                    
+                    // Calculate distance to target
+                    const float diff = m_nextOffset - m_offset;
+                    const float distance = std::abs(diff);
+                    
+                    // ENHANCED BOUNDARY SNAPPING: More aggressive snapping for boundaries
+                    if (distance < 1.0f) {  // Increased threshold from 0.5f
+                        m_offset = m_nextOffset;
+                        m_scrollVelocity = 0.0f;
+                        s_currentScrollVelocity.store(m_scrollVelocity, std::memory_order_release);
+                        
+                        if (prevOffset != m_offset) {
+                            invalidate();
+                            prevOffset = m_offset;
+                        }
+                        return;
+                    }
+                    
+                    // SPECIAL CASE: If target is exactly 0 or max, be more aggressive
+                    const float maxOffset = static_cast<float>(m_listHeight - getHeight());
+                    if (m_nextOffset == 0.0f || m_nextOffset == maxOffset) {
+                        if (distance < 3.0f) {  // Larger snap zone for boundaries
+                            m_offset = m_nextOffset;
+                            m_scrollVelocity = 0.0f;
+                            s_currentScrollVelocity.store(m_scrollVelocity, std::memory_order_release);
+                            
+                            if (prevOffset != m_offset) {
+                                invalidate();
+                                prevOffset = m_offset;
+                            }
+
+                            return;
+                        }
+                    }
+                    
+                    // Emergency correction if item is going out of bounds
+                    if (m_focusedIndex < m_items.size()) {
+                        float itemTop = 0.0f;
+                        for (size_t i = 0; i < m_focusedIndex; ++i) {
+                            itemTop += m_items[i]->getHeight();
+                        }
+                        const float itemBottom = itemTop + m_items[m_focusedIndex]->getHeight();
+                        
+                        //float viewTop = m_offset;
+                        const float viewBottom = m_offset + getHeight();
+                        
+                        if (itemTop < m_offset || itemBottom > viewBottom) {
+                            const float emergencySpeed = (itemBottom < m_offset || itemTop > viewBottom) ? 0.9f : 0.6f;
+                            
+                            m_offset += diff * emergencySpeed;
+                            m_scrollVelocity = diff * 0.3f;
+                            s_currentScrollVelocity.store(m_scrollVelocity, std::memory_order_release);
+                            
+                            if (prevOffset != m_offset) {
+                                invalidate();
+                                prevOffset = m_offset;
+                            }
+                            return;
+                        }
+                    }
+                    
+                    // Rest of your existing smooth scrolling logic...
+                    const bool isLargeJump = distance > getHeight() * 1.5f;
+                    const bool isFromRest = std::abs(m_scrollVelocity) < 2.0f;
+                    
+                    if (isLargeJump && isFromRest) {
+                        static constexpr float gentleAcceleration = 0.08f;
+                        static constexpr float gentleDamping = 0.85f;
+                        
+                        const float targetVelocity = diff * gentleAcceleration;
+                        m_scrollVelocity += (targetVelocity - m_scrollVelocity) * gentleDamping;
+                    } else {
+                        const float urgency = std::min(distance / getHeight(), 1.0f);
+                        const float accelerationFactor = 0.18f + (0.24f * urgency);
+                        const float dampingFactor = 0.48f - (0.18f * urgency);
+                        
+                        const float targetVelocity = diff * accelerationFactor;
+                        m_scrollVelocity += (targetVelocity - m_scrollVelocity) * dampingFactor;
+                    }
+                    
+                    // Apply velocity
+                    m_offset += m_scrollVelocity;
+                    
+                    // ENHANCED overshoot prevention with better boundary handling
+                    if ((m_scrollVelocity > 0 && m_offset > m_nextOffset) ||
+                        (m_scrollVelocity < 0 && m_offset < m_nextOffset)) {
+                        m_offset = m_nextOffset;
+                        m_scrollVelocity = 0.0f;
+                    }
+                    
+                    // ADDITIONAL: Force exact boundary values
+                    if (m_nextOffset == 0.0f && m_offset < 1.0f) {
+                        m_offset = 0.0f;
+                        m_scrollVelocity = 0.0f;
+                    } else if (m_nextOffset == maxOffset && m_offset > maxOffset - 1.0f) {
+                        m_offset = maxOffset;
+                        m_scrollVelocity = 0.0f;
+                    }
+
+                    s_currentScrollVelocity.store(m_scrollVelocity, std::memory_order_release);
+                
+                } else if (Element::getInputMode() == InputMode::TouchScroll) {
+                    // Your existing touch scroll logic...
+                    m_offset = m_nextOffset;
+                    m_scrollVelocity = 0.0f;
+                    
+                    if (m_touchScrollActive) {
+                        const float viewCenter = m_offset + (getHeight() / 2.0f);
+                        float accumHeight = 0.0f;
+                        
+                        //float itemHeight, itemCenter;
+                        for (size_t i = 0; i < m_items.size(); ++i) {
+                            const float itemHeight = m_items[i]->getHeight();
+                            const float itemCenter = accumHeight + (itemHeight / 2.0f);
+                            
+                            if (itemCenter >= viewCenter) {
+                                m_focusedIndex = i;
+                                break;
+                            }
+                            
+                            accumHeight += itemHeight;
+                        }
+                    }
+                }
+                
+                if (prevOffset != m_offset) {
+                    invalidate();
+                    prevOffset = m_offset;
+                }
+            }
+                                                        
+            Element* handleInitialFocus(Element* oldFocus) {
+                const size_t itemCount = m_items.size();
+                if (itemCount == 0) return nullptr;
+                
+                size_t startIndex = 0;
+                
+                // Calculate starting index based on current scroll position
+                if (!oldFocus && m_offset > 0) {
+                    float elementHeight = 0.0f;
+                    const size_t maxIndex = itemCount - 1;
+                    while (elementHeight < m_offset && startIndex < maxIndex) {
+                        elementHeight += m_items[startIndex]->getHeight();
+                        ++startIndex;
+                    }
+                }
+                
+                //resetNavigationState();
+                
+                // Save current offset to prevent scroll jumping
+                const float savedOffset = m_offset;
+                const float savedNextOffset = m_nextOffset;
+                
+                // Single loop with wraparound logic - visits each item exactly once
+                for (size_t count = 0; count < itemCount; ++count) {
+                    const size_t i = (startIndex + count) % itemCount;
+                    
+                    if (!m_items[i]->isTable()) {
+                        Element* const newFocus = m_items[i]->requestFocus(oldFocus, FocusDirection::None);
+                        if (newFocus && newFocus != oldFocus) {
+                            m_focusedIndex = i;
+                            m_offset = savedOffset;
+                            m_nextOffset = savedNextOffset;
+                            return newFocus;
+                        }
+                    }
+                }
+                
+                return nullptr;
+            }
+            
+                                                                                                                                            
+            inline Element* handleDownFocus(Element* oldFocus) {
+                static bool triggerShakeOnce = true;
+                const bool atBottom = isAtBottom();
+                updateHoldState();
+                
+                // Check if the next item is non-focusable BEFORE we do anything else
+                if (m_focusedIndex + 1 < int(m_items.size())) {
+                    Element* nextItem = m_items[m_focusedIndex + 1];
+                    if (!nextItem->m_isItem) {
+                        isTableScrolling.store(true, std::memory_order_release);
+                    }
+                }
+                
+                // If holding and at boundary, try to scroll first
+                if (m_isHolding && m_stoppedAtBoundary && !atBottom) {
+                    scrollDown();
+                    m_stoppedAtBoundary = false;
+                    return oldFocus;
+                }
+                
+                Element* result = navigateDown(oldFocus);
+                
+                if (result != oldFocus) {
+                    m_lastNavigationResult = NavigationResult::Success;
+                    m_stoppedAtBoundary = false;
+                    triggerShakeOnce = true;  // This resets it for THIS function
+                    //triggerRumbleClick.store(true, std::memory_order_release);
+                    //triggerNavigationSound.store(true, std::memory_order_release);
+                    triggerNavigationFeedback();
+                    return result;
+                }
+                
+                // Check if we can still scroll down
+                if (!atBottom) {
+                    scrollDown();
+                    triggerShakeOnce = true;  // ADDED: Reset when scrolling away from boundary
+                    return oldFocus;
+                }
+                
+                // At absolute bottom - check for wrapping (single tap)
+                if (!m_isHolding && !m_hasWrappedInCurrentSequence && atBottom) {
+                    s_directionalKeyReleased.store(false, std::memory_order_release);
+                    m_hasWrappedInCurrentSequence = true;
+                    m_lastNavigationResult = NavigationResult::Wrapped;
+                    
+                    //if (result->m_isItem) {
+                    triggerShakeOnce = true;  // Reset when wrapping
+                    //triggerRumbleClick.store(true, std::memory_order_release);
+                    //triggerNavigationSound.store(true, std::memory_order_release);
+                    //}
+                    return handleJumpToTop(oldFocus);
+                }
+                
+                // Set boundary flag (for holding)
+                if (m_isHolding && atBottom) {
+                    m_stoppedAtBoundary = true;
+                    if (triggerShakeOnce) {
+                        if (result->m_isItem) {
+                            triggerRumbleClick.store(true, std::memory_order_release);
+                            triggerWallSound.store(true, std::memory_order_release);
+                            
+                            for (ssize_t i = static_cast<ssize_t>(m_focusedIndex); i >= 0; --i) {
+                                if (m_items[i]->m_isItem) {
+                                    m_items[i]->shakeHighlight(FocusDirection::Down);
+                                    break;
+                                }
+                            }
+                        } else {
+                            triggerRumbleClick.store(true, std::memory_order_release);
+                            triggerWallSound.store(true, std::memory_order_release);
+                        }
+                        triggerShakeOnce = false;
+                    }
+                } else if (!m_isHolding) {
+                    triggerShakeOnce = true;
+                }
+            
+                m_lastNavigationResult = NavigationResult::HitBoundary;
+                return oldFocus;
+            }
+            
+            inline Element* handleUpFocus(Element* oldFocus) {
+                static bool triggerShakeOnce = true;
+                const bool atTop = isAtTop();
+                updateHoldState();
+                
+                // Check if the previous item is non-focusable BEFORE we do anything else
+                if (m_focusedIndex > 0) {
+                    Element* prevItem = m_items[m_focusedIndex - 1];
+                    if (prevItem->isTable()) {
+                        isTableScrolling.store(true, std::memory_order_release);
+                    }
+                }
+                
+                // If holding and at boundary, try to scroll first
+                if (m_isHolding && m_stoppedAtBoundary && !atTop) {
+                    scrollUp();
+                    m_stoppedAtBoundary = false;
+                    return oldFocus;
+                }
+                
+                Element* result = navigateUp(oldFocus);
+                
+                if (result != oldFocus) {
+                    m_lastNavigationResult = NavigationResult::Success;
+                    m_stoppedAtBoundary = false;
+                    triggerShakeOnce = true;  // This resets it for THIS function
+                    //triggerRumbleClick.store(true, std::memory_order_release);
+                    //triggerNavigationSound.store(true, std::memory_order_release);
+                    triggerNavigationFeedback();
+                    return result;
+                }
+                
+                // Check if we can still scroll up
+                if (!atTop) {
+                    scrollUp();
+                    triggerShakeOnce = true;  // ADDED: Reset when scrolling away from boundary
+                    return oldFocus;
+                }
+                
+                // At absolute top - check for wrapping (single tap)
+                if (!m_isHolding && !m_hasWrappedInCurrentSequence && atTop) {
+                    s_directionalKeyReleased.store(false, std::memory_order_release);
+                    m_hasWrappedInCurrentSequence = true;
+                    m_lastNavigationResult = NavigationResult::Wrapped;
+                    
+                    //if (result->m_isItem) {
+                    triggerShakeOnce = true;  // Reset when wrapping
+                    //triggerRumbleClick.store(true, std::memory_order_release);
+                    //triggerNavigationSound.store(true, std::memory_order_release);
+                    //}
+                    return handleJumpToBottom(oldFocus);
+                }
+                
+                // Set boundary flag (for holding)
+                if (m_isHolding && atTop) {
+                    m_stoppedAtBoundary = true;
+                    if (triggerShakeOnce) {
+                        if (result->m_isItem) {
+                            triggerRumbleClick.store(true, std::memory_order_release);
+                            triggerWallSound.store(true, std::memory_order_release);
+                            
+                            for (size_t i = m_focusedIndex; i < m_items.size(); ++i) {
+                                if (m_items[i]->m_isItem) {
+                                    m_items[i]->shakeHighlight(FocusDirection::Up);
+                                    break;
+                                }
+                            }
+                        } else {
+                            triggerRumbleClick.store(true, std::memory_order_release);
+                            triggerWallSound.store(true, std::memory_order_release);
+                        }
+                        triggerShakeOnce = false;
+                    }
+                } else if (!m_isHolding) {
+                    triggerShakeOnce = true;
+                }
+                
+                m_lastNavigationResult = NavigationResult::HitBoundary;
+                return oldFocus;
+            }
+            
+            
+            inline bool isAtTop() {
+                if (m_items.empty()) return true;
+                
+                // Check if we're at scroll position 0
+                if (m_offset != 0.0f) return false;
+                
+                // Even at offset 0, check if the first item is actually visible
+                // This handles cases where the first item might be partially above viewport
+                if (!m_items.empty()) {
+                    Element* firstItem = m_items[0];
+                    return firstItem->getTopBound() >= getTopBound();
+                }
+                
+                return true;
+            }
+            
+            inline bool isAtBottom() {
+                if (m_items.empty()) return true;
+                
+                // First check: are we at the maximum scroll offset?
+                //float maxOffset = static_cast<float>(m_listHeight - getHeight());
+                const bool atMaxOffset = (m_offset >= static_cast<float>(m_listHeight - getHeight()));
+                
+                // If list is shorter than viewport, we're always at bottom
+                if (m_listHeight <= getHeight()) return true;
+                
+                // If we're not at max offset, we're definitely not at bottom
+                if (!atMaxOffset) return false;
+                
+                // At max offset - now check if the last item is actually fully visible
+                // This prevents wrap-around when there's still content below viewport
+                if (!m_items.empty()) {
+                    Element* lastItem = m_items.back();
+                    //s32 lastItemBottom = lastItem->getBottomBound();
+                    //s32 viewportBottom = getBottomBound();
+                    
+                    // We're truly at bottom only if:
+                    // 1. We're at max scroll offset AND
+                    // 2. The last item's bottom is at or above the viewport bottom
+                    return lastItem->getBottomBound() <= getBottomBound();
+                }
+                
+                return atMaxOffset;
+            }
+
+            // Helper to check if there are any focusable items
+            inline bool hasAnyFocusableItems() {
+                for (size_t i = 0; i < m_items.size(); ++i) {
+                    //Element* test = m_items[i]->requestFocus(nullptr, FocusDirection::None);
+                    //
+                    //if (test) return true;
+                    if (m_items[i]->m_isItem) return true;
+                }
+                return false;
+            }
+
+            
+            inline void updateHoldState() {
+                const u64 currentTime = armTicksToNs(armGetSystemTick());
+                if ((m_lastNavigationTime != 0 && (currentTime - m_lastNavigationTime) < HOLD_THRESHOLD_NS)) {
+                    m_isHolding = true;
+                } else {
+                    m_isHolding = false;
+                    m_stoppedAtBoundary = false;
+                    m_hasWrappedInCurrentSequence = false;
+                }
+                m_lastNavigationTime = currentTime;
+            }
+        
+            inline void resetNavigationState() {
+                m_hasWrappedInCurrentSequence = false;
+                m_lastNavigationResult = NavigationResult::None;
+                m_isHolding = false;
+                m_stoppedAtBoundary = false;
+                m_lastNavigationTime = 0;
+            }
+
+            inline Element* handleJumpToItem(Element* oldFocus) {
+                resetNavigationState();
+                invalidate();
+                
+                const bool needsScroll = m_listHeight > getHeight();
+                const float viewHeight = static_cast<float>(getHeight());
+                const float maxOffset = needsScroll ? m_listHeight - viewHeight : 0.0f;
+                
+                float h = 0.0f;
+                
+                //float itemHeight, itemCenterPos, viewportCenter, idealOffset;
+
+                for (size_t i = 0; i < m_items.size(); ++i) {
+                    m_focusedIndex = i;
+                    
+                    Element* newFocus = m_items[i]->requestFocus(oldFocus, FocusDirection::Down);
+                    if (newFocus && newFocus != oldFocus && m_items[i]->matchesJumpCriteria(m_jumpToText, m_jumpToValue, m_jumpToExactMatch)) {
+                        // CHANGED: Calculate center of the item and center it in viewport
+                        const float itemHeight = m_items[i]->getHeight();
+                        // For middle items, use centering logic
+                        const float itemCenterPos = h + (itemHeight / 2.0f);  // FIXED: Use center, not bottom
+                        const float viewportCenter = viewHeight / 2.0f + VIEW_CENTER_OFFSET + 0.5f; // Same offset as updateScrollOffset
+                        //float idealOffset = itemCenterPos - viewportCenter;
+                        
+                        // Clamp to valid bounds (same as updateScrollOffset)
+                        const float idealOffset = std::max(0.0f, std::min(itemCenterPos - viewportCenter, maxOffset));
+                        
+                        // Set both current and target offset
+                        m_offset = m_nextOffset = idealOffset;
+                        
+                        return newFocus;
+                    }
+                    
+                    h += m_items[i]->getHeight();
+                }
+                
+                // No match found
+                return handleInitialFocus(oldFocus);
+            }
+        
+            // Core navigation logic
+            // Optimized version with variable definitions pulled outside the loop
+            inline Element* navigateDown(Element* oldFocus) {
+                size_t searchIndex = m_focusedIndex + 1;
+                
+                // If currently on a table that needs more scrolling
+                if (m_focusedIndex < m_items.size() && m_items[m_focusedIndex]->isTable()) {
+                    Element* currentTable = m_items[m_focusedIndex];
+                    if (currentTable->getBottomBound() > getBottomBound()) {
+                        isTableScrolling.store(true, std::memory_order_release);
+                        scrollDown();
+                        return oldFocus;
+                    }
+                }
+                
+                // Cache invariant values (legitimate optimization)
+                const s32 viewBottom = getBottomBound();
+                const float containerHeight = getHeight();
+                const float offsetPlusHeight = m_offset + containerHeight;
+                
+                while (searchIndex < m_items.size()) {
+                    Element* item = m_items[searchIndex];
+                    m_focusedIndex = searchIndex;
+                    
+                    if (item->isTable()) {
+                        // Table needs scrolling
+                        const s32 tableBottom = item->getBottomBound();
+                        if (tableBottom > viewBottom) {
+                            isTableScrolling.store(true, std::memory_order_release);
+                            scrollDown();
+                            return oldFocus;
+                        }
+                        searchIndex++;
+                        continue;
+                    }
+                    
+                    // Try to focus this item
+                    Element* newFocus = item->requestFocus(oldFocus, FocusDirection::Down);
+                    if (newFocus && newFocus != oldFocus) {
+                        // ONLY reset when we successfully focus something
+                        isTableScrolling.store(false, std::memory_order_release);
+                        updateScrollOffset();
+                        return newFocus;
+                    } else {
+                        // Non-focusable item (gap/header)
+                        const float itemBottom = calculateItemPosition(searchIndex) + item->getHeight();
+                        if (itemBottom > offsetPlusHeight) {
+                            isTableScrolling.store(true, std::memory_order_release);  // Treat gaps/headers like tables
+                            scrollDown();
+                            return oldFocus;
+                        }
+                        searchIndex++;
+                    }
+                }
+                
+                return oldFocus;
+            }
+            
+            inline Element* navigateUp(Element* oldFocus) {
+                if (m_focusedIndex == 0) return oldFocus;
+                ssize_t searchIndex = static_cast<ssize_t>(m_focusedIndex) - 1;
+                
+                // If currently on a table that needs more scrolling
+                if (m_focusedIndex < m_items.size() && m_items[m_focusedIndex]->isTable()) {
+                    Element* currentTable = m_items[m_focusedIndex];
+                    if (currentTable->getTopBound() < getTopBound()) {
+                        isTableScrolling.store(true, std::memory_order_release);
+                        scrollUp();
+                        return oldFocus;
+                    }
+                }
+                
+                // Cache invariant values (legitimate optimization)
+                const s32 viewTop = getTopBound();
+                const float offset = m_offset;  // Cache in case m_offset is volatile or has accessor overhead
+                
+                while (searchIndex >= 0) {
+                    Element* item = m_items[searchIndex];
+                    m_focusedIndex = static_cast<size_t>(searchIndex);
+                    
+                    if (item->isTable()) {
+                        // Table needs scrolling
+                        const s32 tableTop = item->getTopBound();
+                        if (tableTop < viewTop) {
+                            isTableScrolling.store(true, std::memory_order_release);
+                            scrollUp();
+                            return oldFocus;
+                        }
+                        searchIndex--;
+                        continue;
+                    }
+                    
+                    // Try to focus this item
+                    Element* newFocus = item->requestFocus(oldFocus, FocusDirection::Up);
+                    if (newFocus && newFocus != oldFocus) {
+                        // ONLY reset when we successfully focus something
+                        isTableScrolling.store(false, std::memory_order_release);
+                        updateScrollOffset();
+                        return newFocus;
+                    } else {
+                        // Non-focusable item (gap/header)
+                        const float itemTop = calculateItemPosition(static_cast<size_t>(searchIndex));
+                        if (itemTop < offset) {
+                            isTableScrolling.store(true, std::memory_order_release);  // Treat gaps/headers like tables
+                            scrollUp();
+                            return oldFocus;
+                        }
+                        searchIndex--;
+                    }
+                }
+                
+                return oldFocus;
+            }
+            
+            // Helper method to calculate an item's position in the list
+            inline float calculateItemPosition(size_t index) {
+                float position = 0.0f;
+                for (size_t i = 0; i < index && i < m_items.size(); ++i) {
+                    position += m_items[i]->getHeight();
+                }
+                return position;
+            }
+
+            // Enhanced scroll methods that ensure we always reach boundaries
+            //inline bool canScrollDown() {
+            //    if (m_listHeight <= getHeight()) return false;
+            //    float maxOffset = static_cast<float>(m_listHeight - getHeight());
+            //    return (m_nextOffset < maxOffset - 0.1f) && (m_offset < maxOffset - 0.1f);
+            //}
+            //
+            //inline bool canScrollUp() {
+            //    return (m_nextOffset > 0.1f) || (m_offset > 0.1f);
+            //}
+            
+            
+            //u64 m_lastScrollNavigationTime = 0;
+            //bool m_isHoldingOnTable = false;
+
+            // Enhanced scroll methods that snap to exact boundaries
+            inline void scrollDown() {
+                const u64 currentTime = armTicksToNs(armGetSystemTick());
+                
+                // Calculate frame time
+                float frameTimeMs = 0.0f;
+                if (m_lastScrollTime != 0) {
+                    frameTimeMs = static_cast<float>(currentTime - m_lastScrollTime) / 1000000.0f;
+                }
+                m_lastScrollTime = currentTime;
+                
+                // Use original frame-based amounts
+                float scrollAmount = m_isHolding ? TABLE_SCROLL_STEP_SIZE : TABLE_SCROLL_STEP_SIZE_CLICK;
+                
+                // If frame took longer than ~33ms (slower than 30fps), scale up the scroll amount
+                if (frameTimeMs > 33.0f) {
+                    const float scaleFactor = frameTimeMs / 16.67f;  // 16.67ms = 60fps baseline
+                    scrollAmount *= std::min(scaleFactor, 3.0f);  // Cap at 3x for very slow frames
+                }
+                
+                m_nextOffset = std::min(m_nextOffset + scrollAmount, 
+                                       static_cast<float>(m_listHeight - getHeight()));
+            }
+            
+            inline void scrollUp() {
+                const u64 currentTime = armTicksToNs(armGetSystemTick());
+                
+                // Calculate frame time
+                float frameTimeMs = 0.0f;
+                if (m_lastScrollTime != 0) {
+                    frameTimeMs = static_cast<float>(currentTime - m_lastScrollTime) / 1000000.0f;
+                }
+                m_lastScrollTime = currentTime;
+                
+                // Use original frame-based amounts
+                float scrollAmount = m_isHolding ? TABLE_SCROLL_STEP_SIZE : TABLE_SCROLL_STEP_SIZE_CLICK;
+                
+                // If frame took longer than ~33ms (slower than 30fps), scale up the scroll amount
+                if (frameTimeMs > 33.0f) {
+                    const float scaleFactor = frameTimeMs / 16.67f;  // 16.67ms = 60fps baseline
+                    scrollAmount *= std::min(scaleFactor, 3.0f);  // Cap at 3x for very slow frames
+                }
+                
+                m_nextOffset = std::max(m_nextOffset - scrollAmount, 0.0f);
+            }
+
+            // Jump to Bottom (original behavior + fixed trigger condition)
+            Element* handleJumpToBottom(Element* oldFocus) {
+                if (m_items.empty()) return oldFocus;
+                
+                invalidate();
+                resetNavigationState();
+                jumpToBottom.store(false, std::memory_order_release);
+                
+                const float targetOffset = (m_listHeight > getHeight()) ?
+                                           static_cast<float>(m_listHeight - getHeight()) : 0.0f;
+                static constexpr float tolerance = 5.0f;
+            
+                // Find last focusable item (search backward)
+                size_t lastFocusableIndex = m_items.size();
+                for (ssize_t i = static_cast<ssize_t>(m_items.size()) - 1; i >= 0; --i) {
+                    Element* test = m_items[i]->requestFocus(nullptr, FocusDirection::None);
+                    if (test) {
+                        lastFocusableIndex = static_cast<size_t>(i);
+                        break;
+                    }
+                }
+            
+                if (lastFocusableIndex == m_items.size())
+                    return oldFocus; // no focusable items
+            
+                bool alreadyAtBottom = (m_focusedIndex == lastFocusableIndex) &&
+                                       (std::abs(m_nextOffset - targetOffset) <= tolerance);
+                if (alreadyAtBottom)
+                    return oldFocus;
+            
+                const float oldOffset = m_nextOffset;
+                m_focusedIndex = lastFocusableIndex;
+                m_nextOffset = targetOffset;
+            
+                Element* newFocus = m_items[lastFocusableIndex]->requestFocus(oldFocus, FocusDirection::None);
+            
+                // Trigger feedback if offset or focus changed
+                if ((newFocus && newFocus != oldFocus) ||
+                    (std::abs(m_nextOffset - oldOffset) > tolerance)) {
+                    //triggerRumbleClick.store(true, std::memory_order_release);
+                    //triggerNavigationSound.store(true, std::memory_order_release);
+                    triggerNavigationFeedback();
+                }
+            
+                return newFocus ? newFocus : oldFocus;
+            }
+            
+            
+            // Jump to Top (original behavior + fixed trigger condition)
+            Element* handleJumpToTop(Element* oldFocus) {
+                if (m_items.empty()) return oldFocus;
+            
+                invalidate();
+                resetNavigationState();
+                jumpToTop.store(false, std::memory_order_release);
+            
+                static constexpr float targetOffset = 0.0f;
+                static constexpr float tolerance = 5.0f;
+            
+                // Find first focusable item (search forward)
+                size_t firstFocusableIndex = m_items.size();
+                for (size_t i = 0; i < m_items.size(); ++i) {
+                    Element* test = m_items[i]->requestFocus(nullptr, FocusDirection::None);
+                    if (test) {
+                        firstFocusableIndex = i;
+                        break;
+                    }
+                }
+            
+                if (firstFocusableIndex == m_items.size())
+                    return oldFocus; // no focusable items
+            
+                bool alreadyAtTop = (m_focusedIndex == firstFocusableIndex) &&
+                                    (std::abs(m_nextOffset - targetOffset) <= tolerance);
+                if (alreadyAtTop)
+                    return oldFocus;
+            
+                const float oldOffset = m_nextOffset;
+                m_focusedIndex = firstFocusableIndex;
+                m_nextOffset = targetOffset;
+            
+                Element* newFocus = m_items[firstFocusableIndex]->requestFocus(oldFocus, FocusDirection::None);
+            
+                // Trigger feedback if offset or focus changed
+                if ((newFocus && newFocus != oldFocus) ||
+                    (std::abs(m_nextOffset - oldOffset) > tolerance)) {
+                    //triggerRumbleClick.store(true, std::memory_order_release);
+                    //triggerNavigationSound.store(true, std::memory_order_release);
+                    triggerNavigationFeedback();
+                }
+            
+                return newFocus ? newFocus : oldFocus;
+            }
+            
+            Element* handleSkipDown(Element* oldFocus) {
+                if (m_items.empty()) return oldFocus;
+            
+                invalidate();
+                resetNavigationState();
+            
+                const float targetOffset = (m_listHeight > getHeight()) ?
+                                           static_cast<float>(m_listHeight - getHeight()) : 0.0f;
+                static constexpr float tolerance = 0.0f;
+            
+                // Find last focusable item
+                size_t lastFocusableIndex = m_items.size();
+                for (ssize_t i = static_cast<ssize_t>(m_items.size()) - 1; i >= 0; --i) {
+                    Element* test = m_items[i]->requestFocus(nullptr, FocusDirection::None);
+                    if (test) {
+                        lastFocusableIndex = static_cast<size_t>(i);
+                        break;
+                    }
+                }
+            
+                const bool alreadyAtBottom = (lastFocusableIndex < m_items.size()) &&
+                                       (m_focusedIndex == lastFocusableIndex) &&
+                                       (std::abs(m_nextOffset - targetOffset) <= tolerance);
+            
+                if (alreadyAtBottom) return oldFocus;
+            
+                const float viewHeight = static_cast<float>(getHeight());
+                const float maxOffset = (m_listHeight > viewHeight) ? static_cast<float>(m_listHeight - viewHeight) : 0.0f;
+                const float targetViewportTop = std::min(m_offset + viewHeight, maxOffset);
+            
+                const float actualTravelDistance = targetViewportTop - m_offset;
+                const bool traveledFullViewport = (actualTravelDistance >= viewHeight - tolerance);
+                const float targetViewportCenter = targetViewportTop + (viewHeight / 2.0f + VIEW_CENTER_OFFSET);
+            
+                float itemTop = 0.0f;
+                size_t targetIndex = 0;
+                bool foundFocusable = false;
+                float bestDistance = std::numeric_limits<float>::max();
+            
+                for (size_t i = 0; i < m_items.size(); ++i) {
+                    const float itemHeight = m_items[i]->getHeight();
+                    const float itemCenter = itemTop + (itemHeight / 2.0f);
+                    const float distanceFromCenter = std::abs(itemCenter - targetViewportCenter);
+            
+                    Element* test = m_items[i]->requestFocus(nullptr, FocusDirection::None);
+                    if (test && test->m_isItem && distanceFromCenter < bestDistance) {
+                        targetIndex = i;
+                        bestDistance = distanceFromCenter;
+                        foundFocusable = true;
+                    }
+            
+                    itemTop += itemHeight;
+                }
+            
+                const float oldOffset = m_nextOffset;
+            
+                if (foundFocusable) {
+                    bool nearBottom = true;
+                    if (targetIndex > m_focusedIndex && traveledFullViewport) {
+                        m_focusedIndex = targetIndex;
+                        nearBottom = false;
+                    }
+                    isTableScrolling.store(false, std::memory_order_release);
+                    updateScrollOffset();
+            
+                    Element* newFocus = m_items[targetIndex]->requestFocus(oldFocus, FocusDirection::None);
+            
+                    if (newFocus && newFocus != oldFocus && !nearBottom && traveledFullViewport) {
+                        //triggerRumbleClick.store(true, std::memory_order_release);
+                        //triggerNavigationSound.store(true, std::memory_order_release);
+                        triggerNavigationFeedback();
+                        return newFocus;
+                    } else {
+                        return handleJumpToBottom(oldFocus);
+                    }
+                } else {
+                    // Scroll viewport even if no focusable items
+                    isTableScrolling.store(true, std::memory_order_release);
+                    m_nextOffset = targetViewportTop;
+            
+                    if (std::abs(m_nextOffset - oldOffset) > 0.0f) {
+                        //triggerRumbleClick.store(true, std::memory_order_release);
+                        //triggerNavigationSound.store(true, std::memory_order_release);
+                        triggerNavigationFeedback();
+                    }
+            
+                    // Focus last visible focusable item
+                    float searchItemTop = 0.0f;
+                    size_t lastVisibleFocusable = m_focusedIndex;
+            
+                    for (size_t i = 0; i < m_items.size(); ++i) {
+                        const float itemHeight = m_items[i]->getHeight();
+                        const float itemBottom = searchItemTop + itemHeight;
+            
+                        if (searchItemTop >= targetViewportTop + viewHeight) break;
+            
+                        if (itemBottom > targetViewportTop) {
+                            Element* test = m_items[i]->requestFocus(nullptr, FocusDirection::None);
+                            if (test && test->m_isItem) lastVisibleFocusable = i;
+                        }
+            
+                        searchItemTop += itemHeight;
+                    }
+            
+                    if (lastVisibleFocusable != m_focusedIndex) {
+                        m_focusedIndex = lastVisibleFocusable;
+                        Element* newFocus = m_items[m_focusedIndex]->requestFocus(oldFocus, FocusDirection::None);
+                        if (newFocus && newFocus != oldFocus) {
+                            //triggerRumbleClick.store(true, std::memory_order_release);
+                            //triggerNavigationSound.store(true, std::memory_order_release);
+                            triggerNavigationFeedback();
+                            return newFocus;
+                        }
+                    }
+                }
+            
+                return oldFocus;
+            }
+            
+            Element* handleSkipUp(Element* oldFocus) {
+                if (m_items.empty()) return oldFocus;
+            
+                invalidate();
+                resetNavigationState();
+            
+                static constexpr float targetOffset = 0.0f;
+                static constexpr float tolerance = 0.0f;
+            
+                // Find first focusable item
+                size_t firstFocusableIndex = m_items.size();
+                for (size_t i = 0; i < m_items.size(); ++i) {
+                    Element* test = m_items[i]->requestFocus(nullptr, FocusDirection::None);
+                    if (test) {
+                        firstFocusableIndex = i;
+                        break;
+                    }
+                }
+            
+                const bool alreadyAtTop = (firstFocusableIndex < m_items.size()) &&
+                                    (m_focusedIndex == firstFocusableIndex) &&
+                                    (std::abs(m_nextOffset - targetOffset) <= tolerance);
+            
+                if (alreadyAtTop) return oldFocus;
+            
+                const float viewHeight = static_cast<float>(getHeight());
+                const float targetViewportTop = std::max(0.0f, m_offset - viewHeight);
+            
+                const float actualTravelDistance = m_offset - targetViewportTop;
+                const bool traveledFullViewport = (actualTravelDistance >= viewHeight - tolerance);
+                const float targetViewportCenter = targetViewportTop + (viewHeight / 2.0f + VIEW_CENTER_OFFSET);
+            
+                float itemTop = 0.0f;
+                size_t targetIndex = 0;
+                bool foundFocusable = false;
+                float bestDistance = std::numeric_limits<float>::max();
+            
+                for (size_t i = 0; i < m_items.size(); ++i) {
+                    const float itemHeight = m_items[i]->getHeight();
+                    const float itemCenter = itemTop + (itemHeight / 2.0f);
+                    const float distanceFromCenter = std::abs(itemCenter - targetViewportCenter);
+            
+                    Element* test = m_items[i]->requestFocus(nullptr, FocusDirection::None);
+                    if (test && test->m_isItem && distanceFromCenter < bestDistance) {
+                        targetIndex = i;
+                        bestDistance = distanceFromCenter;
+                        foundFocusable = true;
+                    }
+            
+                    itemTop += itemHeight;
+                }
+            
+                const float oldOffset = m_nextOffset;
+            
+                if (foundFocusable) {
+                    bool nearTop = true;
+                    if (targetIndex < m_focusedIndex && traveledFullViewport) {
+                        m_focusedIndex = targetIndex;
+                        nearTop = false;
+                    }
+                    isTableScrolling.store(false, std::memory_order_release);
+                    updateScrollOffset();
+            
+                    Element* newFocus = m_items[targetIndex]->requestFocus(oldFocus, FocusDirection::None);
+            
+                    if (newFocus && newFocus != oldFocus && !nearTop && traveledFullViewport) {
+                        //triggerRumbleClick.store(true, std::memory_order_release);
+                        //triggerNavigationSound.store(true, std::memory_order_release);
+                        triggerNavigationFeedback();
+                        return newFocus;
+                    } else {
+                        return handleJumpToTop(oldFocus);
+                    }
+                } else {
+                    // Scroll viewport even if no focusable items
+                    isTableScrolling.store(true, std::memory_order_release);
+                    m_nextOffset = targetViewportTop;
+            
+                    if (std::abs(m_nextOffset - oldOffset) > 0.0f) {
+                        //triggerRumbleClick.store(true, std::memory_order_release);
+                        //triggerNavigationSound.store(true, std::memory_order_release);
+                        triggerNavigationFeedback();
+                    }
+            
+                    // Focus first visible focusable item
+                    float searchItemTop = 0.0f;
+                    size_t firstVisibleFocusable = m_focusedIndex;
+            
+                    for (size_t i = 0; i < m_items.size(); ++i) {
+                        const float itemHeight = m_items[i]->getHeight();
+                        const float itemBottom = searchItemTop + itemHeight;
+            
+                        if (itemBottom > targetViewportTop && searchItemTop < targetViewportTop + viewHeight) {
+                            Element* test = m_items[i]->requestFocus(nullptr, FocusDirection::None);
+                            if (test && test->m_isItem) {
+                                firstVisibleFocusable = i;
+                                break;
+                            }
+                        }
+            
+                        searchItemTop += itemHeight;
+                    }
+            
+                    if (firstVisibleFocusable != m_focusedIndex) {
+                        m_focusedIndex = firstVisibleFocusable;
+                        Element* newFocus = m_items[m_focusedIndex]->requestFocus(oldFocus, FocusDirection::None);
+                        if (newFocus && newFocus != oldFocus) {
+                            //triggerRumbleClick.store(true, std::memory_order_release);
+                            //triggerNavigationSound.store(true, std::memory_order_release);
+                            triggerNavigationFeedback();
+                            return newFocus;
+                        }
+                    }
+                }
+            
+                return oldFocus;
+            }
+            
+                        
+            inline void initializePrefixSums() {
+                prefixSums.clear();
+                prefixSums.resize(m_items.size() + 1, 0.0f);
+                
+                for (size_t i = 1; i < prefixSums.size(); ++i) {
+                    prefixSums[i] = prefixSums[i - 1] + m_items[i - 1]->getHeight();
+                }
+            }
+            
+            
+            // Keep your EXACT original updateScrollOffset() method unchanged:
+            virtual void updateScrollOffset() {
+                if (Element::getInputMode() != InputMode::Controller) return;
+                
+                if (m_listHeight <= getHeight()) {
+                    m_nextOffset = m_offset = 0;
+                    return;
+                }
+                
+                // Calculate position of focused item
+                float itemPos = 0.0f;
+                for (size_t i = 0; i < m_focusedIndex && i < m_items.size(); ++i) {
+                    itemPos += m_items[i]->getHeight();
+                }
+                
+                // Get the focused item's height
+                const float itemHeight = (m_focusedIndex < m_items.size()) ? m_items[m_focusedIndex]->getHeight() : 0.0f;
+                
+                // Calculate viewport height
+                const float viewHeight = static_cast<float>(getHeight());
+            
+                // FIXED: Special handling for the first focusable item
+                //if (m_focusedIndex == 0 || itemPos <= viewHeight * 0.3f) {
+                //    // For items at the very top or very close to top, snap to absolute zero
+                //    m_nextOffset = 0.0f;
+                //    return;
+                //}
+                
+                // FIXED: Special handling for items near the bottom
+                const float maxOffset = static_cast<float>(m_listHeight - getHeight());
+                //const float itemBottom = itemPos + itemHeight;
+                //if (itemBottom >= m_listHeight - (viewHeight * 0.3f)) {
+                //    // For items near the bottom, snap to max offset
+                //    m_nextOffset = maxOffset;
+                //    return;
+                //}
+                
+                // For middle items, use centering logic
+                const float itemCenterPos = itemPos + (itemHeight / 2.0f);
+                const float viewportCenter = viewHeight / 2.0f + VIEW_CENTER_OFFSET + 0.5f; // add slight offset
+                //float idealOffset = itemCenterPos - viewportCenter;
+                
+                // Clamp to valid scroll bounds
+                const float idealOffset = std::max(0.0f, std::min(itemCenterPos - viewportCenter, maxOffset));
+                
+                // Set target for smooth animation
+                m_nextOffset = idealOffset;
+
+                //m_nextOffset = std::max(0.0f, std::min(itemPos + itemHeight * 0.5f - (viewHeight * 0.5f + 7.0f), maxOffset));
+            }
+            
+        };
+
+
+        
+
+        /**
+         * @brief A item that goes into a list
+         *
+         */
+        class ListItem : public Element {
+        public:
+            u32 width, height;
+            u64 m_touchStartTime_ns;
+            bool isLocked = false;
+        
+        #if IS_LAUNCHER_DIRECTIVE
+            ListItem(const std::string& text, const std::string& value = "", bool isMini = false, bool useScriptKey = true)
+                : Element(), m_text(text), m_value(value), m_listItemHeight(isMini ? tsl::style::MiniListItemDefaultHeight : tsl::style::ListItemDefaultHeight) {
+                m_isItem = true;
+                m_flags.m_useScriptKey = useScriptKey;
+                m_flags.m_useClickAnimation = true;
+                m_text_clean = m_text;
+                ult::removeTag(m_text_clean);
+                applyInitialTranslations();
+                if (!value.empty()) applyInitialTranslations(true);
+            }
+        #else
+            ListItem(const std::string& text, const std::string& value = "", bool isMini = false)
+                : Element(), m_text(text), m_value(value), m_listItemHeight(isMini ? tsl::style::MiniListItemDefaultHeight : tsl::style::ListItemDefaultHeight) {
+                m_isItem = true;
+                m_flags.m_useClickAnimation = true;
+                m_text_clean = m_text;
+                ult::removeTag(m_text_clean);
+                applyInitialTranslations();
+                if (!value.empty()) applyInitialTranslations(true);
+            }
+        #endif
+        
+            virtual ~ListItem() = default;
+        
+            virtual void draw(gfx::Renderer *renderer) override {
+                const bool useClickTextColor = m_flags.m_touched && Element::getInputMode() == InputMode::Touch && ult::touchInBounds;
+                
+                if (useClickTextColor) [[unlikely]] {
+                    auto drawFunc = ult::expandedMemory ? &gfx::Renderer::drawRectMultiThreaded : &gfx::Renderer::drawRect;
+                    (renderer->*drawFunc)(this->getX() + 4, this->getY(), this->getWidth() - 8, this->getHeight(), aWithOpacity(clickColor));
+                }
+        
+                const s16 yOffset = ((tsl::style::ListItemDefaultHeight - m_listItemHeight) >> 1) + 1;
+        
+                if (!m_maxWidth) [[unlikely]] {
+                    calculateWidths(renderer);
+                }
+        
+                // Optimized separator drawing
+                const float topBound = this->getTopBound();
+                const float bottomBound = this->getBottomBound();
+                static float lastBottomBound = 0.0f;
+                
+                if (lastBottomBound != topBound) [[unlikely]] {
+                    renderer->drawRect(this->getX() + 4, topBound, this->getWidth() + 10, 1, a(separatorColor));
+                }
+                renderer->drawRect(this->getX() + 4, bottomBound, this->getWidth() + 10, 1, a(separatorColor));
+                lastBottomBound = bottomBound;
+            
+            #if IS_LAUNCHER_DIRECTIVE
+                static const std::vector<std::string> specialChars = {ult::STAR_SYMBOL};
+            #else
+                static const std::vector<std::string> specialChars = {ult::DIVIDER_SYMBOL};
+            #endif
+                // Fast path for non-truncated text
+                if (!m_flags.m_truncated) [[likely]] {
+                    const Color textColor = m_focused
+                        ? (!ult::useSelectionText
+                            ? (m_flags.m_hasCustomTextColor ? m_customTextColor : defaultTextColor)
+                            : (useClickTextColor
+                                ? clickTextColor
+                                : selectedTextColor))
+                        : (m_flags.m_hasCustomTextColor
+                            ? m_customTextColor
+                            : (useClickTextColor
+                                ? clickTextColor
+                                : defaultTextColor));
+                #if IS_LAUNCHER_DIRECTIVE
+                    renderer->drawStringWithColoredSections(m_text_clean, false, specialChars, this->getX() + 19, this->getY() + 45 - yOffset, 23,
+                        textColor, (m_focused ? starColor : selectionStarColor));
+                #else
+                    renderer->drawStringWithColoredSections(m_text_clean, false, specialChars, this->getX() + 19, this->getY() + 45 - yOffset, 23,
+                        textColor, textSeparatorColor);
+                #endif
+                } else {
+                    drawTruncatedText(renderer, yOffset, useClickTextColor, specialChars);
+                }
+        
+                if (!m_value.empty()) [[likely]] {
+                    drawValue(renderer, yOffset, useClickTextColor);
+                }
+            }
+        
+            virtual void layout(u16 parentX, u16 parentY, u16 parentWidth, u16 parentHeight) override {
+                this->setBoundaries(this->getX() + 3, this->getY(), this->getWidth() + 9, m_listItemHeight);
+            }
+        
+            virtual bool onClick(u64 keys) override {
+                if (keys & KEY_A) [[likely]] {
+                    triggerRumbleClick.store(true, std::memory_order_release);
+
+                    if (isLocked)
+                        triggerWallSound.store(true, std::memory_order_release);
+                    else if (m_value.find(ult::CAPITAL_ON_STR) != std::string::npos)
+                        triggerOffSound.store(true, std::memory_order_release);
+                    else if (m_value.find(ult::CAPITAL_OFF_STR) != std::string::npos)
+                        triggerOnSound.store(true, std::memory_order_release);
+                    else
+                        triggerEnterSound.store(true, std::memory_order_release);
+                    
+                    if (m_flags.m_useClickAnimation)
+                        triggerClickAnimation();
+                } else if (keys & (KEY_UP | KEY_DOWN | KEY_LEFT | KEY_RIGHT)) [[unlikely]] {
+                    m_clickAnimationProgress = 0;
+                }
+                //if (keys & KEY_B) {
+                //    triggerRumbleDoubleClick.store(true, std::memory_order_release);
+                //    triggerExitSound.store(true, std::memory_order_release);
+                //    
+                //}
+                return Element::onClick(keys);
+            }
+        
+            virtual bool onTouch(TouchEvent event, s32 currX, s32 currY, s32 prevX, s32 prevY, s32 initialX, s32 initialY) override {
+                if (event == TouchEvent::Touch) [[likely]] {
+                    if ((m_flags.m_touched = inBounds(currX, currY))) [[likely]] {
+                        m_touchStartTime_ns = armTicksToNs(armGetSystemTick());
+                    }
+                    return false;
+                }
+        
+                if (event == TouchEvent::Release && m_flags.m_touched) [[likely]] {
+                    m_flags.m_touched = false;
+                    if (Element::getInputMode() == InputMode::Touch) [[likely]] {
+        #if IS_LAUNCHER_DIRECTIVE
+                        const s64 keyToUse = determineKeyOnTouchRelease(m_flags.m_useScriptKey);
+        #else
+                        const s64 keyToUse = determineKeyOnTouchRelease(false);
+        #endif
+                        const bool handled = onClick(keyToUse);
+                        m_clickAnimationProgress = 0;
+                        return handled;
+                    }
+                }
+                return false;
+            }
+            
+            virtual void setFocused(bool state) override {
+                if (state != m_focused) [[likely]] {
+                    m_flags.m_scroll = false;
+                    m_scrollOffset = 0;
+                    timeIn_ns = armTicksToNs(armGetSystemTick());
+                    Element::setFocused(state);
+                }
+            }
+        
+            virtual inline Element* requestFocus(Element *oldFocus, FocusDirection direction) override {
+                return this;
+            }
+        
+            inline void setText(const std::string& text) {
+                if (m_text != text) [[likely]] {
+                    m_text = text;
+                    m_text_clean = m_text;
+                    ult::removeTag(m_text_clean);
+                    resetTextProperties();
+                    applyInitialTranslations();
+                }
+            }
+        
+            inline void setValue(const std::string& value, bool faint = false) {
+                if (m_value != value || m_flags.m_faint != faint) [[likely]] {
+                    m_value = value;
+                    m_flags.m_faint = faint;
+                    m_maxWidth = 0;
+                    if (!value.empty()) applyInitialTranslations(true);
+                }
+            }
+            
+            inline void setTextColor(Color color) {
+                m_customTextColor = color;
+                m_flags.m_hasCustomTextColor = true;
+            }
+            
+            inline void setValueColor(Color color) {
+                m_customValueColor = color;
+                m_flags.m_hasCustomValueColor = true;
+            }
+            
+            inline void clearTextColor() {
+                m_flags.m_hasCustomTextColor = false;
+            }
+            
+            inline void clearValueColor() {
+                m_flags.m_hasCustomValueColor = false;
+            }
+
+            inline void disableClickAnimation() {
+                m_flags.m_useClickAnimation = false;
+            }
+
+            inline void enableClickAnimation() {
+                m_flags.m_useClickAnimation = true;
+            }
+            
+            inline const std::string& getText() const noexcept {
+                return m_text;
+            }
+        
+            inline const std::string& getValue() const noexcept {
+                return m_value;
+            }
+
+            virtual bool matchesJumpCriteria(const std::string& jumpText, const std::string& jumpValue, bool exactMatch=true) const {
+                if (jumpText.empty() && jumpValue.empty()) return false;
+                
+                bool textMatches, valueMatches;
+                if (exactMatch) {
+                    textMatches = (m_text == jumpText);
+                    valueMatches = (m_value == jumpValue);
+                } else { // contains check
+                    textMatches = (m_text.find(jumpText) != std::string::npos);
+                    valueMatches = (m_value.find(jumpValue) != std::string::npos);
+                }
+                
+                if (jumpText.empty() && !jumpValue.empty())
+                    return valueMatches;
+                else if (!jumpText.empty() && jumpValue.empty())
+                    return textMatches;
+
+                return (textMatches && valueMatches);
+            }
+        
+        protected:
+            u64 timeIn_ns;
+            std::string m_text;
+            std::string m_text_clean;
+            std::string m_value;
+            std::string m_scrollText;
+            std::string m_ellipsisText;
+            u16 m_listItemHeight;  // Changed from u32 to u16
+
+            
+            // Bitfield for boolean flags - saves ~7 bytes per instance
+            struct {
+                bool m_scroll : 1;
+                bool m_truncated : 1;
+                bool m_faint : 1;
+                bool m_touched : 1;
+                bool m_hasCustomTextColor : 1;
+                bool m_hasCustomValueColor : 1;
+                bool m_useClickAnimation : 1;
+            #if IS_LAUNCHER_DIRECTIVE
+                bool m_useScriptKey : 1;
+            #endif
+            } m_flags = {};
+        
+            Color m_customTextColor = {0};
+            Color m_customValueColor = {0};
+        
+            float m_scrollOffset = 0.0f;
+            u16 m_maxWidth = 0;     // Changed from u32 to u16
+            u16 m_textWidth = 0;     // Changed from u32 to u16
+        
+        private:
+            // Consolidated scroll constants struct
+            struct ScrollConstants {
+                double totalCycleDuration;
+                double delayDuration;
+                double scrollDuration;
+                double accelTime;
+                double constantVelocityTime;
+                double maxVelocity;
+                double accelDistance;
+                double constantVelocityDistance;
+                double minScrollDistance;
+                double invAccelTime;
+                double invDecelTime;
+                double invBillion;
+                bool initialized = false;
+            };
+            
+            void applyInitialTranslations(bool isValue = false) {
+                std::string& target = isValue ? m_value : m_text_clean;
+                ult::applyLangReplacements(target, isValue);
+                ult::convertComboToUnicode(target);
+                
+                #ifdef UI_OVERRIDE_PATH
+                {
+                    const std::string originalKey = target;
+                    
+                    std::shared_lock<std::shared_mutex> readLock(tsl::gfx::s_translationCacheMutex);
+                    auto translatedIt = ult::translationCache.find(originalKey);
+                    if (translatedIt != ult::translationCache.end()) {
+                        target = translatedIt->second;
+                    } else {
+                        readLock.unlock();
+                        std::unique_lock<std::shared_mutex> writeLock(tsl::gfx::s_translationCacheMutex);
+                        
+                        translatedIt = ult::translationCache.find(originalKey);
+                        if (translatedIt != ult::translationCache.end()) {
+                            target = translatedIt->second;
+                        } else {
+                            ult::translationCache[originalKey] = originalKey;
+                        }
+                    }
+                }
+                #endif
+            }
+        
+            void calculateWidths(gfx::Renderer* renderer) {
+                if (m_value.empty()) {
+                    m_maxWidth = getWidth() - 62;
+                } else {
+                    m_maxWidth = getWidth() - renderer->getTextDimensions(m_value, false, 20).first - 66;
+                }
+            
+                const u16 width = renderer->getTextDimensions(m_text_clean, false, 23).first;
+                m_flags.m_truncated = width > m_maxWidth + 20;
+            
+                if (m_flags.m_truncated) [[unlikely]] {
+                    m_scrollText.clear();
+                    m_scrollText.reserve(m_text_clean.size() * 2 + 8);
+                    
+                    m_scrollText.append(m_text_clean).append("        ");
+                    m_textWidth = renderer->getTextDimensions(m_scrollText, false, 23).first;
+                    m_scrollText.append(m_text_clean);
+                    
+                    m_ellipsisText = renderer->limitStringLength(m_text_clean, false, 23, m_maxWidth);
+                } else {
+                    m_textWidth = width;
+                }
+            }
+        
+            void drawTruncatedText(gfx::Renderer* renderer, s32 yOffset, bool useClickTextColor, const std::vector<std::string>& specialSymbols = {}) {
+                if (m_focused) {
+                    renderer->enableScissoring(getX() + 6, 97, m_maxWidth + (m_value.empty() ? 49 : 27), tsl::cfg::FramebufferHeight - 170);
+                #if IS_LAUNCHER_DIRECTIVE
+                    renderer->drawStringWithColoredSections(m_scrollText, false, specialSymbols, getX() + 19 - static_cast<s32>(m_scrollOffset), getY() + 45 - yOffset, 23,
+                        !ult::useSelectionText ? defaultTextColor: (useClickTextColor ? clickTextColor : selectedTextColor), (starColor));
+                #else
+                    renderer->drawStringWithColoredSections(m_scrollText, false, specialSymbols, getX() + 19 - static_cast<s32>(m_scrollOffset), getY() + 45 - yOffset, 23,
+                        !ult::useSelectionText ? defaultTextColor: (useClickTextColor ? clickTextColor : selectedTextColor), (textSeparatorColor));
+                #endif
+                    renderer->disableScissoring();
+                    handleScrolling();
+                } else {
+                #if IS_LAUNCHER_DIRECTIVE
+                    renderer->drawStringWithColoredSections(m_ellipsisText, false, specialSymbols, getX() + 19, getY() + 45 - yOffset, 23,
+                        m_flags.m_hasCustomTextColor ? m_customTextColor : (useClickTextColor ? clickTextColor : defaultTextColor), (starColor));
+                #else
+                    renderer->drawStringWithColoredSections(m_ellipsisText, false, specialSymbols, getX() + 19, getY() + 45 - yOffset, 23,
+                        m_flags.m_hasCustomTextColor ? m_customTextColor : (useClickTextColor ? clickTextColor : defaultTextColor), (textSeparatorColor));
+                #endif
+                }
+            }
+                    
+            void handleScrolling() {
+                static ScrollConstants sc;
+                static u64 lastUpdateTime = 0;
+                static float cachedScrollOffset = 0.0f;
+                
+                const u64 currentTime_ns = armTicksToNs(armGetSystemTick());
+                const u64 elapsed_ns = currentTime_ns - timeIn_ns;
+                
+                if (!sc.initialized || sc.minScrollDistance != static_cast<double>(m_textWidth)) {
+                    sc.delayDuration = 2.0;
+                    static constexpr double pauseDuration = 1.0;
+                    sc.maxVelocity = 166.0;
+                    sc.accelTime = 0.5;
+                    static constexpr double decelTime = 0.5;
+                    
+                    sc.minScrollDistance = static_cast<double>(m_textWidth);
+                    sc.accelDistance = 0.5 * sc.maxVelocity * sc.accelTime;
+                    const double decelDistance = 0.5 * sc.maxVelocity * decelTime;
+                    sc.constantVelocityDistance = std::max(0.0, sc.minScrollDistance - sc.accelDistance - decelDistance);
+                    sc.constantVelocityTime = sc.constantVelocityDistance / sc.maxVelocity;
+                    sc.scrollDuration = sc.accelTime + sc.constantVelocityTime + decelTime;
+                    sc.totalCycleDuration = sc.delayDuration + sc.scrollDuration + pauseDuration;
+                    
+                    sc.invAccelTime = 1.0 / sc.accelTime;
+                    sc.invDecelTime = 1.0 / decelTime;
+                    sc.invBillion = 1.0 / 1000000000.0;
+                    
+                    sc.initialized = true;
+                }
+                
+                const double elapsed_seconds = static_cast<double>(elapsed_ns) * sc.invBillion;
+                
+                if (currentTime_ns - lastUpdateTime >= 8333333ULL) {
+                    const double cyclePosition = std::fmod(elapsed_seconds, sc.totalCycleDuration);
+                    
+                    if (cyclePosition < sc.delayDuration) [[likely]] {
+                        cachedScrollOffset = 0.0f;
+                    } else if (cyclePosition < sc.delayDuration + sc.scrollDuration) [[likely]] {
+                        const double scrollTime = cyclePosition - sc.delayDuration;
+                        double distance;
+                        
+                        if (scrollTime <= sc.accelTime) {
+                            const double t = scrollTime * sc.invAccelTime;
+                            const double smoothT = t * t;
+                            distance = smoothT * sc.accelDistance;
+                        } else if (scrollTime <= sc.accelTime + sc.constantVelocityTime) {
+                            const double constantTime = scrollTime - sc.accelTime;
+                            distance = sc.accelDistance + (constantTime * sc.maxVelocity);
+                        } else {
+                            const double decelStartTime = sc.accelTime + sc.constantVelocityTime;
+                            const double t = (scrollTime - decelStartTime) * sc.invDecelTime;
+                            const double oneMinusT = 1.0 - t;
+                            const double smoothT = 1.0 - oneMinusT * oneMinusT;
+                            distance = sc.accelDistance + sc.constantVelocityDistance + (smoothT * (sc.minScrollDistance - sc.accelDistance - sc.constantVelocityDistance));
+                        }
+                        
+                        cachedScrollOffset = static_cast<float>(distance < sc.minScrollDistance ? distance : sc.minScrollDistance);
+                    } else [[unlikely]] {
+                        cachedScrollOffset = static_cast<float>(m_textWidth);
+                    }
+                    
+                    lastUpdateTime = currentTime_ns;
+                }
+                
+                m_scrollOffset = cachedScrollOffset;
+                
+                if (elapsed_seconds >= sc.totalCycleDuration) [[unlikely]] {
+                    timeIn_ns = currentTime_ns;
+                }
+            }
+                    
+            void drawValue(gfx::Renderer* renderer, s32 yOffset, bool useClickTextColor) {
+                const s32 xPosition = getX() + m_maxWidth + 47;
+                const s32 yPosition = getY() + 45 - yOffset-1;
+                static constexpr s32 fontSize = 20;
+        
+                static bool lastRunningInterpreter = false;
+                const auto textColor = determineValueTextColor(useClickTextColor, lastRunningInterpreter);
+        
+                if (m_value != ult::INPROGRESS_SYMBOL) [[likely]] {
+                    static const std::vector<std::string> specialChars = {ult::DIVIDER_SYMBOL};
+                    renderer->drawStringWithColoredSections(m_value, false, specialChars, xPosition, yPosition, fontSize, textColor, textSeparatorColor);
+                } else {
+                    drawThrobber(renderer, xPosition, yPosition, fontSize, textColor);
+                }
+                lastRunningInterpreter = ult::runningInterpreter.load(std::memory_order_acquire);
+            }
+                    
+            Color determineValueTextColor(bool useClickTextColor, bool lastRunningInterpreter) const {
+                if (m_focused && ult::useSelectionValue) {
+                    if (m_value == ult::DROPDOWN_SYMBOL || m_value == ult::OPTION_SYMBOL) {
+                        return useClickTextColor ? (clickTextColor) :
+                               (m_flags.m_faint ? offTextColor : (useClickTextColor ? clickTextColor : (ult::useSelectionText ? selectedTextColor : defaultTextColor)));
+                    }
+                    
+                    const bool isRunning = ult::runningInterpreter.load(std::memory_order_acquire) || lastRunningInterpreter;
+                    if (isRunning && (m_value.find(ult::DOWNLOAD_SYMBOL) != std::string::npos ||
+                                     m_value.find(ult::UNZIP_SYMBOL) != std::string::npos ||
+                                     m_value.find(ult::COPY_SYMBOL) != std::string::npos)) {
+                        return m_flags.m_faint ? offTextColor : (inprogressTextColor);
+                    }
+                    
+                    if (m_value == ult::INPROGRESS_SYMBOL) {
+                        return m_flags.m_faint ? offTextColor : (inprogressTextColor);
+                    }
+                    
+                    if (m_value == ult::CROSSMARK_SYMBOL) {
+                        return m_flags.m_faint ? offTextColor : (invalidTextColor);
+                    }
+                    
+                    return useClickTextColor ? clickTextColor : selectedValueTextColor;
+                }
+                
+                if (m_flags.m_hasCustomValueColor) {
+                    return m_customValueColor;
+                }
+                
+                if (m_value == ult::DROPDOWN_SYMBOL || m_value == ult::OPTION_SYMBOL) {
+                    return (m_focused ? (useClickTextColor ? clickTextColor : (m_flags.m_faint ? offTextColor : (ult::useSelectionText ? selectedTextColor : defaultTextColor))) :
+                           (useClickTextColor ? clickTextColor : (m_flags.m_faint ? offTextColor : defaultTextColor)));
+                }
+                
+                const bool isRunning = ult::runningInterpreter.load(std::memory_order_acquire) || lastRunningInterpreter;
+                if (isRunning && (m_value.find(ult::DOWNLOAD_SYMBOL) != std::string::npos ||
+                                 m_value.find(ult::UNZIP_SYMBOL) != std::string::npos ||
+                                 m_value.find(ult::COPY_SYMBOL) != std::string::npos)) {
+                    return m_flags.m_faint ? offTextColor : (inprogressTextColor);
+                }
+                
+                if (m_value == ult::INPROGRESS_SYMBOL) {
+                    return m_flags.m_faint ? offTextColor : (inprogressTextColor);
+                }
+                
+                if (m_value == ult::CROSSMARK_SYMBOL) {
+                    return m_flags.m_faint ? offTextColor : (invalidTextColor);
+                }
+                
+                return (m_flags.m_faint ? offTextColor : (onTextColor));
+            }
+
+            void drawThrobber(gfx::Renderer* renderer, s32 xPosition, s32 yPosition, s32 fontSize, Color textColor) {
+                static size_t throbberCounter = 0;
+                const auto& throbberSymbol = ult::THROBBER_SYMBOLS[(throbberCounter / 10) % ult::THROBBER_SYMBOLS.size()];
+                throbberCounter = (throbberCounter + 1) % (10 * ult::THROBBER_SYMBOLS.size());
+                renderer->drawString(throbberSymbol, false, xPosition, yPosition, fontSize, textColor);
+            }
+            
+            s64 determineKeyOnTouchRelease(bool useScriptKey) const {
+                const u64 touchDuration_ns = armTicksToNs(armGetSystemTick()) - m_touchStartTime_ns;
+                const float touchDurationInSeconds = static_cast<float>(touchDuration_ns) * 1e-9f;
+                
+                #if IS_LAUNCHER_DIRECTIVE
+                if (touchDurationInSeconds >= 0.7f) [[unlikely]] {
+                    ult::longTouchAndRelease.store(true, std::memory_order_release);
+                    return useScriptKey ? SCRIPT_KEY : STAR_KEY;
+                }
+                #endif
+                if (touchDurationInSeconds >= 0.3f) [[unlikely]] {
+                    ult::shortTouchAndRelease.store(true, std::memory_order_release);
+                    return useScriptKey ? SCRIPT_KEY : SETTINGS_KEY;
+                }
+                return KEY_A;
+            }
+        
+            void resetTextProperties() {
+                m_scrollText.clear();
+                m_ellipsisText.clear();
+                m_maxWidth = 0;
+            }
+        };
+        
+        class MiniListItem : public ListItem {
+        public:
+        #if IS_LAUNCHER_DIRECTIVE
+            // Constructor for MiniListItem, with no `isMini` boolean.
+            MiniListItem(const std::string& text, const std::string& value = "", bool useScriptKey = false) 
+                : ListItem(text, value, true, useScriptKey) { // Call the parent constructor with `isMini = true`
+        #else
+            MiniListItem(const std::string& text, const std::string& value = "")
+                : ListItem(text, value, true) {  // Call the parent constructor with `isMini = true`
+        #endif
+            
+                // Additional MiniListItem-specific initialization can go here, if necessary.
+            }
+            
+            // Destructor if needed (inherits default behavior from ListItem)
+            virtual ~MiniListItem() {}
+        };
+
+        /**
+         * @brief A item that goes into a list (this version uses value and faint color sourcing)
+         *
+         */
+        class ListItemV2 : public Element {
+        public:
+            u32 width, height;
+            u64 m_touchStartTime_ns;  // Track the time when touch starts
+        
+            /**
+             * @brief Constructor
+             *
+             * @param text Initial description text
+             */
+            ListItemV2(const std::string& text, const std::string& value = "", Color valueColor = onTextColor, Color faintColor = offTextColor)
+                : Element(), m_text(text), m_value(value), m_valueColor{valueColor}, m_faintColor{faintColor} {
+            }
+            virtual ~ListItemV2() {}
+        
+                    
+            virtual void draw(gfx::Renderer *renderer) override {
+                static float lastBottomBound;
+                bool useClickTextColor = false;
+                if (this->m_touched && Element::getInputMode() == InputMode::Touch) {
+                    if (ult::touchInBounds) {
+                        //renderer->drawRect(ELEMENT_BOUNDS(this), a(clickColor));
+                        renderer->drawRect( this->getX()+4, this->getY(), this->getWidth()-8, this->getHeight(), a(clickColor));
+                        useClickTextColor = true;
+                    }
+                    //renderer->drawRect(ELEMENT_BOUNDS(this), tsl::style::color::ColorClickAnimation);
+                }
+            
+                // Calculate vertical offset to center the text
+                const s32 yOffset = (tsl::style::ListItemDefaultHeight - this->m_listItemHeight) / 2;
+            
+                if (this->m_maxWidth == 0) {
+                    if (this->m_value.length() > 0) {
+                        //std::tie(width, height) = renderer->drawString(this->m_value, false, 0, 0, 20, a(tsl::style::color::ColorTransparent));
+                        //auto valueWidth = renderer->getTextDimensions(this->m_value, false, 20).first;
+                        width = renderer->getTextDimensions(this->m_value, false, 20).first;
+                        this->m_maxWidth = this->getWidth() - width - 70 +4;
+                    } else {
+                        this->m_maxWidth = this->getWidth() - 40 -10 -12;
+                    }
+                    
+                    //std::tie(width, height) = renderer->drawString(this->m_text, false, 0, 0, 23, a(tsl::style::color::ColorTransparent));
+                    //auto textWidth = renderer->getTextDimensions(this->m_text, false, 23).first;
+                    width = renderer->getTextDimensions(this->m_text, false, 23).first;
+                    this->m_trunctuated = width > this->m_maxWidth+20;
+                    
+                    if (this->m_trunctuated) {
+                        this->m_scrollText = this->m_text + "        ";
+                        //std::tie(width, height) = renderer->drawString(this->m_scrollText, false, 0, 0, 23, a(tsl::style::color::ColorTransparent));
+                        //auto scrollWidth = renderer->getTextDimensions(this->m_scrollText, false, 23).first;
+                        width = renderer->getTextDimensions(this->m_scrollText, false, 23).first;
+                        this->m_scrollText += this->m_text;
+                        this->m_textWidth = width;
+                        
+                        this->m_ellipsisText = renderer->limitStringLength(this->m_text, false, 23, this->m_maxWidth);
+                    } else {
+                        this->m_textWidth = width;
+                    }
+                }
+                
+                if (lastBottomBound !=  this->getTopBound())
+                    renderer->drawRect(this->getX()+4, this->getTopBound(), this->getWidth()+6 +4, 1, a(separatorColor));
+                renderer->drawRect(this->getX()+4, this->getBottomBound(), this->getWidth()+6 +4, 1, a(separatorColor));
+            
+                lastBottomBound = this->getBottomBound();
+                
+            
+                if (this->m_trunctuated) {
+                    if (this->m_focused) {
+                        if (this->m_value.length() > 0)
+                            renderer->enableScissoring(this->getX()+6, 97, this->m_maxWidth + 30 -3, tsl::cfg::FramebufferHeight-73-97);
+                        else
+                            renderer->enableScissoring(this->getX()+6, 97, this->m_maxWidth + 40 +9, tsl::cfg::FramebufferHeight-73-97);
+                        renderer->drawString(this->m_scrollText, false, this->getX() + 20-1 - this->m_scrollOffset, this->getY() + 45 - yOffset, 23, a(selectedTextColor));
+                        renderer->disableScissoring();
+                        
+                        // Handle scrolling with frame rate compensation
+                        const u64 currentTime_ns = armTicksToNs(armGetSystemTick());
+                        const u64 elapsed_ns = currentTime_ns - this->timeIn_ns;
+                        
+                        // Frame rate compensation - cache calculations to reduce stutter
+                        static u64 lastUpdateTime = 0;
+                        static float cachedScrollOffset = 0.0f;
+                        
+                        // Pre-compute constants as statics to avoid recalculation
+                        static bool constantsInitialized = false;
+                        static double totalCycleDuration;
+                        static double delayDuration;
+                        static double scrollDuration;
+                        static double accelTime;
+                        static double constantVelocityTime;
+                        static double maxVelocity;
+                        static double accelDistance;
+                        static double constantVelocityDistance;
+                        static double minScrollDistance;
+                        static double invAccelTime;  // 1/accelTime for multiplication instead of division
+                        static double invDecelTime;  // 1/decelTime for multiplication instead of division
+                        static double invBillion;    // 1/1000000000.0 for ns to seconds conversion
+                        
+                        if (!constantsInitialized || minScrollDistance != static_cast<double>(this->m_textWidth)) {
+                            // Constants for velocity-based scrolling
+                            delayDuration = 2.0;
+                            static constexpr double pauseDuration = 1.0;
+                            maxVelocity = 166.0;
+                            accelTime = 0.5;
+                            static constexpr double decelTime = 0.5;
+                            
+                            // Pre-calculate derived constants
+                            minScrollDistance = static_cast<double>(this->m_textWidth);
+                            accelDistance = 0.5 * maxVelocity * accelTime;
+                            const double decelDistance = 0.5 * maxVelocity * decelTime;
+                            constantVelocityDistance = std::max(0.0, minScrollDistance - accelDistance - decelDistance);
+                            constantVelocityTime = constantVelocityDistance / maxVelocity;
+                            scrollDuration = accelTime + constantVelocityTime + decelTime;
+                            totalCycleDuration = delayDuration + scrollDuration + pauseDuration;
+                            
+                            // Pre-calculate reciprocals for faster division
+                            invAccelTime = 1.0 / accelTime;
+                            invDecelTime = 1.0 / decelTime;
+                            invBillion = 1.0 / 1000000000.0;
+                            
+                            constantsInitialized = true;
+                        }
+                        
+                        // Fast ns to seconds conversion
+                        const double elapsed_seconds = static_cast<double>(elapsed_ns) * invBillion;
+                        
+                        // Update at consistent intervals regardless of frame rate
+                        if (currentTime_ns - lastUpdateTime >= 8333333ULL) { // ~120 FPS update rate
+                            // Use std::fmod for modulo - it's optimized and faster than loops
+                            const double cyclePosition = std::fmod(elapsed_seconds, totalCycleDuration);
+                            
+                            if (cyclePosition < delayDuration) {
+                                // Delay phase - no scrolling
+                                cachedScrollOffset = 0.0f;
+                            } else if (cyclePosition < delayDuration + scrollDuration) {
+                                // Scrolling phase - velocity-based movement
+                                const double scrollTime = cyclePosition - delayDuration;
+                                double distance;
+                                
+                                if (scrollTime <= accelTime) {
+                                    // Acceleration phase - quadratic ease-in
+                                    const double t = scrollTime * invAccelTime;  // Multiply instead of divide
+                                    const double smoothT = t * t;
+                                    distance = smoothT * accelDistance;
+                                } else if (scrollTime <= accelTime + constantVelocityTime) {
+                                    // Constant velocity phase
+                                    const double constantTime = scrollTime - accelTime;
+                                    distance = accelDistance + (constantTime * maxVelocity);
+                                } else {
+                                    // Deceleration phase - quadratic ease-out
+                                    const double decelStartTime = accelTime + constantVelocityTime;
+                                    const double t = (scrollTime - decelStartTime) * invDecelTime;  // Multiply instead of divide
+                                    const double oneMinusT = 1.0 - t;
+                                    const double smoothT = 1.0 - oneMinusT * oneMinusT;  // Avoid repeated calculation
+                                    distance = accelDistance + constantVelocityDistance + (smoothT * (minScrollDistance - accelDistance - constantVelocityDistance));
+                                }
+                                
+                                // Use branchless min with conditional move behavior
+                                cachedScrollOffset = static_cast<float>(distance < minScrollDistance ? distance : minScrollDistance);
+                            } else {
+                                // Pause phase - stay at end
+                                cachedScrollOffset = static_cast<float>(this->m_textWidth);
+                            }
+                            
+                            lastUpdateTime = currentTime_ns;
+                        }
+                        
+                        // Use cached value for consistent display
+                        this->m_scrollOffset = cachedScrollOffset;
+                        
+                        // Reset timer when cycle completes
+                        if (elapsed_seconds >= totalCycleDuration) {
+                            this->timeIn_ns = currentTime_ns;
+                        }
+                    } else {
+                        renderer->drawString(this->m_ellipsisText, false, this->getX() + 20-1, this->getY() + 45 - yOffset, 23, a(!useClickTextColor ? defaultTextColor : clickTextColor));
+                    }
+                } else {
+                    // Render the text with special character handling
+                #if IS_LAUNCHER_DIRECTIVE
+                    static const std::vector<std::string> specialChars = {ult::STAR_SYMBOL};
+                #else
+                    static const std::vector<std::string> specialChars = {};
+                #endif
+                    renderer->drawStringWithColoredSections(this->m_text, false, specialChars, this->getX() + 20-1, this->getY() + 45 - yOffset, 23,
+                        (this->m_focused ? (!useClickTextColor ? selectedTextColor : clickTextColor) : (!useClickTextColor ? defaultTextColor : clickTextColor)),
+                        (this->m_focused ? starColor : selectionStarColor)
+                    );
+                }
+                
+                
+                // CUSTOM SECTION START (modification for submenu footer color)
+                const s32 xPosition = this->getX() + this->m_maxWidth + 44 + 3;
+                const s32 yPosition = this->getY() + 45 - yOffset;
+                static constexpr s32 fontSize = 20;
+            
+            
+                //static bool lastRunningInterpreter = ult::runningInterpreter.load(std::memory_order_acquire);
+            
+                // Determine text color
+                const auto textColor = this->m_faint ? a(m_faintColor) : a(m_valueColor);
+                
+                if (this->m_value != ult::INPROGRESS_SYMBOL) {
+                    // Draw the string with the determined text color
+                    renderer->drawString(this->m_value, false, xPosition, yPosition, fontSize, textColor);
+                } else {
+                    static size_t throbberCounter = 0;
+
+                    
+                    // Reset counter to prevent overflow (every full cycle)
+                    if (throbberCounter >= 10 * ult::THROBBER_SYMBOLS.size()) {
+                        throbberCounter = 0;
+                    }
+                    
+                    // Get current throbber symbol (changes every 10 frames)
+                    const size_t symbolIndex = (throbberCounter / 10) % ult::THROBBER_SYMBOLS.size();
+                    const std::string& currentSymbol = ult::THROBBER_SYMBOLS[symbolIndex];
+                    
+                    // Instance-specific counter for independent throbber animation
+                    ++throbberCounter;
+
+                    renderer->drawString(currentSymbol, false, xPosition, yPosition, fontSize, textColor);
+                }
+                //lastRunningInterpreter = ult::runningInterpreter.load(std::memory_order_acquire);
+            }
+        
+            virtual void layout(u16 parentX, u16 parentY, u16 parentWidth, u16 parentHeight) override {
+                this->setBoundaries(this->getX()+2+1, this->getY(), this->getWidth()+8+1, m_listItemHeight);
+            }
+        
+            virtual bool onClick(u64 keys) override {
+                if (keys & KEY_A) {
+                    this->triggerClickAnimation();
+                }
+                else if (keys & (KEY_UP | KEY_DOWN | KEY_LEFT | KEY_RIGHT))
+                    this->m_clickAnimationProgress = 0;
+        
+                return Element::onClick(keys);
+            }
+        
+            virtual bool onTouch(TouchEvent event, s32 currX, s32 currY, s32 prevX, s32 prevY, s32 initialX, s32 initialY) override {
+                if (event == TouchEvent::Touch)
+                    this->m_touched = this->inBounds(currX, currY);
+        
+                if (event == TouchEvent::Release && this->m_touched) {
+                    this->m_touched = false;
+        
+                    if (Element::getInputMode() == InputMode::Touch) {
+                        const bool handled = this->onClick(KEY_A);
+        
+                        this->m_clickAnimationProgress = 0;
+                        return handled;
+                    }
+                }
+                
+                
+                return false;
+            }
+        
+        
+            virtual void setFocused(bool state) override {
+                this->m_scroll = false;
+                this->m_scrollOffset = 0;
+                this->timeIn_ns = armTicksToNs(armGetSystemTick());
+                Element::setFocused(state);
+            }
+        
+            virtual Element* requestFocus(Element *oldFocus, FocusDirection direction) override {
+                return this;
+            }
+        
+            /**
+             * @brief Sets the left hand description text of the list item
+             *
+             * @param text Text
+             */
+            inline void setText(const std::string& text) {
+                this->m_text = text;
+                this->m_scrollText = "";
+                this->m_ellipsisText = "";
+                this->m_maxWidth = 0;
+            }
+        
+            /**
+             * @brief Sets the right hand value text of the list item
+             *
+             * @param value Text
+             * @param faint Should the text be drawn in a glowing green or a faint gray
+             */
+            inline void setValue(const std::string& value, bool faint = false) {
+                this->m_value = value;
+                this->m_faint = faint;
+                this->m_maxWidth = 0;
+            }
+        
+            /**
+             * @brief Sets the value color
+             *
+             * @param value_color color of the value
+             */
+            inline void setValueColor(Color value_color) {
+                this->m_valueColor = value_color;
+            }
+        
+            /**
+             * @brief Sets the faint color
+             *
+             * @param faint_color color of the faint
+             */
+            inline void setFaintColor(Color faint_color) {
+                this->m_faintColor = faint_color;
+            }
+        
+            /**
+             * @brief Gets the left hand description text of the list item
+             *
+             * @return Text
+             */
+            inline const std::string& getText() const {
+                return this->m_text;
+            }
+        
+            /**
+             * @brief Gets the right hand value text of the list item
+             *
+             * @return Value
+             */
+            inline const std::string& getValue() {
+                return this->m_value;
+            }
+        
+        protected:
+            u64 timeIn_ns;
+        
+            std::string m_text;
+            std::string m_value;
+            std::string m_scrollText;
+            std::string m_ellipsisText;
+            u32 m_listItemHeight = tsl::style::ListItemDefaultHeight;
+        
+        #if IS_LAUNCHER_DIRECTIVE
+            bool m_useScriptKey = false;
+        #endif
+            Color m_valueColor;
+            Color m_faintColor;
+        
+            bool m_scroll = false;
+            bool m_trunctuated = false;
+            bool m_faint = false;
+        
+            bool m_touched = false;
+        
+            u16 m_maxScroll = 0;
+            u16 m_scrollOffset = 0;
+            u32 m_maxWidth = 0;
+            u32 m_textWidth = 0;
+            u16 m_scrollAnimationCounter = 0;
+        };
+
+        /**
+         * @brief A toggleable list item that changes the state from On to Off when the A button gets pressed
+         *
+         */
+        class ToggleListItem : public ListItem {
+        public:
+            /**
+             * @brief Constructor
+             *
+             * @param text Initial description text
+             * @param initialState Is the toggle set to On or Off initially
+             * @param onValue Value drawn if the toggle is on
+             * @param offValue Value drawn if the toggle is off
+             */
+            ToggleListItem(const std::string& text, bool initialState, const std::string& onValue = ult::ON, const std::string& offValue = ult::OFF, bool isMini = false, bool delayedHandle=false)
+                : ListItem(text, "", isMini), m_state(initialState), m_onValue(onValue), m_offValue(offValue), m_delayedHandle(delayedHandle) {
+                this->setState(this->m_state);
+            }
+            
+            virtual ~ToggleListItem() {}
+            
+            virtual bool onClick(u64 keys) override {
+
+                #if IS_LAUNCHER_DIRECTIVE
+                if (ult::runningInterpreter.load(std::memory_order_acquire))
+                    return false;
+                #endif
+
+                // Handle KEY_A for toggling
+                if (keys & KEY_A) {
+                    triggerRumbleClick.store(true, std::memory_order_release);
+                    if (!this->m_state)
+                        triggerOnSound.store(true, std::memory_order_release);
+                    else
+                        triggerOffSound.store(true, std::memory_order_release);
+                    
+                    
+                    this->m_state = !this->m_state;
+                    
+                    if (!m_delayedHandle)
+                        this->setState(this->m_state);
+                    
+                    this->m_stateChangedListener(this->m_state);
+                    
+                    
+                    return true;
+                }
+                //if (keys & KEY_B) {
+                //    triggerRumbleDoubleClick.store(true, std::memory_order_release);
+                //    triggerExitSound.store(true, std::memory_order_release);
+                //    
+                //}
+
+                #if IS_LAUNCHER_DIRECTIVE
+                // Handle SCRIPT_KEY for executing script logic
+                else if (keys & SCRIPT_KEY) {
+                    // Trigger the script key listener
+                    if (this->m_scriptKeyListener) {
+                        this->m_scriptKeyListener(this->m_state);  // Pass the current state to the script key listener
+                    }
+                    return ListItem::onClick(keys);
+                }
+                #endif
+                return false;
+            }
+            
+            /**
+             * @brief Gets the current state of the toggle
+             *
+             * @return State
+             */
+            virtual inline bool getState() {
+                return this->m_state;
+            }
+            
+            /**
+             * @brief Sets the current state of the toggle. Updates the Value
+             *
+             * @param state State
+             */
+            virtual inline void setState(bool state) {
+                #if IS_LAUNCHER_DIRECTIVE
+                if (ult::runningInterpreter.load(std::memory_order_acquire))
+                    return;
+                #endif
+
+                this->m_state = state;
+                this->setValue(state ? this->m_onValue : this->m_offValue, !state);
+            }
+            
+            /**
+             * @brief Adds a listener that gets called whenever the state of the toggle changes
+             *
+             * @param stateChangedListener Listener with the current state passed in as parameter
+             */
+            void setStateChangedListener(std::function<void(bool)> stateChangedListener) {
+                this->m_stateChangedListener = stateChangedListener;
+            }
+
+            #if IS_LAUNCHER_DIRECTIVE
+            // Attach the script key listener for SCRIPT_KEY handling
+            void setScriptKeyListener(std::function<void(bool)> scriptKeyListener) {
+                this->m_scriptKeyListener = scriptKeyListener;
+            }
+            #endif
+            
+
+        protected:
+            bool m_state = true;
+
+            std::string m_onValue, m_offValue;
+            bool m_delayedHandle = false;
+            
+            std::function<void(bool)> m_stateChangedListener = [](bool){};
+
+            #if IS_LAUNCHER_DIRECTIVE
+            std::function<void(bool)> m_scriptKeyListener = nullptr;     // Script key listener (with state)
+            #endif
+        };
+        
+        class MiniToggleListItem : public ToggleListItem {
+        public:
+            // Constructor for MiniToggleListItem, with no `isMini` boolean.
+            MiniToggleListItem(const std::string& text, bool initialState, const std::string& onValue = ult::ON, const std::string& offValue = ult::OFF)
+                : ToggleListItem(text, initialState, onValue, offValue, true) {
+            }
+            
+            // Destructor if needed (inherits default behavior from ListItem)
+            virtual ~MiniToggleListItem() {}
+        };
+
+
+        class DummyListItem : public ListItem {
+        public:
+            DummyListItem()
+                : ListItem("") { // Use an empty string for the base class constructor
+                // Set the properties to indicate it's a dummy item
+                this->m_text = "";
+                this->m_value = "";
+                this->m_maxWidth = 0;
+                this->width = 0;
+                this->height = 0;
+                m_isItem = false;
+            }
+            
+            virtual ~DummyListItem() {}
+            
+            // Override the draw method to do nothing
+            virtual void draw(gfx::Renderer* renderer) override {
+                // Intentionally left blank
+            }
+            
+            // Override the layout method to set the dimensions to zero
+            virtual void layout(u16 parentX, u16 parentY, u16 parentWidth, u16 parentHeight) override {
+                //this->setBoundaries(parentX, parentY, 0, 0); // Zero size
+                this->setBoundaries(this->getX(), this->getY(), 0, 0);
+            }
+            
+            // Override the requestFocus method to allow this item to be focusable
+            virtual inline Element* requestFocus(Element* oldFocus, FocusDirection direction) override {
+                return this; // Allow this item to be focusable
+            }
+            
+            //// Optionally override onClick and onTouch to handle interactions
+            //virtual bool onClick(u64 keys) override {
+            //    return true; // Consume the click event
+            //}
+            //
+            //virtual bool onTouch(TouchEvent event, s32 currX, s32 currY, s32 prevX, s32 prevY, s32 initialX, s32 initialY) override {
+            //    return true; // Consume the touch event
+            //}
+        };
+
+
+        class CategoryHeader : public Element {
+        public:
+            CategoryHeader(const std::string &title, bool hasSeparator = true) 
+                : m_text(title), m_hasSeparator(hasSeparator), timeIn_ns(0),
+                  m_scroll(false), m_truncated(false), m_scrollOffset(0.0f), 
+                  m_maxWidth(0), m_textWidth(0) {
+                ult::applyLangReplacements(m_text);
+                ult::convertComboToUnicode(m_text);
+                m_isItem = false;
+            }
+            
+            virtual ~CategoryHeader() {}
+            
+            virtual void draw(gfx::Renderer *renderer) override {
+                static const std::vector<std::string> specialChars = {""};
+                
+                // Calculate widths if not done yet
+                if (!m_maxWidth) {
+                    calculateWidths(renderer);
+                }
+                
+                // Draw separator if needed
+                if (this->m_hasSeparator) {
+                    renderer->drawRect(this->getX()+1+1, this->getBottomBound() - 29-4, 4, 22, (headerSeparatorColor));
+                }
+                
+                // Determine text position
+                const int textX = m_hasSeparator ? (this->getX() + 15+1) : this->getX();
+                const int textY = this->getBottomBound() - 12-4;
+                
+                // Handle scrolling text if truncated
+                if (m_truncated) {
+                    if (!m_scroll) {
+                        m_scroll = true;
+                        timeIn_ns = armTicksToNs(armGetSystemTick());
+                    }
+                    
+                    // Calculate scissoring bounds that respect parent clipping
+                    const int scissorX = textX;
+                    const int scissorY = textY - 16;
+                    const int scissorWidth = m_maxWidth;
+                    const int scissorHeight = 24;
+                    
+                    // Get parent bounds (you'll need to implement this based on your parent system)
+                    // This assumes your parent has some way to get its visible bounds
+                    if (Element* parent = this->getParent()) {
+                        const int parentTop = parent->getY()-8; // or whatever method gets the top bound
+                        const int parentBottom = parent->getBottomBound(); // or equivalent
+                        const int parentLeft = parent->getX();
+                        const int parentRight = parent->getX() + parent->getWidth();
+                        
+                        // Clip scissor rectangle to parent bounds
+                        const int clipLeft = std::max(scissorX, parentLeft);
+                        const int clipRight = std::min(scissorX + scissorWidth, parentRight);
+                        const int clipTop = std::max(scissorY, parentTop);
+                        const int clipBottom = std::min(scissorY + scissorHeight, parentBottom);
+                        
+                        // Only enable scissoring if there's a visible area
+                        if (clipLeft < clipRight && clipTop < clipBottom) {
+                            renderer->enableScissoring(clipLeft, clipTop, 
+                                                     clipRight - clipLeft, 
+                                                     clipBottom - clipTop);
+                            
+                            renderer->drawStringWithColoredSections(m_scrollText, false, specialChars, 
+                                textX - static_cast<s32>(m_scrollOffset), textY, 16, 
+                                (headerTextColor), textSeparatorColor);
+                            
+                            renderer->disableScissoring();
+                        } else {
+                            // Draw normal or ellipsis text
+                            //const std::string& displayText = m_truncated ? m_ellipsisText : m_text;
+                            renderer->drawStringWithColoredSections(m_text, false, specialChars, 
+                                textX, textY, 16, (headerTextColor), textSeparatorColor);
+                        }
+                        // If completely clipped, don't draw anything
+                    } else {
+                        // Draw normal or ellipsis text
+                        //const std::string& displayText = m_truncated ? m_ellipsisText : m_text;
+                        renderer->drawStringWithColoredSections(m_text, false, specialChars, 
+                            textX, textY, 16, (headerTextColor), textSeparatorColor);
+                    }
+                    
+                    handleScrolling();
+                } else {
+                    // Draw normal or ellipsis text
+                    //const std::string& displayText = m_truncated ? m_ellipsisText : m_text;
+                    renderer->drawStringWithColoredSections(m_text, false, specialChars, 
+                        textX, textY, 16, (headerTextColor), textSeparatorColor);
+                }
+            }
+            
+            virtual void layout(u16 parentX, u16 parentY, u16 parentWidth, u16 parentHeight) override {
+                // Check if the CategoryHeader is part of a list and if it's the first entry in it, half it's height
+                if (List *list = static_cast<List*>(this->getParent()); list != nullptr) {
+                    if (list->getIndexInList(this) == 0) {
+                        this->setBoundaries(this->getX(), this->getY(), this->getWidth(), 29+4);
+                        return;
+                    }
+                }
+                this->setBoundaries(this->getX(), this->getY(), this->getWidth(), tsl::style::ListItemDefaultHeight *0.90);
+            }
+            
+            virtual bool onClick(u64 keys) {
+                return false;
+            }
+            
+            virtual Element* requestFocus(Element *oldFocus, FocusDirection direction) override {
+                return nullptr;
+            }
+            
+            virtual void setFocused(bool state) override {}
+            
+            inline void setText(const std::string &text) {
+                if (this->m_text != text) {
+                    this->m_text = text;
+                    ult::applyLangReplacements(m_text);
+                    ult::convertComboToUnicode(m_text);
+                    //resetTextProperties();
+                }
+            }
+            
+            inline const std::string& getText() const {
+                return this->m_text;
+            }
+        
+        private:
+            std::string m_text;
+            bool m_hasSeparator;
+            
+            // Scrolling properties (matching ListItem)
+            u64 timeIn_ns;
+            std::string m_scrollText;
+            //std::string m_ellipsisText;
+            bool m_scroll;
+            bool m_truncated;
+            float m_scrollOffset;
+            u32 m_maxWidth;
+            u32 m_textWidth;
+            
+
+            // Frame rate compensation - cache calculations to reduce stutter
+            u64 lastUpdateTime = 0;
+            float cachedScrollOffset = 0.0f;
+            
+            // Pre-compute constants as statics to avoid recalculation
+            bool constantsInitialized = false;
+            double totalCycleDuration;
+            double delayDuration;
+            double scrollDuration;
+            double accelTime;
+            double constantVelocityTime;
+            double maxVelocity;
+            double accelDistance;
+            double constantVelocityDistance;
+            double minScrollDistance;
+            double invAccelTime;
+            double invDecelTime;
+            double invBillion;
+
+            void calculateWidths(gfx::Renderer* renderer) {
+                // Available width (accounting for separator and margins)
+                m_maxWidth = getWidth() - (m_hasSeparator ? 20-3 : 4);
+                
+                // Get actual text width
+                const u32 width = renderer->getTextDimensions(m_text, false, 16).first;
+                m_truncated = width > m_maxWidth;
+                
+                if (m_truncated) {
+                    // Build scroll text: "text        text"
+                    m_scrollText.clear();
+                    m_scrollText.reserve(m_text.size() * 2 + 8);
+                    m_scrollText.append(m_text).append("        ");
+                    m_textWidth = renderer->getTextDimensions(m_scrollText, false, 16).first;
+                    m_scrollText.append(m_text);
+                    
+                    // Create ellipsis text
+                    //m_ellipsisText = renderer->limitStringLength(m_text, false, 16, m_maxWidth);
+                } else {
+                    m_textWidth = width;
+                }
+            }
+            
+            void handleScrolling() {
+                const u64 currentTime_ns = armTicksToNs(armGetSystemTick());
+                const u64 elapsed_ns = currentTime_ns - timeIn_ns;
+                
+                
+                if (!constantsInitialized || minScrollDistance != static_cast<double>(m_textWidth)) {
+                    // Constants for velocity-based scrolling (3 second pauses as requested)
+                    delayDuration = 3.0;  // 3 second pause at start
+                    static constexpr double pauseDuration = 2.0;  // 3 second pause at end
+                    maxVelocity = 100.0;  // Adjust for desired scroll speed
+                    accelTime = 0.5;
+                    static constexpr double decelTime = 0.5;
+                    
+                    // Pre-calculate derived constants
+                    minScrollDistance = static_cast<double>(m_textWidth);
+                    accelDistance = 0.5 * maxVelocity * accelTime;
+                    const double decelDistance = 0.5 * maxVelocity * decelTime;
+                    constantVelocityDistance = std::max(0.0, minScrollDistance - accelDistance - decelDistance);
+                    constantVelocityTime = constantVelocityDistance / maxVelocity;
+                    scrollDuration = accelTime + constantVelocityTime + decelTime;
+                    totalCycleDuration = delayDuration + scrollDuration + pauseDuration;
+                    
+                    // Pre-calculate reciprocals for faster division
+                    invAccelTime = 1.0 / accelTime;
+                    invDecelTime = 1.0 / decelTime;
+                    invBillion = 1.0 / 1000000000.0;
+                    
+                    constantsInitialized = true;
+                }
+                
+                // Fast ns to seconds conversion
+                const double elapsed_seconds = static_cast<double>(elapsed_ns) * invBillion;
+                
+                // Update at consistent intervals regardless of frame rate
+                if (currentTime_ns - lastUpdateTime >= 8333333ULL) { // ~120 FPS update rate
+                    // Use std::fmod for modulo - it's optimized and faster than loops
+                    const double cyclePosition = std::fmod(elapsed_seconds, totalCycleDuration);
+                    
+                    if (cyclePosition < delayDuration) {
+                        // Delay phase - no scrolling (3 second pause)
+                        cachedScrollOffset = 0.0f;
+                    } else if (cyclePosition < delayDuration + scrollDuration) {
+                        // Scrolling phase - velocity-based movement
+                        const double scrollTime = cyclePosition - delayDuration;
+                        double distance;
+                        
+                        if (scrollTime <= accelTime) {
+                            // Acceleration phase - quadratic ease-in
+                            const double t = scrollTime * invAccelTime;
+                            const double smoothT = t * t;
+                            distance = smoothT * accelDistance;
+                        } else if (scrollTime <= accelTime + constantVelocityTime) {
+                            // Constant velocity phase
+                            const double constantTime = scrollTime - accelTime;
+                            distance = accelDistance + (constantTime * maxVelocity);
+                        } else {
+                            // Deceleration phase - quadratic ease-out
+                            const double decelStartTime = accelTime + constantVelocityTime;
+                            const double t = (scrollTime - decelStartTime) * invDecelTime;
+                            const double oneMinusT = 1.0 - t;
+                            const double smoothT = 1.0 - oneMinusT * oneMinusT;
+                            distance = accelDistance + constantVelocityDistance + (smoothT * (minScrollDistance - accelDistance - constantVelocityDistance));
+                        }
+                        
+                        // Use branchless min
+                        cachedScrollOffset = static_cast<float>(distance < minScrollDistance ? distance : minScrollDistance);
+                    } else {
+                        // Pause phase - stay at end (3 second pause)
+                        cachedScrollOffset = static_cast<float>(m_textWidth);
+                    }
+                    
+                    lastUpdateTime = currentTime_ns;
+                }
+                
+                // Use cached value for consistent display
+                m_scrollOffset = cachedScrollOffset;
+                
+                // Reset timer when cycle completes
+                if (elapsed_seconds >= totalCycleDuration) {
+                    timeIn_ns = currentTime_ns;
+                }
+            }
+            
+            //void resetTextProperties() {
+            //    m_scrollText.clear();
+            //    m_ellipsisText.clear();
+            //    m_maxWidth = 0;
+            //}
+        };
+        
+
+        /**
+         * @brief A customizable analog trackbar going from 0% to 100% (like the brightness slider)
+         *
+         */
+        class TrackBar : public Element {
+        public:
+            /**
+             * @brief Constructor
+             *
+             * @param icon Icon shown next to the track bar
+             * @param usingStepTrackbar Whether this is a step trackbar
+             * @param usingNamedStepTrackbar Whether this is a named step trackbar
+             * @param useV2Style Whether to use V2 visual style (label + value instead of icon)
+             * @param label Label text for V2 style
+             * @param units Units text for V2 style
+             */
+            TrackBar(const char icon[3], bool usingStepTrackbar=false, bool usingNamedStepTrackbar = false, 
+                    bool useV2Style = false, const std::string& label = "", const std::string& units = "") 
+                : m_icon(icon), m_usingStepTrackbar(usingStepTrackbar), m_usingNamedStepTrackbar(usingNamedStepTrackbar),
+                  m_useV2Style(useV2Style), m_label(label), m_units(units) {
+                m_isItem = true;
+            }
+
+            virtual ~TrackBar() {}
+
+            virtual Element* requestFocus(Element *oldFocus, FocusDirection direction) {
+                return this;
+            }
+
+            virtual bool handleInput(u64 keysDown, u64 keysHeld, const HidTouchState &touchPos, HidAnalogStickState leftJoyStick, HidAnalogStickState rightJoyStick) override {
+                if (keysHeld & KEY_LEFT && keysHeld & KEY_RIGHT)
+                    return true;
+
+                if (keysHeld & KEY_LEFT) {
+                    if (this->m_value > 0) {
+                        this->m_value--;
+                        this->m_valueChangedListener(this->m_value);
+                        return true;
+                    }
+                }
+
+                if (keysHeld & KEY_RIGHT) {
+                    if (this->m_value < 100) {
+                        this->m_value++;
+                        this->m_valueChangedListener(this->m_value);
+                        return true;
+                    }
+                }
+
+                return false;
+            }
+
+            virtual bool onTouch(TouchEvent event, s32 currX, s32 currY, s32 prevX, s32 prevY, s32 initialX, s32 initialY) override {
+                const u16 trackBarWidth = this->getWidth() - 95;
+                const u16 handlePos = (trackBarWidth * (this->m_value - 0)) / (100 - 0);
+                const s32 circleCenterX = this->getX() + 59 + handlePos;
+                const s32 circleCenterY = this->getY() + 40 + 16 - 1;
+                static constexpr s32 circleRadius = 16;
+                static bool triggerOnce = true;
+
+                const bool touchInCircle = (std::abs(initialX - circleCenterX) <= circleRadius) && (std::abs(initialY - circleCenterY) <= circleRadius);
+                
+                if (event == TouchEvent::Release) {
+                    triggerOnce = true;
+                    triggerRumbleDoubleClick.store(true, std::memory_order_release);
+                    triggerOffSound.store(true, std::memory_order_release);
+                    touchInSliderBounds = false;
+                    return false;
+                }
+            
+                if (touchInCircle || touchInSliderBounds) {
+                    if (triggerOnce){
+                        triggerOnce = false;
+                        triggerRumbleClick.store(true, std::memory_order_release);
+                        triggerOnSound.store(true, std::memory_order_release);
+                    }
+
+                    touchInSliderBounds = true;
+                    //if (currX > this->getLeftBound() + 50 && currX < this->getRightBound() && currY > this->getTopBound() && currY < this->getBottomBound()) {
+                    s16 newValue = (static_cast<float>(currX - (this->getX() + 60)) / static_cast<float>(this->getWidth() - 95)) * 100;
+                    
+                    if (newValue < 0) {
+                        newValue = 0;
+                    } else if (newValue > 100) {
+                        newValue = 100;
+                    }
+        
+                    if (newValue != this->m_value) {
+                        this->m_value = newValue;
+                        this->m_valueChangedListener(this->getProgress());
+                    }
+        
+                    return true;
+                    //}
+                }
+            
+                return false;
+            }
+
+
+            // Define drawBar function outside the draw method
+            void drawBar(gfx::Renderer *renderer, s32 x, s32 y, u16 width, Color& color, bool isRounded = true) {
+                if (isRounded) {
+                    renderer->drawUniformRoundedRect(x, y, width, 7, a(color));
+                } else {
+                    renderer->drawRect(x, y, width, 7, a(color));
+                }
+            }
+
+            virtual void draw(gfx::Renderer *renderer) override {
+                //static float lastBottomBound;
+                
+                if (touchInSliderBounds) {
+                    m_drawFrameless = true;
+                    drawHighlight(renderer);
+                } else {
+                    m_drawFrameless = false;
+                }
+
+
+                s32 xPos = this->getX() + 59;
+                s32 yPos = this->getY() + 40 + 16 - 1;
+                s32 width = this->getWidth() - 95;
+                u16 handlePos = width * (this->m_value) / (100);
+
+                if (!m_usingNamedStepTrackbar) {
+                    yPos -= 11;
+                }
+
+                s32 iconOffset = 0;
+
+                if (!m_useV2Style && m_icon[0] != '\0') {
+                    s32 iconWidth = 23;//tsl::gfx::calculateStringWidth(m_icon, 23);
+                    iconOffset = 14 + iconWidth;
+                    xPos += iconOffset;
+                    width -= iconOffset;
+                    handlePos = (width) * (this->m_value) / (100);
+                }
+
+                // Draw step tick marks if this is a step trackbar
+                if (m_usingStepTrackbar || m_usingNamedStepTrackbar) {
+                    const u8 numSteps = m_numSteps;
+                    const u16 baseX = xPos;
+                    const u16 baseY = this->getY() + 44;
+                    const u8 halfNumSteps = (numSteps - 1) / 2;
+                    const u16 lastStepX = baseX + width - 1;
+                    const float stepSpacing = static_cast<float>(width) / (numSteps - 1);
+                    const auto stepColor = a(trackBarEmptyColor);
+                    
+                    u16 stepX;
+                    for (u8 i = 0; i < numSteps; i++) {
+                        if (i == numSteps - 1) {
+                            stepX = lastStepX;
+                        } else {
+                            stepX = baseX + static_cast<u16>(std::round(i * stepSpacing));
+                            if (i > halfNumSteps) {
+                                stepX -= 1;
+                            }
+                        }
+                        renderer->drawRect(stepX, baseY, 1, 8, stepColor);
+                    }
+                }
+
+                // Draw track bar background
+                drawBar(renderer, xPos, yPos-3, width, trackBarEmptyColor, !m_usingNamedStepTrackbar);
+
+                if (!this->m_focused) {
+                    drawBar(renderer, xPos, yPos-3, handlePos, trackBarFullColor, !m_usingNamedStepTrackbar);
+                    renderer->drawCircle(xPos + handlePos, yPos, 16, true, a(m_drawFrameless ? highlightColor : trackBarSliderBorderColor));
+                    renderer->drawCircle(xPos + handlePos, yPos, 13, true, a((m_unlockedTrackbar || touchInSliderBounds) ? trackBarSliderMalleableColor : trackBarSliderColor));
+                } else {
+                    touchInSliderBounds = false;
+                    if (m_unlockedTrackbar != ult::unlockedSlide.load(std::memory_order_acquire))
+                        ult::unlockedSlide.store(m_unlockedTrackbar, std::memory_order_release);
+                    drawBar(renderer, xPos, yPos-3, handlePos, trackBarFullColor, !m_usingNamedStepTrackbar);
+                    renderer->drawCircle(xPos + x + handlePos, yPos +y, 16, true, a(highlightColor));
+                    renderer->drawCircle(xPos + x + handlePos, yPos +y, 12, true, a((ult::allowSlide.load(std::memory_order_acquire) || m_unlockedTrackbar) ? trackBarSliderMalleableColor : trackBarSliderColor));
+                }
+
+                // Draw icon (original style) or label + value (V2 style)
+                if (m_useV2Style) {
+                    // V2 Style: Draw label and value
+                    std::string labelPart = this->m_label;
+                    ult::removeTag(labelPart);
+                
+                    std::string valuePart;
+                    if (!m_usingNamedStepTrackbar) {
+                        valuePart = (m_units.compare("%") == 0 || m_units.compare("°C") == 0 || m_units.compare("°F") == 0)
+                                    ? ult::to_string(m_value) + m_units
+                                    : ult::to_string(m_value) + (m_units.empty() ? "" : " ") + m_units;
+                    } else {
+                        valuePart = this->m_selection;
+                    }
+                
+                    const auto valueWidth = renderer->getTextDimensions(valuePart, false, 16).first;
+                
+                    renderer->drawString(labelPart, false, this->getX() + 59, this->getY() + 14 + 16, 16, 
+                                       ((!this->m_focused || !ult::useSelectionText) ? (defaultTextColor) : (selectedTextColor)));
+
+                    renderer->drawString(valuePart, false, this->getWidth() -17 - valueWidth, this->getY() + 14 + 16, 16, (this->m_focused && ult::useSelectionValue) ? selectedValueTextColor : onTextColor);
+                } else {
+                    // Original Style: Draw icon
+                    if (m_icon[0] != '\0')
+                        renderer->drawString(this->m_icon, false, this->getX()+42, this->getY() + 50+2, 23, a(tsl::style::color::ColorText));
+                }
+
+
+                if (m_lastBottomBound != this->getTopBound())
+                    renderer->drawRect(this->getX() + 4+20-1, this->getTopBound(), this->getWidth() + 6 + 10+20 +4, 1, a(separatorColor));
+                renderer->drawRect(this->getX() + 4+20-1, this->getBottomBound(), this->getWidth() + 6 + 10+20 +4, 1, a(separatorColor));
+                m_lastBottomBound = this->getBottomBound();
+            }
+
+            virtual void layout(u16 parentX, u16 parentY, u16 parentWidth, u16 parentHeight) override {
+                this->setBoundaries(this->getX() - 16 , this->getY(), this->getWidth()+20+4, tsl::style::TrackBarDefaultHeight );
+            }
+
+            virtual void drawFocusBackground(gfx::Renderer *renderer) {
+                // No background drawn here in HOS
+            }
+
+            virtual void drawHighlight(gfx::Renderer *renderer) override {
+                
+                // Get current time using ARM system tick for animation timing
+                const u64 currentTime_ns = armTicksToNs(armGetSystemTick());
+                
+                // High precision time calculation - matches standard cosine wave timing
+                const double time_seconds = static_cast<double>(currentTime_ns) / 1000000000.0;
+                
+                // Standard cosine wave calculation with high precision
+                progress = (std::cos(2.0 * ult::_M_PI * std::fmod(time_seconds, 1.0) - ult::_M_PI / 2) + 1.0) / 2.0;
+            
+                // High precision floating point color interpolation
+                highlightColor = {
+                    static_cast<u8>(highlightColor2.r + (highlightColor1.r - highlightColor2.r) * progress + 0.5),
+                    static_cast<u8>(highlightColor2.g + (highlightColor1.g - highlightColor2.g) * progress + 0.5),
+                    static_cast<u8>(highlightColor2.b + (highlightColor1.b - highlightColor2.b) * progress + 0.5),
+                    0xF
+                };
+                
+                // Initialize position offsets
+                x = 0;
+                y = 0;
+                
+                if (this->m_highlightShaking) {
+                    //const u64 currentTime_ns = armTicksToNs(armGetSystemTick());
+                    t_ns = currentTime_ns - this->m_highlightShakingStartTime; // Changed
+                    if (t_ns >= 100000000) // 100ms in nanoseconds
+                        this->m_highlightShaking = false;
+                    else {
+                        amplitude = std::rand() % 5 + 5;
+                        
+                        switch (this->m_highlightShakingDirection) {
+                            case FocusDirection::Up:
+                                y -= shakeAnimation(t_ns, amplitude); // Changed parameter
+                                break;
+                            case FocusDirection::Down:
+                                y += shakeAnimation(t_ns, amplitude); // Changed parameter
+                                break;
+                            case FocusDirection::Left:
+                                x -= shakeAnimation(t_ns, amplitude); // Changed parameter
+                                break;
+                            case FocusDirection::Right:
+                                x += shakeAnimation(t_ns, amplitude); // Changed parameter
+                                break;
+                            default:
+                                break;
+                        }
+                        
+                        x = std::clamp(x, -amplitude, amplitude);
+                        y = std::clamp(y, -amplitude, amplitude);
+                    }
+                }
+                
+                if (!m_drawFrameless) {
+                    if (ult::useSelectionBG) {
+                        if (ult::expandedMemory)
+                            renderer->drawRectMultiThreaded(this->getX() + x +19, this->getY() + y, this->getWidth()-11-4, this->getHeight(), aWithOpacity(selectionBGColor)); // CUSTOM MODIFICATION 
+                        else
+                            renderer->drawRect(this->getX() + x +19, this->getY() + y, this->getWidth()-11-4, this->getHeight(), aWithOpacity(selectionBGColor)); // CUSTOM MODIFICATION 
+
+
+                        //renderer->drawRect(this->getX() + x +19, this->getY() + y, this->getWidth()-11-4, this->getHeight(), a(selectionBGColor)); // CUSTOM MODIFICATION 
+                    }
+                    
+                    renderer->drawBorderedRoundedRect(this->getX() + x +19, this->getY() + y, this->getWidth()-11, this->getHeight(), 5, 5, a(highlightColor));
+                } else {
+                    if (ult::useSelectionBG) {
+                        if (ult::expandedMemory)
+                            renderer->drawRectMultiThreaded(this->getX() + x +19, this->getY() + y, this->getWidth()-11-4, this->getHeight(), aWithOpacity(clickColor)); // CUSTOM MODIFICATION 
+                        else
+                            renderer->drawRect(this->getX() + x +19, this->getY() + y, this->getWidth()-11-4, this->getHeight(), aWithOpacity(clickColor)); // CUSTOM MODIFICATION 
+                    }
+                }
+
+
+                ult::onTrackBar.exchange(true, std::memory_order_acq_rel);
+            }
+
+            /**
+             * @brief Gets the current value of the trackbar
+             *
+             * @return State
+             */
+            virtual inline u8 getProgress() {
+                return this->m_value;
+            }
+
+            /**
+             * @brief Sets the current state of the toggle. Updates the Value
+             *
+             * @param state State
+             */
+            virtual void setProgress(u8 value) {
+                this->m_value = value;
+            }
+
+            /**
+             * @brief Adds a listener that gets called whenever the state of the toggle changes
+             *
+             * @param stateChangedListener Listener with the current state passed in as parameter
+             */
+            void setValueChangedListener(std::function<void(u8)> valueChangedListener) {
+                this->m_valueChangedListener = valueChangedListener;
+            }
+
+        protected:
+            const char *m_icon = nullptr;
+            s16 m_value = 0;
+            bool m_interactionLocked = false;
+
+            std::function<void(u8)> m_valueChangedListener = [](u8){};
+
+            bool m_usingStepTrackbar = false;
+            bool m_usingNamedStepTrackbar = false;
+            bool m_unlockedTrackbar = true;
+            bool touchInSliderBounds = false;
+            
+            u8 m_numSteps = 101;
+            // V2 Style properties
+            bool m_useV2Style = false;
+            std::string m_label;
+            std::string m_units;
+            std::string m_selection; // Used for named step trackbars
+            bool m_drawFrameless = false;
+
+            float m_lastBottomBound;
+        };
+
+
+        /**
+         * @brief A customizable analog trackbar going from 0% to 100% but using discrete steps (Like the volume slider)
+         *
+         */
+        class StepTrackBar : public TrackBar {
+        public:
+            /**
+             * @brief Constructor
+             *
+             * @param icon Icon shown next to the track bar
+             * @param numSteps Number of steps the track bar has
+             * @param usingNamedStepTrackbar Whether this is a named step trackbar
+             * @param useV2Style Whether to use V2 visual style (label + value instead of icon)
+             * @param label Label text for V2 style
+             * @param units Units text for V2 style
+             */
+            StepTrackBar(const char icon[3], size_t numSteps, bool usingNamedStepTrackbar = false,
+                        bool useV2Style = false, const std::string& label = "", const std::string& units = "")
+                : TrackBar(icon, true, usingNamedStepTrackbar, useV2Style, label, units), m_numSteps(numSteps) { }
+
+            virtual ~StepTrackBar() {}
+
+            virtual bool handleInput(u64 keysDown, u64 keysHeld, const HidTouchState &touchPos, HidAnalogStickState leftJoyStick, HidAnalogStickState rightJoyStick) override {
+                static u32 tick = 0;
+
+                if (keysHeld & KEY_LEFT && keysHeld & KEY_RIGHT) {
+                    tick = 0;
+                    return true;
+                }
+
+                if (keysHeld & (KEY_LEFT | KEY_RIGHT)) {
+                    if ((tick == 0 || tick > 20) && (tick % 3) == 0) {
+                        if (keysHeld & KEY_LEFT && this->m_value > 0) {
+                            //triggerRumbleClick.store(true, std::memory_order_release);
+                            //triggerNavigationSound.store(true, std::memory_order_release);
+                            triggerNavigationFeedback();
+                            this->m_value = std::max(this->m_value - (100 / (this->m_numSteps - 1)), 0);
+                        } else if (keysHeld & KEY_RIGHT && this->m_value < 100) {
+                            //triggerRumbleClick.store(true, std::memory_order_release);
+                            //triggerNavigationSound.store(true, std::memory_order_release);
+                            triggerNavigationFeedback();
+                            this->m_value = std::min(this->m_value + (100 / (this->m_numSteps - 1)), 100);
+                        } else {
+                            return false;
+                        }
+                        this->m_valueChangedListener(this->getProgress());
+                    }
+                    tick++;
+                    return true;
+                } else {
+                    tick = 0;
+                }
+
+                return false;
+            }
+
+            virtual bool onTouch(TouchEvent event, s32 currX, s32 currY, s32 prevX, s32 prevY, s32 initialX, s32 initialY) override {
+                const u16 trackBarWidth = this->getWidth() - 95;
+                const u16 handlePos = (trackBarWidth * this->m_value) / 100;
+                const s32 circleCenterX = this->getX() + 59 + handlePos;
+                const s32 circleCenterY = this->getY() + 40 + 16 - 1;
+                static constexpr s32 circleRadius = 16;
+                static bool triggerOnce = true;
+                
+                const bool touchInCircle = (std::abs(initialX - circleCenterX) <= circleRadius) && (std::abs(initialY - circleCenterY) <= circleRadius);
+                
+                if (event == TouchEvent::Release) {
+                    triggerOnce = true;
+                    triggerRumbleDoubleClick.store(true, std::memory_order_release);
+                    triggerOffSound.store(true, std::memory_order_release);
+                    touchInSliderBounds = false;
+                    return false;
+                }
+            
+                if (touchInCircle || touchInSliderBounds) {
+                    if (triggerOnce){
+                        triggerOnce = false;
+                        triggerRumbleClick.store(true, std::memory_order_release);
+                        triggerOnSound.store(true, std::memory_order_release);
+                    }
+
+                    touchInSliderBounds = true;
+                    //if (currY > this->getTopBound() && currY < this->getBottomBound()) {
+                    s16 newValue = (static_cast<float>(currX - (this->getX() + 60)) / static_cast<float>(this->getWidth() - 95)) * 100;
+        
+                    if (newValue < 0) {
+                        newValue = 0;
+                    } else if (newValue > 100) {
+                        newValue = 100;
+                    } else {
+                        newValue = std::round(newValue / (100.0F / (this->m_numSteps - 1))) * (100.0F / (this->m_numSteps - 1));
+                    }
+        
+                    if (newValue != this->m_value) {
+                        //triggerRumbleClick.store(true, std::memory_order_release);
+                        //triggerNavigationSound.store(true, std::memory_order_release);
+                        triggerNavigationFeedback();
+                        this->m_value = newValue;
+                        this->m_valueChangedListener(this->getProgress());
+                    }
+        
+                    return true;
+                    //}
+                }
+            
+                return false;
+            }
+
+            /**
+             * @brief Gets the current value of the trackbar
+             *
+             * @return State
+             */
+            virtual inline u8 getProgress() override {
+                return this->m_value / (100 / (this->m_numSteps - 1));
+            }
+
+            /**
+             * @brief Sets the current state of the toggle. Updates the Value
+             *
+             * @param state State
+             */
+            virtual void setProgress(u8 value) override {
+                value = std::min(value, u8(this->m_numSteps - 1));
+                this->m_value = value * (100 / (this->m_numSteps - 1));
+            }
+
+        protected:
+            u8 m_numSteps = 1;
+        };
+
+
+        /**
+         * @brief A customizable trackbar with multiple discrete steps with specific names. Name gets displayed above the bar
+         *
+         */
+        class NamedStepTrackBar : public StepTrackBar {
+        public:
+            /**
+             * @brief Constructor
+             *
+             * @param icon Icon shown next to the track bar
+             * @param stepDescriptions Step names displayed above the track bar
+             * @param useV2Style Whether to use V2 visual style (label + value instead of icon)
+             * @param label Label text for V2 style
+             */
+            NamedStepTrackBar(const char icon[3], std::initializer_list<std::string> stepDescriptions,
+                             bool useV2Style = false, const std::string& label = "")
+                : StepTrackBar(icon, stepDescriptions.size(), true, useV2Style, label, ""), 
+                  m_stepDescriptions(stepDescriptions.begin(), stepDescriptions.end()) {
+                this->m_usingNamedStepTrackbar = true;
+                // Initialize selection with first step
+                if (!m_stepDescriptions.empty()) {
+                    this->m_selection = m_stepDescriptions[0];
+                }
+                m_numSteps = m_stepDescriptions.size();
+            }
+
+            virtual ~NamedStepTrackBar() {}
+
+            virtual bool handleInput(u64 keysDown, u64 keysHeld, const HidTouchState &touchPos, HidAnalogStickState leftJoyStick, HidAnalogStickState rightJoyStick) override {
+                // Store previous value to update selection
+                const u8 prevProgress = this->getProgress();
+                
+                // Call parent input handling
+                const bool result = StepTrackBar::handleInput(keysDown, keysHeld, touchPos, leftJoyStick, rightJoyStick);
+                
+                // Update selection if progress changed
+                if (result && this->getProgress() != prevProgress) {
+                    const u8 currentIndex = this->getProgress();
+                    if (currentIndex < m_stepDescriptions.size()) {
+                        this->m_selection = m_stepDescriptions[currentIndex];
+                    }
+                }
+                
+                return result;
+            }
+
+            virtual bool onTouch(TouchEvent event, s32 currX, s32 currY, s32 prevX, s32 prevY, s32 initialX, s32 initialY) override {
+                // Store previous value to update selection
+                const u8 prevProgress = this->getProgress();
+                
+                // Call parent touch handling
+                const bool result = StepTrackBar::onTouch(event, currX, currY, prevX, prevY, initialX, initialY);
+                
+                // Update selection if progress changed
+                if (result && this->getProgress() != prevProgress) {
+                    const u8 currentIndex = this->getProgress();
+                    if (currentIndex < m_stepDescriptions.size()) {
+                        this->m_selection = m_stepDescriptions[currentIndex];
+                    }
+                }
+                
+                return result;
+            }
+
+            virtual void setProgress(u8 value) override {
+                StepTrackBar::setProgress(value);
+                
+                // Update selection when progress is set programmatically
+                const u8 currentIndex = this->getProgress();
+                if (currentIndex < m_stepDescriptions.size()) {
+                    this->m_selection = m_stepDescriptions[currentIndex];
+                }
+            }
+
+            virtual void draw(gfx::Renderer *renderer) override {
+                if (touchInSliderBounds) {
+                    m_drawFrameless = true;
+                    drawHighlight(renderer);
+                } else {
+                    m_drawFrameless = false;
+                }
+            
+                s32 xPos = this->getX() + 59;
+                s32 yPos = this->getY() + 40 + 16 - 1;
+                s32 width = this->getWidth() - 95;
+                u16 handlePos = width * (this->m_value) / (100);
+            
+                if (!m_usingNamedStepTrackbar) {
+                    yPos -= 11;
+                }
+            
+                s32 iconOffset = 0;
+            
+                if (!m_useV2Style && m_icon[0] != '\0') {
+                    s32 iconWidth = 23;
+                    iconOffset = 14 + iconWidth;
+                    xPos += iconOffset;
+                    width -= iconOffset;
+                    handlePos = (width) * (this->m_value) / (100);
+                }
+            
+                // Draw step tick marks if this is a step trackbar
+                {
+                    const u8 numSteps = m_numSteps;
+                    const u16 baseX = xPos;
+                    const u16 baseY = this->getY() + 44;
+                    const u8 halfNumSteps = (numSteps - 1) / 2;
+                    const u16 lastStepX = baseX + width - 1;
+                    const float stepSpacing = static_cast<float>(width) / (numSteps - 1);
+                    const auto stepColor = a(trackBarEmptyColor);
+                    
+                    u16 stepX;
+                    for (u8 i = 0; i < numSteps; i++) {
+                        if (i == numSteps - 1) {
+                            stepX = lastStepX;
+                        } else {
+                            stepX = baseX + static_cast<u16>(std::round(i * stepSpacing));
+                            if (i > halfNumSteps) {
+                                stepX -= 1;
+                            }
+                        }
+                        renderer->drawRect(stepX, baseY, 1, 8, stepColor);
+                    }
+                }
+
+                // Draw track bar background
+                drawBar(renderer, xPos, yPos-3, width, trackBarEmptyColor, !m_usingNamedStepTrackbar);
+            
+                if (!this->m_focused) {
+                    drawBar(renderer, xPos, yPos-3, handlePos, trackBarFullColor, !m_usingNamedStepTrackbar);
+                    renderer->drawCircle(xPos + handlePos, yPos, 16, true, a(m_drawFrameless ? highlightColor : trackBarSliderBorderColor));
+                    renderer->drawCircle(xPos + handlePos, yPos, 13, true, a((m_unlockedTrackbar || touchInSliderBounds) ? trackBarSliderMalleableColor : trackBarSliderColor));
+                } else {
+                    touchInSliderBounds = false;
+                    if (m_unlockedTrackbar != ult::unlockedSlide.load(std::memory_order_acquire))
+                        ult::unlockedSlide.store(m_unlockedTrackbar, std::memory_order_release);
+                    drawBar(renderer, xPos, yPos-3, handlePos, trackBarFullColor, !m_usingNamedStepTrackbar);
+                    renderer->drawCircle(xPos + x + handlePos, yPos +y, 16, true, a(highlightColor));
+                    renderer->drawCircle(xPos + x + handlePos, yPos +y, 12, true, a((ult::allowSlide.load(std::memory_order_acquire) || m_unlockedTrackbar) ? trackBarSliderMalleableColor : trackBarSliderColor));
+                }
+            
+                // Draw icon (original style) or label + value (V2 style)
+                if (m_useV2Style) {
+                    // V2 Style: Draw label and value
+                    std::string labelPart = this->m_label;
+                    ult::removeTag(labelPart);
+                
+                    std::string valuePart;
+                    if (!m_usingNamedStepTrackbar) {
+                        valuePart = (m_units.compare("%") == 0 || m_units.compare("°C") == 0 || m_units.compare("°F") == 0)
+                                    ? ult::to_string(m_value) + m_units
+                                    : ult::to_string(m_value) + (m_units.empty() ? "" : " ") + m_units;
+                    } else {
+                        valuePart = this->m_selection;
+                    }
+                
+                    const auto valueWidth = renderer->getTextDimensions(valuePart, false, 16).first;
+                
+                    renderer->drawString(labelPart, false, this->getX() + 59, this->getY() + 14 + 16, 16, 
+                                       ((!this->m_focused || !ult::useSelectionText) ? (defaultTextColor) : (selectedTextColor)));
+            
+                    renderer->drawString(valuePart, false, this->getWidth() -17 - valueWidth, this->getY() + 14 + 16, 16, (this->m_focused && ult::useSelectionValue) ? selectedValueTextColor : onTextColor);
+                } else {
+                    // Original Style: Draw icon
+                    if (m_icon[0] != '\0')
+                        renderer->drawString(this->m_icon, false, this->getX()+42, this->getY() + 50+2, 23, a(tsl::style::color::ColorText));
+                }
+            
+                if (m_lastBottomBound != this->getTopBound())
+                    renderer->drawRect(this->getX() + 4+20-1, this->getTopBound(), this->getWidth() + 6 + 10+20 +4, 1, a(separatorColor));
+                renderer->drawRect(this->getX() + 4+20-1, this->getBottomBound(), this->getWidth() + 6 + 10+20 +4, 1, a(separatorColor));
+                m_lastBottomBound = this->getBottomBound();
+            }
+
+        protected:
+            std::vector<std::string> m_stepDescriptions;
+
+        };
+
+
+
+        /**
+         * @brief A customizable analog trackbar going from minValue to maxValue
+         *
+         */
+        class TrackBarV2 : public Element {
+        public:
+            u64 lastUpdate_ns;
+        
+            Color highlightColor = {0xf, 0xf, 0xf, 0xf};
+            float progress;
+            float counter = 0.0;
+            s32 x, y;
+            s32 amplitude;
+            u32 descWidth, descHeight;
+            
+            void setScriptKeyListener(std::function<void()> listener) {
+                m_scriptKeyListener = std::move(listener);
+            }
+        
+            TrackBarV2(std::string label, std::string packagePath = "", s16 minValue = 0, s16 maxValue = 100, std::string units = "",
+                     std::function<bool(std::vector<std::vector<std::string>>&&, const std::string&, const std::string&)> executeCommands = nullptr,
+                     std::function<std::vector<std::vector<std::string>>(const std::vector<std::vector<std::string>>&, const std::string&, size_t, const std::string&)> sourceReplacementFunc = nullptr,
+                     std::vector<std::vector<std::string>> cmd = {}, const std::string& selCmd = "", bool usingStepTrackbar = false, bool usingNamedStepTrackbar = false, s16 numSteps = -1, bool unlockedTrackbar = false, bool executeOnEveryTick = false)
+                : m_label(label), m_packagePath(packagePath), m_minValue(minValue), m_maxValue(maxValue), m_units(units),
+                  interpretAndExecuteCommands(executeCommands), getSourceReplacement(sourceReplacementFunc), commands(std::move(cmd)), selectedCommand(selCmd),
+                  m_usingStepTrackbar(usingStepTrackbar), m_usingNamedStepTrackbar(usingNamedStepTrackbar), m_numSteps(numSteps), m_unlockedTrackbar(unlockedTrackbar), m_executeOnEveryTick(executeOnEveryTick) {
+                
+                m_isItem = true;
+            
+                if (maxValue < minValue) {
+                    std::swap(minValue, maxValue);
+                    m_minValue = minValue;
+                    m_maxValue = maxValue;
+                }
+            
+                if ((!usingStepTrackbar && !usingNamedStepTrackbar) || numSteps == -1) {
+                    m_numSteps = (maxValue - minValue) + 1;
+                }
+                
+                if (m_numSteps < 2) {
+                    m_numSteps = 2;
+                }
+            
+                bool loadedValue = false;
+                
+                if (!m_packagePath.empty()) {
+                    auto configIniData = ult::getParsedDataFromIniFile(m_packagePath + "config.ini");
+                    auto sectionIt = configIniData.find(m_label);
+                    
+                    if (sectionIt != configIniData.end()) {
+                        auto indexIt = sectionIt->second.find("index");
+                        if (indexIt != sectionIt->second.end() && !indexIt->second.empty()) {
+                            m_index = static_cast<s16>(ult::stoi(indexIt->second));
+                        }
+                        
+                        if (!m_usingNamedStepTrackbar) {
+                            auto valueIt = sectionIt->second.find("value");
+                            if (valueIt != sectionIt->second.end() && !valueIt->second.empty()) {
+                                m_value = static_cast<s16>(ult::stoi(valueIt->second));
+                                loadedValue = true;
+                            }
+                        }
+                    }
+                }
+            
+                if (m_index >= m_numSteps) m_index = m_numSteps - 1;
+                if (m_index < 0) m_index = 0;
+            
+                if (!loadedValue) {
+                    if (m_numSteps > 1) {
+                        m_value = minValue + m_index * (static_cast<float>(maxValue - minValue) / (m_numSteps - 1));
+                    } else {
+                        m_value = minValue;
+                    }
+                }
+                
+                if (m_value > maxValue) m_value = maxValue;
+                if (m_value < minValue) m_value = minValue;
+            
+                lastUpdate_ns = armTicksToNs(armGetSystemTick());
+            }
+            
+            virtual ~TrackBarV2() {}
+            
+            virtual Element* requestFocus(Element *oldFocus, FocusDirection direction) {
+                return this;
+            }
+        
+            inline void updateAndExecute(bool updateIni = true) {
+                if (m_packagePath.empty()) {
+                    return;
+                }
+            
+                const std::string indexStr = ult::to_string(m_index);
+                const std::string valueStr = m_usingNamedStepTrackbar ? m_selection : ult::to_string(m_value);
+            
+                if (updateIni) {
+                    const std::string configPath = m_packagePath + "config.ini";
+                    ult::setIniFileValue(configPath, m_label, "index", indexStr);
+                    ult::setIniFileValue(configPath, m_label, "value", valueStr);
+                }
+                bool success = false;
+            
+                static const std::string valuePlaceholder = "{value}";
+                static const std::string indexPlaceholder = "{index}";
+                static const size_t valuePlaceholderLen = valuePlaceholder.length();
+                static const size_t indexPlaceholderLen = indexPlaceholder.length();
+                const size_t valueStrLen = valueStr.length();
+                const size_t indexStrLen = indexStr.length();
+                
+                size_t tryCount = 0;
+                while (!success) {
+                    if (interpretAndExecuteCommands) {
+                        if (tryCount > 3)
+                            break;
+                        auto modifiedCmds = getSourceReplacement(commands, valueStr, m_index, m_packagePath);
+                        
+                        for (auto& cmd : modifiedCmds) {
+                            for (auto& arg : cmd) {
+                                for (size_t pos = 0; (pos = arg.find(valuePlaceholder, pos)) != std::string::npos; pos += valueStrLen) {
+                                    arg.replace(pos, valuePlaceholderLen, valueStr);
+                                }
+                                
+                                if (m_usingNamedStepTrackbar) {
+                                    for (size_t pos = 0; (pos = arg.find(indexPlaceholder, pos)) != std::string::npos; pos += indexStrLen) {
+                                        arg.replace(pos, indexPlaceholderLen, indexStr);
+                                    }
+                                }
+                            }
+                        }
+                        
+                        success = interpretAndExecuteCommands(std::move(modifiedCmds), m_packagePath, selectedCommand);
+                        ult::resetPercentages();
+            
+                        if (success)
+                            break;
+                        tryCount++;
+                    }
+                }
+            }
+            
+            virtual inline bool handleInput(u64 keysDown, u64 keysHeld, const HidTouchState &touchPos, HidAnalogStickState leftJoyStick, HidAnalogStickState rightJoyStick) override {
+                const u64 keysReleased = m_prevKeysHeld & ~keysHeld;
+                m_prevKeysHeld = keysHeld;
+                
+                const u64 currentTime_ns = armTicksToNs(armGetSystemTick());
+                const u64 elapsed_ns = currentTime_ns - lastUpdate_ns;
+            
+                m_keyRHeld = (keysHeld & KEY_R) != 0;
+            
+                if ((keysHeld & KEY_R)) {
+                    if (keysDown & KEY_UP && !(keysHeld & ~KEY_UP & ~KEY_R & ALL_KEYS_MASK))
+                        this->shakeHighlight(FocusDirection::Up);
+                    else if (keysDown & KEY_DOWN && !(keysHeld & ~KEY_DOWN & ~KEY_R & ALL_KEYS_MASK))
+                        this->shakeHighlight(FocusDirection::Down);
+                    else if (keysDown & KEY_LEFT && !(keysHeld & ~KEY_LEFT & ~KEY_R & ALL_KEYS_MASK)){
+                        this->shakeHighlight(FocusDirection::Left);
+                    }
+                    else if (keysDown & KEY_RIGHT && !(keysHeld & ~KEY_RIGHT & ~KEY_R & ALL_KEYS_MASK)) {
+                        this->shakeHighlight(FocusDirection::Right);
+                    }
+                    return true;
+                }
+            
+                if ((keysDown & KEY_A) && !(keysHeld & ~KEY_A & ALL_KEYS_MASK)) {
+                    //triggerRumbleClick.store(true, std::memory_order_release);
+                    //triggerEnterSound.store(true, std::memory_order_release);
+                    triggerEnterFeedback();
+                    
+
+                    if (!m_unlockedTrackbar) {
+                        ult::atomicToggle(ult::allowSlide);
+                        m_holding = false;
+                    }
+                    if (m_unlockedTrackbar || (!m_unlockedTrackbar && !ult::allowSlide.load(std::memory_order_acquire))) {
+                        updateAndExecute();
+                        triggerClick = true;
+                    }
+                    return true;
+                }
+
+                //if (keysDown & KEY_B && !(keysHeld & ~KEY_B & ALL_KEYS_MASK)) {
+                //    triggerRumbleDoubleClick.store(true, std::memory_order_release);
+                //    triggerExitSound.store(true, std::memory_order_release);
+                //}
+            
+                if ((keysDown & SCRIPT_KEY) && !(keysHeld & ~SCRIPT_KEY & ALL_KEYS_MASK)) {
+                    if (m_scriptKeyListener) {
+                        m_scriptKeyListener();
+                    }
+                    return true;
+                }
+            
+                if (ult::allowSlide.load(std::memory_order_acquire) || m_unlockedTrackbar) {
+                    // Handle key release
+                    if (((keysReleased & KEY_LEFT) || (keysReleased & KEY_RIGHT))) {
+                        // If we were holding and repeating, just stop
+                        if (m_wasLastHeld) {
+                            m_wasLastHeld = false;
+                            //triggerNavigationSound.store(true, std::memory_order_release);
+                            //triggerRumbleClick.store(true, std::memory_order_release);
+
+                            m_holding = false;
+                            updateAndExecute();
+                            lastUpdate_ns = armTicksToNs(armGetSystemTick());
+                            return true;
+                        }
+                        // If it was a quick tap (no repeat happened), handle the single tick
+                        else if (m_holding) {
+                            m_holding = false;
+                            //triggerNavigationSound.store(true, std::memory_order_release);
+                            //triggerRumbleClick.store(true, std::memory_order_release);
+                            updateAndExecute();
+                            lastUpdate_ns = armTicksToNs(armGetSystemTick());
+                            return true;
+                        }
+                    }
+                    
+                    // Ignore simultaneous left+right
+                    if (keysDown & KEY_LEFT && keysDown & KEY_RIGHT)
+                        return true;
+                    if (keysHeld & KEY_LEFT && keysHeld & KEY_RIGHT)
+                        return true;
+            
+                    // Handle initial key press
+                    if (keysDown & KEY_LEFT || keysDown & KEY_RIGHT) {
+                        triggerRumbleClick.store(true, std::memory_order_release);
+                        // Start tracking the hold
+                        m_holding = true;
+                        m_wasLastHeld = false;
+                        m_holdStartTime_ns = armTicksToNs(armGetSystemTick());
+                        lastUpdate_ns = currentTime_ns;
+                        
+                        // Perform the initial single tick
+                        if (keysDown & KEY_LEFT && this->m_value > m_minValue) {
+                            this->m_index--;
+                            this->m_value--;
+                            this->m_valueChangedListener(this->m_value);
+                            updateAndExecute(false);
+                        } else if (keysDown & KEY_RIGHT && this->m_value < m_maxValue) {
+                            this->m_index++;
+                            this->m_value++;
+                            this->m_valueChangedListener(this->m_value);
+                            updateAndExecute(false);
+                        }
+                        return true;
+                    }
+                    
+                    // Handle continued holding (after initial press)
+                    if (m_holding && ((keysHeld & KEY_LEFT) || (keysHeld & KEY_RIGHT))) {
+                        const u64 holdDuration_ns = currentTime_ns - m_holdStartTime_ns;
+            
+                        // Initial delay before repeating starts (e.g., 300ms)
+                        static constexpr u64 initialDelay_ns = 300000000ULL;
+                        // Calculate interval with acceleration
+                        static constexpr u64 initialInterval_ns = 67000000ULL;  // ~67ms
+                        static constexpr u64 shortInterval_ns = 10000000ULL;    // ~10ms
+                        static constexpr u64 transitionPoint_ns = 1000000000ULL; // 2 seconds
+                        
+                        // Trigger navigation sound every 100ms while holding
+                        static u64 lastNavigationSound_ns = 0;
+                        if (currentTime_ns - lastNavigationSound_ns >= 150'000'000ULL) { // 100ms
+                            if (this->m_value > m_minValue && this->m_value < m_maxValue) {
+                                //triggerRumbleClick.store(true, std::memory_order_release);
+                                //triggerNavigationSound.store(true, std::memory_order_release);
+                                triggerNavigationFeedback();
+                                
+                            }
+                            lastNavigationSound_ns = currentTime_ns;
+                        }
+
+                        // If we haven't passed the initial delay, don't repeat yet
+                        if (holdDuration_ns < initialDelay_ns) {
+                            return true;
+                        }
+                        
+                        const u64 holdDurationAfterDelay_ns = holdDuration_ns - initialDelay_ns;
+                        const float t = std::min(1.0f, static_cast<float>(holdDurationAfterDelay_ns) / static_cast<float>(transitionPoint_ns));
+                        const u64 currentInterval_ns = static_cast<u64>((initialInterval_ns - shortInterval_ns) * (1.0f - t) + shortInterval_ns);
+                        
+                        if (elapsed_ns >= currentInterval_ns) {
+                            if (keysHeld & KEY_LEFT && this->m_value > m_minValue) {
+                                this->m_index--;
+                                this->m_value--;
+                                this->m_valueChangedListener(this->m_value);
+                                if (m_executeOnEveryTick) {
+                                    updateAndExecute(false);
+                                }
+                                lastUpdate_ns = currentTime_ns;
+                                m_wasLastHeld = true;
+                                return true;
+                            }
+                            
+                            if (keysHeld & KEY_RIGHT && this->m_value < m_maxValue) {
+                                this->m_index++;
+                                this->m_value++;
+                                this->m_valueChangedListener(this->m_value);
+                                if (m_executeOnEveryTick) {
+                                    updateAndExecute(false);
+                                }
+                                lastUpdate_ns = currentTime_ns;
+                                m_wasLastHeld = true;
+                                return true;
+                            }
+                        }
+                    } else {
+                        m_holding = false;
+                    }
+                }
+                
+                return false;
+            }
+
+            virtual bool onTouch(TouchEvent event, s32 currX, s32 currY, s32 prevX, s32 prevY, s32 initialX, s32 initialY) override {
+                const u16 trackBarWidth = this->getWidth() - 95;
+                const u16 handlePos = (trackBarWidth * (this->m_value - m_minValue)) / (m_maxValue - m_minValue);
+                const s32 circleCenterX = this->getX() + 59 + handlePos;
+                const s32 circleCenterY = this->getY() + 40 + 16 - 1;
+                static constexpr s32 circleRadius = 16;
+                static bool triggerOnce = true;
+                
+                const bool touchInCircle = (std::abs(initialX - circleCenterX) <= circleRadius) && (std::abs(initialY - circleCenterY) <= circleRadius);
+                
+                if (!m_unlockedTrackbar && !ult::allowSlide.load(std::memory_order_acquire)) {
+
+                    return false;
+                }
+                
+                if ((touchInCircle || touchInSliderBounds)) {
+                    touchInSliderBounds = true;
+
+                    if (triggerOnce) {
+                        triggerOnce = false;
+                        triggerRumbleClick.store(true, std::memory_order_release);
+                        triggerOnSound.store(true, std::memory_order_release);
+                    }
+                    
+                    const s16 newIndex = std::max(static_cast<s16>(0), std::min(static_cast<s16>((currX - (this->getX() + 59)) / static_cast<float>(this->getWidth() - 95) * (m_numSteps - 1)), static_cast<s16>(m_numSteps - 1)));
+                    const s16 newValue = m_minValue + newIndex * (static_cast<float>(m_maxValue - m_minValue) / (m_numSteps - 1));
+                    
+                    if (newValue != this->m_value || newIndex != this->m_index) {
+                        this->m_value = newValue;
+                        this->m_index = newIndex;
+                        this->m_valueChangedListener(this->getProgress());
+                        if (m_executeOnEveryTick) {
+                            updateAndExecute(false);
+                        }
+                        if (m_usingStepTrackbar || m_usingNamedStepTrackbar) {
+                            //triggerRumbleClick.store(true, std::memory_order_release);
+                            //triggerNavigationSound.store(true, std::memory_order_release);
+                            triggerNavigationFeedback();
+                        }
+                    } else {
+                        if (event == TouchEvent::Release) {
+                            triggerOnce = true;
+                            updateAndExecute();
+                            if (event == TouchEvent::Release)
+                                touchInSliderBounds = false;
+
+                            triggerRumbleDoubleClick.store(true, std::memory_order_release);
+                            triggerOffSound.store(true, std::memory_order_release);
+                        }
+                    }
+        
+                    return true;
+                }
+                
+                return false;
+            }
+        
+            void drawBar(gfx::Renderer *renderer, s32 x, s32 y, u16 width, Color& color, bool isRounded = true) {
+                if (isRounded) {
+                    renderer->drawUniformRoundedRect(x, y, width, 7, a(color));
+                } else {
+                    renderer->drawRect(x, y, width, 7, a(color));
+                }
+            }
+        
+            virtual void draw(gfx::Renderer *renderer) override {
+                const u16 handlePos = (this->getWidth() - 95) * (this->m_value - m_minValue) / (m_maxValue - m_minValue);
+                const s32 xPos = this->getX() + 59;
+                const s32 yPos = this->getY() + 40 + 16 - 1;
+                const s32 width = this->getWidth() - 95;
+        
+                const bool shouldAppearLocked = m_unlockedTrackbar && m_keyRHeld;
+                const bool visuallyUnlocked = (m_unlockedTrackbar && !m_keyRHeld) || touchInSliderBounds;
+
+                if (visuallyUnlocked && touchInSliderBounds) {
+                    m_drawFrameless = true;
+                    drawHighlight(renderer);
+                } else {
+                    m_drawFrameless = false;
+                }
+
+                drawBar(renderer, xPos, yPos-3, width, trackBarEmptyColor, !m_usingNamedStepTrackbar);
+                
+                
+                if (!this->m_focused) {
+                    drawBar(renderer, xPos, yPos-3, handlePos, trackBarFullColor, !m_usingNamedStepTrackbar);
+                    renderer->drawCircle(xPos + handlePos, yPos, 16, true, a(!m_drawFrameless ? trackBarSliderBorderColor : highlightColor));
+                    renderer->drawCircle(xPos + handlePos, yPos, 13, true, a(visuallyUnlocked ? trackBarSliderMalleableColor : trackBarSliderColor));
+                } else {
+                    touchInSliderBounds = false;
+                    if (m_unlockedTrackbar != ult::unlockedSlide.load(std::memory_order_acquire))
+                        ult::unlockedSlide.store(m_unlockedTrackbar, std::memory_order_release);
+                    drawBar(renderer, xPos, yPos-3, handlePos, trackBarFullColor, !m_usingNamedStepTrackbar);
+                    renderer->drawCircle(xPos + x + handlePos, yPos +y, 16, true, a(highlightColor));
+                    const bool focusedVisuallyUnlocked = (ult::allowSlide.load(std::memory_order_acquire) || m_unlockedTrackbar) && !shouldAppearLocked;
+                    renderer->drawCircle(xPos + x + handlePos, yPos +y, 12, true, a(focusedVisuallyUnlocked ? trackBarSliderMalleableColor : trackBarSliderColor));
+                }
+                 
+                std::string labelPart = this->m_label;
+                ult::removeTag(labelPart);
+            
+                if (!m_usingNamedStepTrackbar) {
+                    m_valuePart = (this->m_units.compare("%") == 0 || this->m_units.compare("°C") == 0 || this->m_units.compare("°F") == 0) 
+                                  ? ult::to_string(this->m_value) + this->m_units 
+                                  : ult::to_string(this->m_value) + (this->m_units.empty() ? "" : " ") + this->m_units;
+                } else
+                    m_valuePart = this->m_selection;
+            
+                const auto valueWidth = renderer->getTextDimensions(m_valuePart, false, 16).first;
+            
+                renderer->drawString(labelPart, false, xPos, this->getY() + 14 + 16, 16, ((!this->m_focused || !ult::useSelectionText) ? (defaultTextColor) : (selectedTextColor)));
+                renderer->drawString(m_valuePart, false, this->getWidth() -17 - valueWidth, this->getY() + 14 + 16, 16, 
+                    (this->m_focused && ult::useSelectionValue) ? selectedValueTextColor : onTextColor);
+            
+                if (m_lastBottomBound != this->getTopBound())
+                    renderer->drawRect(this->getX() + 4+20-1, this->getTopBound(), this->getWidth() + 6 + 10+20 +4, 1, a(separatorColor));
+                renderer->drawRect(this->getX() + 4+20-1, this->getBottomBound(), this->getWidth() + 6 + 10+20 +4, 1, a(separatorColor));
+                m_lastBottomBound = this->getBottomBound();
+            }
+            
+            virtual void layout(u16 parentX, u16 parentY, u16 parentWidth, u16 parentHeight) override {
+                this->setBoundaries(this->getX() - 16 , this->getY(), this->getWidth()+20+4, tsl::style::TrackBarDefaultHeight );
+            }
+            
+            virtual void drawFocusBackground(gfx::Renderer *renderer) {
+            }
+            
+            virtual void drawHighlight(gfx::Renderer *renderer) override {
+                const u64 currentTime_ns = armTicksToNs(armGetSystemTick());
+                const double timeInSeconds = static_cast<double>(currentTime_ns) / 1000000000.0;
+                progress = ((std::cos(2.0 * ult::_M_PI * std::fmod(timeInSeconds, 1.0) - ult::_M_PI / 2) + 1.0) / 2.0);
+                
+                Color clickColor1 = highlightColor1;
+                Color clickColor2 = clickColor;
+                
+                if (triggerClick && !m_clickActive) {
+                    m_clickStartTime_ns = currentTime_ns;
+                    m_clickActive = true;
+                    if (progress >= 0.5) {
+                        clickColor1 = clickColor;
+                        clickColor2 = highlightColor2;
+                    }
+                }
+            
+                if (m_lastLabel != m_label) {
+                    m_clickActive = false;
+                    triggerClick = false;
+                }
+                m_lastLabel = m_label;
+            
+                if (m_clickActive) {
+                    const u64 elapsedTime_ns = currentTime_ns - m_clickStartTime_ns;
+                    if (elapsedTime_ns < 500000000ULL) {
+                        highlightColor = {
+                            static_cast<u8>((clickColor1.r - clickColor2.r) * progress + clickColor2.r + 0.5),
+                            static_cast<u8>((clickColor1.g - clickColor2.g) * progress + clickColor2.g + 0.5),
+                            static_cast<u8>((clickColor1.b - clickColor2.b) * progress + clickColor2.b + 0.5),
+                            0xF
+                        };
+                    } else {
+                        m_clickActive = false;
+                        triggerClick = false;
+                    }
+                } else {
+                    const bool shouldAppearLocked = m_unlockedTrackbar && m_keyRHeld;
+                    
+                    if ((ult::allowSlide.load(std::memory_order_acquire) || m_unlockedTrackbar) && !shouldAppearLocked) {
+                        highlightColor = {
+                            static_cast<u8>((highlightColor1.r - highlightColor2.r) * progress + highlightColor2.r + 0.5),
+                            static_cast<u8>((highlightColor1.g - highlightColor2.g) * progress + highlightColor2.g + 0.5),
+                            static_cast<u8>((highlightColor1.b - highlightColor2.b) * progress + highlightColor2.b + 0.5),
+                            0xF
+                        };
+                    } else {
+                        highlightColor = {
+                            static_cast<u8>((highlightColor3.r - highlightColor4.r) * progress + highlightColor4.r + 0.5),
+                            static_cast<u8>((highlightColor3.g - highlightColor4.g) * progress + highlightColor4.g + 0.5),
+                            static_cast<u8>((highlightColor3.b - highlightColor4.b) * progress + highlightColor4.b + 0.5),
+                            0xF
+                        };
+                    }
+                }
+                            
+                x = 0;
+                y = 0;
+                
+                if (this->m_highlightShaking) {
+                    t_ns = currentTime_ns - this->m_highlightShakingStartTime;
+                    if (t_ns >= 100000000ULL)
+                        this->m_highlightShaking = false;
+                    else {
+                        amplitude = std::rand() % 5 + 5;
+                        
+                        switch (this->m_highlightShakingDirection) {
+                            case FocusDirection::Up:
+                                y -= shakeAnimation(t_ns, amplitude);
+                                break;
+                            case FocusDirection::Down:
+                                y += shakeAnimation(t_ns, amplitude);
+                                break;
+                            case FocusDirection::Left:
+                                x -= shakeAnimation(t_ns, amplitude);
+                                break;
+                            case FocusDirection::Right:
+                                x += shakeAnimation(t_ns, amplitude);
+                                break;
+                            default:
+                                break;
+                        }
+                        
+                        x = std::clamp(x, -amplitude, amplitude);
+                        y = std::clamp(y, -amplitude, amplitude);
+                    }
+                }
+            
+                
+                if (!m_drawFrameless) {
+                    if (ult::useSelectionBG) {
+                        if (ult::expandedMemory)
+                            renderer->drawRectMultiThreaded(this->getX() + x +19, this->getY() + y, this->getWidth()-11-4, this->getHeight(), aWithOpacity(selectionBGColor));
+                        else
+                            renderer->drawRect(this->getX() + x +19, this->getY() + y, this->getWidth()-11-4, this->getHeight(), aWithOpacity(selectionBGColor));
+                    }
+
+                    renderer->drawBorderedRoundedRect(this->getX() + x +19, this->getY() + y, this->getWidth()-11, this->getHeight(), 5, 5, a(highlightColor));
+                } else {
+                    if (ult::useSelectionBG) {
+                        if (ult::expandedMemory)
+                            renderer->drawRectMultiThreaded(this->getX() + x +19, this->getY() + y, this->getWidth()-11-4, this->getHeight(), aWithOpacity(clickColor));
+                        else
+                            renderer->drawRect(this->getX() + x +19, this->getY() + y, this->getWidth()-11-4, this->getHeight(), aWithOpacity(clickColor));
+                    }
+
+                }
+                
+                ult::onTrackBar.store(true, std::memory_order_release);
+            
+                if (m_clickActive) {
+                    const u64 elapsedTime_ns = currentTime_ns - m_clickStartTime_ns;
+            
+                    auto clickAnimationProgress = tsl::style::ListItemHighlightLength * (1.0f - (static_cast<float>(elapsedTime_ns) / 500000000.0f));
+                    
+                    if (clickAnimationProgress < 0.0f) {
+                        clickAnimationProgress = 0.0f;
+                    }
+                
+                    if (clickAnimationProgress > 0.0f) {
+                        const u8 saturation = tsl::style::ListItemHighlightSaturation * (float(clickAnimationProgress) / float(tsl::style::ListItemHighlightLength));
+                
+                        Color animColor = {0xF, 0xF, 0xF, 0xF};
+                        if (invertBGClickColor) {
+                            animColor.r = 15 - saturation;
+                            animColor.g = 15 - saturation;
+                            animColor.b = 15 - saturation;
+                        } else {
+                            animColor.r = saturation;
+                            animColor.g = saturation;
+                            animColor.b = saturation;
+                        }
+                        animColor.a = selectionBGColor.a;
+                        renderer->drawRect(this->getX() +22, this->getY(), this->getWidth() -22, this->getHeight(), aWithOpacity(animColor));
+                    }
+                }
+            }
+            
+            virtual inline u8 getProgress() {
+                return this->m_value;
+            }
+            
+            virtual void setProgress(u8 value) {
+                this->m_value = value;
+            }
+            
+            void setValueChangedListener(std::function<void(u8)> valueChangedListener) {
+                this->m_valueChangedListener = valueChangedListener;
+            }
+        
+        protected:
+            std::string m_label;
+            std::string m_packagePath;
+            std::string m_selection;
+            s16 m_value = 0;
+            s16 m_minValue = 0;
+            s16 m_maxValue = 100;
+            std::string m_units;
+            bool m_interactionLocked = false;
+            bool m_keyRHeld = false;
+            
+            std::function<void(u8)> m_valueChangedListener = [](u8) {};
+        
+            std::function<bool(std::vector<std::vector<std::string>>&&, const std::string&, const std::string&)> interpretAndExecuteCommands;
+            std::function<std::vector<std::vector<std::string>>(const std::vector<std::vector<std::string>>&, const std::string&, size_t, const std::string&)> getSourceReplacement;
+            std::vector<std::vector<std::string>> commands;
+            std::string selectedCommand;
+        
+            bool m_usingStepTrackbar = false;
+            bool m_usingNamedStepTrackbar = false;
+            s16 m_numSteps = 2;
+            s16 m_index = 0;
+            bool m_unlockedTrackbar = false;
+            bool m_executeOnEveryTick = false;
+            bool touchInSliderBounds = false;
+            bool triggerClick = false;
+            std::function<void()> m_scriptKeyListener;
+            
+            // Instance variables replacing static ones
+            float m_lastBottomBound = 0.0f;
+            std::string m_valuePart = "";
+            u64 m_clickStartTime_ns = 0;
+            bool m_clickActive = false;
+            std::string m_lastLabel = "";
+            bool m_holding = false;
+            u64 m_holdStartTime_ns = 0;
+            u64 m_prevKeysHeld = 0;
+            bool m_wasLastHeld = false;
+            bool m_drawFrameless = false;
+        };
+        
+        
+        /**
+         * @brief A customizable analog trackbar going from 0% to 100% but using discrete steps (Like the volume slider)
+         *
+         */
+        class StepTrackBarV2 : public TrackBarV2 {
+        public:
+
+            /**
+             * @brief Constructor
+             *
+             * @param icon Icon shown next to the track bar
+             * @param numSteps Number of steps the track bar has
+             */
+            StepTrackBarV2(std::string label, std::string packagePath, size_t numSteps, s16 minValue, s16 maxValue, std::string units,
+                std::function<bool(std::vector<std::vector<std::string>>&&, const std::string&, const std::string&)> executeCommands = nullptr,
+                std::function<std::vector<std::vector<std::string>>(const std::vector<std::vector<std::string>>&, const std::string&, size_t, const std::string&)> sourceReplacementFunc = nullptr,
+                std::vector<std::vector<std::string>> cmd = {}, const std::string& selCmd = "", bool usingNamedStepTrackbar = false, bool unlockedTrackbar = false, bool executeOnEveryTick = false)
+                : TrackBarV2(label, packagePath, minValue, maxValue, units, executeCommands, sourceReplacementFunc, cmd, selCmd, !usingNamedStepTrackbar, usingNamedStepTrackbar, numSteps, unlockedTrackbar, executeOnEveryTick) {}
+            
+            virtual ~StepTrackBarV2() {}
+            
+            virtual inline bool handleInput(u64 keysDown, u64 keysHeld, const HidTouchState &touchPos, HidAnalogStickState leftJoyStick, HidAnalogStickState rightJoyStick) override {
+                static u32 tick = 0;
+                static bool holding = false;
+                static u64 prevKeysHeld = 0;
+                const u64 keysReleased = prevKeysHeld & ~keysHeld;
+                prevKeysHeld = keysHeld;
+            
+                static bool wasLastHeld = false;
+            
+                // ADD THIS LINE: Update KEY_R state for visual appearance
+                m_keyRHeld = (keysHeld & KEY_R) != 0;
+            
+                if ((keysHeld & KEY_R)) {
+                    //auto currentFocus = currentGui->getFocusedElement();
+                    if (keysDown & KEY_UP && !(keysHeld & ~KEY_UP & ~KEY_R & ALL_KEYS_MASK))
+                        this->shakeHighlight(FocusDirection::Up);
+                    else if (keysDown & KEY_DOWN && !(keysHeld & ~KEY_DOWN & ~KEY_R & ALL_KEYS_MASK))
+                        this->shakeHighlight(FocusDirection::Down);
+                    else if (keysDown & KEY_LEFT && !(keysHeld & ~KEY_LEFT & ~KEY_R & ALL_KEYS_MASK)){
+                        this->shakeHighlight(FocusDirection::Left);
+                    }
+                    else if (keysDown & KEY_RIGHT && !(keysHeld & ~KEY_RIGHT & ~KEY_R & ALL_KEYS_MASK)) {
+                        this->shakeHighlight(FocusDirection::Right);
+                    }
+                    return true;
+                }
+            
+                // Check if KEY_A is pressed to toggle ult::allowSlide
+                if ((keysDown & KEY_A) && !(keysHeld & ~KEY_A & ALL_KEYS_MASK)) {
+                    //triggerRumbleClick.store(true, std::memory_order_release);
+                    //triggerEnterSound.store(true, std::memory_order_release);
+                    triggerEnterFeedback();
+                    
+
+                    if (!m_unlockedTrackbar) {
+                        ult::atomicToggle(ult::allowSlide);
+                        holding = false; // Reset holding state when KEY_A is pressed
+                    }
+                    if (m_unlockedTrackbar || (!m_unlockedTrackbar && !ult::allowSlide.load(std::memory_order_acquire))) {
+                        updateAndExecute();
+                        triggerClick = true;
+                    }
+                    return true;
+                }
+            
+                //if (keysDown & KEY_B && !(keysHeld & ~KEY_B & ALL_KEYS_MASK)) {
+                //    triggerRumbleDoubleClick.store(true, std::memory_order_release);
+                //    triggerExitSound.store(true, std::memory_order_release);
+                //}
+
+                // Handle SCRIPT_KEY press
+                if ((keysDown & SCRIPT_KEY) && !(keysHeld & ~SCRIPT_KEY & ALL_KEYS_MASK)) {
+                    if (m_scriptKeyListener) {
+                        m_scriptKeyListener();
+                    }
+                    return true;
+                }
+            
+                if (ult::allowSlide.load(std::memory_order_acquire) || m_unlockedTrackbar) {
+                    if (((keysReleased & KEY_LEFT) || (keysReleased & KEY_RIGHT)) ||
+                        (wasLastHeld && !(keysHeld & (KEY_LEFT | KEY_RIGHT)))) {
+                        updateAndExecute();
+                        holding = false;
+                        wasLastHeld = false;
+                        tick = 0;
+                        return true;
+                    }
+                    
+                    if (keysHeld & KEY_LEFT && keysHeld & KEY_RIGHT) {
+                        tick = 0;
+                        return true;
+                    }
+                    
+                    if (keysHeld & (KEY_LEFT | KEY_RIGHT)) {
+                        if (!holding) {
+                            holding = true;
+                            tick = 0;
+                        }
+                        
+                        if ((tick == 0 || tick > 20) && (tick % 3) == 0) {
+                            const float stepSize = static_cast<float>(m_maxValue - m_minValue) / (this->m_numSteps - 1);
+                            if (keysHeld & KEY_LEFT && this->m_index > 0) {
+                                //triggerRumbleClick.store(true, std::memory_order_release);
+                                //triggerNavigationSound.store(true, std::memory_order_release);
+                                triggerNavigationFeedback();
+                                
+                                this->m_index--;
+                                this->m_value = static_cast<s16>(std::round(m_minValue + m_index * stepSize));
+                            } else if (keysHeld & KEY_RIGHT && this->m_index < this->m_numSteps-1) {
+                                //triggerRumbleClick.store(true, std::memory_order_release);
+                                //triggerNavigationSound.store(true, std::memory_order_release);
+                                triggerNavigationFeedback();
+                                
+                                this->m_index++;
+                                this->m_value = static_cast<s16>(std::round(m_minValue + m_index * stepSize));
+                            } else {
+                                return false;
+                            }
+                            this->m_valueChangedListener(this->getProgress());
+                            if (m_executeOnEveryTick)
+                                updateAndExecute(false);
+                            wasLastHeld = true;
+                        }
+                        tick++;
+                        return true;
+                    } else {
+                        holding = false;
+                        tick = 0;
+                    }
+                }
+                
+                return false;
+            }
+            
+            
+            /**
+             * @brief Gets the current value of the trackbar
+             *
+             * @return State
+             */
+            virtual inline u8 getProgress() override {
+                return this->m_value / (100 / (this->m_numSteps - 1));
+            }
+            
+            /**
+             * @brief Sets the current state of the toggle. Updates the Value
+             *
+             * @param state State
+             */
+            virtual void setProgress(u8 value) override {
+                value = std::min(value, u8(this->m_numSteps - 1));
+                this->m_value = value * (100 / (this->m_numSteps - 1));
+            }
+            
+        //protected:
+            //u8 m_numSteps = 1;
+            
+        };
+        
+        
+        /**
+         * @brief A customizable trackbar with multiple discrete steps with specific names. Name gets displayed above the bar
+         *
+         */
+        class NamedStepTrackBarV2 : public StepTrackBarV2 {
+        public:
+            u16 trackBarWidth, stepWidth, currentDescIndex;
+            u32 descWidth, descHeight;
+            
+            /**
+             * @brief Constructor
+             *
+             * @param icon Icon shown next to the track bar
+             * @param stepDescriptions Step names displayed above the track bar
+             */
+            NamedStepTrackBarV2(std::string label, std::string packagePath, std::vector<std::string>& stepDescriptions,
+                std::function<bool(std::vector<std::vector<std::string>>&&, const std::string&, const std::string&)> executeCommands = nullptr,
+                std::function<std::vector<std::vector<std::string>>(const std::vector<std::vector<std::string>>&, const std::string&, size_t, const std::string&)> sourceReplacementFunc = nullptr,
+                std::vector<std::vector<std::string>> cmd = {}, const std::string& selCmd = "", bool unlockedTrackbar = false, bool executeOnEveryTick = false)
+                : StepTrackBarV2(label, packagePath, stepDescriptions.size(), 0, (stepDescriptions.size()-1), "", executeCommands, sourceReplacementFunc, cmd, selCmd, true, unlockedTrackbar, executeOnEveryTick), m_stepDescriptions(stepDescriptions) {
+                    //usingNamedStepTrackbar = true;
+                    //logMessage("on initialization");
+
+                    // Initialize the selection with the current index
+                    if (!m_stepDescriptions.empty() && m_index >= 0 && m_index < static_cast<s16>(m_stepDescriptions.size())) {
+                        this->m_selection = m_stepDescriptions[m_index];
+                        currentDescIndex = m_index;
+                    }
+                }
+            
+            virtual ~NamedStepTrackBarV2() {}
+                        
+            virtual void draw(gfx::Renderer *renderer) override {
+                // Cache frequently used values
+                const u16 trackBarWidth = this->getWidth() - 95;
+                const u16 baseX = this->getX() + 59;
+                const u16 baseY = this->getY() + 44; // 50 - 3
+                const u8 numSteps = this->m_numSteps;
+                const u8 halfNumSteps = (numSteps - 1) / 2;
+                const u16 lastStepX = baseX + trackBarWidth - 1;
+                
+                // Pre-calculate step spacing
+                const float stepSpacing = static_cast<float>(trackBarWidth) / (numSteps - 1);
+                
+                // Cache color for multiple drawRect calls
+                const auto stepColor = a(trackBarEmptyColor);
+                
+                // Draw step rectangles - optimized loop
+                u16 stepX;
+                for (u8 i = 0; i < numSteps; i++) {
+                    
+                    if (i == numSteps - 1) {
+                        // Last step - avoid overshooting
+                        stepX = lastStepX;
+                    } else {
+                        stepX = baseX + static_cast<u16>(std::round(i * stepSpacing));
+                        // Adjust for steps on right side of center
+                        if (i > halfNumSteps) {
+                            stepX -= 1;
+                        }
+                    }
+                    
+                    renderer->drawRect(stepX, baseY, 1, 8, stepColor);
+                }
+                
+                // Update selection (only if index changed - optional optimization)
+                if (currentDescIndex != this->m_index) {
+                    currentDescIndex = this->m_index;
+                    this->m_selection = this->m_stepDescriptions[currentDescIndex];
+                }
+                
+                // Draw the parent trackbar
+                StepTrackBarV2::draw(renderer);
+            }
+
+            
+        protected:
+            std::vector<std::string> m_stepDescriptions;
+            
+        };
+        
+    }
+    
+    // Global state and event system
+    static inline Event notificationEvent;
+    static inline std::mutex notificationJsonMutex;
+    static inline std::atomic<uint32_t> notificationGeneration{0};
+    
+    struct NotificationFile {
+        std::string filename;
+        std::string fullPath;
+        time_t creationTime;
+        int priority;
+    };
+
+    class NotificationPrompt {
+    public:
+        NotificationPrompt()
+            : enabled_(true),
+              is_active_(false),
+              //pending_event_fire_(false),
+              generation_(notificationGeneration.load(std::memory_order_acquire))
+        {}
+    
+        ~NotificationPrompt() {
+            shutdown(); // safe cleanup
+        }
+    
+        enum class PromptState {
+            Inactive,
+            SlidingIn,
+            Visible,
+            SlidingOut
+        };
+    
+        struct NotificationData {
+            std::string text;
+            std::string fileName;
+            size_t fontSize = 28;
+            s32 promptWidth = 448;
+            s32 promptHeight = 88;
+            u32 durationMs = 2500;
+            u32 priority = 20;
+            u64 arrivalNs = 0;
+    
+            NotificationData() = default;
+    
+            NotificationData(const std::string& t, const std::string& f = "",
+                             size_t fs = 28, s32 w = 448, s32 h = 88,
+                             u32 dur = 2500, u32 prio = 20)
+                : text(t), fileName(f), fontSize(fs), promptWidth(w), promptHeight(h),
+                  durationMs(dur), priority(prio), arrivalNs(0) {}
+        };
+    
+        struct NotificationCompare {
+            bool operator()(const NotificationData& a, const NotificationData& b) const {
+                if (a.priority == b.priority) {
+                    return a.arrivalNs > b.arrivalNs; // FIFO
+                }
+                return a.priority > b.priority; // Max-heap
+            }
+        };
+    
+        struct NotificationState {
+            std::string activeText;
+            std::string fileName;
+            size_t fontSize = 28;
+            s32 promptWidth = 448;
+            s32 promptHeight = 88;
+            PromptState state = PromptState::Inactive;
+            u64 expireNs = 0;
+            u64 stateStartNs = 0;
+    
+            NotificationState() = default;
+            bool isTextEmpty() const { return activeText.empty(); }
+        };
+    
+        // ---------------- Public Methods ----------------
+    
+        void show(const std::string& msg, size_t fontSize = 26, u32 priority = 20,
+                  const std::string& fileName = "", u32 durationMs = 2500,
+                  s32 promptWidth = 448, s32 promptHeight = 88)
+        {
+            if (msg.empty()) return;
+    
+            // Quick reject using atomics (fast-path)
+            if (!enabled_.load(std::memory_order_acquire)) return;
+            if (!ult::useNotifications) return;
+            if (generation_ != notificationGeneration.load(std::memory_order_acquire)) return;
+    
+            NotificationData data;
+            data.text = msg;
+            data.fileName = fileName;
+            data.fontSize = std::clamp(fontSize, size_t(8), size_t(48));
+            data.promptWidth = std::clamp(promptWidth, s32(100), s32(1280));
+            data.promptHeight = std::clamp(promptHeight, s32(50), s32(720));
+            data.durationMs = std::clamp(durationMs, 500u, 30000u);
+            data.priority = priority;
+            data.arrivalNs = armTicksToNs(armGetSystemTick());
+    
+            std::lock_guard<std::mutex> lg(state_mutex_);
+    
+            // Re-check under lock to avoid TOCTOU
+            if (!enabled_.load(std::memory_order_acquire)) return;
+            if (generation_ != notificationGeneration.load(std::memory_order_acquire)) return;
+            if (pending_queue_.size() >= MAX_NOTIFS) return;
+    
+            pending_queue_.push(data);
+    
+            if (!is_active_) {
+                startNext_NoLock();
+                //pending_event_fire_.store(true, std::memory_order_release);
+                eventFire(&notificationEvent);
+
+                #if IS_STATUS_MONITOR_DIRECTIVE
+                if (isRendering) {
+                    isRendering = false;
+                    wasRendering = true;
+                    
+                    leventSignal(&renderingStopEvent);
+                }
+                #endif
+            }
+        }
+    
+
+        void draw(gfx::Renderer* renderer, bool promptOnly = false) {
+            if (ult::launchingOverlay.load(std::memory_order_acquire) ||
+                generation_ != notificationGeneration.load(std::memory_order_acquire)) return;
+            if (!enabled_.load(std::memory_order_acquire)) return;
+        
+            NotificationState copy;
+            {
+                std::lock_guard<std::mutex> lg(state_mutex_);
+                if (current_state_.state == PromptState::Inactive || current_state_.activeText.empty()) return;
+                copy = current_state_;
+            }
+            
+            const u64 now = armTicksToNs(armGetSystemTick());
+            const u64 elapsedMs = (now - copy.stateStartNs) / 1'000'000ULL;
+        
+            s32 x = 0, y = 0;
+            switch (copy.state) {
+                case PromptState::SlidingIn: {
+                    const float t = std::min(1.0f, float(elapsedMs) / SLIDE_DURATION_MS);
+                    x = ult::useRightAlignment ?
+                        (tsl::cfg::FramebufferWidth - copy.promptWidth + static_cast<s32>((1.0f - t) * copy.promptWidth)) :
+                        static_cast<s32>(-copy.promptWidth + t * copy.promptWidth);
+                    break;
+                }
+                case PromptState::Visible:
+                    x = ult::useRightAlignment ? (tsl::cfg::FramebufferWidth - copy.promptWidth) : 0;
+                    break;
+                case PromptState::SlidingOut: {
+                    const float t = std::min(1.0f, float(elapsedMs) / SLIDE_DURATION_MS);
+                    x = ult::useRightAlignment ?
+                        (tsl::cfg::FramebufferWidth - copy.promptWidth + static_cast<s32>(t * copy.promptWidth)) :
+                        static_cast<s32>(-t * copy.promptWidth);
+                    break;
+                }
+                default: return;
+            }
+        
+            const s32 scissorX = std::max(0, x);
+            const s32 scissorW = std::min(copy.promptWidth, tsl::cfg::FramebufferWidth - scissorX);
+        
+            if (scissorX >= 0 && scissorW > 0 && copy.promptHeight > 0) {
+                renderer->enableScissoring(scissorX, y, scissorW, copy.promptHeight);
+
+            #if IS_STATUS_MONITOR_DIRECTIVE
+                renderer->drawRect(x, y, copy.promptWidth, copy.promptHeight, defaultBackgroundColor);
+            #else
+                if (!promptOnly && ult::expandedMemory)
+                    renderer->drawRectMultiThreaded(x, y, copy.promptWidth, copy.promptHeight, defaultBackgroundColor);
+                else
+                    renderer->drawRect(x, y, copy.promptWidth, copy.promptHeight, defaultBackgroundColor);
+            #endif
+            
+                if (!copy.activeText.empty()) {
+                    std::vector<std::string> lines;
+                    const std::string& text = copy.activeText;
+            
+                    size_t start = 0;
+                    while (start < text.size() && lines.size() < 8) {
+                        // Look for escaped "\n"
+                        const size_t pos = text.find("\\n", start);
+            
+                        if (pos == std::string::npos) {
+                            // No more "\n", take the rest
+                            lines.emplace_back(text.substr(start));
+                            break;
+                        } else {
+                            // Extract line up to the escape sequence
+                            lines.emplace_back(text.substr(start, pos - start));
+                            start = pos + 2; // Skip past "\n"
+                        }
+                    }
+            
+                    const auto fm = tsl::gfx::FontManager::getFontMetricsForCharacter('A', copy.fontSize);
+                    const s32 startY = y + (copy.promptHeight - static_cast<int>(lines.size()) * fm.lineHeight) / 2 + fm.ascent;
+            
+                    for (size_t i = 0; i < lines.size(); ++i) {
+                        const std::string& line = lines[i];
+                        
+                        #if IS_LAUNCHER_DIRECTIVE
+                        // Check if line contains "Ultrahand" (case insensitive)
+                        const bool hasUltrahand = (line.find(ult::CAPITAL_ULTRAHAND_PROJECT_NAME) != std::string::npos);
+                        
+                        if (hasUltrahand) {
+                            // Draw line with dynamic Ultrahand effect
+                            drawUltrahandLine(renderer, line, x, startY + static_cast<int>(i) * fm.lineHeight, 
+                                            copy.fontSize, copy.promptWidth);
+                        } else {
+                            // Draw normal line
+                            const auto [lw, lh] = renderer->getNotificationTextDimensions(line, false, copy.fontSize);
+                            renderer->drawNotificationString(
+                                line, false,
+                                x + (copy.promptWidth - lw) / 2,
+                                startY + static_cast<int>(i) * fm.lineHeight,
+                                copy.fontSize, notificationTextColor
+                            );
+                        }
+                        #else
+                        // Draw normal line
+                        const auto [lw, lh] = renderer->getNotificationTextDimensions(line, false, copy.fontSize);
+                        renderer->drawNotificationString(
+                            line, false,
+                            x + (copy.promptWidth - lw) / 2,
+                            startY + static_cast<int>(i) * fm.lineHeight,
+                            copy.fontSize, notificationTextColor
+                        );
+                        #endif
+                    }
+                }
+            
+                if (!ult::useRightAlignment) {
+                    renderer->drawRect(x + copy.promptWidth - 1, y, 1, copy.promptHeight, edgeSeparatorColor);
+                    renderer->drawRect(x, y + copy.promptHeight - 1, copy.promptWidth, 1, edgeSeparatorColor);
+                } else {
+                    renderer->drawRect(x, y, 1, copy.promptHeight, edgeSeparatorColor);
+                    renderer->drawRect(x, y + copy.promptHeight - 1, copy.promptWidth, 1, edgeSeparatorColor);
+                }
+            
+                renderer->disableScissoring();
+            }
+        }
+
+        #if IS_LAUNCHER_DIRECTIVE
+        void drawUltrahandLine(gfx::Renderer* renderer, const std::string& line, s32 x, s32 y, 
+                              u32 fontSize, s32 promptWidth) {
+            // Find position of "Ultrahand" in the line (case insensitive)
+            size_t ultrahandPos = std::string::npos;
+            std::string ultrahandToReplace;
+            
+            // Check for "Ultrahand" first
+            ultrahandPos = line.find(ult::CAPITAL_ULTRAHAND_PROJECT_NAME);
+            if (ultrahandPos != std::string::npos) {
+                ultrahandToReplace = ult::CAPITAL_ULTRAHAND_PROJECT_NAME;
+            }
+            
+            if (ultrahandPos == std::string::npos) {
+                // Fallback to normal drawing if not found
+                const auto [lw, lh] = renderer->getNotificationTextDimensions(line, false, fontSize);
+                renderer->drawNotificationString(line, false, x + (promptWidth - lw) / 2, y, fontSize, notificationTextColor);
+                return;
+            }
+            
+            // Split the line into parts
+            const std::string before = line.substr(0, ultrahandPos);
+            const std::string hand = ult::SPLIT_PROJECT_NAME_2;
+            const std::string after = line.substr(ultrahandPos + ultrahandToReplace.length());
+            
+            // Calculate individual part widths to get accurate total width
+            s32 beforeWidth = 0, handWidth = 0, afterWidth = 0;
+            
+            if (!before.empty()) {
+                const auto [bw, bh] = renderer->getNotificationTextDimensions(before, false, fontSize);
+                beforeWidth = bw;
+            }
+            
+            if (!after.empty()) {
+                const auto [aw, ah] = renderer->getNotificationTextDimensions(after, false, fontSize);
+                afterWidth = aw;
+            }
+            
+            const auto [hw, hh] = renderer->getNotificationTextDimensions(hand, false, fontSize);
+            handWidth = hw;
+            
+            // Use shared utility to calculate Ultra width
+            const s32 ultraWidth = tsl::elm::calculateUltraTextWidth(renderer, fontSize, true);
+            
+            // Calculate total width and starting position for centering
+            const s32 totalWidth = beforeWidth + ultraWidth + handWidth + afterWidth;
+            s32 currentX = x + (promptWidth - totalWidth) / 2;
+            
+            // Draw each part in sequence
+            
+            // Draw "before" part
+            if (!before.empty()) {
+                renderer->drawNotificationString(before, false, currentX, y, fontSize, notificationTextColor);
+                currentX += beforeWidth;
+            }
+            
+            // Draw dynamic "Ultra" part using shared utility
+            currentX = tsl::elm::drawDynamicUltraText(renderer, currentX, y, fontSize, logoColor1, true);
+            
+            // Draw static "hand" part
+            renderer->drawNotificationString(hand, false, currentX, y, fontSize, logoColor2);
+            currentX += handWidth;
+            
+            // Draw "after" part
+            if (!after.empty()) {
+                renderer->drawNotificationString(after, false, currentX, y, fontSize, notificationTextColor);
+            }
+        }
+        #endif
+
+        void update() {
+            if (!isActive()) {
+                return;
+            }
+            std::lock_guard<std::mutex> lg(state_mutex_);
+            // Optional extra safety: skip if already inactive and queue empty
+            if (ult::launchingOverlay.load(std::memory_order_acquire) ||
+                (!is_active_ && current_state_.activeText.empty() && pending_queue_.empty())) {
+                return;
+            }
+    
+            //std::lock_guard<std::mutex> lg(state_mutex_);
+            if (generation_ != notificationGeneration.load(std::memory_order_acquire) ||
+                !enabled_.load(std::memory_order_acquire))
+            {
+                current_state_ = NotificationState{};
+                is_active_ = false;
+                return;
+            }
+    
+            const u64 now = armTicksToNs(armGetSystemTick());
+            const u64 elapsedMs = (current_state_.stateStartNs == 0) ? 0 : (now - current_state_.stateStartNs) / 1'000'000ULL;
+    
+            switch (current_state_.state) {
+                case PromptState::SlidingIn:
+                    if (elapsedMs >= SLIDE_DURATION_MS) {
+                        current_state_.state = PromptState::Visible;
+                        current_state_.stateStartNs = now;
+                    }
+                    break;
+                case PromptState::Visible:
+                    if (now >= current_state_.expireNs) {
+                        current_state_.state = PromptState::SlidingOut;
+                        current_state_.stateStartNs = now;
+                    }
+                    break;
+                case PromptState::SlidingOut:
+                    if (elapsedMs >= SLIDE_DURATION_MS) {
+                        const std::string fileToDelete = current_state_.fileName;
+                        // Delete the JSON file safely
+                        if (!fileToDelete.empty()) {
+                            std::lock_guard<std::mutex> lg(notificationJsonMutex);
+                            const std::string fullPath = ult::NOTIFICATIONS_PATH + fileToDelete;
+                            remove(fullPath.c_str());  // ignore errors for now
+                        }
+
+                        current_state_ = NotificationState{};
+                        const bool hadNext = startNext_NoLock();
+                        if (!hadNext) {
+                            is_active_ = false;
+                        }
+                    }
+                    break;
+                default: break;
+            }
+        }
+    
+        bool isActive() const {
+            if (!ult::useNotifications) return false;
+            if (generation_ != notificationGeneration.load(std::memory_order_acquire)) return false;
+            std::lock_guard<std::mutex> lg(state_mutex_);
+            if (is_active_) return true;
+            if (!pending_queue_.empty()) return true;
+            //if (pending_event_fire_.load(std::memory_order_acquire)) return true;
+            if (!current_state_.activeText.empty() && current_state_.state != PromptState::Inactive) return true;
+            return false;
+        }
+    
+        void shutdown() {
+            enabled_.store(false, std::memory_order_release);
+            notificationGeneration.fetch_add(1, std::memory_order_acq_rel);
+            generation_ = notificationGeneration.load(std::memory_order_acquire);
+    
+            std::lock_guard<std::mutex> lg(state_mutex_);
+            while (!pending_queue_.empty()) pending_queue_.pop();
+            current_state_ = NotificationState{};
+            is_active_ = false;
+            //pending_event_fire_.store(false, std::memory_order_release);
+        }
+    
+        void forceShutdown() {
+            enabled_.store(false, std::memory_order_release);
+            //pending_event_fire_.store(false, std::memory_order_release);
+        }
+    
+        //void forceCompleteTransition() {
+        //    std::lock_guard<std::mutex> lg(state_mutex_);
+        //    current_state_ = NotificationState{};
+        //    while (!pending_queue_.empty()) pending_queue_.pop();
+        //    is_active_ = false;
+        //    //pending_event_fire_.store(false, std::memory_order_release);
+        //}
+        //
+        //void freezeState() {
+        //    generation_++;
+        //    enabled_.store(false, std::memory_order_release);
+        //    {
+        //        std::lock_guard<std::mutex> lg(state_mutex_);
+        //        is_active_ = false;
+        //    }
+        //    //pending_event_fire_.store(false, std::memory_order_release);
+        //}
+    
+    private:
+        static constexpr size_t MAX_NOTIFS = 30;
+        static constexpr u32 SLIDE_DURATION_MS = 200;
+        //static constexpr double cycleDuration = 1.6;
+    
+        mutable std::mutex state_mutex_;
+        NotificationState current_state_;
+        std::priority_queue<NotificationData, std::vector<NotificationData>, NotificationCompare> pending_queue_;
+
+        std::atomic<bool> enabled_{true};
+        bool is_active_{false}; // protected by mutex
+        //std::atomic<bool> pending_event_fire_{false};
+        uint32_t generation_{0};
+    
+        bool startNext_NoLock() {
+            if (pending_queue_.empty()) return false;
+            const NotificationData next = pending_queue_.top();
+            pending_queue_.pop();
+    
+            const u64 now = armTicksToNs(armGetSystemTick());
+            current_state_.activeText = next.text;
+            current_state_.fileName = next.fileName;
+            current_state_.fontSize = next.fontSize;
+            current_state_.promptWidth = next.promptWidth;
+            current_state_.promptHeight = next.promptHeight;
+            current_state_.state = PromptState::SlidingIn;
+            current_state_.stateStartNs = now;
+            current_state_.expireNs = now + static_cast<u64>(SLIDE_DURATION_MS) * 1'000'000ULL
+                                        + static_cast<u64>(next.durationMs) * 1'000'000ULL;
+            is_active_ = true;
+            return true;
+        }
+    };
+    
+    // Optional: pointer to global notification
+    static inline NotificationPrompt* notification = nullptr;
+    
+
+    // GUI
+    
+    /**
+     * @brief The top level Gui class
+     * @note The main menu and every sub menu are a separate Gui. Create your own Gui class that extends from this one to create your own menus
+     *
+     */
+    class Gui {
+    public:
+        Gui() {
+            #if IS_LAUNCHER_DIRECTIVE
+            #else
+            {
+                #if INITIALIZE_IN_GUI_DIRECTIVE // for different project structures
+                tsl::initializeThemeVars();
+                
+                // Load the bitmap file into memory
+                ult::loadWallpaperFileWhenSafe();
+                #endif
+            }
+            #endif
+        }
+        
+        virtual ~Gui() {
+            if (this->m_topElement != nullptr)
+                delete this->m_topElement;
+
+            if (this->m_bottomElement != nullptr)
+                delete this->m_bottomElement;
+        }
+        
+        /**
+         * @brief Creates all elements present in this Gui
+         * @note Implement this function and let it return a heap allocated element used as the top level element. This is usually some kind of frame e.g \ref OverlayFrame
+         *
+         * @return Top level element
+         */
+        virtual elm::Element* createUI() = 0;
+        
+        /**
+         * @brief Called once per frame to update values
+         *
+         */
+        virtual void update() {}
+        
+        /**
+         * @brief Called once per frame with the latest HID inputs
+         *
+         * @param keysDown Buttons pressed in the last frame
+         * @param keysHeld Buttons held down longer than one frame
+         * @param touchInput Last touch position
+         * @param leftJoyStick Left joystick position
+         * @param rightJoyStick Right joystick position
+         * @return Weather or not the input has been consumed
+         */
+        virtual inline bool handleInput(u64 keysDown, u64 keysHeld, const HidTouchState &touchPos, HidAnalogStickState leftJoyStick, HidAnalogStickState rightJoyStick) {
+            return false;
+        }
+        
+        /**
+         * @brief Gets the top level element
+         *
+         * @return Top level element
+         */
+        elm::Element* getTopElement() {
+            return this->m_topElement;
+        }
+        
+        /**
+         * @brief Gets the bottom level element
+         *
+         * @return Bottom level element
+         */
+        elm::Element* getBottomElement() {
+            return this->m_bottomElement;
+        }
+
+        /**
+         * @brief Get the currently focused element
+         *
+         * @return Focused element
+         */
+        elm::Element* getFocusedElement() {
+            return this->m_focusedElement;
+        }
+        
+        /**
+         * @brief Requests focus to a element
+         * @note Use this function when focusing a element outside of a element's requestFocus function
+         *
+         * @param element Element to focus
+         * @param direction Focus direction
+         */
+        inline void requestFocus(elm::Element *element, FocusDirection direction, bool shake = true) {
+            elm::Element *oldFocus = this->m_focusedElement;
+            
+            if (element != nullptr) {
+                this->m_focusedElement = element->requestFocus(oldFocus, direction);
+                
+                if (oldFocus != nullptr)
+                    oldFocus->setFocused(false);
+                
+                if (this->m_focusedElement != nullptr) {
+                    this->m_focusedElement->setFocused(true);
+                }
+            }
+            
+            if (shake && oldFocus == this->m_focusedElement && this->m_focusedElement != nullptr)
+                this->m_focusedElement->shakeHighlight(direction);
+        }
+        
+        /**
+         * @brief Removes focus from a element
+         *
+         * @param element Element to remove focus from. Pass nullptr to remove the focus unconditionally
+         */
+        inline void removeFocus(elm::Element* element = nullptr) {
+            if (element == nullptr || element == this->m_focusedElement) {
+                if (this->m_focusedElement != nullptr) {
+                    this->m_focusedElement->setFocused(false);
+                    this->m_focusedElement = nullptr;
+                }
+            }
+        }
+        
+        inline void restoreFocus() {
+            this->m_initialFocusSet = false;
+        }
+        
+    protected:
+        constexpr static inline auto a = &gfx::Renderer::a;
+        constexpr static inline auto aWithOpacity = &gfx::Renderer::aWithOpacity;
+        
+    private:
+        elm::Element *m_focusedElement = nullptr;
+        elm::Element *m_topElement = nullptr;
+        elm::Element *m_bottomElement = nullptr;
+
+        bool m_initialFocusSet = false;
+        
+        friend class Overlay;
+        friend class gfx::Renderer;
+        
+        //// Function to recursively find the bottom element
+        //void findBottomElement(elm::Element* currentElement) {
+        //    // Base case: if the current element has no children, it is the bottom element
+        //    if (currentElement->getChildren().empty()) {
+        //        m_bottomElement = currentElement;
+        //        return;
+        //    }
+        //
+        //    // Recursive case: traverse through all children elements
+        //    for (elm::Element* child : currentElement->getChildren()) {
+        //        findBottomElement(child);
+        //    }
+        //}
+
+        /**
+         * @brief Draws the Gui
+         *
+         * @param renderer
+         */
+        void draw(gfx::Renderer *renderer) {
+            if (this->m_topElement != nullptr)
+                this->m_topElement->draw(renderer);
+        }
+        
+        inline bool initialFocusSet() {
+            return this->m_initialFocusSet;
+        }
+        
+        inline void markInitialFocusSet() {
+            this->m_initialFocusSet = true;
+        }
+        
+    };
+    
+
+    // Overlay
+    
+    /**
+     * @brief The top level Overlay class
+     * @note Every Tesla overlay should have exactly one Overlay class initializing services and loading the default Gui
+     */
+    class Overlay {
+    protected:
+        /**
+         * @brief Constructor
+         * @note Called once when the Overlay gets loaded
+         */
+        Overlay() {}
+    public:
+
+        /**
+         * @brief Deconstructor
+         * @note Called once when the Overlay exits
+         *
+         */
+        virtual ~Overlay() {}
+
+
+        /**
+         * @brief Initializes services
+         * @note Called once at the start to initializes services. You have a sm session available during this call, no need to initialize sm yourself
+         */
+        virtual void initServices() {}
+        
+        /**
+         * @brief Exits services
+         * @note Make sure to exit all services you initialized in \ref Overlay::initServices() here to prevent leaking handles
+         */
+        virtual void exitServices() {}
+        
+        /**
+         * @brief Called before overlay changes from invisible to visible state
+         *
+         */
+        virtual void onShow() {}
+        
+        /**
+         * @brief Called before overlay changes from visible to invisible state
+         *
+         */
+        virtual void onHide() {}
+        
+        /**
+         * @brief Loads the default Gui
+         * @note This function should return the initial Gui to load using the \ref Gui::initially<T>(Args.. args) function
+         *       e.g `return initially<GuiMain>();`
+         *
+         * @return Default Gui
+         */
+        virtual std::unique_ptr<tsl::Gui> loadInitialGui() = 0;
+        
+        /**
+         * @brief Gets a reference to the current Gui on top of the Gui stack
+         *
+         * @return Current Gui reference
+         */
+        std::unique_ptr<tsl::Gui>& getCurrentGui() {
+            return this->m_guiStack.top();
+        }
+        
+        /**
+         * @brief Shows the Gui
+         *
+         */
+        void show() {
+            
+
+            if (this->m_disableNextAnimation) {
+                this->m_animationCounter = MAX_ANIMATION_COUNTER;
+                this->m_disableNextAnimation = false;
+            }
+            else {
+                this->m_fadeInAnimationPlaying = true;
+                this->m_animationCounter = 0;
+            }
+
+            ult::isHidden.store(false);
+            this->onShow();
+            triggerRumbleClick.store(true, std::memory_order_release);
+
+            // reinitialize audio for changes from handheld to docked and vise versa
+            if (ult::expandedMemory && ult::useSoundEffects)
+                ult::AudioPlayer::reloadIfDockedChanged();
+            
+            //if (auto& currGui = this->getCurrentGui(); currGui != nullptr) // TESTING DISABLED (EFFECTS NEED TO BE VERIFIED)
+            //    currGui->restoreFocus();
+        }
+        
+        /**
+         * @brief Hides the Gui
+         *
+         */
+        void hide(bool useNoFade = false) {
+
+
+            if (useNoFade) {
+                // Immediately hide overlay
+                ult::isHidden.store(true);
+                this->m_shouldHide = true;
+                return;
+            }
+            
+
+        #if IS_STATUS_MONITOR_DIRECTIVE
+            if (FullMode && !deactivateOriginalFooter) {
+                
+                if (this->m_disableNextAnimation) {
+                    this->m_animationCounter = 0;
+                    this->m_disableNextAnimation = false;
+                }
+                else {
+                    this->m_fadeOutAnimationPlaying = true;
+                    this->m_animationCounter = MAX_ANIMATION_COUNTER;
+                }
+                ult::isHidden.store(true);
+                this->onHide();
+            }
+        #else
+
+            if (this->m_disableNextAnimation) {
+                this->m_animationCounter = 0;
+                this->m_disableNextAnimation = false;
+            }
+            else {
+                this->m_fadeOutAnimationPlaying = true;
+                this->m_animationCounter = MAX_ANIMATION_COUNTER;
+            }
+            ult::isHidden.store(true);
+            this->onHide();
+        #endif
+            triggerRumbleClick.store(true, std::memory_order_release);
+        }
+        
+        /**
+         * @brief Returns whether fade animation is playing
+         *
+         * @return whether fade animation is playing
+         */
+        bool fadeAnimationPlaying() {
+            return this->m_fadeInAnimationPlaying || this->m_fadeOutAnimationPlaying;
+        }
+        
+        /**
+         * @brief Closes the Gui
+         * @note This makes the Tesla overlay exit and return back to the Tesla-Menu
+         *
+         */
+        void close(bool forceClose = false) {
+            if (!forceClose && notification && notification->isActive()) {
+                this->closeAfter();
+                this->hide(true);
+                return;
+            }
+        
+            this->m_shouldClose = true;
+        }
+
+        /**
+         * @brief Closes the Gui
+         * @note This makes the Tesla overlay exit and return back to the Tesla-Menu
+         *
+         */
+        void closeAfter() {
+            this->m_shouldCloseAfter = true;
+
+        }
+        
+        /**
+         * @brief Gets the Overlay instance
+         *
+         * @return Overlay instance
+         */
+        static inline Overlay* const get() {
+            return Overlay::s_overlayInstance;
+        }
+        
+        /**
+         * @brief Creates the initial Gui of an Overlay and moves the object to the Gui stack
+         *
+         * @tparam T
+         * @tparam Args
+         * @param args
+         * @return constexpr std::unique_ptr<T>
+         */
+        template<typename T, typename ... Args>
+        constexpr inline std::unique_ptr<T> initially(Args&&... args) {
+            return std::make_unique<T>(args...);
+        }
+        
+    private:
+        using GuiPtr = std::unique_ptr<tsl::Gui>;
+        std::stack<GuiPtr, std::list<GuiPtr>> m_guiStack;
+        static inline Overlay *s_overlayInstance = nullptr;
+        
+        bool m_fadeInAnimationPlaying = false, m_fadeOutAnimationPlaying = false;
+        u8 m_animationCounter = 0;
+        static constexpr int MAX_ANIMATION_COUNTER = 5; // Define the maximum animation counter value
+
+        bool m_shouldHide = false;
+        bool m_shouldClose = false;
+        bool m_shouldCloseAfter = false;
+        
+        bool m_disableNextAnimation = false;
+        
+        bool m_closeOnExit;
+        
+        static inline std::atomic<bool> isNavigatingBackwards{false};
+        bool justNavigated = false;
+
+        /**
+         * @brief Initializes the Renderer
+         *
+         */
+        void initScreen() {
+            gfx::Renderer::get().init();
+        }
+        
+        /**
+         * @brief Exits the Renderer
+         *
+         */
+        void exitScreen() {
+            gfx::Renderer::get().exit();
+        }
+        
+        /**
+         * @brief Weather or not the Gui should get hidden
+         *
+         * @return should hide
+         */
+        bool shouldHide() {
+            return this->m_shouldHide;
+        }
+        
+        /**
+         * @brief Weather or not hte Gui should get closed
+         *
+         * @return should close
+         */
+        bool shouldClose() {
+            return this->m_shouldClose;
+        }
+        
+        /**
+         * @brief Weather or not hte Gui should get closed after
+         *
+         * @return should close after
+         */
+        bool shouldCloseAfter() {
+            return this->m_shouldCloseAfter;
+        }
+        
+
+        /**
+         * @brief Quadratic ease-in-out function
+         *
+         * @param t Normalized time (0 to 1)
+         * @return Eased value
+         */
+        float calculateEaseInOut(float t) {
+            if (t < 0.5) {
+                return 2 * t * t;
+            } else {
+                return -1 + (4 - 2 * t) * t;
+            }
+        }
+
+        /**
+         * @brief Handles fade in and fade out animations of the Overlay
+         *
+         */
+        void animationLoop() {
+            
+        
+            if (this->m_fadeInAnimationPlaying) {
+                if (this->m_animationCounter < MAX_ANIMATION_COUNTER) {
+                    this->m_animationCounter++;
+                }
+                
+                if (this->m_animationCounter >= MAX_ANIMATION_COUNTER) {
+                    this->m_fadeInAnimationPlaying = false;
+                }
+            }
+            
+            if (this->m_fadeOutAnimationPlaying) {
+                if (this->m_animationCounter > 0) {
+                    this->m_animationCounter--;
+                }
+                
+                if (this->m_animationCounter == 0) {
+                    this->m_fadeOutAnimationPlaying = false;
+                    this->m_shouldHide = true;
+                }
+            }
+        
+            // Calculate and set the opacity using an easing function
+            //float opacity = calculateEaseInOut(static_cast<float>(this->m_animationCounter) / MAX_ANIMATION_COUNTER);
+            gfx::Renderer::setOpacity(calculateEaseInOut(static_cast<float>(this->m_animationCounter) / MAX_ANIMATION_COUNTER));
+        }
+
+
+        
+        /**
+         * @brief Overlay Main loop
+         *
+         */
+        void loop(bool promptOnly = false) {
+            // Early exit check - avoid all work if shutting down
+            if (ult::launchingOverlay.load(std::memory_order_acquire)) {
+                return;
+            }
+            
+            // CRITICAL: Initialize to TRUE because stacks are added in init()!
+            static std::atomic<bool> screenshotStacksAdded{true};
+            static std::atomic<bool> notificationCacheNeedsClearing{false};
+
+            auto& renderer = gfx::Renderer::get();
+            renderer.startFrame();
+        
+            // Handle main UI rendering
+            if (!promptOnly) {
+
+                // In normal mode, ensure screenshots are enabled
+                // Only re-add if they were removed AND force-disable is not set
+                if (!screenshotStacksAdded.load(std::memory_order_acquire) &&
+                    !screenshotsAreForceDisabled.load(std::memory_order_acquire)) {
+                    if (!screenshotStacksAdded.exchange(true, std::memory_order_acq_rel)) {
+                        renderer.addScreenshotStacks(false);
+                    }
+                }
+                
+                this->animationLoop();
+                this->getCurrentGui()->update();
+                this->getCurrentGui()->draw(&renderer);
+                
+                //notificationCacheNeedsClearing.store(true, std::memory_order_release);
+            } else {
+                // Prompt-only mode - temporarily remove screenshots
+                if (screenshotStacksAdded.load(std::memory_order_acquire) &&
+                    !screenshotsAreDisabled.load(std::memory_order_acquire) &&
+                    !screenshotsAreForceDisabled.load(std::memory_order_acquire)) {
+
+                    if (screenshotStacksAdded.exchange(false, std::memory_order_acq_rel)) {
+                        renderer.removeScreenshotStacks(false);
+                    }
+                }
+                renderer.clearScreen();
+            }
+        
+            // Notification handling — safe, consistent, and null-guarded
+            {
+                if (notification && notification->isActive()) {
+                    notification->update();
+                    notification->draw(&renderer, promptOnly);
+
+                    // Only set flag if it's not already set
+                    notificationCacheNeedsClearing.exchange(true, std::memory_order_acq_rel);
+
+                } else if (notificationCacheNeedsClearing.exchange(false, std::memory_order_acq_rel)) {
+                    tsl::gfx::FontManager::clearNotificationCache();
+                    #if IS_STATUS_MONITOR_DIRECTIVE
+                    if (wasRendering) {
+                        wasRendering = false;
+                        isRendering = true;
+                        leventClear(&renderingStopEvent);
+                    }
+                    #endif
+                }
+            }
+        
+            renderer.endFrame();
+        }
+        
+        // Calculate transition using ease-in-out curve instead of linear
+        float easeInOutCubic(float t) {
+            return t < 0.5f ? 4.0f * t * t * t : 1.0f - pow(-2.0f * t + 2.0f, 3.0f) / 2.0f;
+        }
+        
+        
+
+        void handleInput(u64 keysDown, u64 keysHeld, bool touchDetected, const HidTouchState &touchPos, HidAnalogStickState joyStickPosLeft, HidAnalogStickState joyStickPosRight) {
+            if (!ult::internalTouchReleased.load(std::memory_order_acquire) || ult::launchingOverlay.load(std::memory_order_acquire))
+                return;
+
+            // Static variables to maintain state between function calls
+            static HidTouchState initialTouchPos = { 0 };
+            static HidTouchState oldTouchPos = { 0 };
+            static bool oldTouchDetected = false;
+            static elm::TouchEvent touchEvent, oldTouchEvent;
+        
+            static u64 buttonPressTime_ns = 0, lastKeyEventTime_ns = 0, keyEventInterval_ns = 67000000ULL;
+            static bool singlePressHandled = false;
+            static constexpr u64 CLICK_THRESHOLD_NS = 340000000ULL; // 340ms in nanoseconds
+            
+
+            static bool hasScrolled = false;
+            static void* lastGuiPtr = nullptr;  // Use void* instead
+        
+            auto& currentGui = this->getCurrentGui();
+
+            // Return early if current GUI is not available or internal touch is not released
+            if (!currentGui) {
+
+                elm::Element::setInputMode(InputMode::Controller);
+                
+                oldTouchPos = { 0 };
+                initialTouchPos = { 0 };
+                touchEvent = elm::TouchEvent::None;
+                ult::stillTouching.store(false, std::memory_order_release);
+                ult::interruptedTouch.store(false, std::memory_order_release);
+                return;
+            }
+
+            // Retrieve current focus and top/bottom elements of the GUI
+            auto currentFocus = currentGui->getFocusedElement();
+            
+
+            const bool interpreterIsRunning = ult::runningInterpreter.load(std::memory_order_acquire);
+        #if !IS_STATUS_MONITOR_DIRECTIVE
+            if (interpreterIsRunning) {
+                if (keysDown & KEY_UP && !(keysHeld & ~KEY_UP & ALL_KEYS_MASK)) {
+                    currentFocus->shakeHighlight(FocusDirection::Up);
+                    return;
+                }
+                else if (keysDown & KEY_DOWN && !(keysHeld & ~KEY_DOWN & ALL_KEYS_MASK)) {
+                    currentFocus->shakeHighlight(FocusDirection::Down);
+                    return;
+                }
+                else if (keysDown & KEY_LEFT && !(keysHeld & ~KEY_LEFT & ALL_KEYS_MASK)) {
+                    currentFocus->shakeHighlight(FocusDirection::Left);
+                    return;
+                }
+                else if (keysDown & KEY_RIGHT && !(keysHeld & ~KEY_RIGHT & ALL_KEYS_MASK)) {
+                    currentFocus->shakeHighlight(FocusDirection::Right);
+                    return;
+                }
+            }
+        #endif
+        
+        #if IS_STATUS_MONITOR_DIRECTIVE
+            if (FullMode && !deactivateOriginalFooter) {
+                if (ult::simulatedSelect.exchange(false, std::memory_order_acq_rel))
+                    keysDown |= KEY_A;
+                
+                if (ult::simulatedBack.exchange(false, std::memory_order_acq_rel))
+                    keysDown |= KEY_B;
+
+                if (!overrideBackButton) {
+                    if (keysDown & KEY_B && !(keysHeld & ~KEY_B & ALL_KEYS_MASK)) {
+                        if (!currentGui->handleInput(KEY_B,0,{},{},{})) {
+                            this->goBack();
+                            if (this->m_guiStack.size() >= 1) {
+                                //triggerRumbleDoubleClick.store(true, std::memory_order_release);
+                                //triggerExitSound.store(true, std::memory_order_release);
+                                triggerExitFeedback();
+                            }
+                            //ult::simulatedBackComplete = true;
+                        }
+                        return;
+                    }
+                }
+            } else {
+                ult::simulatedSelect.exchange(false, std::memory_order_acq_rel);
+                ult::simulatedBack.exchange(false, std::memory_order_acq_rel);
+            }
+        #else
+            if (ult::simulatedSelect.exchange(false, std::memory_order_acq_rel))
+                keysDown |= KEY_A;
+            
+            if (ult::simulatedBack.exchange(false, std::memory_order_acq_rel))
+                keysDown |= KEY_B;
+
+            if (!overrideBackButton) {
+                if (keysDown & KEY_B && !(keysHeld & ~KEY_B & ALL_KEYS_MASK)) {
+                    if (!currentGui->handleInput(KEY_B,0,{},{},{})) {
+                        this->goBack();
+                        if (this->m_guiStack.size() >= 1 && !interpreterIsRunning) {
+                            //triggerRumbleDoubleClick.store(true, std::memory_order_release);
+                            //triggerExitSound.store(true, std::memory_order_release);
+                            triggerExitFeedback();
+                        }
+                        //ult::simulatedBackComplete = true;
+                    }
+                    return;
+                }
+            } else {
+                if (keysDown & KEY_B && !(keysHeld & ~KEY_B & ALL_KEYS_MASK)) {
+                    if (this->m_guiStack.size() >= 1 && !interpreterIsRunning) {
+                        //triggerRumbleDoubleClick.store(true, std::memory_order_release);
+                        //triggerExitSound.store(true, std::memory_order_release);
+                        triggerExitFeedback();
+                    }
+                }
+            }
+        #endif
+        
+            // Reset touch state when GUI changes
+            if (currentGui.get() != lastGuiPtr) {  // or just currentGui != lastGuiPtr if it's not a smart pointer
+                hasScrolled = false;
+                oldTouchEvent = elm::TouchEvent::None;
+                oldTouchDetected = false;
+                oldTouchPos = { 0 };
+                initialTouchPos = { 0 };
+                lastGuiPtr = currentGui.get();  // or just currentGui
+            }
+            
+            auto topElement = currentGui->getTopElement();
+
+            const u64 currentTime_ns = armTicksToNs(armGetSystemTick());
+
+            if (!currentFocus && !ult::simulatedBack.load(std::memory_order_acquire) && !ult::stillTouching.load(std::memory_order_acquire) && !oldTouchDetected && !interpreterIsRunning) {
+                if (!topElement) return;
+                
+                if (!currentGui->initialFocusSet() || keysDown & (KEY_UP | KEY_DOWN | KEY_LEFT | KEY_RIGHT)) {
+                    currentGui->requestFocus(topElement, FocusDirection::None);
+                    currentGui->markInitialFocusSet();
+                }
+            }
+            if (isNavigatingBackwards.load(std::memory_order_acquire) && !currentFocus && topElement && keysDown & (KEY_UP | KEY_DOWN | KEY_LEFT | KEY_RIGHT)) {
+                currentGui->requestFocus(topElement, FocusDirection::None);
+                currentGui->markInitialFocusSet();
+                isNavigatingBackwards.store(false, std::memory_order_release);
+                
+                // Reset navigation timing to prevent fast scrolling
+                buttonPressTime_ns = currentTime_ns;
+                lastKeyEventTime_ns = buttonPressTime_ns;
+                singlePressHandled = false;
+            }
+            
+
+        
+            if (!currentFocus && !touchDetected && (!oldTouchDetected || oldTouchEvent == elm::TouchEvent::Scroll)) {
+                if (!isNavigatingBackwards.load(std::memory_order_acquire) &&
+                    !ult::shortTouchAndRelease.load(std::memory_order_acquire) &&
+                    !ult::longTouchAndRelease.load(std::memory_order_acquire) &&
+                    !ult::simulatedSelect.load(std::memory_order_acquire) &&
+                    !ult::simulatedBack.load(std::memory_order_acquire) &&
+                    !ult::simulatedNextPage.load(std::memory_order_acquire)
+                    && topElement) {
+
+                    if (oldTouchEvent == elm::TouchEvent::Scroll) {
+                        hasScrolled = true;
+                    }
+                    if (!hasScrolled) {
+                        currentGui->removeFocus();
+                        currentGui->requestFocus(topElement, FocusDirection::None);
+                    }
+                } else if (ult::longTouchAndRelease.exchange(false, std::memory_order_acq_rel)) {
+                    hasScrolled = true;
+                } else if (ult::shortTouchAndRelease.exchange(false, std::memory_order_acq_rel)) {
+                    hasScrolled = true;
+                }
+            }
+            
+            bool handled = false;
+            elm::Element* parentElement = currentFocus;
+            
+            while (!handled && parentElement) {
+                handled = parentElement->onClick(keysDown) || parentElement->handleInput(keysDown, keysHeld, touchPos, joyStickPosLeft, joyStickPosRight);
+                parentElement = parentElement->getParent();
+            }
+            
+            if (currentGui != this->getCurrentGui()) return;
+            
+            handled |= currentGui->handleInput(keysDown, keysHeld, touchPos, joyStickPosLeft, joyStickPosRight);
+            
+
+            // Navigational boundary cases for handling wrapping
+            static bool lastDirectionPressed = true;
+            const bool directionPressed = ((keysHeld & KEY_UP) || (keysHeld & KEY_DOWN) || (keysHeld & KEY_LEFT) || (keysHeld & KEY_RIGHT));
+
+            if (!directionPressed && lastDirectionPressed)
+                tsl::elm::s_directionalKeyReleased.store(true, std::memory_order_release);
+            else if (directionPressed && lastDirectionPressed)
+                tsl::elm::s_directionalKeyReleased.store(false, std::memory_order_release);
+
+            lastDirectionPressed = directionPressed;
+
+            const float currentScrollVelocity = tsl::elm::s_currentScrollVelocity.load(std::memory_order_acquire);
+
+            if (hasScrolled) {
+                const bool singleArrowKeyPress = ((keysHeld & KEY_UP) != 0) + ((keysHeld & KEY_DOWN) != 0) + ((keysHeld & KEY_LEFT) != 0) + ((keysHeld & KEY_RIGHT) != 0) == 1 && !(keysHeld & ~((currentScrollVelocity != 0.0f ? KEY_A | KEY_UP : KEY_UP) | KEY_DOWN | KEY_LEFT | KEY_RIGHT) & ALL_KEYS_MASK);
+                
+                if (singleArrowKeyPress) {
+                   // const u64 currentTime_ns = armTicksToNs(armGetSystemTick());
+                    buttonPressTime_ns = currentTime_ns;
+                    lastKeyEventTime_ns = currentTime_ns;
+                    hasScrolled = false;
+                    isNavigatingBackwards.store(false, std::memory_order_release);
+                }
+            } else {
+                if (!touchDetected && !oldTouchDetected && !handled && currentFocus && !ult::stillTouching.load(std::memory_order_acquire) && !interpreterIsRunning) {
+                    static bool shouldShake = true;
+                    const bool singleArrowKeyPress = ((keysHeld & KEY_UP) != 0) + ((keysHeld & KEY_DOWN) != 0) + ((keysHeld & KEY_LEFT) != 0) + ((keysHeld & KEY_RIGHT) != 0) == 1 && !(keysHeld & ~((currentScrollVelocity != 0.0f ? KEY_A | KEY_UP: KEY_UP) | KEY_DOWN | KEY_LEFT | KEY_RIGHT) & ALL_KEYS_MASK);
+                    
+                    if (singleArrowKeyPress) {
+                        //const u64 currentTime_ns = armTicksToNs(armGetSystemTick());
+                        
+                        if (keysDown) {
+                            buttonPressTime_ns = currentTime_ns;
+                            lastKeyEventTime_ns = currentTime_ns;
+                            singlePressHandled = false;
+                            // Immediate single press action
+                            if (keysHeld & KEY_UP && !(keysHeld & ~KEY_UP & ALL_KEYS_MASK))
+                                currentGui->requestFocus(topElement, FocusDirection::Up, shouldShake);
+                            else if (keysHeld & KEY_DOWN && !(keysHeld & ~KEY_DOWN & ALL_KEYS_MASK)) {
+                                currentGui->requestFocus(currentFocus->getParent(), FocusDirection::Down, shouldShake);
+                                //isTopElement = false;
+                            }
+                            else if (keysHeld & KEY_LEFT && !(keysHeld & ~KEY_LEFT & ALL_KEYS_MASK))
+                                currentGui->requestFocus(currentFocus->getParent(), FocusDirection::Left, shouldShake);
+                            else if (keysHeld & KEY_RIGHT && !(keysHeld & ~KEY_RIGHT & ALL_KEYS_MASK))
+                                currentGui->requestFocus(currentFocus->getParent(), FocusDirection::Right, shouldShake);
+                        }
+                        
+                        if (keysHeld & ~KEY_DOWN & ~KEY_UP & ~KEY_LEFT & ~KEY_RIGHT & ALL_KEYS_MASK) // reset
+                            buttonPressTime_ns = currentTime_ns;
+                        
+                        const u64 durationSincePress_ns = currentTime_ns - buttonPressTime_ns;
+                        const u64 durationSinceLastEvent_ns = currentTime_ns - lastKeyEventTime_ns;
+                        
+                        if (!singlePressHandled && durationSincePress_ns >= CLICK_THRESHOLD_NS) {
+                            singlePressHandled = true;
+                        }
+                        
+                        if (!tsl::elm::isTableScrolling.load(std::memory_order_acquire)) {
+                            // Calculate transition factor (t) from 0 to 1 based on how far we are from the transition point
+                            static constexpr u64 transitionPoint_ns = 2000000000ULL; // 2000ms in nanoseconds
+                            static constexpr u64 initialInterval_ns = 67000000ULL;   // 67ms in nanoseconds
+                            static constexpr u64 shortInterval_ns = 10000000ULL;     // 10ms in nanoseconds
+                            
+                            const float t = (durationSincePress_ns >= transitionPoint_ns) ? 1.0f : 
+                                     (float)durationSincePress_ns / (float)transitionPoint_ns;
+                            // Smooth transition between intervals using linear interpolation
+                            keyEventInterval_ns = ((1.0f - t) * initialInterval_ns + t * shortInterval_ns);
+                        } else {
+                            // Table scrolling - faster timing
+                            static constexpr u64 transitionPoint_ns = 200000000ULL; // 300ms (faster transition)
+                            static constexpr u64 initialInterval_ns = 33000000ULL;   // 33ms (faster initial)
+                            static constexpr u64 shortInterval_ns = 5000000ULL;      // 5ms (faster sustained)
+                            
+                            const float t = (durationSincePress_ns >= transitionPoint_ns) ? 1.0f : 
+                                     (float)durationSincePress_ns / (float)transitionPoint_ns;
+                            // Smooth transition between intervals using linear interpolation
+                            keyEventInterval_ns = ((1.0f - t) * initialInterval_ns + t * shortInterval_ns);
+                        }
+                        
+        
+                        
+                        if (singlePressHandled && durationSinceLastEvent_ns >= keyEventInterval_ns) {
+                            lastKeyEventTime_ns = currentTime_ns;
+                            if (keysHeld & KEY_UP && !(keysHeld & ~((currentScrollVelocity != 0.0f ? KEY_A | KEY_UP: KEY_UP)) & ALL_KEYS_MASK))
+                                currentGui->requestFocus(topElement, FocusDirection::Up, false);
+                            else if (keysHeld & KEY_DOWN && !(keysHeld & ~((currentScrollVelocity != 0.0f ? KEY_A | KEY_DOWN: KEY_DOWN)) & ALL_KEYS_MASK)) {
+                                currentGui->requestFocus(currentFocus->getParent(), FocusDirection::Down, false);
+                                //isTopElement = false;
+                            }
+                            else if (keysHeld & KEY_LEFT && !(keysHeld & ~KEY_LEFT & ALL_KEYS_MASK))
+                                currentGui->requestFocus(currentFocus->getParent(), FocusDirection::Left, false);
+                            else if (keysHeld & KEY_RIGHT && !(keysHeld & ~KEY_RIGHT & ALL_KEYS_MASK))
+                                currentGui->requestFocus(currentFocus->getParent(), FocusDirection::Right, false);
+                        }
+        #if !IS_STATUS_MONITOR_DIRECTIVE
+                    } else {
+                        buttonPressTime_ns = lastKeyEventTime_ns = currentTime_ns;
+        #endif
+                    }
+                }
+            }
+        
+        #if !IS_STATUS_MONITOR_DIRECTIVE
+            if (!touchDetected && !interpreterIsRunning && topElement) {
+        #else
+            if (!disableJumpTo && !touchDetected && !interpreterIsRunning && topElement) {
+        #endif
+                // Shared constants used by ZL/ZR buttons
+                static constexpr u64 INITIAL_HOLD_THRESHOLD_NS = 400000000ULL;
+                static constexpr u64 HOLD_THRESHOLD_NS = 300000000ULL;         // 300ms to start continuous
+                static constexpr u64 RAPID_CLICK_WINDOW_NS = 500000000ULL;     // 500ms window for rapid clicking
+                static constexpr u64 RAPID_MODE_TIMEOUT_NS = 1000000000ULL;    // 1s timeout to exit rapid mode
+                // Acceleration timing constants
+                static constexpr u64 ACCELERATION_POINT_NS = 1500000000ULL;    // 1.5s transition point
+                static constexpr u64 INITIAL_INTERVAL_NS = 67000000ULL;        // 67ms initial interval
+                static constexpr u64 FAST_INTERVAL_NS = 10000000ULL;           // 10ms fast interval
+                
+                //const u64 currentTime_ns = armTicksToNs(armGetSystemTick());
+                                
+                // Detect PHYSICAL key states (whether key is actually pressed)
+                const bool lKeyPressed = (keysHeld & KEY_L);
+                const bool rKeyPressed = (keysHeld & KEY_R);
+                const bool zlKeyPressed = (keysHeld & KEY_ZL);
+                const bool zrKeyPressed = (keysHeld & KEY_ZR);
+                
+                // Detect if other keys are pressed (for preventing timer resets)
+                const bool notlKeyPressed = (keysHeld & ~KEY_L & ALL_KEYS_MASK);
+                const bool notrKeyPressed = (keysHeld & ~KEY_R & ALL_KEYS_MASK);
+                const bool notzlKeyPressed = (keysHeld & ~KEY_ZL & ALL_KEYS_MASK);
+                const bool notzrKeyPressed = (keysHeld & ~KEY_ZR & ALL_KEYS_MASK);
+                
+                // Handle L button (simple jump to top on release, but not if held too long)
+                {
+                    static bool lKeyWasPressed = false;
+                    static bool lWasIsolated = false;  // Track if L was isolated when first pressed
+                    static u64 lButtonPressStart_ns = 0;
+                    
+                    if (lKeyPressed) {
+                        
+                        if (!lKeyWasPressed) {
+                            // L key physically pressed for the first time (start timer)
+                            lButtonPressStart_ns = currentTime_ns;
+                            lWasIsolated = !notlKeyPressed;  // Remember if it started isolated
+                        }
+                        // Don't reset timer if other keys are pressed after L was already held
+                        lKeyWasPressed = true;
+                    } else {
+                        if (lKeyWasPressed) {
+                            // L key physically released - only jump to top if was isolated when first pressed and not held too long
+                            if (lWasIsolated && !(keysHeld & ~KEY_L & ALL_KEYS_MASK)) {  // Was isolated initially and no other keys held at release
+                                const u64 holdDuration = currentTime_ns - lButtonPressStart_ns;
+                                if (holdDuration < INITIAL_HOLD_THRESHOLD_NS) {
+                                    jumpToTop.store(true, std::memory_order_release);
+                                    currentGui->requestFocus(topElement, FocusDirection::None);
+                                }
+                            }
+                        }
+                        lKeyWasPressed = false;
+                        lWasIsolated = false;
+                    }
+                }
+                
+                // Handle R button (simple jump to bottom on release, but not if held too long)
+                {
+                    static bool rKeyWasPressed = false;
+                    static bool rWasIsolated = false;  // Track if R was isolated when first pressed
+                    static u64 rButtonPressStart_ns = 0;
+                    
+                    if (rKeyPressed) {
+                        if (!rKeyWasPressed) {
+                            // R key physically pressed for the first time (start timer)
+                            rButtonPressStart_ns = currentTime_ns;
+                            rWasIsolated = !notrKeyPressed;  // Remember if it started isolated
+                        }
+                        // Don't reset timer if other keys are pressed after R was already held
+                        rKeyWasPressed = true;
+                    } else {
+                        if (rKeyWasPressed) {
+                            // R key physically released - only jump to bottom if was isolated when first pressed and not held too long
+                            if (rWasIsolated && !(keysHeld & ~KEY_R & ALL_KEYS_MASK)) {  // Was isolated initially and no other keys held at release
+                                const u64 holdDuration = currentTime_ns - rButtonPressStart_ns;
+                                if (holdDuration < INITIAL_HOLD_THRESHOLD_NS) {
+                                    jumpToBottom.store(true, std::memory_order_release);
+                                    currentGui->requestFocus(topElement, FocusDirection::None);
+                                }
+                            }
+                        }
+                        rKeyWasPressed = false;
+                        rWasIsolated = false;
+                    }
+                }
+                
+                // Handle ZL button (skip up with hold)
+                {
+                    static u64 zlLastClickTime_ns = 0;
+                    static bool zlKeyWasPressed = false;
+                    static bool zlWasIsolated = false;  // Track if ZL was isolated when first pressed
+                    static bool zlInRapidClickMode = false;
+                    static u64 zlFirstClickPressStart_ns = 0;  // Track timing for first clicks only
+                    
+                    // Check if we should exit rapid click mode due to timeout
+                    if (zlInRapidClickMode && (currentTime_ns - zlLastClickTime_ns) > RAPID_MODE_TIMEOUT_NS) {
+                        zlInRapidClickMode = false;
+                    }
+                    
+                    if (zlKeyPressed) {
+                        if (!zlKeyWasPressed) {
+                            // ZL key physically pressed for the first time
+                            const u64 timeSinceLastClick = currentTime_ns - zlLastClickTime_ns;
+                            
+                            zlWasIsolated = !notzlKeyPressed;  // Remember if it started isolated
+                            
+                            // Track press start time for first clicks (when not in rapid mode)
+                            if (!zlInRapidClickMode) {
+                                zlFirstClickPressStart_ns = currentTime_ns;
+                            }
+                            
+                            // Enter rapid click mode if clicking within window
+                            if (timeSinceLastClick <= RAPID_CLICK_WINDOW_NS) {
+                                zlInRapidClickMode = true;
+                            }
+                            
+                            // Only trigger immediately if in rapid click mode AND was isolated initially
+                            if (zlInRapidClickMode && zlWasIsolated) {
+                                skipUp.store(true, std::memory_order_release);
+                                currentGui->requestFocus(topElement, FocusDirection::None);
+                                zlLastClickTime_ns = currentTime_ns;
+                            }
+                        }
+                        
+                        // Check for hold behavior - ONLY if in rapid click mode AND was isolated initially
+                        if (zlInRapidClickMode && zlWasIsolated) {
+                            static u64 zlButtonPressStart_ns = 0;
+                            static u64 zlLastHoldTrigger_ns = 0;
+                            static bool zlHoldTriggered = false;
+                            
+                            // Initialize on new press
+                            if (!zlKeyWasPressed) {
+                                zlButtonPressStart_ns = currentTime_ns;
+                                zlLastHoldTrigger_ns = currentTime_ns;
+                                zlHoldTriggered = false;
+                            }
+                            
+                            const u64 holdDuration = currentTime_ns - zlButtonPressStart_ns;
+                            
+                            if (holdDuration >= HOLD_THRESHOLD_NS) {
+                                // Calculate dynamic interval based on hold duration (accelerating)
+                                const float t = (holdDuration >= ACCELERATION_POINT_NS) ? 1.0f : 
+                                               (float)holdDuration / (float)ACCELERATION_POINT_NS;
+                                const u64 currentInterval = ((1.0f - t) * INITIAL_INTERVAL_NS + t * FAST_INTERVAL_NS);
+                                
+                                const u64 timeSinceLastHoldTrigger = currentTime_ns - zlLastHoldTrigger_ns;
+                                
+                                if (!zlHoldTriggered || timeSinceLastHoldTrigger >= currentInterval) {
+                                    // Trigger skip
+                                    skipUp.store(true, std::memory_order_release);
+                                    currentGui->requestFocus(topElement, FocusDirection::None);
+                                    zlHoldTriggered = true;
+                                    zlLastHoldTrigger_ns = currentTime_ns;
+                                    zlLastClickTime_ns = currentTime_ns;  // Keep rapid mode active
+                                }
+                            }
+                        }
+                        
+                        zlKeyWasPressed = true;
+                    } else {
+                        if (zlKeyWasPressed) {
+                            // ZL key physically released - only trigger if was isolated initially and no other keys held at release
+                            if (!zlInRapidClickMode && zlWasIsolated && !(keysHeld & ~KEY_ZL & ALL_KEYS_MASK)) {
+                                const u64 holdDuration = currentTime_ns - zlFirstClickPressStart_ns;
+                                
+                                // Only trigger if not held too long
+                                if (holdDuration < INITIAL_HOLD_THRESHOLD_NS) {
+                                    skipUp.store(true, std::memory_order_release);
+                                    currentGui->requestFocus(topElement, FocusDirection::None);
+                                    zlLastClickTime_ns = currentTime_ns;
+                                    zlInRapidClickMode = true;  // Enter rapid mode after first release
+                                }
+                            }
+                        }
+                        zlKeyWasPressed = false;
+                        zlWasIsolated = false;
+                    }
+                }
+                
+                // Handle ZR button (skip down with hold)
+                {
+                    static u64 zrLastClickTime_ns = 0;
+                    static bool zrKeyWasPressed = false;
+                    static bool zrWasIsolated = false;  // Track if ZR was isolated when first pressed
+                    static bool zrInRapidClickMode = false;
+                    static u64 zrFirstClickPressStart_ns = 0;  // Track timing for first clicks only
+                    
+                    // Check if we should exit rapid click mode due to timeout
+                    if (zrInRapidClickMode && (currentTime_ns - zrLastClickTime_ns) > RAPID_MODE_TIMEOUT_NS) {
+                        zrInRapidClickMode = false;
+                    }
+                    
+                    if (zrKeyPressed) {
+                        if (!zrKeyWasPressed) {
+                            // ZR key physically pressed for the first time
+                            const u64 timeSinceLastClick = currentTime_ns - zrLastClickTime_ns;
+                            
+                            zrWasIsolated = !notzrKeyPressed;  // Remember if it started isolated
+                            
+                            // Track press start time for first clicks (when not in rapid mode)
+                            if (!zrInRapidClickMode) {
+                                zrFirstClickPressStart_ns = currentTime_ns;
+                            }
+                            
+                            // Enter rapid click mode if clicking within window
+                            if (timeSinceLastClick <= RAPID_CLICK_WINDOW_NS) {
+                                zrInRapidClickMode = true;
+                            }
+                            
+                            // Only trigger immediately if in rapid click mode AND was isolated initially
+                            if (zrInRapidClickMode && zrWasIsolated) {
+                                skipDown.store(true, std::memory_order_release);
+                                currentGui->requestFocus(topElement, FocusDirection::None);
+                                zrLastClickTime_ns = currentTime_ns;
+                            }
+                        }
+                        
+                        // Check for hold behavior - ONLY if in rapid click mode AND was isolated initially
+                        if (zrInRapidClickMode && zrWasIsolated) {
+                            static u64 zrButtonPressStart_ns = 0;
+                            static u64 zrLastHoldTrigger_ns = 0;
+                            static bool zrHoldTriggered = false;
+                            
+                            // Initialize on new press
+                            if (!zrKeyWasPressed) {
+                                zrButtonPressStart_ns = currentTime_ns;
+                                zrLastHoldTrigger_ns = currentTime_ns;
+                                zrHoldTriggered = false;
+                            }
+                            
+                            const u64 holdDuration = currentTime_ns - zrButtonPressStart_ns;
+                            
+                            if (holdDuration >= HOLD_THRESHOLD_NS) {
+                                // Calculate dynamic interval based on hold duration (accelerating)
+                                const float t = (holdDuration >= ACCELERATION_POINT_NS) ? 1.0f : 
+                                               (float)holdDuration / (float)ACCELERATION_POINT_NS;
+                                const u64 currentInterval = ((1.0f - t) * INITIAL_INTERVAL_NS + t * FAST_INTERVAL_NS);
+                                
+                                const u64 timeSinceLastHoldTrigger = currentTime_ns - zrLastHoldTrigger_ns;
+                                
+                                if (!zrHoldTriggered || timeSinceLastHoldTrigger >= currentInterval) {
+                                    // Trigger skip
+                                    skipDown.store(true, std::memory_order_release);
+                                    currentGui->requestFocus(topElement, FocusDirection::None);
+                                    zrHoldTriggered = true;
+                                    zrLastHoldTrigger_ns = currentTime_ns;
+                                    zrLastClickTime_ns = currentTime_ns;  // Keep rapid mode active
+                                }
+                            }
+                        }
+                        
+                        zrKeyWasPressed = true;
+                    } else {
+                        if (zrKeyWasPressed) {
+                            // ZR key physically released - only trigger if was isolated initially and no other keys held at release
+                            if (!zrInRapidClickMode && zrWasIsolated && !(keysHeld & ~KEY_ZR & ALL_KEYS_MASK)) {
+                                const u64 holdDuration = currentTime_ns - zrFirstClickPressStart_ns;
+                                
+                                // Only trigger if not held too long
+                                if (holdDuration < INITIAL_HOLD_THRESHOLD_NS) {
+                                    skipDown.store(true, std::memory_order_release);
+                                    currentGui->requestFocus(topElement, FocusDirection::None);
+                                    zrLastClickTime_ns = currentTime_ns;
+                                    zrInRapidClickMode = true;  // Enter rapid mode after first release
+                                }
+                            }
+                        }
+                        zrKeyWasPressed = false;
+                        zrWasIsolated = false;
+                    }
+                }
+            }
+            
+            //if (keysDown & KEY_ZL) {
+            //    //while (tsl::notification && tsl::notification->isActive()) {
+            //    //    tsl::notification->update(true, true); // No file ops, allow state transitions
+            //    //    svcSleepThread(10'000'000); // 1ms sleep
+            //    //}
+            //    if (notification)
+            //        notification->forceShutdown();
+            //}
+
+            
+            if (!touchDetected && oldTouchDetected && currentGui && topElement) {
+                topElement->onTouch(elm::TouchEvent::Release, oldTouchPos.x, oldTouchPos.y, oldTouchPos.x, oldTouchPos.y, initialTouchPos.x, initialTouchPos.y);
+            }
+
+            // Cache common calculations
+            // Use consistent edge padding equal to halfGap (matching drawing code)
+            const float edgePadding = ult::halfGap.load(std::memory_order_acquire) - 5;
+            const float buttonStartX = edgePadding;
+            
+            // Calculate button positions matching the drawing code
+            const float backLeftEdge = buttonStartX + ult::layerEdge;
+            const float backRightEdge = backLeftEdge + ult::backWidth.load(std::memory_order_acquire);
+            const float selectLeftEdge = backRightEdge;
+            const float selectRightEdge = selectLeftEdge + ult::selectWidth.load(std::memory_order_acquire);
+            const float nextPageLeftEdge = ult::noClickableItems.load(std::memory_order_acquire) ? backRightEdge : selectRightEdge;
+            const float nextPageRightEdge = nextPageLeftEdge + ult::nextPageWidth.load(std::memory_order_acquire);
+            
+            const float menuRightEdge = 245.0f + ult::layerEdge - 13;
+            const u32 footerY = cfg::FramebufferHeight - 73U + 1;
+            static std::vector<bool> lastSimulatedTouch = {false, false, false, false};
+            
+            // Touch region calculations
+            const bool backTouched = (touchPos.x >= backLeftEdge && touchPos.x < backRightEdge && touchPos.y > footerY) &&
+                                     (initialTouchPos.x >= backLeftEdge && initialTouchPos.x < backRightEdge && initialTouchPos.y > footerY);
+            
+            const bool selectTouched = !ult::noClickableItems.load(std::memory_order_acquire) &&
+                                       (touchPos.x >= selectLeftEdge && touchPos.x < selectRightEdge && touchPos.y > footerY) &&
+                                       (initialTouchPos.x >= selectLeftEdge && initialTouchPos.x < selectRightEdge && initialTouchPos.y > footerY);
+            
+            const bool nextPageTouched = (touchPos.x >= nextPageLeftEdge && touchPos.x < nextPageRightEdge && touchPos.y > footerY) &&
+                                          (initialTouchPos.x >= nextPageLeftEdge && initialTouchPos.x < nextPageRightEdge && initialTouchPos.y > footerY);
+            
+            const bool menuTouched = (touchPos.x > ult::layerEdge+7U && touchPos.x <= menuRightEdge && touchPos.y > 10U && touchPos.y <= 83U) &&
+                                     (initialTouchPos.x > ult::layerEdge+7U && initialTouchPos.x <= menuRightEdge && initialTouchPos.y > 10U && initialTouchPos.y <= 83U);
+            
+            ult::touchingBack.store(backTouched, std::memory_order_release);
+            ult::touchingSelect.store(selectTouched, std::memory_order_release);
+            ult::touchingNextPage.store(nextPageTouched, std::memory_order_release);
+            ult::touchingMenu.store(menuTouched, std::memory_order_release);
+            
+            if (touchDetected) {
+                // Update lastSimulatedTouch with current touch states
+                lastSimulatedTouch = {
+                    backTouched, 
+                    selectTouched, 
+                    nextPageTouched, 
+                    menuTouched
+                };
+
+                ult::interruptedTouch.store(((keysHeld & ALL_KEYS_MASK) != 0), std::memory_order_release);
+            
+                const u32 xDistance = std::abs(static_cast<s32>(initialTouchPos.x) - static_cast<s32>(touchPos.x));
+                const u32 yDistance = std::abs(static_cast<s32>(initialTouchPos.y) - static_cast<s32>(touchPos.y));
+                
+                const bool isScroll = (xDistance * xDistance + yDistance * yDistance) > 1000;
+                if (isScroll) {
+                    elm::Element::setInputMode(InputMode::TouchScroll);
+                    touchEvent = elm::TouchEvent::Scroll;
+                } else {
+                    if (touchEvent != elm::TouchEvent::Scroll) {
+                        touchEvent = elm::TouchEvent::Hold;
+                    }
+                }
+                
+                if (!oldTouchDetected) {
+                    initialTouchPos = touchPos;
+                    elm::Element::setInputMode(InputMode::Touch);
+                    if (!interpreterIsRunning) {
+                        ult::touchInBounds = (initialTouchPos.y <= footerY && initialTouchPos.y > 73U && 
+                                            initialTouchPos.x <= ult::layerEdge + cfg::FramebufferWidth - 30U && 
+                                            initialTouchPos.x > 40U + ult::layerEdge);
+                        if (ult::touchInBounds) currentGui->removeFocus();
+                    }
+                    touchEvent = elm::TouchEvent::Touch;
+                }
+                
+                if (currentGui && topElement && !interpreterIsRunning) {
+                    topElement->onTouch(touchEvent, touchPos.x, touchPos.y, oldTouchPos.x, oldTouchPos.y, initialTouchPos.x, initialTouchPos.y);
+                    if (touchPos.x > 40U + ult::layerEdge && touchPos.x <= cfg::FramebufferWidth - 30U + ult::layerEdge && 
+                        touchPos.y > 73U && touchPos.y <= footerY) {
+                        currentGui->removeFocus();
+                    }
+                }
+                
+                oldTouchPos = touchPos;
+                if ((touchPos.x < ult::layerEdge || touchPos.x > cfg::FramebufferWidth + ult::layerEdge) && tsl::elm::Element::getInputMode() == tsl::InputMode::Touch) {
+                    oldTouchPos = { 0 };
+                    initialTouchPos = { 0 };
+            #if IS_STATUS_MONITOR_DIRECTIVE
+                    if (FullMode && !deactivateOriginalFooter) {
+                        this->hide();
+                    }
+            #else
+                    this->hide();
+            #endif
+                }
+                ult::stillTouching.store(true, std::memory_order_release);
+            } else {
+                // Process touch release using stored touch states - no need to recalculate boundaries
+                for (int i = 0; i < 4; ++i) {
+                    if (lastSimulatedTouch[i]) {
+                        if (!ult::interruptedTouch.load(std::memory_order_acquire) && !interpreterIsRunning) {
+                            switch (i) {
+                                case 0: // Back button
+                                    ult::simulatedBack.store(true, std::memory_order_release);
+                                    break;
+                                case 1: // Select button
+                                    ult::simulatedSelect.store(true, std::memory_order_release);
+                                    break;
+                                case 2: // Next page button
+                                    ult::simulatedNextPage.store(true, std::memory_order_release);
+                                    break;
+                                case 3: // Menu button
+                                    ult::simulatedMenu.store(true, std::memory_order_release);
+                                    break;
+                            }
+                        } else if (interpreterIsRunning) {
+                            switch (i) {
+                                case 0: // Back button when interpreter is running
+                                    this->hide();
+                                    break;
+                                case 1: // Select button when interpreter is running
+                                    ult::externalAbortCommands.store(true, std::memory_order_release);
+                                    break;
+                                // cases 2 and 3 don't have interpreter running logic in original code
+                            }
+                        }
+                    }
+                }
+                
+                // Update lastSimulatedTouch with current touch states
+                lastSimulatedTouch = {
+                    false, 
+                    false, 
+                    false, 
+                    false
+                };
+
+                elm::Element::setInputMode(InputMode::Controller);
+                
+                oldTouchPos = { 0 };
+                initialTouchPos = { 0 };
+                touchEvent = elm::TouchEvent::None;
+                ult::stillTouching.store(false, std::memory_order_release);
+                ult::interruptedTouch.store(false, std::memory_order_release);
+            }
+            
+            oldTouchDetected = touchDetected;
+            oldTouchEvent = touchEvent;
+
+        }
+        
+
+        /**
+         * @brief Clears the screen
+         *
+         */
+        void clearScreen() {
+            auto& renderer = gfx::Renderer::get();
+            
+            renderer.startFrame();
+            renderer.clearScreen();
+            renderer.endFrame();
+        }
+        
+        /**
+         * @brief Reset hide and close flags that were previously set by \ref Overlay::close() or \ref Overlay::hide()
+         *
+         */
+        void resetFlags() {
+            this->m_shouldHide = false;
+            this->m_shouldClose = false;
+            this->m_shouldCloseAfter = false;
+        }
+        
+        /**
+         * @brief Disables the next animation that would play
+         *
+         */
+        void disableNextAnimation() {
+            this->m_disableNextAnimation = true;
+        }
+        
+
+        /**
+         * @brief Changes to a different Gui
+         *
+         * @param gui Gui to change to
+         * @return Reference to the Gui
+         */
+        std::unique_ptr<tsl::Gui>& changeTo(std::unique_ptr<tsl::Gui>&& gui, bool clearGlyphCache = false) {
+            if (this->m_guiStack.top() != nullptr && this->m_guiStack.top()->m_focusedElement != nullptr)
+                this->m_guiStack.top()->m_focusedElement->resetClickAnimation();
+            
+            isNavigatingBackwards.store(false, std::memory_order_release);
+
+            // cache frame for forward rendering using external list method (to be implemented)
+
+            // Create the top element of the new Gui
+            gui->m_topElement = gui->createUI();
+
+            
+            // Push the new Gui onto the stack
+            this->m_guiStack.push(std::move(gui));
+            //if (clearGlyphCache)
+            //    tsl::gfx::FontManager::clearCache();
+            return this->m_guiStack.top();
+        }
+
+        
+        /**
+         * @brief Creates a new Gui and changes to it
+         *
+         * @tparam G Gui to create
+         * @tparam Args Arguments to pass to the Gui
+         * @param args Arguments to pass to the Gui
+         * @return Reference to the newly created Gui
+         */
+        // Template version without clearGlyphCache (for backward compatibility)
+        template<typename G, typename ...Args>
+        std::unique_ptr<tsl::Gui>& changeTo(Args&&... args) {
+            return this->changeTo(std::make_unique<G>(std::forward<Args>(args)...), false);
+        }
+        
+
+        /**
+         * @brief Swaps to a different Gui
+         *
+         * @param gui Gui to change to
+         * @return Reference to the Gui
+         */
+        std::unique_ptr<tsl::Gui>& swapTo(std::unique_ptr<tsl::Gui>&& gui, u32 count = 1) {
+            //isNavigatingBackwards = true;
+            
+            isNavigatingBackwards.store(true, std::memory_order_release);
+            
+            // Clamp count to available stack size to prevent underflow
+            const u32 actualCount = std::min(count, static_cast<u32>(this->m_guiStack.size()));
+            
+            if (actualCount > 1) {
+                tsl::elm::skipDeconstruction.store(true, std::memory_order_release);
+                // Pop the specified number of GUIs
+                for (u32 i = 0; i < actualCount; ++i) {
+                    this->m_guiStack.pop();
+                }
+                tsl::elm::skipDeconstruction.store(false, std::memory_order_release);
+            } else {
+                this->m_guiStack.pop();
+            }
+
+
+
+            if (this->m_guiStack.top() != nullptr && this->m_guiStack.top()->m_focusedElement != nullptr)
+                this->m_guiStack.top()->m_focusedElement->resetClickAnimation();
+            
+            isNavigatingBackwards.store(false, std::memory_order_release);
+
+            // cache frame for forward rendering using external list method (to be implemented)
+
+            // Create the top element of the new Gui
+            gui->m_topElement = gui->createUI();
+
+            
+            // Push the new Gui onto the stack
+            this->m_guiStack.push(std::move(gui));
+            //if (clearGlyphCache)
+            //    tsl::gfx::FontManager::clearCache();
+            return this->m_guiStack.top();
+        }
+
+        /**
+         * @brief Creates a new Gui and changes to it
+         *
+         * @tparam G Gui to create
+         * @tparam Args Arguments to pass to the Gui
+         * @param args Arguments to pass to the Gui
+         * @return Reference to the newly created Gui
+         */
+        // Template version without clearGlyphCache (for backward compatibility)
+        template<typename G, typename ...Args>
+        std::unique_ptr<tsl::Gui>& swapTo(SwapDepth depth, Args&&... args) {
+            return this->swapTo(std::make_unique<G>(std::forward<Args>(args)...), depth.value);
+        }
+        
+        template<typename G, typename ...Args>
+        std::unique_ptr<tsl::Gui>& swapTo(Args&&... args) {
+            return this->swapTo(std::make_unique<G>(std::forward<Args>(args)...), 1);
+        }
+        
+        /**
+         * @brief Pops the top Gui(s) from the stack and goes back count number of times
+         * @param count Number of Guis to pop from the stack (default: 1)
+         * @note The Overlay gets closed once there are no more Guis on the stack
+         */
+        void goBack(u32 count = 1) {
+            tsl::elm::g_disableMenuCacheOnReturn.store(true, std::memory_order_release);
+
+            // If there is exactly one GUI and an active notification, handle that first
+            if (this->m_guiStack.size() == 1 && notification && notification->isActive()) {
+                this->close(); 
+                return;
+            }
+        
+            isNavigatingBackwards.store(true, std::memory_order_release);
+        
+            // Clamp count to available stack size to prevent underflow
+            const u32 actualCount = std::min(count, static_cast<u32>(this->m_guiStack.size()));
+        
+            // Special case: if we don't close on exit and popping everything would leave us with 0 or 1 GUI
+            if (!this->m_closeOnExit && this->m_guiStack.size() <= actualCount) {
+                this->hide();
+                return;
+            }
+        
+            if (actualCount > 1)
+                tsl::elm::skipDeconstruction.store(true, std::memory_order_release);
+        
+            // Pop the specified number of GUIs
+            for (u32 i = 0; i < actualCount && !this->m_guiStack.empty(); ++i) {
+                this->m_guiStack.pop();
+            }
+        
+            tsl::elm::skipDeconstruction.exchange(false, std::memory_order_acq_rel);
+            
+            // Close overlay if stack is empty
+            if (this->m_guiStack.empty()) {
+                this->close();
+            } else {
+                //triggerRumbleDoubleClick.store(true, std::memory_order_release);
+                //triggerExitSound.store(true, std::memory_order_release);
+            }
+
+        }
+
+        void pop(u32 count = 1) {
+            isNavigatingBackwards.store(true, std::memory_order_release);
+            
+            // Clamp count to available stack size to prevent underflow
+            const u32 actualCount = std::min(count, static_cast<u32>(this->m_guiStack.size()));
+
+            if (actualCount > 1) {
+                tsl::elm::skipDeconstruction.store(true, std::memory_order_release);
+                // Pop the specified number of GUIs
+                for (u32 i = 0; i < actualCount; ++i) {
+                    this->m_guiStack.pop();
+                }
+                tsl::elm::skipDeconstruction.store(false, std::memory_order_release);
+            } else {
+                this->m_guiStack.pop();
+            }
+        }
+
+
+        
+        template<typename G, typename ...Args>
+        friend std::unique_ptr<tsl::Gui>& changeTo(Args&&... args);
+        template<typename G, typename ...Args>
+        friend std::unique_ptr<tsl::Gui>& swapTo(Args&&... args);
+        
+        template<typename G, typename ...Args>
+        friend std::unique_ptr<tsl::Gui>& swapTo(SwapDepth depth, Args&&... args);
+        
+        friend void goBack(u32 count);
+        friend void pop(u32 count);
+        
+        template<typename, tsl::impl::LaunchFlags>
+        friend int loop(int argc, char** argv);
+        
+        friend class tsl::Gui;
+    };
+    
+    
+    namespace impl {
+        static constexpr const char* TESLA_CONFIG_FILE = "/config/tesla/config.ini";
+        static constexpr const char* ULTRAHAND_CONFIG_FILE = "/config/ultrahand/config.ini";
+        
+        /**
+         * @brief Data shared between the different ult::renderThreads
+         *
+         */
+        struct SharedThreadData {
+            std::atomic<bool> running = false;
+            
+            Event comboEvent = { 0 };
+            
+            std::atomic<bool> overlayOpen = false;
+            
+            std::mutex dataMutex;
+            u64 keysDown = 0;
+            u64 keysDownPending = 0;
+            u64 keysHeld = 0;
+            HidTouchScreenState touchState = { 0 };
+            HidAnalogStickState joyStickPosLeft = { 0 }, joyStickPosRight = { 0 };
+        };
+        
+        
+        /**
+         * @brief Extract values from Tesla settings file
+         *
+         */
+        static void parseOverlaySettings() {
+            hlp::ini::IniData parsedConfig = hlp::ini::readOverlaySettings(ULTRAHAND_CONFIG_FILE);
+            
+            u64 decodedKeys = hlp::comboStringToKeys(parsedConfig[ult::ULTRAHAND_PROJECT_NAME][ult::KEY_COMBO_STR]); // CUSTOM MODIFICATION
+            if (decodedKeys)
+                tsl::cfg::launchCombo = decodedKeys;
+            else {
+                parsedConfig = hlp::ini::readOverlaySettings(TESLA_CONFIG_FILE);
+                decodedKeys = hlp::comboStringToKeys(parsedConfig["tesla"][ult::KEY_COMBO_STR]);
+                if (decodedKeys)
+                    tsl::cfg::launchCombo = decodedKeys;
+            }
+            
+            //#if USING_WIDGET_DIRECTIVE
+            ult::datetimeFormat = parsedConfig[ult::ULTRAHAND_PROJECT_NAME]["datetime_format"]; // read datetime_format
+            ult::removeQuotes(ult::datetimeFormat);
+            if (ult::datetimeFormat.empty()) {
+                ult::datetimeFormat = ult::DEFAULT_DT_FORMAT;
+                ult::removeQuotes(ult::datetimeFormat);
+            }
+
+
+            std::string tempStr;
+            
+            tempStr = parsedConfig[ult::ULTRAHAND_PROJECT_NAME]["hide_clock"];
+            ult::removeQuotes(tempStr);
+            ult::hideClock = tempStr != ult::FALSE_STR;
+            
+            tempStr = parsedConfig[ult::ULTRAHAND_PROJECT_NAME]["hide_battery"];
+            ult::removeQuotes(tempStr);
+            ult::hideBattery = tempStr != ult::FALSE_STR;
+            
+            tempStr = parsedConfig[ult::ULTRAHAND_PROJECT_NAME]["hide_pcb_temp"];
+            ult::removeQuotes(tempStr);
+            ult::hidePCBTemp = tempStr != ult::FALSE_STR;
+            
+            tempStr = parsedConfig[ult::ULTRAHAND_PROJECT_NAME]["hide_soc_temp"];
+            ult::removeQuotes(tempStr);
+            ult::hideSOCTemp = tempStr != ult::FALSE_STR;
+            
+            tempStr = parsedConfig[ult::ULTRAHAND_PROJECT_NAME]["dynamic_widget_colors"];
+            ult::removeQuotes(tempStr);
+            ult::dynamicWidgetColors = tempStr != ult::FALSE_STR;
+            
+            tempStr = parsedConfig[ult::ULTRAHAND_PROJECT_NAME]["hide_widget_backdrop"];
+            ult::removeQuotes(tempStr);
+            ult::hideWidgetBackdrop = tempStr != ult::FALSE_STR;
+            
+            tempStr = parsedConfig[ult::ULTRAHAND_PROJECT_NAME]["center_widget_alignment"];
+            ult::removeQuotes(tempStr);
+            ult::centerWidgetAlignment = tempStr != ult::FALSE_STR;
+            
+            tempStr = parsedConfig[ult::ULTRAHAND_PROJECT_NAME]["extended_widget_backdrop"];
+            ult::removeQuotes(tempStr);
+            ult::extendedWidgetBackdrop = tempStr != ult::FALSE_STR;
+            
+            tempStr = parsedConfig[ult::ULTRAHAND_PROJECT_NAME]["dynamic_logo"];
+            ult::removeQuotes(tempStr);
+            ult::useDynamicLogo = tempStr != ult::FALSE_STR;
+            
+            tempStr = parsedConfig[ult::ULTRAHAND_PROJECT_NAME]["selection_bg"];
+            ult::removeQuotes(tempStr);
+            ult::useSelectionBG = tempStr != ult::FALSE_STR;
+            
+            tempStr = parsedConfig[ult::ULTRAHAND_PROJECT_NAME]["selection_text"];
+            ult::removeQuotes(tempStr);
+            ult::useSelectionText = tempStr != ult::FALSE_STR;
+            
+            tempStr = parsedConfig[ult::ULTRAHAND_PROJECT_NAME]["selection_value"];
+            ult::removeQuotes(tempStr);
+            ult::useSelectionValue = tempStr != ult::FALSE_STR;
+
+            //#endif
+            
+        }
+
+        /**
+         * @brief Update and save launch combo keys
+         *
+         * @param keys the new combo keys
+         */
+        [[maybe_unused]] static void updateCombo(u64 keys) {
+            tsl::cfg::launchCombo = keys;
+            hlp::ini::updateOverlaySettings({
+                { ult::TESLA_STR, { // CUSTOM MODIFICATION
+                    { ult::KEY_COMBO_STR , tsl::hlp::keysToComboString(keys) }
+                }}
+            }, TESLA_CONFIG_FILE);
+            hlp::ini::updateOverlaySettings({
+                { ult::ULTRAHAND_PROJECT_NAME, { // CUSTOM MODIFICATION
+                    { ult::KEY_COMBO_STR , tsl::hlp::keysToComboString(keys) }
+                }}
+            }, ULTRAHAND_CONFIG_FILE);
+        }
+        
+
+        /**
+         * @brief Background event polling loop thread
+         *
+         * @param args Used to pass in a pointer to a \ref SharedThreadData struct
+         */
+        static void backgroundEventPoller(void *args) {
+        
+            tsl::hlp::loadEntryKeyCombos();
+            ult::launchingOverlay.store(false, std::memory_order_release);
+        
+            SharedThreadData *shData = static_cast<SharedThreadData*>(args);
+            
+            // To prevent focus glitchout, close the overlay immediately when the home button gets pressed
+            Event homeButtonPressEvent = {};
+            hidsysAcquireHomeButtonEventHandle(&homeButtonPressEvent, false);
+            eventClear(&homeButtonPressEvent);
+            tsl::hlp::ScopeGuard homeButtonEventGuard([&] { eventClose(&homeButtonPressEvent); });
+            
+            // To prevent focus glitchout, close the overlay immediately when the power button gets pressed
+            Event powerButtonPressEvent = {};
+            hidsysAcquireSleepButtonEventHandle(&powerButtonPressEvent, false);
+            eventClear(&powerButtonPressEvent);
+            tsl::hlp::ScopeGuard powerButtonEventGuard([&] { eventClose(&powerButtonPressEvent); });
+            
+        
+            // For handling screenshots color alpha
+            Event captureButtonPressEvent = {};
+            hidsysAcquireCaptureButtonEventHandle(&captureButtonPressEvent, false);
+            eventClear(&captureButtonPressEvent);
+            hidsysAcquireCaptureButtonEventHandle(&captureButtonPressEvent, false);
+            eventClear(&captureButtonPressEvent);
+            tsl::hlp::ScopeGuard captureButtonEventGuard([&] { eventClose(&captureButtonPressEvent); });
+        
+            // Parse Tesla settings
+            impl::parseOverlaySettings();
+            
+        
+            // Allow only Player 1 and handheld mode
+            HidNpadIdType id_list[2] = { HidNpadIdType_No1, HidNpadIdType_Handheld };
+            
+            // Configure HID system to only listen to these IDs
+            hidSetSupportedNpadIdType(id_list, 2);
+            
+            // Configure input for up to 2 supported controllers (P1 + Handheld)
+            padConfigureInput(2, HidNpadStyleSet_NpadStandard | HidNpadStyleTag_NpadSystemExt);
+            
+            // Initialize separate pad states for both controllers
+            PadState pad_p1;
+            PadState pad_handheld;
+            padInitialize(&pad_p1, HidNpadIdType_No1);
+            padInitialize(&pad_handheld, HidNpadIdType_Handheld);
+            
+            // Touch screen init
+            hidInitializeTouchScreen();
+            
+            // Clear any stale input from both controllers
+            padUpdate(&pad_p1);
+            padUpdate(&pad_handheld);
+
+            //ult::initRumble(); // initialize rumble
+            
+            enum WaiterObject {
+                WaiterObject_HomeButton,
+                WaiterObject_PowerButton,
+                WaiterObject_CaptureButton,
+                WaiterObject_Count
+            };
+            
+            // Construct waiter
+            Waiter objects[3] = {
+                [WaiterObject_HomeButton] = waiterForEvent(&homeButtonPressEvent),
+                [WaiterObject_PowerButton] = waiterForEvent(&powerButtonPressEvent),
+                [WaiterObject_CaptureButton] = waiterForEvent(&captureButtonPressEvent),
+            };
+            
+            u64 currentTouchTick = 0;
+            auto lastTouchX = 0;
+            auto lastTouchY = 0;
+        
+            // Preset touch boundaries
+            constexpr int SWIPE_RIGHT_BOUND = 16;  // 16 + 80
+            constexpr int SWIPE_LEFT_BOUND = (1280 - 16);
+            constexpr u64 TOUCH_THRESHOLD_NS = 150'000'000ULL; // 150ms in nanoseconds
+            constexpr u64 FAST_SWAP_THRESHOLD_NS = 150'000'000ULL;
+        
+            // Global underscan monitoring - run at most once every 300ms
+            auto lastUnderscanPixels = std::make_pair(0, 0);
+            bool firstUnderscanCheck = true;
+            u64 lastUnderscanCheckNs = 0;  // store last execution in nanoseconds
+            constexpr u64 UNDERSCAN_INTERVAL_NS = 300'000'000ULL; // 300ms in ns
+
+            s32 idx;
+            Result rc;
+            
+            std::string currentTitleID;
+        
+            u64 lastPollTick = 0;
+            u64 resetStartTick = armGetSystemTick();
+            const u64 startNs = armTicksToNs(resetStartTick);
+
+            ult::lastTitleID = ult::getTitleIdAsString();
+        
+            //u64 elapsedTime_ns;
+
+            // Notification variables
+            u64 lastNotifCheck = 0;
+            std::vector<std::string> shownFiles;
+            std::string text;
+            int fontSize;
+            int priority;
+            time_t creationTime;
+
+            
+            while (shData->running.load(std::memory_order_acquire)) {
+
+                const u64 nowTick = armGetSystemTick();
+                const u64 nowNs = armTicksToNs(nowTick);
+                
+                
+                
+                // Scan for input changes from both controllers
+                padUpdate(&pad_p1);
+                padUpdate(&pad_handheld);
+                
+                // Read in HID values
+                {
+
+                    // Poll Title ID every 1 seconds
+                    if (!ult::resetForegroundCheck.load(std::memory_order_acquire)) {
+                        const u64 elapsedNs = armTicksToNs(nowTick - lastPollTick);
+                        if (elapsedNs >= 1'000'000'000ULL) {
+                            lastPollTick = nowTick;
+                            
+                            currentTitleID = ult::getTitleIdAsString();
+                            if (currentTitleID != ult::lastTitleID) {
+                                ult::lastTitleID = currentTitleID;
+                                ult::resetForegroundCheck.store(true, std::memory_order_release);
+                                resetStartTick = nowTick;
+                            }
+                        }
+                    }
+
+                    // If a reset is scheduled, trigger after 3.5s delay
+                    if (ult::resetForegroundCheck.load(std::memory_order_acquire)) {
+                        const u64 resetElapsedNs = armTicksToNs(nowTick - resetStartTick);
+                        if (resetElapsedNs >= 3'500'000'000ULL) {
+                            if (shData->overlayOpen && ult::currentForeground.load(std::memory_order_acquire)) {
+                                #if IS_STATUS_MONITOR_DIRECTIVE
+                                if (!isValidOverlayMode())
+                                    hlp::requestForeground(true, false);
+                                #else
+                                hlp::requestForeground(true, false);
+                                #endif
+                            }
+                            ult::resetForegroundCheck.store(false, std::memory_order_release);
+                        }
+                    }
+                    
+                    if (firstUnderscanCheck || (nowNs - lastUnderscanCheckNs) >= UNDERSCAN_INTERVAL_NS) {
+                        const auto currentUnderscanPixels = tsl::gfx::getUnderscanPixels();
+                    
+                        if (firstUnderscanCheck || currentUnderscanPixels != lastUnderscanPixels) {
+                            // Update layer dimensions without destroying state
+                            tsl::gfx::Renderer::get().updateLayerSize();
+                            
+                            lastUnderscanPixels = currentUnderscanPixels;
+                            firstUnderscanCheck = false;
+                        }
+                    
+                        lastUnderscanCheckNs = nowNs;
+                    }
+    
+                    //bool expected = true;
+                    //if (fireNotificationEvent.compare_exchange_strong(expected, false, std::memory_order_acq_rel)) {
+                    //    if (ult::launchingOverlay.load(std::memory_order_acquire))
+                    //        return;
+                    //    eventFire(&shData->notificationEvent);  // wake the loop
+                    //}
+    
+                    // Process notification files every 300ms
+                    {
+                        std::lock_guard<std::mutex> jsonLock(notificationJsonMutex);
+                        
+                        if (armTicksToNs(nowTick - lastNotifCheck) >= 300'000'000ULL) {
+                            lastNotifCheck = nowTick;
+                            
+                            DIR* dir = opendir(ult::NOTIFICATIONS_PATH.c_str());
+                            if (dir) {
+                                
+                                if (ult::useNotifications) {
+                                    const std::string& notifPath = ult::NOTIFICATIONS_PATH;
+                                    
+                                    // --- Prune missing files from shownFiles ---
+                                    for (auto it = shownFiles.begin(); it != shownFiles.end();) {
+                                        const std::string fullPath = notifPath + *it;
+                                        if (access(fullPath.c_str(), F_OK) != 0) {
+                                            it = shownFiles.erase(it);
+                                        } else {
+                                            ++it;
+                                        }
+                                    }
+                                    
+                                    // Reuse existing variables - track best file as we scan
+                                    static std::string bestFilename;
+                                    static std::string bestFullPath;
+                                    static time_t bestCreationTime;
+                                    static int bestPriority;
+                                    
+                                    bestFilename.clear();
+                                    bestFullPath.clear();
+                                    bestPriority = -1;
+                                    bestCreationTime = 0;
+                                    bool foundAny = false;
+                                    
+                                    struct dirent* entry;
+                                    
+                                    // --- Find the best notification file in one pass ---
+                                    while ((entry = readdir(dir)) != nullptr) {
+                                        if (entry->d_type != DT_REG) continue;
+                                        
+                                        const char* fname = entry->d_name;
+                                        const size_t filenameLen = strlen(fname);
+                                        
+                                        // Must end with ".notify"
+                                        if (filenameLen <= 7 || strcmp(fname + filenameLen - 7, ".notify") != 0)
+                                            continue;
+                                        
+                                        // Skip if already shown
+                                        if (std::find(shownFiles.begin(), shownFiles.end(), fname) != shownFiles.end())
+                                            continue;
+                                        
+                                        // --- Build path ---
+                                        static std::string fullPath;
+                                        fullPath = notifPath;
+                                        fullPath += fname;
+                                        
+                                        // --- Get file creation/modification time ---
+                                        struct stat fileStat;
+                                        creationTime = 0;
+                                        if (stat(fullPath.c_str(), &fileStat) == 0) {
+                                            creationTime = fileStat.st_mtime;
+                                        }
+                                        
+                                        // --- Read priority from JSON ---
+                                        priority = 20; // default (reuse existing variable)
+                                        std::unique_ptr<ult::json_t, ult::JsonDeleter> root(
+                                            ult::readJsonFromFile(fullPath), ult::JsonDeleter());
+                                        if (root) {
+                                            cJSON* croot = reinterpret_cast<cJSON*>(root.get());
+                                            cJSON* priorityObj = cJSON_GetObjectItemCaseSensitive(croot, "priority");
+                                            if (priorityObj && cJSON_IsNumber(priorityObj)) {
+                                                priority = static_cast<int>(priorityObj->valuedouble);
+                                            }
+                                        }
+                                        
+                                        // --- Is this better than current best? ---
+                                        const bool isBetter = !foundAny || 
+                                                       (priority > bestPriority) ||
+                                                       (priority == bestPriority && creationTime < bestCreationTime);
+                                        
+                                        if (isBetter) {
+                                            bestFilename = fname;
+                                            bestFullPath = fullPath;
+                                            bestCreationTime = creationTime;
+                                            bestPriority = priority;
+                                            foundAny = true;
+                                        }
+                                    }
+                                    
+                                    closedir(dir);
+                                    
+                                    // --- Process the best file ---
+                                    if (foundAny) {
+                                        text = ult::getStringFromJsonFile(bestFullPath, "text");
+                                        if (!text.empty()) {
+                                            fontSize = 28; // default (reuse existing variable)
+                                            
+                                            std::unique_ptr<ult::json_t, ult::JsonDeleter> root(
+                                                ult::readJsonFromFile(bestFullPath), ult::JsonDeleter());
+                                            if (root) {
+                                                cJSON* croot = reinterpret_cast<cJSON*>(root.get());
+                                                cJSON* fontSizeObj = cJSON_GetObjectItemCaseSensitive(croot, "font_size");
+                                                if (fontSizeObj && cJSON_IsNumber(fontSizeObj)) {
+                                                    fontSize = std::clamp(static_cast<int>(fontSizeObj->valuedouble), 1, 34);
+                                                }
+                                            }
+                                            
+                                            // --- Show notification safely ---
+                                            if (notification) {
+                                                notification->show(text, fontSize, bestPriority, bestFilename);
+                                            }
+                                            
+                                            // Mark file as shown
+                                            shownFiles.push_back(bestFilename);
+                                        }
+                                    }
+                                    
+                                } else {
+                                    // --- Notifications disabled: delete all files ---
+                                    struct dirent* entry;
+                                    static std::string fullPath;
+                                    
+                                    while ((entry = readdir(dir)) != nullptr) {
+                                        if (entry->d_type != DT_REG) continue;
+                                        
+                                        const char* fname = entry->d_name;
+                                        const size_t len = strlen(fname);
+                                        
+                                        if (len > 7 && strcmp(fname + len - 7, ".notify") == 0) {
+                                            fullPath.clear();
+                                            fullPath = ult::NOTIFICATIONS_PATH;
+                                            fullPath.append(fname, len);
+                                            
+                                            remove(fullPath.c_str());
+                                        }
+                                    }
+                                    closedir(dir);
+                                }
+                            }
+                        }
+                    }
+
+
+                    if (ult::launchingOverlay.load(std::memory_order_acquire))
+                        break;
+                    std::scoped_lock lock(shData->dataMutex);
+                    if (ult::launchingOverlay.load(std::memory_order_acquire))
+                        break;
+
+                    // Flush any pending rumble triggers when feedback is off
+                    if (!ult::useHapticFeedback) {
+                        triggerRumbleClick.exchange(false, std::memory_order_acq_rel);
+                        triggerRumbleDoubleClick.exchange(false, std::memory_order_acq_rel);
+                    } else {
+                        ult::checkAndReinitRumble();
+                        
+                        if (triggerRumbleDoubleClick.exchange(false)) {
+                            if (!ult::doubleClickActive.load(std::memory_order_acquire)) {
+                                ult::rumbleDoubleClick();
+                            }
+                            triggerRumbleClick.exchange(false);
+                        } else if (triggerRumbleClick.exchange(false)) {
+                            ult::rumbleClick();
+                        }
+                        
+                        //const u64 _nowNs = armTicksToNs(armGetSystemTick());
+
+                        ult::processRumbleStop(nowNs);
+                        ult::processRumbleDoubleClick(nowNs);
+                    }
+                    
+                    // Flush any pending sound triggers when effects are off
+
+                    if (ult::expandedMemory) {
+                        if (!ult::useSoundEffects || disableSound.load(std::memory_order_acquire)) {
+                            triggerNavigationSound.exchange(false, std::memory_order_acq_rel);
+                            triggerEnterSound.exchange(false, std::memory_order_acq_rel);
+                            triggerExitSound.exchange(false, std::memory_order_acq_rel);
+                            triggerWallSound.exchange(false, std::memory_order_acq_rel);
+                            triggerOnSound.exchange(false, std::memory_order_acq_rel);
+                            triggerOffSound.exchange(false, std::memory_order_acq_rel);
+                            triggerSettingsSound.exchange(false, std::memory_order_acq_rel);
+                            triggerMoveSound.exchange(false, std::memory_order_acq_rel);
+                        } else {
+                            if (reloadSoundCacheNow.exchange(false, std::memory_order_acq_rel)) {
+                                ult::AudioPlayer::reloadAllSounds();
+                            }
+
+                            if (triggerNavigationSound.exchange(false)) {
+                                ult::AudioPlayer::playNavigateSound();
+                            } else if (triggerEnterSound.exchange(false)) {
+                                ult::AudioPlayer::playEnterSound();
+                            } else if (triggerExitSound.exchange(false)) {
+                                ult::AudioPlayer::playExitSound();
+                            } else if (triggerWallSound.exchange(false)) {
+                                ult::AudioPlayer::playWallSound();
+                            } else if (triggerOnSound.exchange(false)) {
+                                ult::AudioPlayer::playOnSound();
+                            } else if (triggerOffSound.exchange(false)) {
+                                ult::AudioPlayer::playOffSound();
+                            } else if (triggerSettingsSound.exchange(false)) {
+                                ult::AudioPlayer::playSettingsSound();
+                            } else if (triggerMoveSound.exchange(false)) {
+                                ult::AudioPlayer::playMoveSound();
+                            }
+
+                            //if (clearSoundCacheNow.exchange(false, std::memory_order_acq_rel)) {
+                            //    //ult::AudioPlayer::unloadAllSounds(ult::AudioPlayer::SoundType::Wall);
+                            //    ult::AudioPlayer::unloadAllSounds({ult::AudioPlayer::SoundType::Wall});
+                            //    //ult::AudioPlayer::unloadAllSounds();
+                            //    //clearSoundCacheNow.store(false, std::memory_order_release);
+                            //    clearSoundCacheNow.notify_all();
+                            //}
+                        }
+                    }
+
+                    //else if (triggerNavigationSound.exchange(false)) {
+                    //    ult::AudioPlayer::playSlideSound();
+                    //}
+                    
+                    // Combine inputs from both controllers
+                    const u64 kDown_p1 = padGetButtonsDown(&pad_p1);
+                    const u64 kHeld_p1 = padGetButtons(&pad_p1);
+                    const u64 kDown_handheld = padGetButtonsDown(&pad_handheld);
+                    const u64 kHeld_handheld = padGetButtons(&pad_handheld);
+                    
+                    shData->keysDown = kDown_p1 | kDown_handheld;
+                    shData->keysHeld = kHeld_p1 | kHeld_handheld;
+                    
+                    // For joysticks, prioritize handheld if available, otherwise use P1
+                    const HidAnalogStickState leftStick_handheld = padGetStickPos(&pad_handheld, 0);
+                    const HidAnalogStickState rightStick_handheld = padGetStickPos(&pad_handheld, 1);
+                    
+                    // Check if handheld has any stick input (not at center position)
+                    const bool handheldHasInput = (leftStick_handheld.x != 0 || leftStick_handheld.y != 0 || 
+                                                  rightStick_handheld.x != 0 || rightStick_handheld.y != 0);
+                    
+                    if (handheldHasInput) {
+                        shData->joyStickPosLeft = leftStick_handheld;
+                        shData->joyStickPosRight = rightStick_handheld;
+                    } else {
+                        shData->joyStickPosLeft = padGetStickPos(&pad_p1, 0);
+                        shData->joyStickPosRight = padGetStickPos(&pad_p1, 1);
+                    }
+                    
+                    
+                    // Read in touch positions
+                    if (hidGetTouchScreenStates(&shData->touchState, 1) > 0) { // Check if any touch event is present
+                        if (!shData->overlayOpen) {
+                            //ult::internalTouchReleased = false;
+                            ult::internalTouchReleased.store(false, std::memory_order_release);
+                        }
+        
+                        const HidTouchState& currentTouch = shData->touchState.touches[0];  // Correct type is HidTouchPoint
+                        
+                        
+                        const u64 elapsedTime_ns = armTicksToNs(nowTick - currentTouchTick);
+                        
+                        // Check if the touch is within bounds for left-to-right swipe within the time window
+                        if (ult::useSwipeToOpen && elapsedTime_ns <= TOUCH_THRESHOLD_NS) {
+                            if ((lastTouchX != 0 && lastTouchY != 0) && (currentTouch.x != 0 || currentTouch.y != 0)) {
+                                if (ult::layerEdge == 0 && currentTouch.x > SWIPE_RIGHT_BOUND + 84 && lastTouchX <= SWIPE_RIGHT_BOUND) {
+                                    eventFire(&shData->comboEvent);
+                                    mainComboHasTriggered.store(true, std::memory_order_release);
+                                }
+                                // Check if the touch is within bounds for right-to-left swipe within the time window
+                                else if (ult::layerEdge > 0 && currentTouch.x < SWIPE_LEFT_BOUND - 84 && lastTouchX >= SWIPE_LEFT_BOUND) {
+                                    eventFire(&shData->comboEvent);
+                                    mainComboHasTriggered.store(true, std::memory_order_release);
+                                }
+                            }
+                        }
+                    
+                        // Handle touch release state
+                        if (currentTouch.x == 0 && currentTouch.y == 0) {
+                            ult::internalTouchReleased.store(true, std::memory_order_release);
+                            //ult::internalTouchReleased = true;  // Indicate that the touch has been released
+                            //ult::internalTouchReleased.store(true, std::memory_order_release);
+                            lastTouchX = 0;
+                            lastTouchY = 0;
+                        }
+        
+                        // If this is the first touch of a gesture, store lastTouchX
+                        else if ((lastTouchX == 0 && lastTouchY == 0) && (currentTouch.x != 0 || currentTouch.y != 0)) {
+                            currentTouchTick = nowTick;
+                            lastTouchX = currentTouch.x;
+                            lastTouchY = currentTouch.y;
+                        }
+        
+                    } else {
+                        // Reset touch state if no touch is present
+                        shData->touchState = { 0 };
+                        //ult::internalTouchReleased = true;
+                        ult::internalTouchReleased.store(true, std::memory_order_release);
+                        //ult::internalTouchReleased.store(true, std::memory_order_release);
+                    
+                        // Reset touch history to invalid state
+                        lastTouchX = 0;
+                        lastTouchY = 0;
+                    
+                        // Reset time tracking
+                        //currentTouchTick = nowTick;
+                    }
+
+                    #if IS_STATUS_MONITOR_DIRECTIVE
+                    if (triggerExitNow) {
+                        ult::launchingOverlay.store(true, std::memory_order_release);
+                        ult::setIniFileValue(
+                            ult::ULTRAHAND_CONFIG_INI_PATH,
+                            ult::ULTRAHAND_PROJECT_NAME,
+                            ult::IN_OVERLAY_STR,
+                            ult::FALSE_STR
+                        );
+                        tsl::setNextOverlay(
+                            ult::OVERLAY_PATH + "ovlmenu.ovl"
+                        );
+                        tsl::Overlay::get()->close();
+                        //tsl::goBack();
+                        //triggerExitNow = false;
+                        break;
+                    }
+                    #endif
+                    //if ((shData->keysDown & KEY_ZL && shData->keysHeld & KEY_L) || (shData->keysDown & KEY_L && shData->keysHeld & KEY_ZL)) {
+                    //    notification->show("Hello world! ¯\\_(ツ)_/¯");
+                    //    eventFire(&shData->notificationEvent);  // wake the loop
+                    //}
+                    
+                    
+                    // Check main launch combo first (highest priority)
+                    if ((((shData->keysHeld & tsl::cfg::launchCombo) == tsl::cfg::launchCombo) && shData->keysDown & tsl::cfg::launchCombo)) {
+                    #if IS_LAUNCHER_DIRECTIVE
+                        if (ult::updateMenuCombos) {
+                            ult::setIniFileValue(ult::ULTRAHAND_CONFIG_INI_PATH, ult::ULTRAHAND_PROJECT_NAME, ult::KEY_COMBO_STR , ult::ULTRAHAND_COMBO_STR);
+                            ult::setIniFileValue(ult::TESLA_CONFIG_INI_PATH, ult::TESLA_STR, ult::KEY_COMBO_STR , ult::ULTRAHAND_COMBO_STR);
+                            ult::updateMenuCombos = false;
+                        }
+                    #endif
+                        
+                        #if IS_STATUS_MONITOR_DIRECTIVE
+                        isRendering = false;
+                        leventSignal(&renderingStopEvent);
+                        #endif
+                        
+                        if (shData->overlayOpen) {
+                            tsl::Overlay::get()->hide();
+                            shData->overlayOpen = false;
+                        }
+                        else {
+                            eventFire(&shData->comboEvent);
+                            mainComboHasTriggered.store(true, std::memory_order_release);
+                        }
+                    }
+                #if IS_LAUNCHER_DIRECTIVE
+                    else if (ult::updateMenuCombos && (((shData->keysHeld & tsl::cfg::launchCombo2) == tsl::cfg::launchCombo2) && shData->keysDown & tsl::cfg::launchCombo2)) {
+                        std::swap(tsl::cfg::launchCombo, tsl::cfg::launchCombo2); // Swap the two launch combos
+                        ult::setIniFileValue(ult::ULTRAHAND_CONFIG_INI_PATH, ult::ULTRAHAND_PROJECT_NAME, ult::KEY_COMBO_STR , ult::TESLA_COMBO_STR);
+                        ult::setIniFileValue(ult::TESLA_CONFIG_INI_PATH, ult::TESLA_STR, ult::KEY_COMBO_STR , ult::TESLA_COMBO_STR);
+                        eventFire(&shData->comboEvent);
+                        mainComboHasTriggered.store(true, std::memory_order_release);
+                        ult::updateMenuCombos = false;
+                    }
+                    else if (ult::overlayLaunchRequested.load(std::memory_order_acquire) && !ult::runningInterpreter.load(std::memory_order_acquire) && ult::settingsInitialized.load(std::memory_order_acquire) && (nowNs - startNs) >= FAST_SWAP_THRESHOLD_NS) {
+                        std::string requestedPath, requestedArgs;
+                        
+                        // Get the request data safely
+                        {
+                            std::lock_guard<std::mutex> lock(ult::overlayLaunchMutex);
+                            requestedPath = ult::requestedOverlayPath;
+                            requestedArgs = ult::requestedOverlayArgs;
+                            ult::overlayLaunchRequested.store(false, std::memory_order_release);
+                        }
+                        
+                        if (!requestedPath.empty()) {
+
+                            const std::string overlayFileName = ult::getNameFromPath(requestedPath);
+                            
+                            // Set overlay state for ovlmenu.ovl
+        
+                            // OPTIMIZED: Batch INI file writes
+                            {
+                                auto iniData = ult::getParsedDataFromIniFile(ult::ULTRAHAND_CONFIG_INI_PATH);
+                                auto& section = iniData[ult::ULTRAHAND_PROJECT_NAME];
+                                section[ult::IN_OVERLAY_STR] = ult::TRUE_STR;
+                                section["to_packages"] = ult::TRUE_STR;
+                                ult::saveIniFileData(ult::ULTRAHAND_CONFIG_INI_PATH, iniData);
+                            }
+        
+                            // Reset navigation state variables (these control slide navigation)
+                            ult::allowSlide.store(false, std::memory_order_release);
+                            ult::unlockedSlide.store(false, std::memory_order_release);
+                            
+                            eventClose(&homeButtonPressEvent);
+                            eventClose(&powerButtonPressEvent);
+                            eventClose(&captureButtonPressEvent);
+
+                            //hidExit();
+                            // Launch the overlay using the same mechanism as key combos
+                            //shData->overlayOpen = false;
+                            ult::launchingOverlay.store(true, std::memory_order_release);
+                            tsl::setNextOverlay(requestedPath, requestedArgs+" --direct");
+                            tsl::Overlay::get()->close();
+                            eventFire(&shData->comboEvent);
+
+                            launchComboHasTriggered.store(true, std::memory_order_release);
+                            return;
+                        }
+                    }
+                #endif
+                    // Check overlay key combos (only when overlay is not open, keys are pressed, and not conflicting with main combos)
+                    //else if (!shData->overlayOpen && shData->keysDown != 0) {
+                    else if (shData->keysDown != 0 && ult::useLaunchCombos) {
+                        if (shData->keysHeld != tsl::cfg::launchCombo) {
+                            // Lookup both path and optional mode launch args
+                            const auto comboInfo = tsl::hlp::getEntryForKeyCombo(shData->keysHeld);
+                            const std::string& overlayPath = comboInfo.path;
+                            
+                    
+                    #if IS_LAUNCHER_DIRECTIVE
+                            if (!overlayPath.empty() && (shData->keysHeld) && !ult::runningInterpreter.load(std::memory_order_acquire) && ult::settingsInitialized.load(std::memory_order_acquire) && (armTicksToNs(nowTick) - startNs) >= FAST_SWAP_THRESHOLD_NS) {
+                    #else
+                            if (!overlayPath.empty() && (shData->keysHeld) && (nowNs - startNs) >= FAST_SWAP_THRESHOLD_NS) {
+                    #endif
+                                const std::string& modeArg = comboInfo.launchArg;
+                                const std::string overlayFileName = ult::getNameFromPath(overlayPath);
+                    
+                                // hideHidden check
+                                if (hideHidden) {
+                                    const auto hideStatus = ult::parseValueFromIniSection(
+                                        ult::OVERLAYS_INI_FILEPATH, overlayFileName, ult::HIDE_STR);
+                                    if (hideStatus == ult::TRUE_STR) {
+                                        shData->keysDownPending |= shData->keysDown;
+                                        continue;
+                                    }
+                                }
+        
+                                #if IS_STATUS_MONITOR_DIRECTIVE
+                                isRendering = false;
+                                leventSignal(&renderingStopEvent);
+                                #endif
+                    
+                    #if !IS_LAUNCHER_DIRECTIVE
+                                if (lastOverlayFilename == overlayFileName && lastOverlayMode == modeArg) {
+                    #else
+                                if (lastOverlayFilename == overlayFileName  && lastOverlayMode == modeArg && lastOverlayMode.find("--package") != std::string::npos) {
+                    #endif
+                                    ult::setIniFileValue(
+                                        ult::ULTRAHAND_CONFIG_INI_PATH,
+                                        ult::ULTRAHAND_PROJECT_NAME,
+                                        ult::IN_OVERLAY_STR,
+                                        ult::TRUE_STR
+                                    );
+                                
+                                    //shData->overlayOpen = false;
+                                    //hidExit();
+
+                                    eventClose(&homeButtonPressEvent);
+                                    eventClose(&powerButtonPressEvent);
+                                    eventClose(&captureButtonPressEvent);
+
+                                    ult::launchingOverlay.store(true, std::memory_order_release);
+                                    tsl::setNextOverlay(ult::OVERLAY_PATH + "ovlmenu.ovl", "--direct --comboReturn");
+                                    tsl::Overlay::get()->close();
+                                    eventFire(&shData->comboEvent);
+                                    launchComboHasTriggered.store(true, std::memory_order_release);
+                                    return;
+                                }
+                                
+                                // Compose launch args
+                                std::string finalArgs;
+                                if (!modeArg.empty()) {
+                                    finalArgs = modeArg;
+                                } else {
+                                    // Only check overlay-specific launch args for non-ovlmenu entries
+                                    if (overlayFileName.compare("ovlmenu.ovl") != 0) {
+                                        // OPTIMIZED: Single INI read for both values
+                                        auto overlaysIniData = ult::getParsedDataFromIniFile(ult::OVERLAYS_INI_FILEPATH);
+                                        std::string useArgs = "";
+                                        std::string launchArgs = "";
+        
+                                        auto sectionIt = overlaysIniData.find(overlayFileName);
+                                        if (sectionIt != overlaysIniData.end()) {
+                                            auto useArgsIt = sectionIt->second.find(ult::USE_LAUNCH_ARGS_STR);
+                                            if (useArgsIt != sectionIt->second.end()) {
+                                                useArgs = useArgsIt->second;
+                                            }
+                                            
+                                            auto argsIt = sectionIt->second.find(ult::LAUNCH_ARGS_STR);
+                                            if (argsIt != sectionIt->second.end()) {
+                                                launchArgs = argsIt->second;
+                                            }
+                                        }
+                                        
+                                        if (useArgs == ult::TRUE_STR) {
+                                            finalArgs = launchArgs;
+                                            ult::removeQuotes(finalArgs);
+                                        }
+                                    }
+                                }
+                                if (finalArgs.empty()) {
+                                    finalArgs = "--direct";
+                                } else {
+                                    finalArgs += " --direct";
+                                }
+        
+                                if (overlayFileName.compare("ovlmenu.ovl") == 0) {
+                                    finalArgs += " --comboReturn";
+                                    ult::setIniFileValue(
+                                        ult::ULTRAHAND_CONFIG_INI_PATH,
+                                        ult::ULTRAHAND_PROJECT_NAME,
+                                        ult::IN_OVERLAY_STR,
+                                        ult::TRUE_STR
+                                    );
+                                }
+                    
+                                //shData->overlayOpen = false;
+                                //hidExit();
+                                eventClose(&homeButtonPressEvent);
+                                eventClose(&powerButtonPressEvent);
+                                eventClose(&captureButtonPressEvent);
+
+                                ult::launchingOverlay.store(true, std::memory_order_release);
+                                tsl::setNextOverlay(overlayPath, finalArgs);
+                                tsl::Overlay::get()->close();
+                                eventFire(&shData->comboEvent);
+                                launchComboHasTriggered.store(true, std::memory_order_release);
+                                return;
+                            }
+                        }
+                    }
+                //#endif
+                    
+                    shData->keysDownPending |= shData->keysDown;
+                }
+
+                //20 ms
+                //s32 idx = 0;
+                rc = waitObjects(&idx, objects, WaiterObject_Count, 20'000'000ul);
+                if (R_SUCCEEDED(rc)) {
+        
+        #if IS_STATUS_MONITOR_DIRECTIVE
+                    if (idx == WaiterObject_HomeButton || idx == WaiterObject_PowerButton) { // Changed condition to exclude capture button
+                        if (shData->overlayOpen && !isValidOverlayMode()) {
+                            tsl::Overlay::get()->hide();
+                            shData->overlayOpen = false;
+                        }
+                    }
+        #else
+                    if (idx == WaiterObject_HomeButton || idx == WaiterObject_PowerButton) { // Changed condition to exclude capture button
+                        if (shData->overlayOpen) {
+                            tsl::Overlay::get()->hide();
+                            shData->overlayOpen = false;
+                        }
+                    }
+        #endif
+                    
+                    switch (idx) {
+                        case WaiterObject_HomeButton:
+                            eventClear(&homeButtonPressEvent);
+                            break;
+                        case WaiterObject_PowerButton:
+                            eventClear(&powerButtonPressEvent);
+        
+                            // Perform any necessary cleanup
+                            hidExit();
+        
+                            // Reinitialize resources
+                            ASSERT_FATAL(hidInitialize()); // Reinitialize HID to reset states
+                            
+                            // Reinitialize both controllers
+                            padInitialize(&pad_p1, HidNpadIdType_No1);
+                            padInitialize(&pad_handheld, HidNpadIdType_Handheld);
+                            hidInitializeTouchScreen();
+                            
+                            // Update both controllers
+                            padUpdate(&pad_p1);
+                            padUpdate(&pad_handheld);
+                            break;
+                            
+                            
+                        case WaiterObject_CaptureButton:
+                            if (screenshotsAreDisabled) {
+                                eventClear(&captureButtonPressEvent);
+                                break;
+                            }
+
+                            #if IS_STATUS_MONITOR_DIRECTIVE
+                            bool inOverlayMode = isValidOverlayMode();
+                            if (inOverlayMode) {
+                                delayUpdate = true;
+                                isRendering = false;
+                                leventSignal(&renderingStopEvent);
+                            }
+                            #endif
+        
+                            ult::disableTransparency = true;
+                            eventClear(&captureButtonPressEvent);
+                            svcSleepThread(1'500'000'000);
+                            ult::disableTransparency = false;
+        
+                            #if IS_STATUS_MONITOR_DIRECTIVE
+                            if (inOverlayMode) {
+                                isRendering = true;
+                                leventClear(&renderingStopEvent);
+                                delayUpdate = false;
+                            }
+                            #endif
+        
+                            break;
+                    }
+                } else if (rc != KERNELRESULT(TimedOut)) {
+                    ASSERT_FATAL(rc);
+                }
+            }
+            //hidExit();
+
+            eventClose(&homeButtonPressEvent);
+            eventClose(&powerButtonPressEvent);
+            eventClose(&captureButtonPressEvent);
+
+        }
+    }
+    
+    /**
+     * @brief Creates a new Gui and changes to it
+     *
+     * @tparam G Gui to create
+     * @tparam Args Arguments to pass to the Gui
+     * @param args Arguments to pass to the Gui
+     * @return Reference to the newly created Gui
+     */
+    template<typename G, typename ...Args>
+    std::unique_ptr<tsl::Gui>& changeTo(Args&&... args) {
+        return Overlay::get()->changeTo<G, Args...>(std::forward<Args>(args)...);
+    }
+
+    template<typename G, typename ...Args>
+    std::unique_ptr<tsl::Gui>& swapTo(Args&&... args) {
+        return Overlay::get()->swapTo<G, Args...>(std::forward<Args>(args)...);
+    }
+
+    template<typename G, typename ...Args>
+    std::unique_ptr<tsl::Gui>& swapTo(SwapDepth depth, Args&&... args) {
+        return Overlay::get()->swapTo<G, Args...>(depth, std::forward<Args>(args)...);
+    }
+    
+
+    /**
+     * @brief Pops the top Gui from the stack and goes back to the last one
+     * @note The Overlay gets closed once there are no more Guis on the stack
+     */
+    void goBack(u32 count) {
+        Overlay::get()->goBack(count);
+    }
+    
+    void pop(u32 count) {
+        Overlay::get()->pop(count);
+    }
+        
+    
+    static inline std::mutex setNextOverlayMutex;
+
+    static inline std::string nextOverlayName;
+    static void setNextOverlay(const std::string& ovlPath, std::string origArgs) {
+        std::lock_guard lk(setNextOverlayMutex);
+        char buffer[512];
+        char* p = buffer;
+        char* bufferEnd = buffer + sizeof(buffer) - 1; // Leave room for null terminator
+        
+        // Store filename and copy it
+        const std::string filenameStr = ult::getNameFromPath(ovlPath);
+        nextOverlayName = filenameStr;
+
+        const char* filename = filenameStr.c_str();
+        while (*filename && p < bufferEnd) *p++ = *filename++;
+        if (p < bufferEnd) *p++ = ' ';
+        
+        // Single-pass argument filtering
+        const char* src = origArgs.c_str();
+        const char* end = src + origArgs.length();
+        bool hasSkipCombo = false;
+        
+        while (src < end && p < bufferEnd) {
+            // Skip whitespace
+            while (src < end && *src == ' ' && p < bufferEnd) {
+                *p++ = *src++;
+            }
+            
+            if (src >= end || p >= bufferEnd) break;
+            
+            // Check for flags to filter/detect
+            if (src[0] == '-' && src[1] == '-') {
+                
+                // Check what flag this is
+                if (strncmp(src, "--skipCombo", 11) == 0 && (src[11] == ' ' || src[11] == '\0')) {
+                    hasSkipCombo = true;
+                    // Copy this flag
+                    while (src < end && *src != ' ' && p < bufferEnd) *p++ = *src++;
+                }
+                else if (strncmp(src, "--foregroundFix", 15) == 0) {
+                    // Skip this flag and its value
+                    src += 15;
+                    while (src < end && *src == ' ') src++; // Skip spaces
+                    if (src < end && (*src == '0' || *src == '1')) src++; // Skip value
+                }
+                else if (strncmp(src, "--lastTitleID", 13) == 0) {
+                    // Skip this flag and its value
+                    src += 13;
+                    while (src < end && *src == ' ') src++; // Skip spaces
+                    while (src < end && *src != ' ' && *src != '\0') src++; // Skip title ID
+                }
+                else {
+                    // Copy unknown flag
+                    while (src < end && *src != ' ' && p < bufferEnd) *p++ = *src++;
+                }
+            }
+            else {
+                // Copy regular argument
+                while (src < end && *src != ' ' && p < bufferEnd) *p++ = *src++;
+            }
+        }
+        
+        // Add required flags with bounds checking
+        if (!hasSkipCombo && (p + 12) < bufferEnd) {
+            memcpy(p, " --skipCombo", 12);
+            p += 12;
+        }
+        
+        // Add foreground flag with bounds checking
+        if ((p + 17) < bufferEnd) {
+            memcpy(p, " --foregroundFix ", 17);
+            p += 17;
+            if (p < bufferEnd) {
+                *p++ = (ult::resetForegroundCheck.load(std::memory_order_acquire) || ult::lastTitleID != ult::getTitleIdAsString()) ? '1' : '0';
+            }
+        }
+        
+        // Add last title ID with bounds checking
+        if ((p + 15 + ult::lastTitleID.length()) < bufferEnd) {
+            memcpy(p, " --lastTitleID ", 15);
+            p += 15;
+            const char* titleId = ult::lastTitleID.c_str();
+            while (*titleId && p < bufferEnd) *p++ = *titleId++;
+        }
+        
+        // Safety check - if we're at the end, we might have truncated
+        if (p >= bufferEnd) {
+            p = bufferEnd;
+        }
+        
+        *p = '\0';
+        
+        //isLaunchingNextOverlay.store(true, std::memory_order_release);
+        envSetNextLoad(ovlPath.c_str(), buffer);
+    }
+    
+    
+
+    struct option_entry {
+        const char* name;
+        u8 len;
+        u8 action;
+    };
+    
+    static const struct option_entry options[] = {
+        {"direct", 6, 1},
+        {"skipCombo", 9, 2},
+        {"lastTitleID", 11, 3}, 
+        {"foregroundFix", 13, 4},
+        {"package", 7, 5},
+        {"lastSelectedItem", 16, 6},
+        {"comboReturn", 11, 7} // new option
+    };
+
+
+    /**
+     * @brief libtesla's main function
+     * @note Call it directly from main passing in argc and argv and returning it e.g `return tsl::loop<OverlayTest>(argc, argv);`
+     *
+     * @tparam TOverlay Your overlay class
+     * @tparam launchFlags \ref LaunchFlags
+     * @param argc argc
+     * @param argv argv
+     * @return int result
+     */
+    template<typename TOverlay, impl::LaunchFlags launchFlags>
+    static inline int loop(int argc, char** argv) {
+        static_assert(std::is_base_of_v<tsl::Overlay, TOverlay>, "tsl::loop expects a type derived from tsl::Overlay");
+
+    #if IS_STATUS_MONITOR_DIRECTIVE
+        leventClear(&renderingStopEvent);
+    #endif
+
+        // Initialize buffer sizes based on expanded memory setting
+        if (ult::expandedMemory) {
+            ult::COPY_BUFFER_SIZE = 262144;
+            ult::HEX_BUFFER_SIZE = 8192;
+            ult::UNZIP_READ_BUFFER = 262144;
+            ult::UNZIP_WRITE_BUFFER = 131072;
+            ult::DOWNLOAD_READ_BUFFER = 262144/2;
+            ult::DOWNLOAD_WRITE_BUFFER = 131072;
+        }
+    
+        if (argc > 0) {
+            g_overlayFilename = ult::getNameFromPath(argv[0]);
+            lastOverlayFilename = g_overlayFilename;
+    
+            lastOverlayMode.clear();
+            bool skip;
+            for (u8 arg = 1; arg < argc; arg++) {
+                const char* s = argv[arg];
+
+                skip = false;
+    
+                if (arg > 1) {
+                    const char* prev = argv[arg - 1];
+                    if (prev[0] == '-' && prev[1] == '-') {
+                        if (strcmp(prev, "--lastTitleID") == 0 || strcmp(prev, "--foregroundFix") == 0) {
+                            skip = true;
+                        }
+                    }
+                }
+    
+                if (!skip && s[0] == '-' && s[1] == '-') {
+                    if (strcmp(s, "--direct") == 0 ||
+                        strcmp(s, "--skipCombo") == 0 ||
+                        strcmp(s, "--lastTitleID") == 0 ||
+                        strcmp(s, "--foregroundFix") == 0) {
+                        skip = true;
+                    }
+                }
+    
+                if (!skip) {
+                    if (strcmp(s, "--package") == 0) {
+                        lastOverlayMode = "--package";
+                        arg++;
+                        if (arg < argc) {
+                            lastOverlayMode += " ";
+                            lastOverlayMode += argv[arg];
+                            arg++;
+                            while (arg < argc && argv[arg][0] != '-') {
+                                lastOverlayMode += " ";
+                                lastOverlayMode += argv[arg];
+                                arg++;
+                            }
+                        }
+                    } else {
+                        lastOverlayMode = s;
+                    }
+                    break;
+                }
+            }
+        }
+    
+        bool skipCombo = false;
+    #if IS_LAUNCHER_DIRECTIVE
+        bool comboReturn = false;
+        bool directMode = true;
+    #else
+        bool directMode = false;
+    #endif
+        bool usingPackageLauncher = false;
+        
+    
+        for (u8 arg = 0; arg < argc; arg++) {
+            const char* s = argv[arg];
+            if (s[0] != '-' || s[1] != '-') continue;
+            const char* opt = s + 2;
+    
+            for (u8 i = 0; i < 7; i++) { // now 6 instead of 5
+                if (memcmp(opt, options[i].name, options[i].len) == 0 && opt[options[i].len] == '\0') {
+                    switch (options[i].action) {
+                        case 1: // direct
+                            directMode = true;
+                            g_overlayFilename = "";
+                            jumpItemName = "";
+                            jumpItemValue = "";
+                            jumpItemExactMatch.store(true, std::memory_order_release);
+                            break;
+                        case 2: // skipCombo
+                            skipCombo = true;
+                            ult::firstBoot = false;
+                            break;
+                        case 3: // lastTitleID
+                            if (++arg < argc) {
+                                const char* providedID = argv[arg];
+                                if (ult::getTitleIdAsString() != providedID) {
+                                    ult::resetForegroundCheck.store(true, std::memory_order_release);
+                                }
+                            }
+                            break;
+                        case 4: // foregroundFix
+                            if (++arg < argc) {
+                                ult::resetForegroundCheck.store(
+                                    ult::resetForegroundCheck.load(std::memory_order_acquire) ||
+                                    (argv[arg][0] == '1'), std::memory_order_release);
+                            }
+                            break;
+                        case 5: // package
+                            usingPackageLauncher = true;
+                            break;
+                        case 6: // lastSelectedItem
+                            #if IS_STATUS_MONITOR_DIRECTIVE
+                            lastMode = "returning";
+                            #endif
+                            break;
+                        case 7: // comboReturn
+                            #if IS_LAUNCHER_DIRECTIVE
+                            comboReturn = true;
+                            #endif
+                            break;
+                    }
+                }
+            }
+        }
+    
+        impl::SharedThreadData shData;
+        shData.running.store(true, std::memory_order_release);
+    
+        Thread backgroundThread;
+        threadCreate(&backgroundThread, impl::backgroundEventPoller, &shData, nullptr, 0x2000, 0x2c, -2);
+        threadStart(&backgroundThread);
+    
+        eventCreate(&shData.comboEvent, false);
+    
+        auto& overlay = tsl::Overlay::s_overlayInstance;
+        overlay = new TOverlay();
+        overlay->m_closeOnExit = (u8(launchFlags) & u8(impl::LaunchFlags::CloseOnExit)) == u8(impl::LaunchFlags::CloseOnExit);
+    
+        tsl::hlp::doWithSmSession([&overlay]{
+            overlay->initServices();
+        });
+    #if !IS_LAUNCHER_DIRECTIVE
+        tsl::initializeUltrahandSettings();
+    #endif
+
+        // Initialize the audio service
+        if (ult::useSoundEffects && ult::expandedMemory) {
+            ult::AudioPlayer::initialize();
+        }
+
+
+
+        overlay->initScreen();
+        overlay->changeTo(overlay->loadInitialGui());
+        
+
+        bool shouldFireEvent = false;
+
+    #if IS_LAUNCHER_DIRECTIVE
+       
+        {
+            bool inOverlay;
+            
+            auto configData = ult::getParsedDataFromIniFile(ult::ULTRAHAND_CONFIG_INI_PATH);
+            bool needsUpdate = false;
+    
+            if (ult::firstBoot) {
+                configData[ult::ULTRAHAND_PROJECT_NAME][ult::IN_OVERLAY_STR] = ult::FALSE_STR;
+                needsUpdate = true;
+            }
+    
+            auto projectIt = configData.find(ult::ULTRAHAND_PROJECT_NAME);
+            if (projectIt != configData.end()) {
+                auto overlayIt = projectIt->second.find(ult::IN_OVERLAY_STR);
+                inOverlay = (overlayIt == projectIt->second.end() || overlayIt->second != ult::FALSE_STR);
+            } else {
+                inOverlay = true;
+            }
+    
+            if (inOverlay && skipCombo) {
+                configData[ult::ULTRAHAND_PROJECT_NAME][ult::IN_OVERLAY_STR] = ult::FALSE_STR;
+                needsUpdate = true;
+                shouldFireEvent = true;
+            }
+    
+            if (needsUpdate) {
+                ult::saveIniFileData(ult::ULTRAHAND_CONFIG_INI_PATH, configData);
+            }
+    
+            if (shouldFireEvent) {
+                eventFire(&shData.comboEvent);
+            }
+        }
+    #else
+        {
+            
+            auto configData = ult::getParsedDataFromIniFile(ult::ULTRAHAND_CONFIG_INI_PATH);
+
+            auto projectIt = configData.find(ult::ULTRAHAND_PROJECT_NAME);
+            if (projectIt != configData.end()) {
+                auto overlayIt = projectIt->second.find(ult::IN_OVERLAY_STR);
+                const bool inOverlay = (overlayIt == projectIt->second.end() || overlayIt->second != ult::FALSE_STR);
+
+                if (inOverlay && directMode) {
+                    configData[ult::ULTRAHAND_PROJECT_NAME][ult::IN_OVERLAY_STR] = ult::FALSE_STR;
+                    ult::saveIniFileData(ult::ULTRAHAND_CONFIG_INI_PATH, configData);
+                }
+            }
+        }
+
+        if (skipCombo) {
+            eventFire(&shData.comboEvent);
+            shouldFireEvent = true;
+        }
+    #endif
+    
+        overlay->disableNextAnimation();
+    
+        {
+            Handle handles[2] = { shData.comboEvent.revent, notificationEvent.revent };
+            s32 index = -1;
+    
+            bool exitAfterPrompt = false;
+            bool comboBreakout = false;
+            bool firstLoop = !ult::firstBoot;
+    
+            while (shData.running.load(std::memory_order_acquire)) {
+                // Early exit if launching new overlay
+                if (ult::launchingOverlay.load(std::memory_order_acquire)) {
+                    //std::scoped_lock lock(shData.dataMutex);
+                    shData.running.store(false, std::memory_order_release);
+                    shData.overlayOpen.store(false, std::memory_order_release);
+                    break;
+                }
+    
+                // Wait for events only if no active notification
+                if (!(notification && notification->isActive())) {
+                    svcWaitSynchronization(&index, handles, 2, UINT64_MAX);
+                    //eventClear(&notificationEvent);
+                    //eventClear(&shData.comboEvent);
+                }
+                eventClear(&notificationEvent);
+                eventClear(&shData.comboEvent);
+    
+                if ((notification && notification->isActive() && !firstLoop) || index == 1) {
+                    comboBreakout = false;
+    
+                    while (shData.running.load(std::memory_order_acquire)) {
+                        {
+                            //std::scoped_lock lock(shData.dataMutex);
+                            if (ult::launchingOverlay.load(std::memory_order_acquire)) {
+                                shData.running.store(false, std::memory_order_release);
+                                shData.overlayOpen.store(false, std::memory_order_release);
+                                break;
+                            }
+                            overlay->loop(true); // Draw prompts while hidden
+                        }
+    
+                        if (mainComboHasTriggered.exchange(false, std::memory_order_acq_rel)) {
+                            comboBreakout = true;
+                            exitAfterPrompt = false;
+                            break;
+                        }
+    
+                        if (launchComboHasTriggered.load(std::memory_order_acquire)) {
+                            exitAfterPrompt = true;
+                            usingPackageLauncher = false;
+                            directMode = false;
+                            break;
+                        }
+    
+                        if (!(notification && notification->isActive())) {
+                            break;
+                        }
+                    }
+    
+                    if (!comboBreakout || !shData.running.load(std::memory_order_acquire)) {
+                        {
+                            //std::scoped_lock lock(shData.dataMutex);
+                            if (!ult::launchingOverlay.load(std::memory_order_acquire)) {
+                                overlay->clearScreen();
+                            }
+                        }
+                        if (exitAfterPrompt) {
+                            std::scoped_lock lock(shData.dataMutex);
+                            exitAfterPrompt = false;
+                            shData.running.store(false, std::memory_order_release);
+                            shData.overlayOpen.store(false, std::memory_order_release);
+                            ult::launchingOverlay.store(true, std::memory_order_release);
+                            launchComboHasTriggered.store(true, std::memory_order_release); // for isolating sound effect
+    
+                            if (usingPackageLauncher || directMode) {
+                                tsl::setNextOverlay(ult::OVERLAY_PATH + "ovlmenu.ovl");
+                            }
+                            
+                            hlp::requestForeground(false);
+                            break;
+                        }
+                        continue;
+                    }
+                }
+    
+                {
+                    //std::scoped_lock lock(shData.dataMutex);
+                    if (ult::launchingOverlay.load(std::memory_order_acquire)) {
+                        shData.running.store(false, std::memory_order_release);
+                        shData.overlayOpen.store(false, std::memory_order_release);
+                        break;
+                    }
+                    firstLoop = false;
+                    shData.overlayOpen.store(true, std::memory_order_release);
+    
+    #if IS_STATUS_MONITOR_DIRECTIVE
+                    if (!isValidOverlayMode())
+                        hlp::requestForeground(true);
+    #else
+                    hlp::requestForeground(true);
+    #endif
+    
+                    overlay->show();
+                    if (!comboBreakout && !(notification && notification->isActive()))
+                        overlay->clearScreen();
+
+                    {
+                        std::scoped_lock lock(shData.dataMutex);
+                        // Clear derived states that the overlay loop will use
+                        shData.keysDown = 0;
+                        shData.keysHeld = 0;
+                        // Clear any queued pending keys so nothing gets processed one frame late
+                        shData.keysDownPending = 0;
+                    }
+                }
+                
+                while (shData.running.load(std::memory_order_acquire)) {
+                    {
+                        
+                        if (ult::launchingOverlay.load(std::memory_order_acquire)) {
+                            shData.running.store(false, std::memory_order_release);
+                            shData.overlayOpen.store(false, std::memory_order_release);
+                            break;
+                        }
+                        overlay->loop();
+                        {
+                            std::scoped_lock lock(shData.dataMutex);
+                            if (!overlay->fadeAnimationPlaying()) {
+                                overlay->handleInput(shData.keysDownPending, shData.keysHeld, shData.touchState.count, shData.touchState.touches[0], shData.joyStickPosLeft, shData.joyStickPosRight);
+                            }
+                            shData.keysDownPending = 0;
+                        }
+                        #if IS_LAUNCHER_DIRECTIVE
+                        if (shouldFireEvent) {
+                            shouldFireEvent = false;
+                            
+                            if (!comboReturn) {
+                                //triggerRumbleDoubleClick.store(true, std::memory_order_release);
+                                //triggerExitSound.store(true, std::memory_order_release);
+                                triggerExitFeedback();
+                            //} else {
+                            //    triggerRumbleClick.store(true, std::memory_order_release);
+                            }
+                        }
+                        #else
+                        if (!directMode && shouldFireEvent) {
+                            shouldFireEvent = false;
+                            #if IS_STATUS_MONITOR_DIRECTIVE
+                            if (lastMode.compare("returning") == 0) {
+                                //triggerRumbleDoubleClick.store(true, std::memory_order_release);
+                                //triggerExitSound.store(true, std::memory_order_release);
+                                triggerExitFeedback();
+                            } else {
+                                //triggerRumbleClick.store(true, std::memory_order_release);
+                                triggerEnterSound.store(true, std::memory_order_release);
+                            }
+                            #else
+                            //triggerRumbleClick.store(true, std::memory_order_release);
+                            //triggerEnterSound.store(true, std::memory_order_release);
+                            triggerEnterFeedback();
+                            #endif
+                        }
+                        #endif
+                    }
+    
+    #if IS_STATUS_MONITOR_DIRECTIVE
+                    if (pendingExit && wasRendering) {
+                        pendingExit = false;
+                        wasRendering = false;
+                        isRendering = true;
+                        leventClear(&renderingStopEvent);
+                    }
+    #endif
+    
+                    if (overlay->shouldHide()) {
+                        if (overlay->shouldCloseAfter()) {
+                            if (!directMode) {
+                                //std::scoped_lock lock(shData.dataMutex);
+                                shData.running.store(false, std::memory_order_release);
+                                shData.overlayOpen.store(false, std::memory_order_release);
+                                break;
+                            } else {
+                                exitAfterPrompt = true;
+    #if IS_STATUS_MONITOR_DIRECTIVE
+                                pendingExit = true;
+    #endif
+                            }
+                        }
+                        break;
+                    }
+    
+                    if (overlay->shouldClose()) {
+                        //std::scoped_lock lock(shData.dataMutex);
+                        shData.running.store(false, std::memory_order_release);
+                        shData.overlayOpen.store(false, std::memory_order_release);
+
+                        break;
+                    }
+                }
+    
+                if (shData.running.load(std::memory_order_acquire)) {
+                    //std::scoped_lock lock(shData.dataMutex);
+                    if (!(notification && notification->isActive()))
+                        overlay->clearScreen();
+                    overlay->resetFlags();
+                    hlp::requestForeground(false);
+                    shData.overlayOpen.store(false, std::memory_order_release);
+                    mainComboHasTriggered.store(false, std::memory_order_acquire);
+                    launchComboHasTriggered.store(false, std::memory_order_acquire);
+                    eventClear(&shData.comboEvent);
+                }
+            }
+
+            // Ensure background thread is fully stopped before overlay cleanup
+            shData.running.store(false, std::memory_order_release);
+            threadWaitForExit(&backgroundThread);
+            threadClose(&backgroundThread);
+
+            
+            // Cleanup overlay resources
+            tsl::elm::fullDeconstruction.store(true, std::memory_order_release);
+            hlp::requestForeground(false);
+            overlay->exitScreen();
+            overlay->exitServices();
+            delete overlay;
+            
+            
+            eventClose(&shData.comboEvent);
+
+
+            if (directMode && !launchComboHasTriggered.load(std::memory_order_acquire)) {
+                if (!disableSound.load(std::memory_order_acquire) && ult::useSoundEffects)
+                    ult::AudioPlayer::playExitSound();
+                if (ult::useHapticFeedback) {
+                    ult::rumbleDoubleClickStandalone();
+                }
+            }
+
+            
+            // Brief delay to ensure thread quiescence before nx-ovlloader transition
+            //svcSleepThread(100'000'000); // 100ms
+    
+            return 0;
+        }
+    }
+
+}
+
+
+#ifdef TESLA_INIT_IMPL
+
+namespace tsl::cfg {
+    
+    u16 LayerWidth  = 0;
+    u16 LayerHeight = 0;
+    u16 LayerPosX   = 0;
+    u16 LayerPosY   = 0;
+    u16 FramebufferWidth  = 0;
+    u16 FramebufferHeight = 0;
+    u64 launchCombo = KEY_ZL | KEY_ZR | KEY_DDOWN;
+    u64 launchCombo2 = KEY_L | KEY_DDOWN | KEY_RSTICK;
+}
+extern "C" void __libnx_init_time(void);
+
+extern "C" {
+    
+    u32 __nx_applet_type = AppletType_None;
+    u32 __nx_fs_num_sessions = 1;
+    u32  __nx_nv_transfermem_size = 0x15000;
+    ViLayerFlags __nx_vi_stray_layer_flags = (ViLayerFlags)0;
+    
+    /**
+     * @brief libtesla service initializing function to override libnx's
+     *
+     */
+    void __appInit(void) {
+        ASSERT_FATAL(smInitialize()); // needed to prevent issues with powering device into sleep
+
+        //tsl::hlp::doWithSmSession([]{
+        
+        ASSERT_FATAL(fsInitialize());
+        ASSERT_FATAL(hidInitialize());                          // Controller inputs and Touch
+        if (hosversionAtLeast(16,0,0)) {
+            ASSERT_FATAL(plInitialize(PlServiceType_User));     // Font data. Use pl:u for 16.0.0+
+        } else {
+            ASSERT_FATAL(plInitialize(PlServiceType_System));   // Use pl:s for 15.0.1 and below to prevent qlaunch/overlaydisp session exhaustion
+        }
+        ASSERT_FATAL(pmdmntInitialize());                       // PID querying
+        ASSERT_FATAL(hidsysInitialize());                       // Focus control
+        ASSERT_FATAL(setsysInitialize());                       // Settings querying
+        
+        // Time initializations
+        if R_SUCCEEDED(timeInitialize()) {
+            __libnx_init_time();
+            timeExit();
+        }
+
+        #if USING_WIDGET_DIRECTIVE
+        ult::powerInit();
+        i2cInitialize();
+        #endif
+
+        fsdevMountSdmc();
+        splInitialize();
+        spsmInitialize();
+        //i2cInitialize();
+        //ASSERT_FATAL(socketInitializeDefault());
+        //ASSERT_FATAL(nifmInitialize(NifmServiceType_User));
+
+        //});
+        
+
+        
+
+        #if IS_STATUS_MONITOR_DIRECTIVE
+        Service *plSrv = plGetServiceSession();
+        Service plClone;
+        ASSERT_FATAL(serviceClone(plSrv, &plClone));
+        serviceClose(plSrv);
+        *plSrv = plClone;
+        #endif
+
+        eventCreate(&tsl::notificationEvent, false);
+        tsl::notification = new tsl::NotificationPrompt();
+        //tsl::notification = nullptr;
+    }
+    
+    /**
+     * @brief libtesla service exiting function to override libnx's
+     *
+     */
+    void __appExit(void) {
+        delete tsl::notification;
+        eventClose(&tsl::notificationEvent);
+
+        //deinitRumble();
+        if (ult::expandedMemory)
+            ult::AudioPlayer::exit();
+
+        
+        //socketExit();
+        //nifmExit();
+        spsmExit();
+        splExit();
+        fsdevUnmountAll();
+        
+        #if USING_WIDGET_DIRECTIVE
+        i2cExit();
+        ult::powerExit(); // CUSTOM MODIFICATION
+        #endif
+        
+        fsExit();
+        hidExit();
+        plExit();
+        pmdmntExit();
+        hidsysExit();
+        setsysExit();
+        smExit();
+
+        // Final cleanup
+        tsl::gfx::FontManager::cleanup();
+    }
+
+}
+
+#endif
diff --git a/Source/sys-clk/overlay/lib/libultrahand/libultra/LICENSE b/Source/sys-clk/overlay/lib/libultrahand/libultra/LICENSE
new file mode 100644
index 00000000..d159169d
--- /dev/null
+++ b/Source/sys-clk/overlay/lib/libultrahand/libultra/LICENSE
@@ -0,0 +1,339 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
diff --git a/Source/sys-clk/overlay/lib/libultrahand/libultra/README.md b/Source/sys-clk/overlay/lib/libultrahand/libultra/README.md
new file mode 100644
index 00000000..9966139d
--- /dev/null
+++ b/Source/sys-clk/overlay/lib/libultrahand/libultra/README.md
@@ -0,0 +1,69 @@
+# libultra
+
+![Ultrahand Logo](https://github.com/ppkantorski/Ultrahand-Overlay/blob/main/.pics/ultrahand.png)
+
+
+## Overview
+
+`libultra` is a powerful collection of helper functions designed specifically for the Ultrahand Overlay project. This library offers a comprehensive set of utilities aimed at simplifying common tasks and enhancing the efficiency of your projects within the Ultrahand Overlay ecosystem.
+
+## Features
+
+### [Ultra Header](/libultra/include/ultra.hpp)
+
+- **ultra.hpp**: The main header file for the `libultra` library, including all essential functions and declarations for seamless integration into your projects.
+
+### [Debug Functions](/libultra/include/debug_funcs.hpp)
+
+- **debug_funcs.hpp**: A collection of functions tailored for debugging purposes, aiding in identifying and resolving issues within your codebase.
+
+### [Download Functions](/libultra/include/download_funcs.hpp)
+
+- **download_funcs.hpp**: Utilities for managing file downloads, enabling seamless retrieval of resources from external sources.
+
+### [Get Functions](/libultra/include/get_funcs.hpp)
+
+- **get_funcs.hpp**: Functions for retrieving data from various sources, simplifying the process of fetching information within your applications.
+
+### [Hex Functions](/libultra/include/hex_funcs.hpp)
+
+- **hex_funcs.hpp**: Tools for working with hexadecimal data, facilitating operations such as conversion and manipulation of hexadecimal values.
+
+### [INI Functions](/libultra/include/ini_funcs.hpp)
+
+- **ini_funcs.hpp**: Helper functions for handling INI configuration files, offering a convenient way to manage application settings.
+
+### [JSON Functions](/libultra/include/json_funcs.hpp)
+
+- **json_funcs.hpp**: Utilities for parsing and manipulating JSON data, providing easy integration with JSON-based APIs and services.
+
+### [List Functions](/libultra/include/list_funcs.hpp)
+
+- **list_funcs.hpp**: Functions for working with lists and arrays, offering essential operations like sorting, searching, and manipulation of list elements.
+
+### [Mod Functions](/libultra/include/mod_funcs.hpp)
+
+- **mod_funcs.hpp**: Functions for manipulating game mods, facilitating operations and management tasks related to modifications in gaming environments.
+
+### [Path Functions](/libultra/include/path_funcs.hpp)
+
+- **path_funcs.hpp**: Tools for working with file paths and directories, simplifying file system operations within your applications.
+
+### [String Functions](/libultra/include/string_funcs.hpp)
+
+- **string_funcs.hpp**: A collection of string manipulation functions, providing utilities for tasks such as formatting, searching, and modification of strings.
+
+
+## Usage
+
+To build Ultrahand overlays with `libultra` + `libtesla`, simply add the `lib` folder to your project, then import `tesla.hpp`.
+
+## Contribution
+
+Contributions to `libultra` are welcome. If you have ideas for additional helper functions or improvements to existing ones, feel free to submit a pull request or open an issue on GitHub.
+
+## License
+
+Licensed under both [GPLv2](LICENSE) and [CC-BY-4.0](SUB_LICENSE).
+
+Copyright (c) 2024 ppkantorski
diff --git a/Source/sys-clk/overlay/lib/libultrahand/libultra/SUB_LICENSE b/Source/sys-clk/overlay/lib/libultrahand/libultra/SUB_LICENSE
new file mode 100644
index 00000000..2f244ac8
--- /dev/null
+++ b/Source/sys-clk/overlay/lib/libultrahand/libultra/SUB_LICENSE
@@ -0,0 +1,395 @@
+Attribution 4.0 International
+
+=======================================================================
+
+Creative Commons Corporation ("Creative Commons") is not a law firm and
+does not provide legal services or legal advice. Distribution of
+Creative Commons public licenses does not create a lawyer-client or
+other relationship. Creative Commons makes its licenses and related
+information available on an "as-is" basis. Creative Commons gives no
+warranties regarding its licenses, any material licensed under their
+terms and conditions, or any related information. Creative Commons
+disclaims all liability for damages resulting from their use to the
+fullest extent possible.
+
+Using Creative Commons Public Licenses
+
+Creative Commons public licenses provide a standard set of terms and
+conditions that creators and other rights holders may use to share
+original works of authorship and other material subject to copyright
+and certain other rights specified in the public license below. The
+following considerations are for informational purposes only, are not
+exhaustive, and do not form part of our licenses.
+
+     Considerations for licensors: Our public licenses are
+     intended for use by those authorized to give the public
+     permission to use material in ways otherwise restricted by
+     copyright and certain other rights. Our licenses are
+     irrevocable. Licensors should read and understand the terms
+     and conditions of the license they choose before applying it.
+     Licensors should also secure all rights necessary before
+     applying our licenses so that the public can reuse the
+     material as expected. Licensors should clearly mark any
+     material not subject to the license. This includes other CC-
+     licensed material, or material used under an exception or
+     limitation to copyright. More considerations for licensors:
+	wiki.creativecommons.org/Considerations_for_licensors
+
+     Considerations for the public: By using one of our public
+     licenses, a licensor grants the public permission to use the
+     licensed material under specified terms and conditions. If
+     the licensor's permission is not necessary for any reason--for
+     example, because of any applicable exception or limitation to
+     copyright--then that use is not regulated by the license. Our
+     licenses grant only permissions under copyright and certain
+     other rights that a licensor has authority to grant. Use of
+     the licensed material may still be restricted for other
+     reasons, including because others have copyright or other
+     rights in the material. A licensor may make special requests,
+     such as asking that all changes be marked or described.
+     Although not required by our licenses, you are encouraged to
+     respect those requests where reasonable. More_considerations
+     for the public:
+	wiki.creativecommons.org/Considerations_for_licensees
+
+=======================================================================
+
+Creative Commons Attribution 4.0 International Public License
+
+By exercising the Licensed Rights (defined below), You accept and agree
+to be bound by the terms and conditions of this Creative Commons
+Attribution 4.0 International Public License ("Public License"). To the
+extent this Public License may be interpreted as a contract, You are
+granted the Licensed Rights in consideration of Your acceptance of
+these terms and conditions, and the Licensor grants You such rights in
+consideration of benefits the Licensor receives from making the
+Licensed Material available under these terms and conditions.
+
+
+Section 1 -- Definitions.
+
+  a. Adapted Material means material subject to Copyright and Similar
+     Rights that is derived from or based upon the Licensed Material
+     and in which the Licensed Material is translated, altered,
+     arranged, transformed, or otherwise modified in a manner requiring
+     permission under the Copyright and Similar Rights held by the
+     Licensor. For purposes of this Public License, where the Licensed
+     Material is a musical work, performance, or sound recording,
+     Adapted Material is always produced where the Licensed Material is
+     synched in timed relation with a moving image.
+
+  b. Adapter's License means the license You apply to Your Copyright
+     and Similar Rights in Your contributions to Adapted Material in
+     accordance with the terms and conditions of this Public License.
+
+  c. Copyright and Similar Rights means copyright and/or similar rights
+     closely related to copyright including, without limitation,
+     performance, broadcast, sound recording, and Sui Generis Database
+     Rights, without regard to how the rights are labeled or
+     categorized. For purposes of this Public License, the rights
+     specified in Section 2(b)(1)-(2) are not Copyright and Similar
+     Rights.
+
+  d. Effective Technological Measures means those measures that, in the
+     absence of proper authority, may not be circumvented under laws
+     fulfilling obligations under Article 11 of the WIPO Copyright
+     Treaty adopted on December 20, 1996, and/or similar international
+     agreements.
+
+  e. Exceptions and Limitations means fair use, fair dealing, and/or
+     any other exception or limitation to Copyright and Similar Rights
+     that applies to Your use of the Licensed Material.
+
+  f. Licensed Material means the artistic or literary work, database,
+     or other material to which the Licensor applied this Public
+     License.
+
+  g. Licensed Rights means the rights granted to You subject to the
+     terms and conditions of this Public License, which are limited to
+     all Copyright and Similar Rights that apply to Your use of the
+     Licensed Material and that the Licensor has authority to license.
+
+  h. Licensor means the individual(s) or entity(ies) granting rights
+     under this Public License.
+
+  i. Share means to provide material to the public by any means or
+     process that requires permission under the Licensed Rights, such
+     as reproduction, public display, public performance, distribution,
+     dissemination, communication, or importation, and to make material
+     available to the public including in ways that members of the
+     public may access the material from a place and at a time
+     individually chosen by them.
+
+  j. Sui Generis Database Rights means rights other than copyright
+     resulting from Directive 96/9/EC of the European Parliament and of
+     the Council of 11 March 1996 on the legal protection of databases,
+     as amended and/or succeeded, as well as other essentially
+     equivalent rights anywhere in the world.
+
+  k. You means the individual or entity exercising the Licensed Rights
+     under this Public License. Your has a corresponding meaning.
+
+
+Section 2 -- Scope.
+
+  a. License grant.
+
+       1. Subject to the terms and conditions of this Public License,
+          the Licensor hereby grants You a worldwide, royalty-free,
+          non-sublicensable, non-exclusive, irrevocable license to
+          exercise the Licensed Rights in the Licensed Material to:
+
+            a. reproduce and Share the Licensed Material, in whole or
+               in part; and
+
+            b. produce, reproduce, and Share Adapted Material.
+
+       2. Exceptions and Limitations. For the avoidance of doubt, where
+          Exceptions and Limitations apply to Your use, this Public
+          License does not apply, and You do not need to comply with
+          its terms and conditions.
+
+       3. Term. The term of this Public License is specified in Section
+          6(a).
+
+       4. Media and formats; technical modifications allowed. The
+          Licensor authorizes You to exercise the Licensed Rights in
+          all media and formats whether now known or hereafter created,
+          and to make technical modifications necessary to do so. The
+          Licensor waives and/or agrees not to assert any right or
+          authority to forbid You from making technical modifications
+          necessary to exercise the Licensed Rights, including
+          technical modifications necessary to circumvent Effective
+          Technological Measures. For purposes of this Public License,
+          simply making modifications authorized by this Section 2(a)
+          (4) never produces Adapted Material.
+
+       5. Downstream recipients.
+
+            a. Offer from the Licensor -- Licensed Material. Every
+               recipient of the Licensed Material automatically
+               receives an offer from the Licensor to exercise the
+               Licensed Rights under the terms and conditions of this
+               Public License.
+
+            b. No downstream restrictions. You may not offer or impose
+               any additional or different terms or conditions on, or
+               apply any Effective Technological Measures to, the
+               Licensed Material if doing so restricts exercise of the
+               Licensed Rights by any recipient of the Licensed
+               Material.
+
+       6. No endorsement. Nothing in this Public License constitutes or
+          may be construed as permission to assert or imply that You
+          are, or that Your use of the Licensed Material is, connected
+          with, or sponsored, endorsed, or granted official status by,
+          the Licensor or others designated to receive attribution as
+          provided in Section 3(a)(1)(A)(i).
+
+  b. Other rights.
+
+       1. Moral rights, such as the right of integrity, are not
+          licensed under this Public License, nor are publicity,
+          privacy, and/or other similar personality rights; however, to
+          the extent possible, the Licensor waives and/or agrees not to
+          assert any such rights held by the Licensor to the limited
+          extent necessary to allow You to exercise the Licensed
+          Rights, but not otherwise.
+
+       2. Patent and trademark rights are not licensed under this
+          Public License.
+
+       3. To the extent possible, the Licensor waives any right to
+          collect royalties from You for the exercise of the Licensed
+          Rights, whether directly or through a collecting society
+          under any voluntary or waivable statutory or compulsory
+          licensing scheme. In all other cases the Licensor expressly
+          reserves any right to collect such royalties.
+
+
+Section 3 -- License Conditions.
+
+Your exercise of the Licensed Rights is expressly made subject to the
+following conditions.
+
+  a. Attribution.
+
+       1. If You Share the Licensed Material (including in modified
+          form), You must:
+
+            a. retain the following if it is supplied by the Licensor
+               with the Licensed Material:
+
+                 i. identification of the creator(s) of the Licensed
+                    Material and any others designated to receive
+                    attribution, in any reasonable manner requested by
+                    the Licensor (including by pseudonym if
+                    designated);
+
+                ii. a copyright notice;
+
+               iii. a notice that refers to this Public License;
+
+                iv. a notice that refers to the disclaimer of
+                    warranties;
+
+                 v. a URI or hyperlink to the Licensed Material to the
+                    extent reasonably practicable;
+
+            b. indicate if You modified the Licensed Material and
+               retain an indication of any previous modifications; and
+
+            c. indicate the Licensed Material is licensed under this
+               Public License, and include the text of, or the URI or
+               hyperlink to, this Public License.
+
+       2. You may satisfy the conditions in Section 3(a)(1) in any
+          reasonable manner based on the medium, means, and context in
+          which You Share the Licensed Material. For example, it may be
+          reasonable to satisfy the conditions by providing a URI or
+          hyperlink to a resource that includes the required
+          information.
+
+       3. If requested by the Licensor, You must remove any of the
+          information required by Section 3(a)(1)(A) to the extent
+          reasonably practicable.
+
+       4. If You Share Adapted Material You produce, the Adapter's
+          License You apply must not prevent recipients of the Adapted
+          Material from complying with this Public License.
+
+
+Section 4 -- Sui Generis Database Rights.
+
+Where the Licensed Rights include Sui Generis Database Rights that
+apply to Your use of the Licensed Material:
+
+  a. for the avoidance of doubt, Section 2(a)(1) grants You the right
+     to extract, reuse, reproduce, and Share all or a substantial
+     portion of the contents of the database;
+
+  b. if You include all or a substantial portion of the database
+     contents in a database in which You have Sui Generis Database
+     Rights, then the database in which You have Sui Generis Database
+     Rights (but not its individual contents) is Adapted Material; and
+
+  c. You must comply with the conditions in Section 3(a) if You Share
+     all or a substantial portion of the contents of the database.
+
+For the avoidance of doubt, this Section 4 supplements and does not
+replace Your obligations under this Public License where the Licensed
+Rights include other Copyright and Similar Rights.
+
+
+Section 5 -- Disclaimer of Warranties and Limitation of Liability.
+
+  a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE
+     EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS
+     AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF
+     ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS,
+     IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION,
+     WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR
+     PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS,
+     ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT
+     KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT
+     ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU.
+
+  b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE
+     TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION,
+     NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT,
+     INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES,
+     COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR
+     USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN
+     ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR
+     DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR
+     IN PART, THIS LIMITATION MAY NOT APPLY TO YOU.
+
+  c. The disclaimer of warranties and limitation of liability provided
+     above shall be interpreted in a manner that, to the extent
+     possible, most closely approximates an absolute disclaimer and
+     waiver of all liability.
+
+
+Section 6 -- Term and Termination.
+
+  a. This Public License applies for the term of the Copyright and
+     Similar Rights licensed here. However, if You fail to comply with
+     this Public License, then Your rights under this Public License
+     terminate automatically.
+
+  b. Where Your right to use the Licensed Material has terminated under
+     Section 6(a), it reinstates:
+
+       1. automatically as of the date the violation is cured, provided
+          it is cured within 30 days of Your discovery of the
+          violation; or
+
+       2. upon express reinstatement by the Licensor.
+
+     For the avoidance of doubt, this Section 6(b) does not affect any
+     right the Licensor may have to seek remedies for Your violations
+     of this Public License.
+
+  c. For the avoidance of doubt, the Licensor may also offer the
+     Licensed Material under separate terms or conditions or stop
+     distributing the Licensed Material at any time; however, doing so
+     will not terminate this Public License.
+
+  d. Sections 1, 5, 6, 7, and 8 survive termination of this Public
+     License.
+
+
+Section 7 -- Other Terms and Conditions.
+
+  a. The Licensor shall not be bound by any additional or different
+     terms or conditions communicated by You unless expressly agreed.
+
+  b. Any arrangements, understandings, or agreements regarding the
+     Licensed Material not stated herein are separate from and
+     independent of the terms and conditions of this Public License.
+
+
+Section 8 -- Interpretation.
+
+  a. For the avoidance of doubt, this Public License does not, and
+     shall not be interpreted to, reduce, limit, restrict, or impose
+     conditions on any use of the Licensed Material that could lawfully
+     be made without permission under this Public License.
+
+  b. To the extent possible, if any provision of this Public License is
+     deemed unenforceable, it shall be automatically reformed to the
+     minimum extent necessary to make it enforceable. If the provision
+     cannot be reformed, it shall be severed from this Public License
+     without affecting the enforceability of the remaining terms and
+     conditions.
+
+  c. No term or condition of this Public License will be waived and no
+     failure to comply consented to unless expressly agreed to by the
+     Licensor.
+
+  d. Nothing in this Public License constitutes or may be interpreted
+     as a limitation upon, or waiver of, any privileges and immunities
+     that apply to the Licensor or You, including from the legal
+     processes of any jurisdiction or authority.
+
+
+=======================================================================
+
+Creative Commons is not a party to its public
+licenses. Notwithstanding, Creative Commons may elect to apply one of
+its public licenses to material it publishes and in those instances
+will be considered the “Licensor.” The text of the Creative Commons
+public licenses is dedicated to the public domain under the CC0 Public
+Domain Dedication. Except for the limited purpose of indicating that
+material is shared under a Creative Commons public license or as
+otherwise permitted by the Creative Commons policies published at
+creativecommons.org/policies, Creative Commons does not authorize the
+use of the trademark "Creative Commons" or any other trademark or logo
+of Creative Commons without its prior written consent including,
+without limitation, in connection with any unauthorized modifications
+to any of its public licenses or any other arrangements,
+understandings, or agreements concerning use of licensed material. For
+the avoidance of doubt, this paragraph does not form part of the
+public licenses.
+
+Creative Commons may be contacted at creativecommons.org.
diff --git a/Source/sys-clk/overlay/lib/libultrahand/libultra/include/audio_player.hpp b/Source/sys-clk/overlay/lib/libultrahand/libultra/include/audio_player.hpp
new file mode 100644
index 00000000..d9e9765e
--- /dev/null
+++ b/Source/sys-clk/overlay/lib/libultrahand/libultra/include/audio_player.hpp
@@ -0,0 +1,96 @@
+/********************************************************************************
+ * File: audio_player.hpp
+ * Author: ppkantorski
+ * Description:
+ *   This header defines the AudioPlayer class and related structures used for
+ *   handling sound playback within the Ultrahand Overlay. It provides interfaces
+ *   for loading, caching, and playing WAV audio through libnx’s audout service,
+ *   along with basic sound type management and synchronization support.
+ *
+ *   For the latest updates and contributions, visit the project's GitHub repository.
+ *   (GitHub Repository: https://github.com/ppkantorski/Ultrahand-Overlay)
+ *
+ *   Note: Please be aware that this notice cannot be altered or removed. It is a part
+ *   of the project's documentation and must remain intact.
+ * 
+ *   Licensed under both GPLv2 and CC-BY-4.0
+ *   Copyright (c) 2025 ppkantorski
+ ********************************************************************************/
+
+#pragma once
+#include <switch.h>
+#include <cstdio>
+#include <algorithm>
+#include <vector>
+#include <atomic>
+#include <cstring>
+#include <mutex>
+
+namespace ult {
+    class AudioPlayer {
+    public:
+        enum class SoundType : uint8_t {  // <- uint8_t saves space
+            Navigate,
+            Enter,
+            Exit,
+            Wall,
+            On,
+            Off,
+            Settings,
+            Move,
+            Count
+        };
+        
+        struct CachedSound {
+            void* buffer = nullptr;
+            uint32_t bufferSize = 0;
+            uint32_t dataSize = 0;
+        };
+        
+        static bool initialize();
+        static void exit();
+        static void playSound(SoundType type);
+        
+        // Inline wrappers - same API, zero overhead
+        static inline void playNavigateSound() { playSound(SoundType::Navigate); }
+        static inline void playEnterSound() { playSound(SoundType::Enter); }
+        static inline void playExitSound() { playSound(SoundType::Exit); }
+        static inline void playWallSound() { playSound(SoundType::Wall); }
+        static inline void playOnSound() { playSound(SoundType::On); }
+        static inline void playOffSound() { playSound(SoundType::Off); }
+        static inline void playSettingsSound() { playSound(SoundType::Settings); }
+        static inline void playMoveSound() { playSound(SoundType::Move); }
+        
+        static void setMasterVolume(float volume);
+        static void setEnabled(bool enabled);
+        static bool isEnabled();
+        static bool isDocked();
+        static bool reloadIfDockedChanged();
+        static void reloadAllSounds();
+        static void unloadAllSounds(const std::initializer_list<SoundType>& excludeSounds = {});
+        static std::mutex m_audioMutex;
+        
+    private:
+        static bool m_initialized;
+        static std::atomic<bool> m_enabled;  // <- atomic for lock-free reads
+        static float m_masterVolume;
+        static std::vector<CachedSound> m_cachedSounds;
+        
+        static bool m_lastDockedState;
+        
+        inline static constexpr const char* m_soundPaths[static_cast<size_t>(SoundType::Count)] = {
+            "sdmc:/config/ultrahand/sounds/tick.wav",
+            "sdmc:/config/ultrahand/sounds/enter.wav",
+            "sdmc:/config/ultrahand/sounds/exit.wav",
+            "sdmc:/config/ultrahand/sounds/wall.wav",
+            "sdmc:/config/ultrahand/sounds/on.wav",
+            "sdmc:/config/ultrahand/sounds/off.wav",
+            "sdmc:/config/ultrahand/sounds/settings.wav",
+            "sdmc:/config/ultrahand/sounds/move.wav"
+        };
+        
+        //static void playAudioBuffer(void* buffer, uint32_t bufferSize);
+        static bool loadSoundFromWav(SoundType type, const char* path);
+        
+    };
+}
\ No newline at end of file
diff --git a/Source/sys-clk/overlay/lib/libultrahand/libultra/include/debug_funcs.hpp b/Source/sys-clk/overlay/lib/libultrahand/libultra/include/debug_funcs.hpp
new file mode 100644
index 00000000..aa0a045d
--- /dev/null
+++ b/Source/sys-clk/overlay/lib/libultrahand/libultra/include/debug_funcs.hpp
@@ -0,0 +1,53 @@
+/********************************************************************************
+ * File: debug_funcs.hpp
+ * Author: ppkantorski
+ * Description:
+ *   This header file contains debugging functions for the Ultrahand Overlay project.
+ *   These functions allow logging messages with timestamps to a log file.
+ *
+ *   For the latest updates and contributions, visit the project's GitHub repository.
+ *   (GitHub Repository: https://github.com/ppkantorski/Ultrahand-Overlay)
+ *
+ *   Note: Please be aware that this notice cannot be altered or removed. It is a part
+ *   of the project's documentation and must remain intact.
+ * 
+ *  Licensed under both GPLv2 and CC-BY-4.0
+ *  Copyright (c) 2024 ppkantorski
+ ********************************************************************************/
+
+#pragma once
+#ifndef DEBUG_FUNCS_HPP
+#define DEBUG_FUNCS_HPP
+
+#if !USING_FSTREAM_DIRECTIVE // For not using fstream (needs implementing)
+#include <stdio.h>
+#else
+#include <fstream>
+#endif
+#include <mutex>
+#include <string>
+#include <ctime>
+
+namespace ult {
+    #if USING_LOGGING_DIRECTIVE
+
+    // Specify the log file path
+    extern const std::string defaultLogFilePath;
+    
+    extern std::string logFilePath;  // Declare logFilePath as extern
+    extern bool disableLogging;        // Declare disableLogging as extern
+    
+    // Global mutex for thread-safe logging
+    extern std::mutex logMutex;        // Declare logMutex as extern
+
+    /**
+     * @brief Logs a message with a timestamp to a log file in a thread-safe manner.
+     *
+     * @param message The message to be logged.
+     */
+    void logMessage(const char* message);
+    void logMessage(const std::string& message);
+    #endif
+}
+
+#endif // DEBUG_FUNCS_HPP
diff --git a/Source/sys-clk/overlay/lib/libultrahand/libultra/include/download_funcs.hpp b/Source/sys-clk/overlay/lib/libultrahand/libultra/include/download_funcs.hpp
new file mode 100644
index 00000000..240db66c
--- /dev/null
+++ b/Source/sys-clk/overlay/lib/libultrahand/libultra/include/download_funcs.hpp
@@ -0,0 +1,83 @@
+/********************************************************************************
+ * File: download_funcs.hpp
+ * Author: ppkantorski
+ * Description:
+ *   This header file contains functions for downloading and extracting files
+ *   using libcurl and miniz. It includes functions for downloading files from URLs,
+ *   writing received data to a file, and extracting files from ZIP archives.
+ *
+ *   For the latest updates and contributions, visit the project's GitHub repository.
+ *   (GitHub Repository: https://github.com/ppkantorski/Ultrahand-Overlay)
+ *
+ *   Note: Please be aware that this notice cannot be altered or removed. It is a part
+ *   of the project's documentation and must remain intact.
+ * 
+ *  Licensed under both GPLv2 and CC-BY-4.0
+ *  Copyright (c) 2024 ppkantorski
+ ********************************************************************************/
+
+#pragma once
+#ifndef DOWNLOAD_FUNCS_HPP
+#define DOWNLOAD_FUNCS_HPP
+
+#include <stdio.h>
+#include <sys/stat.h>
+#include <switch.h>
+
+#define CURL_DISABLE_DEFLATE
+#include <curl/curl.h>
+#include <zlib.h>
+#include <minizip/unzip.h>
+
+#include <atomic>
+#include <memory>
+#include <string>
+#include <mutex>
+#include <cstring>
+#include <algorithm>
+
+#include "global_vars.hpp"
+#include "string_funcs.hpp"
+#include "get_funcs.hpp"
+#include "path_funcs.hpp"
+#include "debug_funcs.hpp"
+
+namespace ult {
+    // Constants for buffer sizes
+
+    extern size_t DOWNLOAD_READ_BUFFER;
+    extern size_t DOWNLOAD_WRITE_BUFFER;
+    extern size_t UNZIP_READ_BUFFER;
+    extern size_t UNZIP_WRITE_BUFFER;
+    
+    // Path to the CA certificate
+    //extern const std::string cacertPath;
+    //extern const std::string cacertURL;
+    
+    // Thread-safe atomic flags for operation control
+    extern std::atomic<bool> abortDownload;
+    extern std::atomic<bool> abortUnzip;
+    extern std::atomic<int> downloadPercentage;
+    extern std::atomic<int> unzipPercentage;
+    
+    
+    // Thread-safe callback functions
+    //#if !USING_FSTREAM_DIRECTIVE
+    //size_t writeCallback(void* ptr, size_t size, size_t nmemb, FILE* stream);
+    //#else
+    //size_t writeCallback(void* ptr, size_t size, size_t nmemb, std::ostream* stream);
+    //#endif
+    
+    //int progressCallback(void* ptr, curl_off_t totalToDownload, curl_off_t nowDownloaded, curl_off_t totalToUpload, curl_off_t nowUploaded);
+    
+    
+    // Thread-safe initialization and cleanup functions
+    //void initializeCurl();
+    //void cleanupCurl();
+    
+    // Main API functions - thread-safe and optimized
+    bool downloadFile(const std::string& url, const std::string& toDestination, bool noPercentagePolling=false);
+    bool unzipFile(const std::string& zipFilePath, const std::string& extractTo);
+}
+
+#endif // DOWNLOAD_FUNCS_HPP
\ No newline at end of file
diff --git a/Source/sys-clk/overlay/lib/libultrahand/libultra/include/get_funcs.hpp b/Source/sys-clk/overlay/lib/libultrahand/libultra/include/get_funcs.hpp
new file mode 100644
index 00000000..f2ad167d
--- /dev/null
+++ b/Source/sys-clk/overlay/lib/libultrahand/libultra/include/get_funcs.hpp
@@ -0,0 +1,160 @@
+/********************************************************************************
+ * File: get_funcs.hpp
+ * Author: ppkantorski
+ * Description:
+ *   This header file contains functions for retrieving information and data
+ *   from various sources, including file system and JSON files. It includes
+ *   functions for obtaining overlay module information, reading file contents,
+ *   and parsing JSON data.
+ *
+ *   For the latest updates and contributions, visit the project's GitHub repository.
+ *   (GitHub Repository: https://github.com/ppkantorski/Ultrahand-Overlay)
+ *
+ *   Note: Please be aware that this notice cannot be altered or removed. It is a part
+ *   of the project's documentation and must remain intact.
+ * 
+ *  Licensed under both GPLv2 and CC-BY-4.0
+ *  Copyright (c) 2024 ppkantorski
+ ********************************************************************************/
+
+#pragma once
+
+#ifndef GET_FUNCS_HPP
+#define GET_FUNCS_HPP
+
+
+#include <cstring>
+#include <dirent.h>
+#include <fnmatch.h>
+#include "debug_funcs.hpp"
+#include "string_funcs.hpp"
+
+
+namespace ult {
+    struct DirCloser {
+        void operator()(DIR* dir) const {
+            if (dir) closedir(dir);
+        }
+    };
+    
+    
+    
+    /**
+     * @brief Reads the contents of a file and returns it as a string, normalizing line endings.
+     *
+     * @param filePath The path to the file to be read.
+     * @return The content of the file as a string with line endings normalized to '\n'.
+     */
+    //std::string getFileContents(const std::string& filePath);
+    
+    
+    /**
+     * @brief Concatenates the provided directory and file names to form a destination path.
+     *
+     * @param destinationDir The directory where the file should be placed.
+     * @param fileName The name of the file.
+     * @return The destination path as a string.
+     */
+    std::string getDestinationPath(const std::string& destinationDir, const std::string& fileName);
+    
+    /**
+     * @brief Extracts the value part from a string line containing a key-value pair.
+     *
+     * @param line The string line containing a key-value pair (e.g., "key=value").
+     * @return The extracted value as a string. If no value is found, an empty string is returned.
+     */
+    std::string getValueFromLine(const std::string& line);
+    
+    
+    
+    /**
+     * @brief Extracts the name from a file path, including handling directories.
+     *
+     * @param path The file path from which to extract the name.
+     * @return The extracted name as a string. If the path indicates a directory, it extracts the last directory name.
+     * If the path is empty or no name is found, an empty string is returned.
+     */
+    std::string getNameFromPath(const std::string& path);
+    
+    
+    
+    /**
+     * @brief Extracts the file name from a full file path.
+     *
+     * This function takes a filesystem path and returns only the file name,
+     * stripping away any directory paths that precede it.
+     *
+     * @param path The full path to the file.
+     * @return The file name extracted from the full path.
+     */
+    std::string getFileName(const std::string& path);
+    
+    
+    
+    /**
+     * @brief Extracts the name of the parent directory from a given file path at a specified level.
+     *
+     * @param path The file path from which to extract the parent directory name.
+     * @param level The level of the parent directory to extract (0 for immediate parent, 1 for grandparent, and so on).
+     * @return The name of the parent directory at the specified level.
+     */
+    std::string getParentDirNameFromPath(const std::string& path, size_t level = 0);
+    
+    
+    
+    /**
+     * @brief Extracts the parent directory path from a given file path.
+     *
+     * @param path The file path from which to extract the parent directory path.
+     * @return The parent directory path.
+     */
+    std::string getParentDirFromPath(const std::string& path);
+    
+    
+    
+    /**
+     * @brief Gets a list of subdirectories in a directory.
+     *
+     * @param directoryPath The path of the directory to search.
+     * @return A vector of strings containing the names of subdirectories.
+     */
+    std::vector<std::string> getSubdirectories(const std::string& directoryPath);
+    
+    // Cache to store directory status
+    // Assuming a very simple cache implementation
+    //extern std::vector<std::pair<std::string, bool>> directoryCache;
+    
+    bool isDirectory(struct dirent* entry, const std::string& path);
+    
+    /**
+     * @brief Recursively retrieves a list of files from a directory.
+     *
+     * @param directoryPath The path of the directory to search.
+     * @return A vector of strings containing the paths of the files.
+     */
+    std::vector<std::string> getFilesListFromDirectory(const std::string& directoryPath);
+    
+    // Helper function to check if a path is a directory
+    //bool isDirectoryCached(const struct dirent* entry, const std::string& fullPath) {
+    //    struct stat st;
+    //    if (stat(fullPath.c_str(), &st) != 0) return false;
+    //    return S_ISDIR(st.st_mode);
+    //}
+    
+    
+
+    void handleDirectory(const std::string& basePath, const std::vector<std::string>& parts, size_t partIndex, std::vector<std::string>& results, bool directoryOnly, size_t maxLines=0);
+    /**
+     * @brief Gets a list of files and folders based on a wildcard pattern.
+     *
+     * This function searches for files and folders in a directory that match the
+     * specified wildcard pattern.
+     *
+     * @param pathPattern The wildcard pattern to match files and folders.
+     * @return A vector of strings containing the paths of matching files and folders.
+     */
+    std::vector<std::string> getFilesListByWildcards(const std::string& pathPattern, size_t maxLines=0);
+    
+}
+
+#endif
\ No newline at end of file
diff --git a/Source/sys-clk/overlay/lib/libultrahand/libultra/include/global_vars.hpp b/Source/sys-clk/overlay/lib/libultrahand/libultra/include/global_vars.hpp
new file mode 100644
index 00000000..26ea2aef
--- /dev/null
+++ b/Source/sys-clk/overlay/lib/libultrahand/libultra/include/global_vars.hpp
@@ -0,0 +1,173 @@
+/********************************************************************************
+ * File: global_vars.hpp
+ * Author: ppkantorski
+ * Description: 
+ *   This header file provides the definitions of global constants and paths used 
+ *   throughout the Ultrahand Overlay project. These constants are essential for 
+ *   file management and configuration settings within the application.
+ *
+ *   For the latest updates and contributions, visit the project's GitHub repository:
+ *   GitHub Repository: https://github.com/ppkantorski/Ultrahand-Overlay
+ *
+ *   Note: This notice is integral to the project's documentation and must not be 
+ *   altered or removed.
+ *
+ *  Licensed under both GPLv2 and CC-BY-4.0
+ *  Copyright (c) 2024 ppkantorski
+ ********************************************************************************/
+
+
+#pragma once
+
+#include <string>
+#include <vector>
+#include <atomic>
+#include <set>
+
+// Auto-detect constexpr std::string support based on C++ version
+#if __cplusplus >= 202400L
+    #define CONSTEXPR_STRING constexpr
+#else
+    #define CONSTEXPR_STRING const
+#endif
+
+namespace ult {
+    extern const std::string CONFIG_FILENAME;
+
+    extern const std::string ULTRAHAND_PROJECT_NAME;
+    extern const std::string CAPITAL_ULTRAHAND_PROJECT_NAME;
+    
+    extern const std::string ROOT_PATH;
+    extern const std::string SETTINGS_PATH;
+    extern const std::string ULTRAHAND_CONFIG_INI_PATH;
+    extern const std::string TESLA_CONFIG_INI_PATH;
+    extern const std::string LANG_PATH;
+    extern const std::string THEMES_PATH;
+    extern const std::string WALLPAPERS_PATH;
+    extern const std::string SOUNDS_PATH;
+    extern const std::string FLAGS_PATH;
+    extern const std::string NOTIFICATIONS_PATH;
+    extern const std::string PAYLOADS_PATH;
+    extern const std::string HB_APPSTORE_JSON;
+    
+    // Can be overriden with APPEARANCE_OVERRIDE_PATH directive
+    extern std::string THEME_CONFIG_INI_PATH;
+    extern std::string WALLPAPER_PATH;
+
+
+    //#if IS_LAUNCHER_DIRECTIVE
+    extern const std::string SPLIT_PROJECT_NAME_1;
+    extern const std::string SPLIT_PROJECT_NAME_2;
+    extern const std::string BOOT_PACKAGE_FILENAME;
+    extern const std::string EXIT_PACKAGE_FILENAME;
+    extern const std::string PACKAGE_FILENAME;
+    
+    extern const std::string DOWNLOADS_PATH;
+    extern const std::string EXPANSION_PATH;
+    extern const std::string FUSE_DATA_INI_PATH;
+    extern const std::string PACKAGE_PATH;
+    extern const std::string OVERLAY_PATH;
+    extern const std::string OVERLAYS_INI_FILEPATH;
+    extern const std::string PACKAGES_INI_FILEPATH;
+
+    extern const std::string NOTIFICATIONS_FLAG_FILEPATH;
+
+    extern const std::set<std::string> PROTECTED_FILES;
+
+    extern const std::string ULTRAHAND_REPO_URL;
+    extern const std::string INCLUDED_THEME_FOLDER_URL;
+    extern const std::string LATEST_RELEASE_INFO_URL;
+    extern const std::string NX_OVLLOADER_ZIP_URL;
+    extern const std::string NX_OVLLOADER_PLUS_ZIP_URL;
+    extern const std::string OLD_NX_OVLLOADER_ZIP_URL;
+    extern const std::string OLD_NX_OVLLOADER_PLUS_ZIP_URL;
+    extern const std::string UPDATER_PAYLOAD_URL;
+    extern const std::string SOUND_EFFECTS_URL;
+    
+    extern const std::string LAUNCH_ARGS_STR;
+    extern const std::string USE_LAUNCH_ARGS_STR;
+    extern const std::string USE_QUICK_LAUNCH_STR;
+    extern const std::string USE_BOOT_PACKAGE_STR;
+    extern const std::string USE_EXIT_PACKAGE_STR;
+    extern const std::string USE_LOGGING_STR;
+
+    //#endif
+
+    extern const std::string TESLA_COMBO_STR;
+    extern const std::string ULTRAHAND_COMBO_STR;
+    
+    extern const std::string FUSE_STR;
+    extern const std::string TESLA_STR;
+    extern const std::string ERISTA_STR;
+    extern const std::string MARIKO_STR;
+    extern const std::string KEY_COMBO_STR;
+    extern const std::string DEFAULT_LANG_STR;
+
+
+    extern const std::string LIST_STR;
+    extern const std::string LIST_FILE_STR;
+    extern const std::string JSON_STR;
+    extern const std::string JSON_FILE_STR;
+    extern const std::string INI_FILE_STR;
+    extern const std::string HEX_FILE_STR;
+    extern const std::string PACKAGE_STR;
+    extern const std::string PACKAGES_STR;
+    extern const std::string OVERLAY_STR;
+    extern const std::string OVERLAYS_STR;
+    extern const std::string IN_OVERLAY_STR;
+    extern const std::string IN_HIDDEN_OVERLAY_STR;
+    extern const std::string IN_HIDDEN_PACKAGE_STR;
+    extern const std::string FILE_STR;
+    extern const std::string SYSTEM_STR;
+    extern const std::string MODE_STR;
+    extern const std::string GROUPING_STR;
+    extern const std::string FOOTER_STR;
+    extern const std::string TOGGLE_STR;
+    extern const std::string LEFT_STR;
+    extern const std::string RIGHT_STR;
+    extern const std::string CENTER_STR;
+    extern const std::string HIDE_STR;
+    extern const std::string STAR_STR;
+    extern const std::string PRIORITY_STR;
+    extern const std::string ON_STR;
+    extern const std::string OFF_STR;
+    extern const std::string CAPITAL_ON_STR;
+    extern const std::string CAPITAL_OFF_STR;
+    extern const std::string TRUE_STR;
+    extern const std::string FALSE_STR;
+    extern const std::string GLOBAL_STR;
+    extern const std::string DEFAULT_STR;
+    extern const std::string SLOT_STR;
+    extern const std::string OPTION_STR;
+    extern const std::string FORWARDER_STR;
+    extern const std::string TEXT_STR;
+    extern const std::string TABLE_STR;
+    extern const std::string TRACKBAR_STR;
+    extern const std::string STEP_TRACKBAR_STR;
+    extern const std::string NAMED_STEP_TRACKBAR_STR;
+    extern const std::string NULL_STR;
+    extern const std::string THEME_STR;
+    extern const std::string NOT_AVAILABLE_STR;
+    extern const std::string MEMORY_STR;
+
+    // Pre-defined symbols
+    extern const std::string OPTION_SYMBOL;
+    extern const std::string DROPDOWN_SYMBOL;
+    extern const std::string CHECKMARK_SYMBOL;
+    extern const std::string CROSSMARK_SYMBOL;
+    extern const std::string DOWNLOAD_SYMBOL;
+    extern const std::string UNZIP_SYMBOL; 
+    extern const std::string COPY_SYMBOL;
+    extern const std::string INPROGRESS_SYMBOL;
+    extern const std::string STAR_SYMBOL;
+    extern const std::string DIVIDER_SYMBOL;
+
+    extern const std::vector<std::string> THROBBER_SYMBOLS;
+
+    extern std::atomic<int> downloadPercentage;
+    extern std::atomic<int> unzipPercentage;
+    extern std::atomic<int> copyPercentage;
+    extern std::atomic<int> displayPercentage;
+    
+    void resetPercentages();
+}
diff --git a/Source/sys-clk/overlay/lib/libultrahand/libultra/include/haptics.hpp b/Source/sys-clk/overlay/lib/libultrahand/libultra/include/haptics.hpp
new file mode 100644
index 00000000..1b887295
--- /dev/null
+++ b/Source/sys-clk/overlay/lib/libultrahand/libultra/include/haptics.hpp
@@ -0,0 +1,41 @@
+/********************************************************************************
+ * File: haptics.hpp
+ * Author: ppkantorski
+ * Description:
+ *   This header declares functions and shared flags for managing haptic feedback
+ *   in the Ultrahand Overlay. It includes routines for initializing vibration
+ *   devices, sending rumble and double-click patterns, and controlling timing
+ *   for single and double pulse haptics. Atomic flags ensure safe access across
+ *   threads.
+ *
+ *   For the latest updates and contributions, visit the project's GitHub repository.
+ *   (GitHub Repository: https://github.com/ppkantorski/Ultrahand-Overlay)
+ *
+ *   Note: Please be aware that this notice cannot be altered or removed. It is a part
+ *   of the project's documentation and must remain intact.
+ * 
+ *   Licensed under both GPLv2 and CC-BY-4.0
+ *   Copyright (c) 2025 ppkantorski
+ ********************************************************************************/
+
+#pragma once
+#include <switch.h>
+#include <atomic>
+#include <cstdint>
+
+namespace ult {
+	
+	//extern bool rumbleInitialized;
+	extern std::atomic<bool> rumbleActive;
+	extern std::atomic<bool> doubleClickActive;
+	
+	//void initRumble();
+	void deinitRumble();
+	void checkAndReinitRumble();
+	
+	void rumbleClick();
+	void rumbleDoubleClick();
+	void processRumbleStop(u64 nowNs);
+	void processRumbleDoubleClick(u64 nowNs);
+	void rumbleDoubleClickStandalone();
+}
\ No newline at end of file
diff --git a/Source/sys-clk/overlay/lib/libultrahand/libultra/include/hex_funcs.hpp b/Source/sys-clk/overlay/lib/libultrahand/libultra/include/hex_funcs.hpp
new file mode 100644
index 00000000..bdd29144
--- /dev/null
+++ b/Source/sys-clk/overlay/lib/libultrahand/libultra/include/hex_funcs.hpp
@@ -0,0 +1,211 @@
+/********************************************************************************
+ * File: hex_funcs.hpp
+ * Author: ppkantorski
+ * Description:
+ *   This header file provides functions for working with hexadecimal data in C++.
+ *   It includes functions for converting between ASCII and hexadecimal strings,
+ *   finding hexadecimal data offsets in a file, and editing hexadecimal data in a file.
+ *
+ *   For the latest updates and contributions, visit the project's GitHub repository.
+ *   (GitHub Repository: https://github.com/ppkantorski/Ultrahand-Overlay)
+ *
+ *   Note: Please be aware that this notice cannot be altered or removed. It is a part
+ *   of the project's documentation and must remain intact.
+ * 
+ *  Licensed under both GPLv2 and CC-BY-4.0
+ *  Copyright (c) 2024 ppkantorski
+ ********************************************************************************/
+
+#pragma once
+
+#ifndef HEX_FUNCS_HPP
+#define HEX_FUNCS_HPP
+
+#if !USING_FSTREAM_DIRECTIVE // For not using fstream (needs implementing)
+#include <stdio.h>
+#else
+#include <fstream>
+#endif
+
+#include <string>
+#include <vector>
+#include <algorithm>
+#include <functional>
+//#include <cstdio> // Added for FILE and fopen
+#include <cstring> // Added for std::memcmp
+#include <mutex>
+#include <shared_mutex>
+
+#include <global_vars.hpp>
+#include <debug_funcs.hpp>
+#include <string_funcs.hpp>
+
+
+namespace ult {
+    extern size_t HEX_BUFFER_SIZE;
+    
+    
+    // For improving the speed of hexing consecutively with the same file and asciiPattern.
+    extern std::unordered_map<std::string, std::string> hexSumCache; // MOVED TO main.cpp
+    
+    // Lookup table for hex characters
+    inline constexpr char hexLookup[] = "0123456789ABCDEF";
+    
+
+    // ULTRA-FAST hex conversion with lookup table
+    inline constexpr unsigned char hexTable[256] = {
+        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,2,3,4,5,6,7,8,9,0,0,0,0,0,0,
+        0,10,11,12,13,14,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+        0,10,11,12,13,14,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+    };
+
+
+    extern void clearHexSumCache();
+    extern size_t getHexSumCacheSize();
+
+    /**
+     * @brief Converts an ASCII string to a hexadecimal string.
+     *
+     * This function takes an ASCII string as input and converts it into a hexadecimal string.
+     *
+     * @param asciiStr The ASCII string to convert.
+     * @return The corresponding hexadecimal string.
+     */
+    
+    
+    // Function to convert ASCII string to Hex string
+    std::string asciiToHex(const std::string& asciiStr);
+    
+    /**
+     * @brief Converts a decimal string to a hexadecimal string.
+     *
+     * This function takes a decimal string as input and converts it into a hexadecimal string.
+     *
+     * @param decimalStr The decimal string to convert.
+     * @return The corresponding hexadecimal string.
+     */
+    std::string decimalToHex(const std::string& decimalStr, int byteGroupSize = 2);
+    
+    
+    /**
+     * @brief Converts a hexadecimal string to a decimal string.
+     *
+     * This function takes a hexadecimal string as input and converts it into a decimal string.
+     *
+     * @param hexStr The hexadecimal string to convert.
+     * @return The corresponding decimal string.
+     */
+    std::string hexToDecimal(const std::string& hexStr);
+    
+    
+    
+    std::string hexToReversedHex(const std::string& hexadecimal, int order = 2);
+    
+    /**
+     * @brief Converts a decimal string to a reversed hexadecimal string.
+     *
+     * This function takes a decimal string as input, converts it into a hexadecimal
+     * string, and reverses the resulting hexadecimal string in groups of byteGroupSize.
+     *
+     * @param decimalStr The decimal string to convert.
+     * @param byteGroupSize The grouping byteGroupSize for reversing the hexadecimal string.
+     * @return The reversed hexadecimal string.
+     */
+    std::string decimalToReversedHex(const std::string& decimalStr, int byteGroupSize = 2);
+    
+    
+    
+    /**
+     * @brief Finds the offsets of hexadecimal data in a file.
+     *
+     * This function searches for occurrences of hexadecimal data in a binary file
+     * and returns the file offsets where the data is found.
+     *
+     * @param filePath The path to the binary file.
+     * @param hexData The hexadecimal data to search for.
+     * @return A vector of strings containing the file offsets where the data is found.
+     */
+    std::vector<std::string> findHexDataOffsets(const std::string& filePath, const std::string& hexData);
+    
+    
+    
+    /**
+     * @brief Edits hexadecimal data in a file at a specified offset.
+     *
+     * This function opens a binary file, seeks to a specified offset, and replaces
+     * the data at that offset with the provided hexadecimal data.
+     *
+     * @param filePath The path to the binary file.
+     * @param offsetStr The offset in the file to performthe edit.
+     * @param hexData The hexadecimal data to replace at the offset.
+     */
+    void hexEditByOffset(const std::string& filePath, const std::string& offsetStr, const std::string& hexData);
+    
+    /**
+     * @brief Edits a specific offset in a file with custom hexadecimal data.
+     *
+     * This function searches for a custom pattern in the file and calculates a new offset
+     * based on user-provided offsetStr and the found pattern. It then replaces the data
+     * at the calculated offset with the provided hexadecimal data.
+     *
+     * @param filePath The path to the binary file.
+     * @param offsetStr The user-provided offset for the edit.
+     * @param customPattern The custom pattern to search for in the file.
+     * @param hexDataReplacement The hexadecimal data to replace at the calculated offset.
+     * @param occurrence The occurrence/index of the data to replace (default is "0" to replace all occurrences).
+     */
+    void hexEditByCustomOffset(const std::string& filePath, const std::string& customAsciiPattern, const std::string& offsetStr, const std::string& hexDataReplacement, size_t occurrence = 0);
+    
+    /**
+     * @brief Finds and replaces hexadecimal data in a file.
+     *
+     * This function searches for occurrences of hexadecimal data in a binary file
+     * and replaces them with a specified hexadecimal replacement data.
+     *
+     * @param filePath The path to the binary file.
+     * @param hexDataToReplace The hexadecimal data to search for and replace.
+     * @param hexDataReplacement The hexadecimal data to replace with.
+     * @param occurrence The occurrence/index of the data to replace (default is "0" to replace all occurrences).
+     */
+    void hexEditFindReplace(const std::string& filePath, const std::string& hexDataToReplace, const std::string& hexDataReplacement, size_t occurrence = 0);
+
+    /**
+     * @brief Finds and replaces hexadecimal data in a file.
+     *
+     * This function searches for occurrences of hexadecimal data in a binary file
+     * and replaces them with a specified hexadecimal replacement data.
+     *
+     * @param filePath The path to the binary file.
+     * @param hexDataToReplace The hexadecimal data to search for and replace.
+     * @param hexDataReplacement The hexadecimal data to replace with.
+     * @param occurrence The occurrence/index of the data to replace (default is "0" to replace all occurrences).
+     */
+    std::string parseHexDataAtCustomOffset(const std::string& filePath, const std::string& customAsciiPattern, const std::string& offsetStr, size_t length, size_t occurrence = 0);
+    
+    
+    
+    /**
+     * @brief Finds and replaces hexadecimal data in a file.
+     *
+     * This function searches for occurrences of hexadecimal data in a binary file
+     * and replaces them with a specified hexadecimal replacement data.
+     *
+     * @param filePath The path to the binary file.
+     * @param hexDataToReplace The hexadecimal data to search for and replace.
+     * @param hexDataReplacement The hexadecimal data to replace with.
+     * @param occurrence The occurrence/index of the data to replace (default is "0" to replace all occurrences).
+     */
+    
+    std::string replaceHexPlaceholder(const std::string& arg, const std::string& hexPath);
+    
+    
+    
+    std::string extractVersionFromBinary(const std::string &filePath);
+}
+
+#endif
diff --git a/Source/sys-clk/overlay/lib/libultrahand/libultra/include/ini_funcs.hpp b/Source/sys-clk/overlay/lib/libultrahand/libultra/include/ini_funcs.hpp
new file mode 100644
index 00000000..c85da275
--- /dev/null
+++ b/Source/sys-clk/overlay/lib/libultrahand/libultra/include/ini_funcs.hpp
@@ -0,0 +1,344 @@
+/********************************************************************************
+ * File: ini_funcs.hpp
+ * Author: ppkantorski
+ * Description:
+ *   This header file provides functions for working with INI (Initialization) files
+ *   in C++. It includes functions for reading, parsing, and editing INI files,
+ *   as well as cleaning INI file formatting.
+ *
+ *   For the latest updates and contributions, visit the project's GitHub repository.
+ *   (GitHub Repository: https://github.com/ppkantorski/Ultrahand-Overlay)
+ *
+ *   Note: Please be aware that this notice cannot be altered or removed. It is a part
+ *   of the project's documentation and must remain intact.
+ * 
+ *  Licensed under both GPLv2 and CC-BY-4.0
+ *  Copyright (c) 2024 ppkantorski
+ ********************************************************************************/
+
+#pragma once
+
+#ifndef INI_FUNCS_HPP
+#define INI_FUNCS_HPP
+
+#if !USING_FSTREAM_DIRECTIVE // For not using fstream (needs implementing)
+#include <stdio.h>
+#else
+#include <fstream>
+//#include "nx_fstream.hpp"
+#endif
+
+#include <cstring>  // For std::string, strlen(), etc.
+#include <string>   // For std::string
+#include <vector>   // For std::vector
+#include <map>      // For std::map
+//#include <sstream>  // For std::istringstream
+#include <algorithm> // For std::remove_if
+//#include <cctype>   // For ::isspace
+
+#include <shared_mutex>
+#include <unordered_map>
+#include <mutex>
+
+#include "get_funcs.hpp"
+#include "path_funcs.hpp"
+
+namespace ult {
+
+    extern void clearIniMutexCache();
+
+    extern size_t INI_BUFFER_SIZE;
+    extern size_t INI_BUFFER_LARGE;
+
+    /**
+     * @brief Represents a package header structure.
+     *
+     * This structure holds information about a package header, including version,
+     * creator, and description.
+     */
+    struct PackageHeader {
+        std::string title;
+        std::string display_title;
+        std::string version;
+        std::string creator;
+        std::string about;
+        std::string credits;
+        std::string color;
+        std::string show_version;
+        std::string show_widget;
+        
+        void clear() {
+            title.clear();
+            display_title.clear();
+            version.clear();
+            creator.clear();
+            about.clear();
+            credits.clear();
+            color.clear();
+            show_version.clear();
+            show_widget.clear();
+        }
+    };
+    
+    /**
+     * @brief Retrieves the package header information from an INI file.
+     *
+     * This function parses an INI file and extracts the package header information.
+     *
+     * @param filePath The path to the INI file.
+     * @return The package header structure.
+     */
+    PackageHeader getPackageHeaderFromIni(const std::string& filePath);
+    
+    
+    /**
+     * @brief Splits a string into a vector of substrings using a specified delimiter.
+     *
+     * This function splits a given string into multiple substrings based on the specified delimiter.
+     *
+     * @param str The input string to be split.
+     * @param delim The delimiter character used for splitting (default is space ' ').
+     * @return A vector of substrings obtained by splitting the input string.
+     */
+    std::vector<std::string> split(const std::string& str, char delim = ' ');
+    
+    
+    /**
+     * @brief Parses an INI-formatted string into a map of sections and key-value pairs.
+     *
+     * This function parses an INI-formatted string and organizes the data into a map,
+     * where sections are keys and key-value pairs are stored within each section.
+     *
+     * @param str The INI-formatted string to parse.
+     * @return A map representing the parsed INI data.
+     */
+    std::map<std::string, std::map<std::string, std::string>> parseIni(const std::string &str);
+    
+    
+    /**
+     * @brief Parses an INI file and returns its content as a map of sections and key-value pairs.
+     *
+     * This function reads the contents of an INI file located at the specified path,
+     * parses it into a map structure, where section names are keys and key-value pairs
+     * are stored within each section.
+     *
+     * @param configIniPath The path to the INI file to be parsed.
+     * @return A map representing the parsed INI data.
+     */
+    std::map<std::string, std::map<std::string, std::string>> getParsedDataFromIniFile(const std::string& configIniPath);
+    
+    
+    /**
+     * @brief Parses an INI file and retrieves key-value pairs from a specific section.
+     *
+     * This function reads the contents of an INI file located at the specified path,
+     * and returns the key-value pairs within a specific section.
+     *
+     * @param configIniPath The path to the INI file to be parsed.
+     * @param sectionName The name of the section to retrieve key-value pairs from.
+     * @return A map representing the key-value pairs in the specified section.
+     */
+    std::map<std::string, std::string> getKeyValuePairsFromSection(const std::string& configIniPath, const std::string& sectionName);
+    
+    
+    /**
+     * @brief Parses sections from an INI file and returns them as a list of strings.
+     *
+     * This function reads an INI file and extracts the section names from it.
+     *
+     * @param filePath The path to the INI file.
+     * @return A vector of section names.
+     */
+    std::vector<std::string> parseSectionsFromIni(const std::string& filePath);
+    
+    
+    
+    /**
+     * @brief Parses a specific value from a section and key in an INI file.
+     *
+     * @param filePath The path to the INI file.
+     * @param sectionName The name of the section containing the desired key.
+     * @param keyName The name of the key whose value is to be retrieved.
+     * @return The value as a string, or an empty string if the key or section isn't found.
+     */
+    std::string parseValueFromIniSection(const std::string& filePath, const std::string& sectionName, const std::string& keyName);
+    
+    
+    
+    /**
+     * @brief Cleans the formatting of an INI file by removing empty lines and standardizing section formatting.
+     *
+     * This function takes an INI file located at the specified path, removes empty lines,
+     * and standardizes the formatting of sections by ensuring that there is a newline
+     * between each section's closing ']' and the next section's opening '['.
+     *
+     * @param filePath The path to the INI file to be cleaned.
+     */
+    void cleanIniFormatting(const std::string& filePath);
+    
+    
+    /**
+     * @brief Modifies or creates an INI file by adding or updating key-value pairs in the specified section.
+     *
+     * This function attempts to open the specified INI file for reading. If the file doesn't exist,
+     * it creates a new file and adds the specified section and key-value pair. If the file exists,
+     * it reads its contents, modifies or adds the key-value pair in the specified section, and saves
+     * the changes back to the original file.
+     *
+     * @param fileToEdit      The path to the INI file to be modified or created.
+     * @param desiredSection  The name of the section in which the key-value pair should be added or updated.
+     * @param desiredKey      The key for the key-value pair to be added or updated.
+     * @param desiredValue    The new value for the key-value pair.
+     * @param desiredNewKey   (Optional) If provided, the function will rename the key while preserving the original value.
+     */
+    void setIniFile(const std::string& fileToEdit, const std::string& desiredSection, const std::string& desiredKey, const std::string& desiredValue, const std::string& desiredNewKey = "", const std::string& comment = "");
+    
+    
+    /**
+     * @brief Sets the value of a key in an INI file within the specified section and cleans the formatting.
+     *
+     * This function sets the value of the specified key within the given section of the INI file.
+     * If the key or section does not exist, it creates them. After updating the INI file,
+     * it cleans the formatting to ensure proper INI file structure.
+     *
+     * @param fileToEdit      The path to the INI file to be modified or created.
+     * @param desiredSection  The name of the section in which the key-value pair should be added or updated.
+     * @param desiredKey      The key for the key-value pair to be added or updated.
+     * @param desiredValue    The new value for the key-value pair.
+     */
+    void setIniFileValue(const std::string& fileToEdit, const std::string& desiredSection, const std::string& desiredKey, const std::string& desiredValue, const std::string& comment="");
+    
+    /**
+     * @brief Sets the key name to a new name in an INI file within the specified section and cleans the formatting.
+     *
+     * This function sets the key name to a new name within the given section of the INI file.
+     * If the key or section does not exist, it creates them. After updating the INI file,
+     * it cleans the formatting to ensure proper INI file structure.
+     *
+     * @param fileToEdit      The path to the INI file to be modified or created.
+     * @param desiredSection  The name of the section in which the key-name change should occur.
+     * @param desiredKey      The key name to be changed.
+     * @param desiredNewKey   The new key name to replace the original key name.
+     */
+    void setIniFileKey(const std::string& fileToEdit, const std::string& desiredSection, const std::string& desiredKey, const std::string& desiredNewKey, const std::string& comment="");
+    
+    
+    
+    
+    /**
+     * @brief Adds a new section to an INI file.
+     *
+     * This function adds a new section with the specified name to the INI file located at the
+     * specified path. If the section already exists, it does nothing.
+     *
+     * @param filePath The path to the INI file.
+     * @param sectionName The name of the section to add.
+     */
+    void addIniSection(const std::string& filePath, const std::string& sectionName);
+    
+    
+    
+    /**
+     * @brief Renames a section in an INI file.
+     *
+     * This function renames the section with the specified current name to the specified new name
+     * in the INI file located at the specified path. If the current section does not exist, or if the
+     * new section name already exists, it does nothing.
+     *
+     * @param filePath The path to the INI file.
+     * @param currentSectionName The name of the section to rename.
+     * @param newSectionName The new name for the section.
+     */
+    void renameIniSection(const std::string& filePath, const std::string& currentSectionName, const std::string& newSectionName);
+    
+    
+    
+    
+    /**
+     * @brief Removes a section from an INI file.
+     *
+     * This function removes the section with the specified name, including all its associated key-value
+     * pairs, from the INI file located at the specified path. If the section does not exist in the file,
+     * it does nothing.
+     *
+     * @param filePath The path to the INI file.
+     * @param sectionName The name of the section to remove.
+     */
+    void removeIniSection(const std::string& filePath, const std::string& sectionName);
+    
+    
+    // Removes a key-value pair from an ini accordingly.
+    void removeIniKey(const std::string& filePath, const std::string& sectionName, const std::string& keyName);
+    
+    
+    //void saveIniFileData(const std::string& filePath, const std::map<std::string, std::map<std::string, std::string>>& data) {
+    //    std::ofstream file(filePath);
+    //    if (!file.is_open()) {
+    //        // Handle error: could not open file
+    //        return;
+    //    }
+    //
+    //    for (const auto& section : data) {
+    //        file << "[" << section.first << "]\n";
+    //        for (const auto& kv : section.second) {
+    //            file << kv.first << "=" << kv.second << "\n";
+    //        }
+    //        file << "\n"; // Separate sections with a newline
+    //    }
+    //
+    //    file.close();
+    //}
+    
+    
+    void syncIniValue(std::map<std::string, std::map<std::string, std::string>>& packageConfigData,
+                       const std::string& packageConfigIniPath,
+                       const std::string& optionName,
+                       const std::string& key,
+                       std::string& value);
+    
+    /**
+     * @brief Parses a command line into individual parts, handling quoted strings.
+     *
+     * @param line The command line to parse.
+     * @return A vector of strings containing the parsed command parts.
+     */
+    std::vector<std::string> parseCommandLine(const std::string& line);
+    
+    
+    
+    /**
+     * @brief Loads and parses options from an INI file.
+     *
+     * This function reads and parses options from an INI file, organizing them by section.
+     *
+     * @param packageIniPath The path to the INI file.
+     * @return A vector containing pairs of section names and their associated key-value pairs.
+     */
+    std::vector<std::pair<std::string, std::vector<std::vector<std::string>>>> loadOptionsFromIni(const std::string& packageIniPath);
+    
+    /**
+     * @brief Loads a specific section from an INI file.
+     *
+     * This function reads and parses a specific section from an INI file.
+     *
+     * @param packageIniPath The path to the INI file.
+     * @param sectionName The name of the section to load.
+     * @return A vector of commands within the specified section.
+     */
+    std::vector<std::vector<std::string>> loadSpecificSectionFromIni(const std::string& packageIniPath, const std::string& sectionName);
+    
+
+
+    /**
+     * @brief Saves INI data structure to a file.
+     *
+     * This function writes a complete INI data structure to the specified file path.
+     * The data structure should be organized as sections containing key-value pairs.
+     *
+     * @param filePath The path to the INI file to write.
+     * @param data The complete INI data structure to save.
+     */
+    void saveIniFileData(const std::string& filePath, const std::map<std::string, std::map<std::string, std::string>>& data);
+}
+
+#endif
\ No newline at end of file
diff --git a/Source/sys-clk/overlay/lib/libultrahand/libultra/include/json_funcs.hpp b/Source/sys-clk/overlay/lib/libultrahand/libultra/include/json_funcs.hpp
new file mode 100644
index 00000000..5995cc7d
--- /dev/null
+++ b/Source/sys-clk/overlay/lib/libultrahand/libultra/include/json_funcs.hpp
@@ -0,0 +1,107 @@
+/********************************************************************************
+ * File: json_funcs.hpp
+ * Author: ppkantorski
+ * Description:
+ *   This header file provides functions for working with JSON files in C++ using
+ *   the `cJSON` library. It includes a function to read JSON data from a file.
+ *
+ *   For the latest updates and contributions, visit the project's GitHub repository.
+ *   (GitHub Repository: https://github.com/ppkantorski/Ultrahand-Overlay)
+ *
+ *   Note: Please be aware that this notice cannot be altered or removed. It is a part
+ *   of the project's documentation and must remain intact.
+ *
+ *  Licensed under both GPLv2 and CC-BY-4.0
+ *  Copyright (c) 2024 ppkantorski
+ ********************************************************************************/
+#pragma once
+#ifndef JSON_FUNCS_HPP
+#define JSON_FUNCS_HPP
+#if !USING_FSTREAM_DIRECTIVE // For not using fstream (needs implementing)
+#include <stdio.h>
+#else
+#include <fstream>
+#endif
+#include <string>
+#include <cJSON.h>
+#include "string_funcs.hpp"
+#include <switch.h>
+
+namespace ult {
+    // Define json_t as an opaque type to maintain API compatibility
+    typedef void json_t;
+    
+    // Define a custom deleter for json_t*
+    struct JsonDeleter {
+        void operator()(json_t* json) const {
+            if (json) {
+                cJSON_Delete(reinterpret_cast<cJSON*>(json));
+            }
+        }
+    };
+    
+    
+    /**
+     * @brief Reads JSON data from a file and returns it as a `json_t` object.
+     *
+     * @param filePath The path to the JSON file.
+     * @return A `json_t` object representing the parsed JSON data. Returns `nullptr` on error.
+     */
+    json_t* readJsonFromFile(const std::string& filePath);
+    
+    
+    /**
+     * @brief Parses a JSON string into a json_t object.
+     *
+     * This function takes a JSON string as input and parses it into a json_t object using cJSON library's `cJSON_Parse` function.
+     * If parsing fails, it logs the error and returns nullptr.
+     *
+     * @param input The input JSON string to parse.
+     * @return A json_t object representing the parsed JSON, or nullptr if parsing fails.
+     */
+    json_t* stringToJson(const std::string& input);
+    
+    
+    // Function to get a string from a JSON object
+    std::string getStringFromJson(const json_t* root, const char* key);
+    
+    
+    /**
+     * @brief Loads a JSON file from the specified path and retrieves a string value for a given key.
+     *
+     * This function combines the functionality of loading a JSON file and retrieving a string value associated
+     * with a given key in a single step.
+     *
+     * @param filePath The path to the JSON file.
+     * @param key The key whose associated string value is to be retrieved.
+     * @return A string containing the value associated with the given key, or an empty string if the key is not found.
+     */
+    std::string getStringFromJsonFile(const std::string& filePath, const std::string& key);
+    
+    
+    /**
+     * @brief Sets a value in a JSON file, creating the file if it doesn't exist.
+     *
+     * @param filePath The path to the JSON file.
+     * @param key The key to set.
+     * @param value The value to set (auto-detected type).
+     * @param createIfNotExists Whether to create the file if it doesn't exist.
+     * @return true if successful, false otherwise.
+     */
+    bool setJsonValue(const std::string& filePath, const std::string& key, const std::string& value, bool createIfNotExists = false);
+
+
+    /**
+     * @brief Renames a key in a JSON file.
+     *
+     * @param filePath The path to the JSON file.
+     * @param oldKey The current key name.
+     * @param newKey The new key name.
+     * @return true if successful, false otherwise.
+     */
+    bool renameJsonKey(const std::string& filePath, const std::string& oldKey, const std::string& newKey);
+
+
+    void pushNotificationJson(const std::string& appID, const std::string& text, size_t fontSize=28);
+}
+#endif
\ No newline at end of file
diff --git a/Source/sys-clk/overlay/lib/libultrahand/libultra/include/list_funcs.hpp b/Source/sys-clk/overlay/lib/libultrahand/libultra/include/list_funcs.hpp
new file mode 100644
index 00000000..b1b8aabb
--- /dev/null
+++ b/Source/sys-clk/overlay/lib/libultrahand/libultra/include/list_funcs.hpp
@@ -0,0 +1,110 @@
+/********************************************************************************
+ * File: list_funcs.hpp
+ * Author: ppkantorski
+ * Description:
+ *   This header file contains function declarations and utility functions related
+ *   to working with lists and vectors of strings. These functions are used in the
+ *   Ultrahand Overlay project to perform various operations on lists, such as
+ *   removing entries, filtering, and more.
+ *
+ *   For the latest updates and contributions, visit the project's GitHub repository.
+ *   (GitHub Repository: https://github.com/ppkantorski/Ultrahand-Overlay)
+ *
+ *   Note: Please be aware that this notice cannot be altered or removed. It is a part
+ *   of the project's documentation and must remain intact.
+ * 
+ *  Licensed under both GPLv2 and CC-BY-4.0
+ *  Copyright (c) 2024 ppkantorski
+ ********************************************************************************/
+
+
+#pragma once
+
+#ifndef LIST_FUNCS_HPP
+#define LIST_FUNCS_HPP
+
+#if !USING_FSTREAM_DIRECTIVE // For not using fstream (needs implementing)
+#include <stdio.h>
+#else
+#include <fstream>
+#endif
+
+#include <vector>
+#include <string>
+#include <unordered_set>
+#include "debug_funcs.hpp"
+#include "string_funcs.hpp"
+#include "get_funcs.hpp"
+
+
+namespace ult {
+
+    std::vector<std::string> splitIniList(const std::string& value);
+    
+    
+    std::string joinIniList(const std::vector<std::string>& list);
+
+
+
+    /**
+     * @brief Removes entries from a vector of strings that match a specified entry.
+     *
+     * This function removes entries from the `itemsList` vector of strings that match the `entry`.
+     *
+     * @param entry The entry to be compared against the elements in `itemsList`.
+     * @param itemsList The vector of strings from which matching entries will be removed.
+     */
+    void removeEntryFromList(const std::string& entry, std::vector<std::string>& itemsList);
+    
+    /**
+     * @brief Filters a list of strings based on a specified filter list.
+     *
+     * This function filters a list of strings (`itemsList`) by removing entries that match any
+     * of the criteria specified in the `filterList`. It uses the `removeEntryFromList` function
+     * to perform the removal.
+     *
+     * @param filterList The list of entries to filter by. Entries in `itemsList` matching any entry in this list will be removed.
+     * @param itemsList The list of stringsto be filtered.
+     */
+    void filterItemsList(const std::vector<std::string>& filterList, std::vector<std::string>& itemsList);
+    
+    
+    // Function to read file into a vector of strings
+    std::vector<std::string> readListFromFile(const std::string& filePath, size_t maxLines=0);
+
+    
+    // Function to get an entry from the list based on the index
+    std::string getEntryFromListFile(const std::string& listPath, size_t listIndex);
+
+    
+    /**
+     * @brief Splits a string into a vector of strings using a delimiter.
+     *
+     * This function splits the input string into multiple strings using the specified delimiter.
+     *
+     * @param str The input string to split.
+     * @return A vector of strings containing the split values.
+     */
+    std::vector<std::string> stringToList(const std::string& str);
+    
+    
+    // Function to read file into a set of strings
+    std::unordered_set<std::string> readSetFromFile(const std::string& filePath);
+
+    
+    // Function to write a set to a file
+    void writeSetToFile(const std::unordered_set<std::string>& fileSet, const std::string& filePath);
+
+    
+    // Function to compare two file lists and save duplicates to an output file
+    void compareFilesLists(const std::string& txtFilePath1, const std::string& txtFilePath2, const std::string& outputTxtFilePath);
+
+    
+    // Helper function to read a text file and process each line with a callback
+    //void processFileLines(const std::string& filePath, const std::function<void(const std::string&)>& callback);
+
+    
+    void compareWildcardFilesLists(const std::string& wildcardPatternFilePath, const std::string& txtFilePath, const std::string& outputTxtFilePath);
+}
+
+#endif
\ No newline at end of file
diff --git a/Source/sys-clk/overlay/lib/libultrahand/libultra/include/mod_funcs.hpp b/Source/sys-clk/overlay/lib/libultrahand/libultra/include/mod_funcs.hpp
new file mode 100644
index 00000000..b5b04315
--- /dev/null
+++ b/Source/sys-clk/overlay/lib/libultrahand/libultra/include/mod_funcs.hpp
@@ -0,0 +1,121 @@
+/********************************************************************************
+ * File: mod_funcs.hpp
+ * Author: ppkantorski
+ * Description:
+ *   This header file contains function declarations and utility functions for IPS
+ *   binary generations. These functions are used in the Ultrahand Overlay project
+ *   to convert `.pchtxt` mods into `.ips` binaries.
+ *
+ *   For the latest updates and contributions, visit the project's GitHub repository.
+ *   (GitHub Repository: https://github.com/ppkantorski/Ultrahand-Overlay)
+ *
+ *   Note: Please be aware that this notice cannot be altered or removed. It is a part
+ *   of the project's documentation and must remain intact.
+ * 
+ *  Licensed under both GPLv2 and CC-BY-4.0
+ *  Copyright (c) 2024 ppkantorski
+ ********************************************************************************/
+
+#pragma once
+
+#ifndef MOD_FUNCS_HPP
+#define MOD_FUNCS_HPP
+
+#if !USING_FSTREAM_DIRECTIVE // For not using fstream (needs implementing)
+#include <stdio.h>
+#else
+#include <fstream>
+#endif
+
+//#include <sstream>
+#include <vector>
+#include <string>
+#include <sys/stat.h>
+#include "debug_funcs.hpp"
+#include "path_funcs.hpp"
+#include "hex_funcs.hpp"
+#include <iomanip> // Include this header for std::setw and std::setfill
+
+namespace ult {
+    inline constexpr const char* IPS32_HEAD_MAGIC = "IPS32";
+    inline constexpr const char* IPS32_FOOT_MAGIC = "EEOF";
+
+    //const std::string CHEAT_HEADER = "// auto generated by pchtxt2cheat\n\n";
+    //extern const std::string CHEAT_TYPE;
+    //extern const std::string CHEAT_EXT;
+    //extern const std::string CHEAT_ENCODING;
+    
+    /**
+     * @brief Checks if a cheat already exists in the cheat file.
+     * @param cheatFilePath The path to the cheat file.
+     * @param newCheat The new cheat to check.
+     * @return True if the cheat exists, otherwise false.
+     */
+    bool cheatExists(const std::string &cheatFilePath, const std::string &newCheat);
+    
+    /**
+     * @brief Appends a new cheat to the cheat file.
+     * @param cheatFilePath The path to the cheat file.
+     * @param newCheat The new cheat to append.
+     */
+    void appendCheatToFile(const std::string &cheatFilePath, const std::string &newCheat);
+    
+    /**
+     * @brief Extracts the cheat name from the given file path.
+     * @param filePath The full file path.
+     * @return The extracted cheat name.
+     */
+    std::string extractCheatName(const std::string &filePath);
+    
+    // Helper function to determine if a string is a valid title ID
+    bool isValidTitleID(const std::string &str);
+    
+    // Function to find the title ID in the text, avoiding the @nsobid- line
+    std::string findTitleID(const std::string &text);
+    
+    /**
+     * @brief Converts a .pchtxt file to a cheat file.
+     * @param pchtxtPath The file path to the .pchtxt file.
+     * @param cheatName The name of the cheat.
+     * @param outCheatPath The file path for the output cheat file.
+     * @return True if the conversion was successful, false otherwise.
+     */
+    bool pchtxt2cheat(const std::string &pchtxtPath, std::string cheatName = "", std::string outCheatPath = "");
+    
+    // Corrected helper function to convert values to big-endian format
+    //uint32_t toBigEndian(uint32_t value);
+    //
+    //uint16_t toBigEndian(uint16_t value);
+
+    // Corrected helper function to convert values to big-endian format
+    inline uint32_t toBigEndian(uint32_t value) {
+        return ((value & 0x000000FF) << 24) |
+               ((value & 0x0000FF00) << 8)  |
+               ((value & 0x00FF0000) >> 8)  |
+               ((value & 0xFF000000) >> 24);
+    }
+    
+    inline uint16_t toBigEndian(uint16_t value) {
+        return ((value & 0x00FF) << 8) |
+               ((value & 0xFF00) >> 8);
+    }
+    
+    // Helper function to convert a vector of bytes to a hex string for logging
+    
+    //std::string hexToString(const std::vector<uint8_t>& bytes);
+    
+    
+    /**
+     * @brief Converts a .pchtxt file to an IPS file using fstream.
+     *
+     * This function reads the contents of a .pchtxt file, extracts the address-value pairs,
+     * and generates an IPS file with the provided output folder.
+     *
+     * @param pchtxtPath The file path to the .pchtxt file.
+     * @param outputFolder The folder path for the output IPS file.
+     * @return True if the conversion was successful, false otherwise.
+     */
+    bool pchtxt2ips(const std::string& pchtxtPath, const std::string& outputFolder);
+}
+
+#endif
\ No newline at end of file
diff --git a/Source/sys-clk/overlay/lib/libultrahand/libultra/include/path_funcs.hpp b/Source/sys-clk/overlay/lib/libultrahand/libultra/include/path_funcs.hpp
new file mode 100644
index 00000000..2eea6781
--- /dev/null
+++ b/Source/sys-clk/overlay/lib/libultrahand/libultra/include/path_funcs.hpp
@@ -0,0 +1,279 @@
+/********************************************************************************
+ * File: path_funcs.hpp
+ * Author: ppkantorski
+ * Description:
+ *   This header file contains function declarations and utility functions related
+ *   to file and directory path manipulation. These functions are used in the
+ *   Ultrahand Overlay project to handle file operations, such as creating
+ *   directories, moving files, and more.
+ *
+ *   For the latest updates and contributions, visit the project's GitHub repository.
+ *   (GitHub Repository: https://github.com/ppkantorski/Ultrahand-Overlay)
+ *
+ *   Note: Please be aware that this notice cannot be altered or removed. It is a part
+ *   of the project's documentation and must remain intact.
+ * 
+ *  Licensed under both GPLv2 and CC-BY-4.0
+ *  Copyright (c) 2024 ppkantorski
+ ********************************************************************************/
+
+#pragma once
+
+#ifndef PATH_FUNCS_HPP
+#define PATH_FUNCS_HPP
+
+#if !USING_FSTREAM_DIRECTIVE // For not using fstream (needs implementing)
+#include <stdio.h>
+#else
+#include <fstream>
+#endif
+
+#include <memory>
+#include <dirent.h>
+#include <sys/stat.h>
+#include "global_vars.hpp"
+#include "string_funcs.hpp"
+#include "get_funcs.hpp"
+#include <queue>
+#include <mutex>
+
+
+namespace ult {
+    extern std::atomic<bool> abortFileOp;
+    
+    extern size_t COPY_BUFFER_SIZE; // Made const for thread safety
+    extern std::atomic<int> copyPercentage;
+    
+    // Mutex for thread-safe logging operations
+    extern std::mutex logMutex;
+    
+    /**
+     * @brief Checks if a path points to a directory.
+     *
+     * This function checks if the specified path points to a directory.
+     *
+     * @param path The path to check.
+     * @return True if the path is a directory, false otherwise.
+     */
+    bool isDirectory(const std::string& path);
+    
+    
+    
+    /**
+     * @brief Checks if a path points to a file.
+     *
+     * This function checks if the specified path points to a file.
+     *
+     * @param path The path to check.
+     * @return True if the path is a file, false otherwise.
+     */
+    bool isFile(const std::string& path);
+    
+    
+    /**
+     * @brief Checks if a path points to a file or directory.
+     *
+     * This function checks if the specified path points to either a file or a directory.
+     *
+     * @param path The path to check.
+     * @return True if the path points to a file or directory, false otherwise.
+     */
+    bool isFileOrDirectory(const std::string& path);
+    
+    
+    bool isDirectoryEmpty(const std::string& dirPath);
+    
+    /**
+     * @brief Creates a single directory if it doesn't exist.
+     *
+     * This function checks if the specified directory exists, and if not, it creates the directory.
+     *
+     * @param directoryPath The path of the directory to be created.
+     */
+    void createSingleDirectory(const std::string& directoryPath);
+    
+    
+    /**
+     * @brief Creates a directory and its parent directories if they don't exist.
+     *
+     * This function creates a directory specified by `directoryPath` and also creates any parent directories
+     * if they don't exist. It handles nested directory creation.
+     *
+     * @param directoryPath The path of the directory to be created.
+     */
+    void createDirectory(const std::string& directoryPath);
+    
+    
+    #if !USING_FSTREAM_DIRECTIVE
+    void writeLog(FILE* logFile, const std::string& line);
+    #else
+    void writeLog(std::ofstream& logFile, const std::string& line);
+    #endif
+    
+    /**
+     * @brief Creates a text file with the specified content.
+     *
+     * This function creates a text file specified by `filePath` and writes the given `content` to the file.
+     *
+     * @param filePath The path of the text file to be created.
+     * @param content The content to be written to the text file.
+     */
+    void createTextFile(const std::string& filePath, const std::string& content);
+    
+    
+    
+    
+    /**
+     * @brief Deletes a file or directory.
+     *
+     * This function deletes the file or directory specified by `path`. It can delete both files and directories.
+     *
+     * @param path The path of the file or directory to be deleted.
+     */
+    void deleteFileOrDirectory(const std::string& pathToDelete, const std::string& logSource = "");
+    
+    
+    
+    
+    /**
+     * @brief Deletes files or directories that match a specified pattern.
+     *
+     * This function deletes files or directories specified by `pathPattern` by matching against a pattern.
+     * It identifies files or directories that match the pattern and deletes them.
+     *
+     * @param pathPattern The pattern used to match and delete files or directories.
+     */
+    void deleteFileOrDirectoryByPattern(const std::string& pathPattern, const std::string& logSource = "");
+    
+    
+    void moveDirectory(const std::string& sourcePath, const std::string& destinationPath,
+                       const std::string& logSource = "", const std::string& logDestination = "");
+    
+    
+    
+    bool moveFile(const std::string& sourcePath, const std::string& destinationPath,
+                  const std::string& logSource = "", const std::string& logDestination = "");
+    
+    
+    
+    
+    /**
+     * @brief Moves a file or directory to a new destination.
+     *
+     * This function moves a file or directory from the `sourcePath` to the `destinationPath`. It can handle both
+     * files and directories and ensures that the destination directory exists before moving.
+     *
+     * @param sourcePath The path of the source file or directory.
+     * @param destinationPath The path of the destination where the file or directory will be moved.
+     */
+    void moveFileOrDirectory(const std::string& sourcePath, const std::string& destinationPath,
+        const std::string& logSource = "", const std::string& logDestination = "");
+    
+    
+    
+    /**
+     * @brief Moves files or directories matching a specified pattern to a destination directory.
+     *
+     * This function identifies files or directories that match the `sourcePathPattern` and moves them to the `destinationPath`.
+     * It processes each matching entry in the source directory pattern and moves them to the specified destination.
+     *
+     * @param sourcePathPattern The pattern used to match files or directories to be moved.
+     * @param destinationPath The destination directory where matching files or directories will be moved.
+     */
+    void moveFilesOrDirectoriesByPattern(const std::string& sourcePathPattern, const std::string& destinationPath,
+        const std::string& logSource = "", const std::string& logDestination = "");
+    
+    
+    
+    /**
+     * @brief Copies a single file from the source path to the destination path.
+     *
+     * This function copies a single file specified by `fromFile` to the location specified by `toFile`.
+     *
+     * @param fromFile The path of the source file to be copied.
+     * @param toFile The path of the destination where the file will be copied.
+     */
+    void copySingleFile(const std::string& fromFile, const std::string& toFile, long long& totalBytesCopied, const long long totalSize,
+                        const std::string& logSource = "", const std::string& logDestination = "");
+    
+    
+    
+    /**
+     * Recursively calculates the total size of the given file or directory.
+     * @param path The path to the file or directory.
+     * @return The total size in bytes of all files within the directory or the size of a file.
+     */
+    long long getTotalSize(const std::string& path);
+    
+    
+    /**
+     * @brief Copies a file or directory from the source path to the destination path.
+     *
+     * This function copies a file or directory specified by `fromFileOrDirectory` to the location specified by `toFileOrDirectory`.
+     * If the source is a regular file, it copies the file to the destination. If the source is a directory, it recursively copies
+     * the entire directory and its contents to the destination.
+     *
+     * @param fromPath The path of the source file or directory to be copied.
+     * @param toPath The path of the destination where the file or directory will be copied.
+     */
+    void copyFileOrDirectory(const std::string& fromPath, const std::string& toPath, long long* totalBytesCopied = nullptr, long long totalSize = 0,
+        const std::string& logSource = "", const std::string& logDestination = "");
+    
+    
+    
+    
+    /**
+     * @brief Copies files or directories matching a specified pattern to a destination directory.
+     *
+     * This function identifies files or directories that match the `sourcePathPattern` and copies them to the `toDirectory`.
+     * It processes each matching entry in the source directory pattern and copies them to the specified destination.
+     *
+     * @param sourcePathPattern The pattern used to match files or directories to be copied.
+     * @param toDirectory The destination directory where matching files or directories will be copied.
+     */
+    void copyFileOrDirectoryByPattern(const std::string& sourcePathPattern, const std::string& toDirectory,
+        const std::string& logSource = "", const std::string& logDestination = "");
+    
+    
+    
+    
+    
+    /**
+     * @brief Mirrors the deletion of files from a source directory to a target directory.
+     *
+     * This function mirrors the deletion of files from a `sourcePath` directory to a `targetPath` directory.
+     * It deletes corresponding files in the `targetPath` that match the source directory structure.
+     *
+     * @param sourcePath The path of the source directory.
+     * @param targetPath The path of the target directory where files will be mirrored and deleted.
+     *                   Default is "sdmc:/". You can specify a different target path if needed.
+     */
+    void mirrorFiles(const std::string& sourcePath, const std::string targetPath, const std::string mode);
+    
+
+    /**
+     * @brief For each match of the wildcard pattern, creates an empty text file
+     *        named basename.txt inside the output directory.
+     *        Uses FILE* if !USING_FSTREAM_DIRECTIVE is defined, otherwise uses std::ofstream.
+     *
+     * @param wildcardPattern A path with a wildcard, such as /some/path/[*].
+     *                        Each match results in a file named after the basename.
+     * @param outputDir       Directory where the output files will be written.
+     *                        Created if it doesn't already exist.
+     */
+    void createFlagFiles(const std::string& wildcardPattern, const std::string& outputDir);
+
+
+    /**
+     * @brief Removes all files starting with "._" from a directory and its subdirectories.
+     *
+     * This function recursively scans the specified directory and removes all files
+     * whose names start with "._" (commonly macOS metadata files). It processes
+     * all subdirectories recursively.
+     *
+     * @param sourcePath The path of the directory to clean.
+     */
+    void dotCleanDirectory(const std::string& sourcePath);
+}
+
+#endif
\ No newline at end of file
diff --git a/Source/sys-clk/overlay/lib/libultrahand/libultra/include/string_funcs.hpp b/Source/sys-clk/overlay/lib/libultrahand/libultra/include/string_funcs.hpp
new file mode 100644
index 00000000..71696d07
--- /dev/null
+++ b/Source/sys-clk/overlay/lib/libultrahand/libultra/include/string_funcs.hpp
@@ -0,0 +1,274 @@
+/********************************************************************************
+ * File: string_funcs.hpp
+ * Author: ppkantorski
+ * Description:
+ *   This header file contains function declarations and utility functions for string
+ *   manipulation. These functions are used in the Ultrahand Overlay project to
+ *   perform operations like trimming whitespaces, removing quotes, replacing
+ *   multiple slashes, and more.
+ *
+ *   For the latest updates and contributions, visit the project's GitHub repository.
+ *   (GitHub Repository: https://github.com/ppkantorski/Ultrahand-Overlay)
+ *
+ *   Note: Please be aware that this notice cannot be altered or removed. It is a part
+ *   of the project's documentation and must remain intact.
+ * 
+ *  Licensed under both GPLv2 and CC-BY-4.0
+ *  Copyright (c) 2024 ppkantorski
+ ********************************************************************************/
+
+#pragma once
+
+#ifndef STRING_FUNCS_HPP
+#define STRING_FUNCS_HPP
+
+#include <cstring>
+#include <string>
+#include <iterator> 
+#include <vector>
+//#include <jansson.h>
+//#include <regex>
+#include <algorithm>
+#include <sys/stat.h>
+#include <dirent.h>
+#include "global_vars.hpp"
+#include "debug_funcs.hpp"
+
+namespace ult {
+    
+    extern std::string to_string(int value);
+    extern int stoi(const std::string& str, std::size_t* pos = nullptr, int base = 10);
+    extern float stof(const std::string& str);
+
+    extern bool canConvertToInt(const std::string& str);
+
+    /**
+     * @brief A lightweight string stream class that mimics basic functionality of std::istringstream.
+     */
+    class StringStream {
+    public:
+        StringStream() : position(0), hexMode(false), validState(true) {}
+    
+    
+        // Add this constructor to accept a string
+        StringStream(const std::string& input) : data(input), position(0), hexMode(false) {}
+    
+        // Set hex mode
+        StringStream& hex() {
+            hexMode = true;
+            return *this;
+        }
+    
+        // Reset hex mode
+        StringStream& resetHex() {
+            hexMode = false;
+            return *this;
+        }
+    
+        // Mimics std::getline() with a delimiter
+        bool getline(std::string& output, char delimiter);
+    
+        // Mimics operator >> to split by whitespace
+        StringStream& operator>>(std::string& output);
+    
+        // Overload the << operator to insert strings and integers
+        StringStream& operator<<(const std::string& input);
+        StringStream& operator<<(const char* input);
+        StringStream& operator<<(char input);
+        StringStream& operator<<(int input);  // Handles int insertion with hex support
+        StringStream& operator<<(long long input); // for long long
+    
+        // Conversion to bool for checking stream state (success/failure)
+        explicit operator bool() const {
+            return validState;
+        }
+    
+        std::string str() const;
+        void clear() { data.clear(); position = 0; } // Add clear function
+    
+    private:
+        std::string data;
+        size_t position;
+        bool hexMode;
+        bool validState;  // Track if the stream is in a valid state
+    };
+    
+
+
+    /**
+     * @brief Trims leading and trailing whitespaces from a string.
+     *
+     * This function removes leading and trailing whitespaces, tabs, newlines, carriage returns, form feeds,
+     * and vertical tabs from the input string.
+     *
+     * @param str The input string to trim.
+     * @return The trimmed string.
+     */
+    void trim(std::string& str);
+    
+    
+    
+    // Function to trim newline characters from the end of a string
+    void trimNewline(std::string& str);
+    
+    
+    /**
+     * @brief Removes all white spaces from a string.
+     *
+     * This function removes all white spaces, including spaces, tabs, newlines, carriage returns, form feeds,
+     * and vertical tabs from the input string.
+     *
+     * @param str The input string to remove white spaces from.
+     * @return The string with white spaces removed.
+     */
+    std::string removeWhiteSpaces(const std::string& str);
+    
+    
+    
+    /**
+     * @brief Removes quotes from a string.
+     *
+     * This function removes single and double quotes from the beginning and end of the input string.
+     *
+     * @param str The input string to remove quotes from.
+     * @return The string with quotes removed.
+     */
+    void removeQuotes(std::string& str);
+    
+    
+    /**
+     * @brief Replaces multiple consecutive slashes with a single slash in a string.
+     *
+     * This function replaces sequences of two or more consecutive slashes with a single slash in the input string.
+     *
+     * @param input The input string to process.
+     * @return The string with multiple slashes replaced.
+     */
+    std::string replaceMultipleSlashes(const std::string& input);
+    
+    
+    void resolveDirectoryTraversal(std::string& path);
+    
+    /**
+     * @brief Preprocesses a path string by replacing multiple slashes and adding "sdmc:" prefix.
+     *
+     * This function preprocesses a path string by removing multiple consecutive slashes,
+     * adding the "sdmc:" prefix if not present, and modifying the input string in place.
+     *
+     * @param path The input path string to preprocess, passed by reference.
+     */
+    void preprocessPath(std::string& path, const std::string& packagePath = "");
+    
+    /**
+     * @brief Preprocesses a URL string by adding "https://" prefix.
+     *
+     * This function preprocesses a URL string by adding the "https://" prefix if not already present.
+     *
+     * @param path The input URL string to preprocess, passed by reference and modified in-place.
+     */
+    void preprocessUrl(std::string& path);
+    
+    /**
+     * @brief Drops the file extension from a filename.
+     *
+     * This function removes the file extension (characters after the last dot) from the input filename string.
+     *
+     * @param filename The input filename from which to drop the extension, passed by reference and modified in-place.
+     */
+    void dropExtension(std::string& filename);
+    
+    /**
+     * @brief Checks if a string starts with a given prefix.
+     *
+     * This function checks if the input string starts with the specified prefix.
+     *
+     * @param str The input string to check.
+     * @param prefix The prefix to check for.
+     * @return True if the string starts with the prefix, false otherwise.
+     */
+    bool startsWith(const std::string& str, const std::string& prefix);
+    
+    
+    // Helper function to check if a string is a valid integer
+    bool isValidNumber(const std::string& str);
+    
+    // For properly handling placeholder replacements
+    std::string returnOrNull(const std::string& value);
+
+    
+    // Function to slice a string from start to end index
+    std::string sliceString(const std::string& str, size_t start, size_t end);
+    
+    
+    /**
+     * @brief Converts a string to lowercase.
+     *
+     * This function takes a string as input and returns a lowercase version of that string.
+     *
+     * @param str The input string to convert to lowercase.
+     * @return The lowercase version of the input string.
+     */
+    
+    std::string stringToLowercase(const std::string& str);
+    
+
+    /**
+     * @brief Converts a string to uppercase.
+     *
+     * This function takes a string as input and returns an uppercase version of that string.
+     *
+     * @param str The input string to convert to uppercase.
+     * @return The uppercase version of the input string.
+     */
+    
+    std::string stringToUppercase(const std::string& str);
+    
+    /**
+     * @brief Formats a priority string to a desired width.
+     *
+     * This function takes a priority string and formats it to a specified desired width by padding with '0's if it's shorter
+     * or truncating with '9's if it's longer.
+     *
+     * @param priority The input priority string to format.
+     * @param desiredWidth The desired width of the formatted string (default is 4).
+     * @return A formatted priority string.
+     */
+    std::string formatPriorityString(const std::string& priority, int desiredWidth = 4);
+    
+    
+    
+    /**
+     * @brief Removes the part of the string after the first occurrence of '?' character.
+     *
+     * This function takes a string and removes the portion of the string that appears after
+     * the first '?' character, if found. If no '?' character is present, the string remains unchanged.
+     *
+     * @param input The input string from which to remove the tag, passed by reference and modified in-place.
+     */
+    void removeTag(std::string &input);
+    
+    std::string getFirstLongEntry(const std::string& input, size_t minLength = 8);
+    
+    
+    // This will take a string like "v1.3.5-abasdfasdfa" and output "1.3.5". string could also look like "test-1.3.5-1" or "v1.3.5" and we will only want "1.3.5"
+    std::string cleanVersionLabel(const std::string& input);
+    
+    
+    std::string extractTitle(const std::string& input);
+    
+    
+    std::vector<std::string> splitString(const std::string& str, const std::string& delimiter);
+    
+    
+    // Function to split a string by a delimiter and return a specific index
+    std::string splitStringAtIndex(const std::string& str, const std::string& delimiter, size_t index);
+    
+    
+    std::string customAlign(int number);
+    
+    #if IS_LAUNCHER_DIRECTIVE
+    std::string inputExists(const std::string& input);
+    #endif
+}
+
+#endif
\ No newline at end of file
diff --git a/Source/sys-clk/overlay/lib/libultrahand/libultra/include/tsl_utils.hpp b/Source/sys-clk/overlay/lib/libultrahand/libultra/include/tsl_utils.hpp
new file mode 100644
index 00000000..4baabffe
--- /dev/null
+++ b/Source/sys-clk/overlay/lib/libultrahand/libultra/include/tsl_utils.hpp
@@ -0,0 +1,726 @@
+/********************************************************************************
+ * File: tsl_utils.hpp
+ * Author: ppkantorski
+ * Description: 
+ *   'tsl_utils.hpp' is a central utility header for the Ultrahand Overlay project,
+ *   containing a variety of functions and definitions related to system status,
+ *   input handling, and application-specific behavior on the Nintendo Switch.
+ *   This header provides essential utilities for interacting with the system,
+ *   managing key input, and enhancing overlay functionality.
+ *
+ *   The utilities defined here are designed to operate independently, facilitating
+ *   robust system interaction capabilities required for custom overlays.
+ *
+ *   For the latest updates and contributions, visit the project's GitHub repository:
+ *   GitHub Repository: https://github.com/ppkantorski/Ultrahand-Overlay
+ *
+ *   Note: This notice is integral to the project's documentation and must not be 
+ *   altered or removed.
+ *
+ *  Licensed under both GPLv2 and CC-BY-4.0
+ *  Copyright (c) 2024 ppkantorski
+ ********************************************************************************/
+
+
+#pragma once
+#ifndef TSL_UTILS_HPP
+#define TSL_UTILS_HPP
+
+#if !USING_FSTREAM_DIRECTIVE // For not using fstream (needs implementing)
+#include <stdio.h>
+#else
+#include <fstream>
+#endif
+
+#include <ultra.hpp>
+#include <switch.h>
+#include <arm_neon.h>
+
+#include <stdlib.h>
+#include <strings.h>
+//#include <math.h>
+
+#include <algorithm>
+#include <cstring>
+#include <cwctype>
+#include <string>
+#include <functional>
+#include <type_traits>
+#include <mutex>
+#include <memory>
+//#include <chrono>
+#include <list>
+#include <stack>
+#include <map>
+#include <barrier>
+
+#ifndef APPROXIMATE_cos
+// Approximation for cos(x) using Taylor series around 0
+#define APPROXIMATE_cos(x)       (1 - (x) * (x) / 2 + (x) * (x) * (x) * (x) / 24)  // valid for small x
+#endif
+
+
+#ifndef APPROXIMATE_ifloor
+#define APPROXIMATE_ifloor(x)   ((int)((x) >= 0 ? (x) : (x) - 1))  // truncate toward negative infinity
+#define APPROXIMATE_iceil(x)    ((int)((x) == (int)(x) ? (x) : ((x) > 0 ? (int)(x) + 1 : (int)(x))))  // truncate toward positive infinity
+#endif
+
+#ifndef APPROXIMATE_sqrt
+// Fast approximation for sqrt using Newton's method
+#define APPROXIMATE_sqrt(x)     ((x) <= 0 ? 0 : (x) / 2.0 * (3.0 - ((x) * (x) * 0.5)))  // Approximation for x close to 1
+#define APPROXIMATE_pow(x, y)   ((y) == 0 ? 1 : ((y) == 1 ? (x) : APPROXIMATE_sqrt(x))) // limited to approximate sqrt if y=0.5
+#endif
+
+#ifndef APPROXIMATE_fmod
+#define APPROXIMATE_fmod(x, y)    ((x) - ((int)((x) / (y)) * (y)))  // equivalent to x - floor(x/y) * y
+#endif
+
+#ifndef APPROXIMATE_cos
+// Approximation for cos(x) using Taylor series around 0
+#define APPROXIMATE_cos(x)       (1 - (x) * (x) / 2 + (x) * (x) * (x) * (x) / 24)  // valid for small x
+#endif
+
+#ifndef APPROXIMATE_acos
+#define APPROXIMATE_acos(x)      (1.5708 - (x) - (x)*(x)*(x) / 6)  // limited approximation for acos in range [-1, 1]
+#endif
+
+#ifndef APPROXIMATE_fabs
+#define APPROXIMATE_fabs(x)      ((x) < 0 ? -(x) : (x))
+#endif
+
+struct OverlayCombo {
+    std::string path;   // full overlay path
+    std::string launchArg; // empty = use per-overlay launch_args key, otherwise a “mode” arg
+};
+
+struct SwapDepth {
+    u32 value;
+    explicit SwapDepth(u32 v) : value(v) {}
+};
+
+namespace ult {
+    extern bool correctFrameSize; // for detecting the correct Overlay display size
+
+    extern u16 DefaultFramebufferWidth;            ///< Width of the framebuffer
+    extern u16 DefaultFramebufferHeight;           ///< Height of the framebuffer
+
+    extern std::unordered_map<std::string, std::string> translationCache;
+
+    extern std::unordered_map<u64, OverlayCombo> g_entryCombos;
+    extern std::atomic<bool> launchingOverlay;
+    extern std::atomic<bool> settingsInitialized;
+    extern std::atomic<bool> currentForeground;
+    //extern std::mutex simulatedNextPageMutex;
+
+    //void loadOverlayKeyCombos();
+    //std::string getOverlayForKeyCombo(u64 keys);
+
+    bool readFileContent(const std::string& filePath, std::string& content);
+    void parseJsonContent(const std::string& content, std::unordered_map<std::string, std::string>& result);
+    bool parseJsonToMap(const std::string& filePath, std::unordered_map<std::string, std::string>& result);
+
+    bool loadTranslationsFromJSON(const std::string& filePath);
+
+    extern u16 activeHeaderHeight;
+
+    bool consoleIsDocked();
+    
+    std::string getBuildIdAsString();
+
+    std::string getTitleIdAsString();
+    
+    extern std::string lastTitleID;
+    extern std::atomic<bool> resetForegroundCheck;
+
+
+    //extern bool isLauncher;
+    extern std::atomic<bool> internalTouchReleased;
+    extern u32 layerEdge;
+    extern bool useRightAlignment;
+    extern bool useSwipeToOpen;
+    extern bool useLaunchCombos;
+    extern bool useNotifications;
+    extern bool useSoundEffects;
+    extern bool useHapticFeedback;
+    extern bool usePageSwap;
+    extern std::atomic<bool> noClickableItems;
+
+    extern bool useDynamicLogo;
+    extern bool useSelectionBG;
+    extern bool useSelectionText;
+    extern bool useSelectionValue;
+
+
+    
+    // Define the duration boundaries (for smooth scrolling)
+    //extern const std::chrono::milliseconds initialInterval;  // Example initial interval
+    //extern const std::chrono::milliseconds shortInterval;    // Short interval after long hold
+    //extern const std::chrono::milliseconds transitionPoint; // Point at which the shortest interval is reached
+    
+
+
+    //constexpr std::chrono::milliseconds initialInterval = std::chrono::milliseconds(67);  // Example initial interval
+    //constexpr std::chrono::milliseconds shortInterval = std::chrono::milliseconds(10);    // Short interval after long hold
+    //constexpr std::chrono::milliseconds transitionPoint = std::chrono::milliseconds(2000); // Point at which the shortest interval is reached
+
+    // Function to interpolate between two durations
+    //std::chrono::milliseconds interpolateDuration(std::chrono::milliseconds start, std::chrono::milliseconds end, float t);
+    
+#if IS_LAUNCHER_DIRECTIVE
+    extern std::atomic<bool> overlayLaunchRequested;
+    extern std::string requestedOverlayPath;
+    extern std::string requestedOverlayArgs;
+    extern std::mutex overlayLaunchMutex;
+#endif
+    
+    
+    //#include <filesystem> // Comment out filesystem
+    
+    // CUSTOM SECTION START
+    //extern float backWidth, selectWidth, nextPageWidth;
+    extern std::atomic<float> backWidth;
+    extern std::atomic<float> selectWidth;
+    extern std::atomic<float> nextPageWidth;
+    extern std::atomic<bool> inMainMenu;
+    extern std::atomic<bool> inOverlaysPage;
+    extern std::atomic<bool> inPackagesPage;
+    
+    extern bool firstBoot; // for detecting first boot
+    
+    //static std::unordered_map<std::string, std::string> hexSumCache;
+    
+    // Define an atomic bool for interpreter completion
+    extern std::atomic<bool> threadFailure;
+    extern std::atomic<bool> runningInterpreter;
+    extern std::atomic<bool> shakingProgress;
+    
+    extern std::atomic<bool> isHidden;
+    extern std::atomic<bool> externalAbortCommands;
+    
+    //bool progressAnimation = false;
+    extern bool disableTransparency;
+    //bool useCustomWallpaper = false;
+    extern bool useMemoryExpansion;
+    extern bool useOpaqueScreenshots;
+    
+    extern std::atomic<bool> onTrackBar;
+    extern std::atomic<bool> allowSlide;
+    extern std::atomic<bool> unlockedSlide;
+    
+    void atomicToggle(std::atomic<bool>& b);
+
+    /**
+     * @brief Shutdown modes for the Ultrahand-Overlay project.
+     *
+     * These macros define the shutdown modes used in the Ultrahand-Overlay project:
+     * - `SpsmShutdownMode_Normal`: Normal shutdown mode.
+     * - `SpsmShutdownMode_Reboot`: Reboot mode.
+     */
+    #define SpsmShutdownMode_Normal 0
+    #define SpsmShutdownMode_Reboot 1
+    
+    /**
+     * @brief Key mapping macros for button keys.
+     *
+     * These macros define button keys for the Ultrahand-Overlay project to simplify key mappings.
+     * For example, `KEY_A` represents the `HidNpadButton_A` key.
+     */
+    #define KEY_A HidNpadButton_A
+    #define KEY_B HidNpadButton_B
+    #define KEY_X HidNpadButton_X
+    #define KEY_Y HidNpadButton_Y
+    #define KEY_L HidNpadButton_L
+    #define KEY_R HidNpadButton_R
+    #define KEY_ZL HidNpadButton_ZL
+    #define KEY_ZR HidNpadButton_ZR
+    #define KEY_PLUS HidNpadButton_Plus
+    #define KEY_MINUS HidNpadButton_Minus
+    #define KEY_DUP HidNpadButton_Up
+    #define KEY_DDOWN HidNpadButton_Down
+    #define KEY_DLEFT HidNpadButton_Left
+    #define KEY_DRIGHT HidNpadButton_Right
+    #define KEY_SL HidNpadButton_AnySL
+    #define KEY_SR HidNpadButton_AnySR
+    #define KEY_LSTICK HidNpadButton_StickL
+    #define KEY_RSTICK HidNpadButton_StickR
+    #define KEY_UP HidNpadButton_AnyUp
+    #define KEY_DOWN HidNpadButton_AnyDown
+    #define KEY_LEFT HidNpadButton_AnyLeft
+    #define KEY_RIGHT HidNpadButton_AnyRight
+    
+    #define SCRIPT_KEY HidNpadButton_Minus
+    #define SYSTEM_SETTINGS_KEY HidNpadButton_Plus
+    #define SETTINGS_KEY HidNpadButton_Y
+    #define STAR_KEY HidNpadButton_X
+
+    
+    // Define a mask with all possible key flags
+    #define ALL_KEYS_MASK (KEY_A | KEY_B | KEY_X | KEY_Y | KEY_DUP | KEY_DDOWN | KEY_DLEFT | KEY_DRIGHT | KEY_L | KEY_R | KEY_ZL | KEY_ZR | KEY_SL | KEY_SR | KEY_LSTICK | KEY_RSTICK | KEY_PLUS | KEY_MINUS)
+    
+    
+    extern bool updateMenuCombos;
+    
+    /**
+     * @brief Ultrahand-Overlay Input Macros
+     *
+     * This block of code defines macros for handling input in the Ultrahand-Overlay project.
+     * These macros simplify the mapping of input events to corresponding button keys and
+     * provide aliases for touch and joystick positions.
+     *
+     * The macros included in this block are:
+     *
+     * - `touchPosition`: An alias for a constant `HidTouchState` pointer.
+     * - `touchInput`: An alias for `&touchPos`, representing touch input.
+     * - `JoystickPosition`: An alias for `HidAnalogStickState`, representing joystick input.
+     *
+     * These macros are utilized within the Ultrahand-Overlay project to manage and interpret
+     * user input, including touch and joystick events.
+     */
+    #define touchPosition const HidTouchState
+    #define touchInput &touchPos
+    #define JoystickPosition HidAnalogStickState
+    
+    //void convertComboToUnicode(std::string& combo);
+
+    /**
+     * @brief Combo key mapping
+     */
+    struct KeyInfo {
+        u64 key;
+        const char* name;
+        const char* glyph;
+    };
+
+    /**
+     * @brief Combo key mappings
+     *
+     * Ordered as they should be displayed
+     */
+    extern std::array<KeyInfo, 18> KEYS_INFO;
+
+    std::unordered_map<std::string, std::string> createButtonCharMap();
+    
+    extern std::unordered_map<std::string, std::string> buttonCharMap;
+    
+    
+    void convertComboToUnicode(std::string& combo);
+    
+    
+    // English string definitions
+    
+    extern const std::string whiteColor;
+    extern const std::string blackColor;
+    extern const std::string greyColor;
+
+    extern std::atomic<bool> languageWasChanged;
+    
+    inline constexpr double _M_PI = 3.14159265358979323846;  // For double precision
+    inline constexpr double RAD_TO_DEG = 180.0f / _M_PI;
+    
+    #if IS_LAUNCHER_DIRECTIVE
+    extern std::string ENGLISH;
+    extern std::string SPANISH;
+    extern std::string FRENCH;
+    extern std::string GERMAN;
+    extern std::string JAPANESE;
+    extern std::string KOREAN;
+    extern std::string ITALIAN;
+    extern std::string DUTCH;
+    extern std::string PORTUGUESE;
+    extern std::string RUSSIAN;
+    extern std::string UKRAINIAN;
+    extern std::string POLISH;
+    extern std::string SIMPLIFIED_CHINESE;
+    extern std::string TRADITIONAL_CHINESE;
+
+    extern std::string OVERLAYS; //defined in libTesla now
+    extern std::string OVERLAYS_ABBR;
+    extern std::string OVERLAY;
+    extern std::string HIDDEN_OVERLAYS;
+    extern std::string PACKAGES; //defined in libTesla now
+    extern std::string PACKAGE;
+    extern std::string HIDDEN_PACKAGES;
+    extern std::string HIDDEN;
+    extern std::string HIDE_OVERLAY;
+    extern std::string HIDE_PACKAGE;
+    extern std::string LAUNCH_ARGUMENTS;
+    extern std::string QUICK_LAUNCH;
+    extern std::string BOOT_COMMANDS;
+    extern std::string EXIT_COMMANDS;
+    extern std::string ERROR_LOGGING;
+    extern std::string COMMANDS;
+    extern std::string SETTINGS;
+    extern std::string FAVORITE;
+    extern std::string MAIN_SETTINGS;
+    extern std::string UI_SETTINGS;
+
+    extern std::string WIDGET;
+    extern std::string WIDGET_ITEMS;
+    extern std::string WIDGET_SETTINGS;
+    extern std::string CLOCK;
+    extern std::string BATTERY;
+    extern std::string SOC_TEMPERATURE;
+    extern std::string PCB_TEMPERATURE;
+    extern std::string BACKDROP;
+    extern std::string DYNAMIC_COLORS;
+    extern std::string CENTER_ALIGNMENT;
+    extern std::string EXTENDED_BACKDROP;
+    extern std::string MISCELLANEOUS;
+    //extern std::string MENU_ITEMS;
+    extern std::string MENU_SETTINGS;
+    extern std::string USER_GUIDE;
+    extern std::string SHOW_HIDDEN;
+    extern std::string SHOW_DELETE;
+    extern std::string PAGE_SWAP;
+    extern std::string RIGHT_SIDE_MODE;
+    extern std::string OVERLAY_VERSIONS;
+    extern std::string PACKAGE_VERSIONS;
+    extern std::string CLEAN_VERSIONS;
+    //extern std::string VERSION_LABELS;
+    extern std::string KEY_COMBO;
+    extern std::string MODE;
+    extern std::string MODES;
+    extern std::string LANGUAGE;
+    extern std::string OVERLAY_INFO;
+    extern std::string SOFTWARE_UPDATE;
+    extern std::string UPDATE_ULTRAHAND;
+    extern std::string UPDATE_LANGUAGES;
+    extern std::string SYSTEM;
+    extern std::string DEVICE_INFO;
+    extern std::string FIRMWARE;
+    extern std::string BOOTLOADER;
+    extern std::string HARDWARE;
+    extern std::string MEMORY;
+    extern std::string VENDOR;
+    extern std::string MODEL;
+    extern std::string STORAGE;
+    extern std::string NOTICE;
+    extern std::string UTILIZES;
+
+    extern std::string MEMORY_EXPANSION;
+    extern std::string REBOOT_REQUIRED;
+    extern std::string LOCAL_IP;
+    extern std::string WALLPAPER;
+    extern std::string THEME;
+    extern std::string DEFAULT;
+    extern std::string ROOT_PACKAGE;
+    extern std::string SORT_PRIORITY;
+    extern std::string OPTIONS;
+    extern std::string FAILED_TO_OPEN;
+
+    extern std::string LAUNCH_COMBOS;
+    extern std::string NOTIFICATIONS;
+    extern std::string SOUND_EFFECTS;
+    extern std::string HAPTIC_FEEDBACK;
+    extern std::string OPAQUE_SCREENSHOTS;
+
+    extern std::string PACKAGE_INFO;
+    extern std::string _TITLE;
+    extern std::string _VERSION;
+    extern std::string _CREATOR;
+    extern std::string _ABOUT;
+    extern std::string _CREDITS;
+
+    extern std::string USERGUIDE_OFFSET;
+    extern std::string SETTINGS_MENU;
+    extern std::string SCRIPT_OVERLAY;
+    extern std::string STAR_FAVORITE;
+    extern std::string APP_SETTINGS;
+    extern std::string ON_MAIN_MENU;
+    extern std::string ON_A_COMMAND;
+    extern std::string ON_OVERLAY_PACKAGE;
+    extern std::string FEATURES;
+    extern std::string SWIPE_TO_OPEN;
+
+    extern std::string THEME_SETTINGS;
+    extern std::string DYNAMIC_LOGO;
+    extern std::string SELECTION_BACKGROUND;
+    extern std::string SELECTION_TEXT;
+    extern std::string SELECTION_VALUE;
+    extern std::string LIBULTRAHAND_TITLES;
+    extern std::string LIBULTRAHAND_VERSIONS;
+    extern std::string PACKAGE_TITLES;
+
+    extern std::string ULTRAHAND_HAS_STARTED;
+    extern std::string NEW_UPDATE_IS_AVAILABLE;
+    extern std::string REBOOT_IS_REQUIRED;
+    extern std::string HOLD_A_TO_DELETE;
+    extern std::string SELECTION_IS_EMPTY;
+
+    //extern std::string PACKAGE_VERSIONS;
+    //extern std::string PROGRESS_ANIMATION;
+
+    extern std::string REBOOT_TO;
+    extern std::string REBOOT;
+    extern std::string SHUTDOWN;
+    extern std::string BOOT_ENTRY;
+    #endif
+
+    extern std::string FREE;
+
+    extern std::string DEFAULT_CHAR_WIDTH;
+    extern std::string UNAVAILABLE_SELECTION;
+
+    extern std::string ON;
+    extern std::string OFF;
+
+    extern std::string OK;
+    extern std::string BACK;
+    extern std::string HIDE;
+    extern std::string CANCEL;
+
+    extern std::string GAP_1;
+    extern std::string GAP_2;
+    extern std::atomic<float> halfGap;
+
+    //extern std::string EMPTY;
+
+    #if USING_WIDGET_DIRECTIVE
+    extern std::string SUNDAY;
+    extern std::string MONDAY;
+    extern std::string TUESDAY;
+    extern std::string WEDNESDAY;
+    extern std::string THURSDAY;
+    extern std::string FRIDAY;
+    extern std::string SATURDAY;
+    
+    extern std::string JANUARY;
+    extern std::string FEBRUARY;
+    extern std::string MARCH;
+    extern std::string APRIL;
+    extern std::string MAY;
+    extern std::string JUNE;
+    extern std::string JULY;
+    extern std::string AUGUST;
+    extern std::string SEPTEMBER;
+    extern std::string OCTOBER;
+    extern std::string NOVEMBER;
+    extern std::string DECEMBER;
+    
+    extern std::string SUN;
+    extern std::string MON;
+    extern std::string TUE;
+    extern std::string WED;
+    extern std::string THU;
+    extern std::string FRI;
+    extern std::string SAT;
+    
+    extern std::string JAN;
+    extern std::string FEB;
+    extern std::string MAR;
+    extern std::string APR;
+    extern std::string MAY_ABBR;
+    extern std::string JUN;
+    extern std::string JUL;
+    extern std::string AUG;
+    extern std::string SEP;
+    extern std::string OCT;
+    extern std::string NOV;
+    extern std::string DEC;
+    #endif
+    
+    #if IS_LAUNCHER_DIRECTIVE
+    // Constant string definitions (English)
+    void reinitializeLangVars();
+    #endif
+    
+    
+    // Define the updateIfNotEmpty function
+    void updateIfNotEmpty(std::string& constant, const char* jsonKey, const json_t* jsonData);
+    
+    void parseLanguage(const std::string& langFile);
+    
+    #if USING_WIDGET_DIRECTIVE
+    void localizeTimeStr(char* timeStr);
+    #endif
+
+    // Unified function to apply replacements
+    void applyLangReplacements(std::string& text, bool isValue = false);
+    
+    
+    
+    //// Map of character widths (pre-calibrated)
+    //extern std::unordered_map<wchar_t, float> characterWidths;
+    
+    //extern float defaultNumericCharWidth;
+    
+    
+    
+    // Predefined hexMap
+    //extern const std::array<int, 256> hexMap;
+    inline constexpr std::array<int, 256> hexMap = [] {
+        std::array<int, 256> map = {0};
+        map['0'] = 0; map['1'] = 1; map['2'] = 2; map['3'] = 3; map['4'] = 4;
+        map['5'] = 5; map['6'] = 6; map['7'] = 7; map['8'] = 8; map['9'] = 9;
+        map['A'] = 10; map['B'] = 11; map['C'] = 12; map['D'] = 13; map['E'] = 14; map['F'] = 15;
+        map['a'] = 10; map['b'] = 11; map['c'] = 12; map['d'] = 13; map['e'] = 14; map['f'] = 15;
+        return map;
+    }();
+    
+    
+    // Prepare a map of default settings
+    extern std::map<const std::string, std::string> defaultThemeSettingsMap;
+    
+    bool isNumericCharacter(char c);
+    
+    bool isValidHexColor(const std::string& hexColor);
+    
+    
+    
+    float calculateAmplitude(float x, float peakDurationFactor = 0.25f);
+            
+    
+    extern std::atomic<bool> refreshWallpaperNow;
+    extern std::atomic<bool> refreshWallpaper;
+    extern std::vector<u8> wallpaperData;
+    extern std::atomic<bool> inPlot;
+    
+    extern std::mutex wallpaperMutex;
+    extern std::condition_variable cv;
+    
+    
+    
+    // Function to load the RGBA file into memory and modify wallpaperData directly
+    void loadWallpaperFile(const std::string& filePath, s32 width = 448, s32 height = 720);
+    void loadWallpaperFileWhenSafe();
+
+    void reloadWallpaper();
+    
+    // Global variables for FPS calculation
+    //extern double lastTimeCount;
+    //extern int frameCount;
+    //extern float fps;
+    //extern double elapsedTime;
+    
+    
+    extern std::atomic<bool> themeIsInitialized;
+
+    // Variables for touch commands
+    extern std::atomic<bool> touchingBack;
+    extern std::atomic<bool> touchingSelect;
+    extern std::atomic<bool> touchingNextPage;
+    extern std::atomic<bool> touchingMenu;
+    extern std::atomic<bool> shortTouchAndRelease;
+    extern std::atomic<bool> longTouchAndRelease;
+    extern std::atomic<bool> simulatedBack;
+    //extern bool simulatedBackComplete;
+    extern std::atomic<bool> simulatedSelect;
+    //extern bool simulatedSelectComplete;
+    extern std::atomic<bool> simulatedNextPage;
+    //extern std::atomic<bool> simulatedNextPageComplete;
+    extern std::atomic<bool> simulatedMenu;
+    //extern bool simulatedMenuComplete;
+    extern std::atomic<bool> stillTouching;
+    extern std::atomic<bool> interruptedTouch;
+    extern std::atomic<bool> touchInBounds;
+    
+    
+#if USING_WIDGET_DIRECTIVE
+    // Battery implementation
+    extern bool powerInitialized;
+    extern bool powerCacheInitialized;
+    extern uint32_t powerCacheCharge;
+    extern bool powerCacheIsCharging;
+    extern PsmSession powerSession;
+    
+    // Define variables to store previous battery charge and time
+    //extern uint32_t prevBatteryCharge;
+    //extern s64 timeOut;
+    
+    
+    extern std::atomic<uint32_t> batteryCharge;
+    extern std::atomic<bool> isCharging;
+    
+    //constexpr std::chrono::seconds min_delay = std::chrono::seconds(3); // Minimum delay between checks
+    
+    bool powerGetDetails(uint32_t *_batteryCharge, bool *_isCharging);
+    
+    void powerInit(void);
+    
+    void powerExit(void);
+#endif
+    
+    // Temperature Implementation
+    extern std::atomic<float> PCB_temperature;
+    extern std::atomic<float> SOC_temperature;
+    
+    /*
+    I2cReadRegHandler was taken from Switch-OC-Suite source code made by KazushiMe
+    Original repository link (Deleted, last checked 15.04.2023): https://github.com/KazushiMe/Switch-OC-Suite
+    */
+    
+    Result I2cReadRegHandler(u8 reg, I2cDevice dev, u16 *out);
+    
+    
+    #define TMP451_SOC_TEMP_REG 0x01  // Register for SOC temperature integer part
+    #define TMP451_SOC_TMP_DEC_REG 0x10  // Register for SOC temperature decimal part
+    #define TMP451_PCB_TEMP_REG 0x00  // Register for PCB temperature integer part
+    #define TMP451_PCB_TMP_DEC_REG 0x15  // Register for PCB temperature decimal part
+    
+    // Common helper function to read temperature (integer and fractional parts)
+    Result ReadTemperature(float *temperature, u8 integerReg, u8 fractionalReg, bool integerOnly);
+    
+    // Function to get the SOC temperature
+    Result ReadSocTemperature(float *temperature, bool integerOnly = true);
+    
+    // Function to get the PCB temperature
+    Result ReadPcbTemperature(float *temperature, bool integerOnly = true);
+    
+    
+    
+    // Time implementation
+    
+    extern const std::string DEFAULT_DT_FORMAT;
+    extern std::string datetimeFormat;
+    
+    
+    // Widget settings
+    //static std::string hideClock, hideBattery, hidePCBTemp, hideSOCTemp;
+    extern bool hideClock, hideBattery, hidePCBTemp, hideSOCTemp, dynamicWidgetColors;
+    extern bool hideWidgetBackdrop, centerWidgetAlignment, extendedWidgetBackdrop;
+
+    #if IS_LAUNCHER_DIRECTIVE
+    void reinitializeWidgetVars();
+    #endif
+    
+    extern bool cleanVersionLabels, hideOverlayVersions, hidePackageVersions, useLibultrahandTitles, useLibultrahandVersions, usePackageTitles, usePackageVersions;
+    
+    extern const std::string loaderInfo;
+    extern const std::string loaderTitle;
+    extern const bool expandedMemory;
+    
+    extern std::string versionLabel;
+    
+    #if IS_LAUNCHER_DIRECTIVE
+    void reinitializeVersionLabels();
+    #endif
+    
+    
+    // Number of renderer threads to use
+    extern const unsigned numThreads;
+    extern std::vector<std::thread> renderThreads;
+    extern const s32 bmpChunkSize;
+    extern std::atomic<s32> currentRow;
+    
+    
+    
+    static std::barrier inPlotBarrier(numThreads, [](){
+        inPlot.store(false, std::memory_order_release);
+    });
+
+
+    //extern std::atomic<unsigned int> barrierCounter;
+    //extern std::mutex barrierMutex;
+    //extern std::condition_variable barrierCV;
+    //
+    //extern void barrierWait();
+    
+
+    void initializeThemeVars();
+    
+    void initializeUltrahandSettings();
+
+
+}
+
+#endif
diff --git a/Source/sys-clk/overlay/lib/libultrahand/libultra/include/ultra.hpp b/Source/sys-clk/overlay/lib/libultrahand/libultra/include/ultra.hpp
new file mode 100644
index 00000000..c0d1f1f8
--- /dev/null
+++ b/Source/sys-clk/overlay/lib/libultrahand/libultra/include/ultra.hpp
@@ -0,0 +1,49 @@
+/********************************************************************************
+ * File: ultra.hpp
+ * Author: ppkantorski
+ * Description: 
+ *   'ultra.hpp' serves as a central include header for the Ultrahand Overlay project,
+ *   bringing together a comprehensive suite of utility functions essential for the
+ *   development and operation of custom overlays on the Nintendo Switch. This header
+ *   provides consolidated access to functions facilitating debugging, string processing,
+ *   file management, JSON manipulation, and more, enhancing the modularity and 
+ *   reusability of code within the project.
+ *
+ *   These utilities are designed to operate independently, providing robust tools to
+ *   support complex overlay functionalities and interactions.
+ *
+ *   For the latest updates and contributions, visit the project's GitHub repository:
+ *   GitHub Repository: https://github.com/ppkantorski/Ultrahand-Overlay
+ *
+ *   Note: This notice is integral to the project's documentation and must not be 
+ *   altered or removed.
+ *
+ *  Licensed under both GPLv2 and CC-BY-4.0
+ *  Copyright (c) 2024 ppkantorski
+ ********************************************************************************/
+#pragma once
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-function"
+
+#ifndef ULTRA_HPP
+#define ULTRA_HPP
+
+// Include all functional headers used in the libUltra library
+
+#include "global_vars.hpp"
+#include "debug_funcs.hpp"
+#include "string_funcs.hpp"
+#include "get_funcs.hpp"
+#include "path_funcs.hpp"
+#include "list_funcs.hpp"
+#include "json_funcs.hpp"
+#include "ini_funcs.hpp"
+#include "hex_funcs.hpp"
+#include "download_funcs.hpp"
+#include "mod_funcs.hpp"
+#include "tsl_utils.hpp"
+#include "audio_player.hpp"
+#include "haptics.hpp"
+
+#endif // ULTRA_HPP
\ No newline at end of file
diff --git a/Source/sys-clk/overlay/lib/libultrahand/libultra/source/audio_player.cpp b/Source/sys-clk/overlay/lib/libultrahand/libultra/source/audio_player.cpp
new file mode 100644
index 00000000..b9246519
--- /dev/null
+++ b/Source/sys-clk/overlay/lib/libultrahand/libultra/source/audio_player.cpp
@@ -0,0 +1,312 @@
+/********************************************************************************
+ * File: audio_player.cpp
+ * Author: ppkantorski
+ * Description:
+ *   Memory-optimized version with reduced allocation overhead and chunked I/O.
+ *   Key changes:
+ *   - Eliminated temporary vector allocations (saves 50% memory during load)
+ *   - Chunked file reading to reduce peak memory usage
+ *   - Reduced alignment padding (saves ~3-4KB per sound)
+ *   - Added lazy loading option via unloadAllSounds()
+ *
+ *   For the latest updates and contributions, visit the project's GitHub repository.
+ *   (GitHub Repository: https://github.com/ppkantorski/Ultrahand-Overlay)
+ *
+ *   Note: Please be aware that this notice cannot be altered or removed. It is a part
+ *   of the project's documentation and must remain intact.
+ * 
+ *  Licensed under both GPLv2 and CC-BY-4.0
+ *  Copyright (c) 2025 ppkantorski
+ ********************************************************************************/
+
+#include "audio_player.hpp"
+
+namespace ult {
+    bool AudioPlayer::m_initialized = false;
+    std::atomic<bool> AudioPlayer::m_enabled{true};
+    float AudioPlayer::m_masterVolume = 0.6f;
+    bool AudioPlayer::m_lastDockedState = false;
+    std::vector<AudioPlayer::CachedSound> AudioPlayer::m_cachedSounds;
+    std::mutex AudioPlayer::m_audioMutex;
+    
+    bool AudioPlayer::initialize() {
+        std::lock_guard<std::mutex> lock(m_audioMutex);
+        
+        if (m_initialized) return true;
+        
+        if (R_FAILED(audoutInitialize()) || R_FAILED(audoutStartAudioOut())) {
+            audoutExit();
+            return false;
+        }
+        
+        m_initialized = true;
+        m_cachedSounds.resize(static_cast<uint32_t>(SoundType::Count));
+        m_lastDockedState = isDocked();
+        reloadAllSounds();
+        
+        return true;
+    }
+    
+    void AudioPlayer::exit() {
+        std::lock_guard<std::mutex> lock(m_audioMutex);
+        
+        // Free all cached sound buffers
+        for (auto& cached : m_cachedSounds) {
+            if (cached.buffer) {
+                free(cached.buffer);
+                cached.buffer = nullptr;
+            }
+            cached.bufferSize = 0;
+            cached.dataSize = 0;
+        }
+        
+        if (m_initialized) {
+            audoutStopAudioOut();
+            audoutExit();
+            m_initialized = false;
+        }
+    }
+    
+    void AudioPlayer::reloadAllSounds() {
+        for (uint32_t i = 0; i < static_cast<uint32_t>(SoundType::Count); ++i) {
+            loadSoundFromWav(static_cast<SoundType>(i), m_soundPaths[i]);
+        }
+    }
+
+    void AudioPlayer::unloadAllSounds(const std::initializer_list<SoundType>& excludeSounds) {
+        std::lock_guard<std::mutex> lock(m_audioMutex);
+        if (!m_initialized) return;
+    
+        for (uint32_t i = 0; i < m_cachedSounds.size(); ++i) {
+            SoundType current = static_cast<SoundType>(i);
+    
+            // Skip if this sound is in the exclude list
+            if (std::find(excludeSounds.begin(), excludeSounds.end(), current) != excludeSounds.end()) {
+                continue;
+            }
+    
+            auto& cached = m_cachedSounds[i];
+            if (cached.buffer) {
+                free(cached.buffer);
+                cached.buffer = nullptr;
+            }
+            cached.bufferSize = 0;
+            cached.dataSize = 0;
+        }
+    }
+    
+    bool AudioPlayer::reloadIfDockedChanged() {
+        if (!m_initialized) return false;
+        
+        const bool currentDocked = isDocked();
+        if (currentDocked == m_lastDockedState) return false;
+        
+        std::lock_guard<std::mutex> lock(m_audioMutex);
+        m_lastDockedState = currentDocked;
+        reloadAllSounds();
+        
+        return true;
+    }
+    
+    bool AudioPlayer::loadSoundFromWav(SoundType type, const char* path) {
+        const uint32_t idx = static_cast<uint32_t>(type);
+        if (!m_initialized || idx >= static_cast<uint32_t>(SoundType::Count)) return false;
+    
+        // Free existing buffer
+        free(m_cachedSounds[idx].buffer);
+        m_cachedSounds[idx] = { nullptr, 0, 0 };
+    
+        FILE* f = fopen(path, "rb");
+        if (!f) return false;
+    
+        // Parse WAV header
+        char hdr[12];
+        if (fread(hdr, 1, 12, f) != 12 || memcmp(hdr, "RIFF", 4) || memcmp(hdr + 8, "WAVE", 4)) {
+            fclose(f);
+            return false;
+        }
+    
+        u16 fmt = 0, ch = 0, bits = 0;
+        u32 rate = 0, dSize = 0;
+        long dPos = 0;
+    
+        // Find fmt and data chunks
+        while (fread(hdr, 1, 8, f) == 8) {
+            const u32 sz = *(u32*)(hdr + 4);
+            if (!memcmp(hdr, "fmt ", 4)) {
+                fread(&fmt, 2, 1, f);
+                fread(&ch, 2, 1, f);
+                fread(&rate, 4, 1, f);
+                fseek(f, 6, SEEK_CUR);
+                fread(&bits, 2, 1, f);
+                fseek(f, sz - 16, SEEK_CUR);
+            } else if (!memcmp(hdr, "data", 4)) {
+                dSize = sz;
+                dPos = ftell(f);
+                break;
+            } else {
+                fseek(f, sz, SEEK_CUR);
+            }
+        }
+    
+        // Validate format
+        if (!dSize || fmt != 1 || ch == 0 || ch > 2 || (bits != 8 && bits != 16)) {
+            fclose(f);
+            return false;
+        }
+    
+        // Calculate buffer sizes
+        // Note: audout REQUIRES stereo (2 channels), so we must duplicate mono
+        const bool mono = (ch == 1);
+        const uint32_t inSamples = dSize / (bits / 8);
+        const uint32_t outSamples = mono ? inSamples * 2 : inSamples;  // Duplicate mono to stereo
+        const uint32_t outSize = outSamples * 2;  // 16-bit samples
+        
+        // Use smaller alignment to reduce waste (256 bytes instead of 4KB)
+        const uint32_t align = 0x100;
+        const uint32_t bufSize = (outSize + align - 1) & ~(align - 1);
+    
+        // Allocate output buffer
+        void* buf = aligned_alloc(align, bufSize);
+        if (!buf) {
+            fclose(f);
+            return false;
+        }
+    
+        fseek(f, dPos, SEEK_SET);
+        s16* out = (s16*)buf;
+        
+        // Calculate volume scaling
+        float effectiveVolume = m_masterVolume;
+        if (m_lastDockedState) {
+            effectiveVolume *= 0.5f;
+        }
+        const float scale = std::clamp(effectiveVolume, 0.0f, 1.0f);
+    
+        // Process audio in chunks to minimize memory usage
+        // This eliminates the need for temporary vectors
+        constexpr uint32_t CHUNK_SIZE = 512;
+        
+        if (bits == 8) {
+            // 8-bit audio: read and convert in chunks
+            const int32_t scaleInt = static_cast<int32_t>(scale * 256.0f);
+            u8 chunk[CHUNK_SIZE];
+            uint32_t remaining = inSamples;
+            uint32_t outIdx = 0;
+            
+            while (remaining > 0) {
+                const uint32_t toRead = std::min(remaining, CHUNK_SIZE);
+                if (fread(chunk, 1, toRead, f) != toRead) {
+                    free(buf);
+                    fclose(f);
+                    return false;
+                }
+                
+                for (uint32_t i = 0; i < toRead; ++i) {
+                    const s16 sample = static_cast<s16>((chunk[i] - 128) * scaleInt);
+                    if (mono) {
+                        // Duplicate to both L and R channels for stereo output
+                        out[outIdx++] = sample;  // Left
+                        out[outIdx++] = sample;  // Right
+                    } else {
+                        out[outIdx++] = sample;
+                    }
+                }
+                remaining -= toRead;
+            }
+        } else {
+            // 16-bit audio: read and convert in chunks
+            s16 chunk[CHUNK_SIZE];
+            uint32_t remaining = inSamples;
+            uint32_t outIdx = 0;
+            
+            while (remaining > 0) {
+                const uint32_t toRead = std::min(remaining, CHUNK_SIZE);
+                if (fread(chunk, sizeof(s16), toRead, f) != toRead) {
+                    free(buf);
+                    fclose(f);
+                    return false;
+                }
+                
+                for (uint32_t i = 0; i < toRead; ++i) {
+                    const s16 sample = static_cast<s16>(chunk[i] * scale);
+                    if (mono) {
+                        // Duplicate to both L and R channels for stereo output
+                        out[outIdx++] = sample;  // Left
+                        out[outIdx++] = sample;  // Right
+                    } else {
+                        out[outIdx++] = sample;
+                    }
+                }
+                remaining -= toRead;
+            }
+        }
+    
+        fclose(f);
+    
+        // Zero-fill any padding
+        if (outSize < bufSize) {
+            memset((u8*)buf + outSize, 0, bufSize - outSize);
+        }
+    
+        m_cachedSounds[idx] = { buf, bufSize, outSize };
+        return true;
+    }
+    
+    void AudioPlayer::playSound(SoundType type) {
+        // Lock-free check - SAFE with atomic
+        if (!m_enabled.load(std::memory_order_relaxed)) return;
+    
+        const uint32_t idx = static_cast<uint32_t>(type);
+        if (idx >= static_cast<uint32_t>(SoundType::Count)) return;
+    
+        std::lock_guard<std::mutex> lock(m_audioMutex);
+        
+        // Check again under lock
+        if (!m_initialized) return;
+        
+        auto& cached = m_cachedSounds[idx];
+        if (!cached.buffer) return;
+    
+        // Release any finished buffers
+        AudioOutBuffer* releasedBuffers = nullptr;
+        u32 releasedCount = 0;
+        audoutGetReleasedAudioOutBuffer(&releasedBuffers, &releasedCount);
+    
+        // Static buffer is safe with mutex protection
+        static AudioOutBuffer audioBuffer = {};
+        audioBuffer = {};
+        audioBuffer.buffer = cached.buffer;
+        audioBuffer.buffer_size = cached.bufferSize;
+        audioBuffer.data_size = cached.dataSize;
+        audioBuffer.data_offset = 0;
+        audioBuffer.next = nullptr;
+    
+        AudioOutBuffer* rel = nullptr;
+        audoutPlayBuffer(&audioBuffer, &rel);
+    }
+    
+    void AudioPlayer::setMasterVolume(float v) { 
+        std::lock_guard<std::mutex> lock(m_audioMutex);
+        m_masterVolume = std::clamp(v, 0.0f, 1.0f);
+    }
+    
+    void AudioPlayer::setEnabled(bool e) { 
+        m_enabled.store(e, std::memory_order_relaxed);
+    }
+    
+    bool AudioPlayer::isEnabled() { 
+        return m_enabled.load(std::memory_order_relaxed);
+    }
+    
+    bool AudioPlayer::isDocked() {
+        Result rc = apmInitialize();
+        if (R_FAILED(rc)) return false;
+        
+        ApmPerformanceMode perfMode = ApmPerformanceMode_Invalid;
+        rc = apmGetPerformanceMode(&perfMode);
+        apmExit();
+        
+        return R_SUCCEEDED(rc) && (perfMode == ApmPerformanceMode_Boost);
+    }
+}
\ No newline at end of file
diff --git a/Source/sys-clk/overlay/lib/libultrahand/libultra/source/debug_funcs.cpp b/Source/sys-clk/overlay/lib/libultrahand/libultra/source/debug_funcs.cpp
new file mode 100644
index 00000000..0ec0fbd2
--- /dev/null
+++ b/Source/sys-clk/overlay/lib/libultrahand/libultra/source/debug_funcs.cpp
@@ -0,0 +1,54 @@
+/********************************************************************************
+ * File: debug_funcs.cpp
+ * Author: ppkantorski
+ * Description:
+ *   This source file contains the implementation of debugging functions for the
+ *   Ultrahand Overlay project.
+ ********************************************************************************/
+
+#include "debug_funcs.hpp"
+
+namespace ult {
+    #if USING_LOGGING_DIRECTIVE
+    // Define static variables
+    const std::string defaultLogFilePath = "sdmc:/switch/.packages/log.txt";
+    std::string logFilePath = defaultLogFilePath; 
+    bool disableLogging = true;
+    std::mutex logMutex;
+    
+    void logMessage(const char* message) {
+        std::time_t currentTime = std::time(nullptr);
+        std::tm* timeInfo = std::localtime(&currentTime);
+        char timestamp[30];
+        strftime(timestamp, sizeof(timestamp), "[%Y-%m-%d %H:%M:%S] ", timeInfo);
+        
+        #if !USING_FSTREAM_DIRECTIVE
+        {
+            std::lock_guard<std::mutex> lock(logMutex);
+            
+            FILE* file = fopen(logFilePath.c_str(), "a");
+            if (file != nullptr) {
+                fputs(timestamp, file);
+                fputs(message, file);
+                fputc('\n', file);
+                fclose(file);
+            }
+        }
+        #else
+        {
+            std::lock_guard<std::mutex> lock(logMutex);
+            
+            std::ofstream file(logFilePath.c_str(), std::ios::app);
+            if (file.is_open()) {
+                file << timestamp << message << "\n";
+            }
+        }
+        #endif
+    }
+    
+    // Overload for std::string
+    void logMessage(const std::string& message) {
+        logMessage(message.c_str());
+    }
+    #endif
+}
\ No newline at end of file
diff --git a/Source/sys-clk/overlay/lib/libultrahand/libultra/source/download_funcs.cpp b/Source/sys-clk/overlay/lib/libultrahand/libultra/source/download_funcs.cpp
new file mode 100644
index 00000000..3ff0216e
--- /dev/null
+++ b/Source/sys-clk/overlay/lib/libultrahand/libultra/source/download_funcs.cpp
@@ -0,0 +1,879 @@
+/********************************************************************************
+ * File: download_funcs.cpp
+ * Author: ppkantorski
+ * Description:
+ *   This source file provides implementations for the functions declared in
+ *   download_funcs.hpp. These functions utilize libcurl for downloading files
+ *   from the internet and minizip-ng for extracting ZIP archives with proper
+ *   64-bit file support.
+ *
+ *   For the latest updates and contributions, visit the project's GitHub repository.
+ *   (GitHub Repository: https://github.com/ppkantorski/Ultrahand-Overlay)
+ *
+ *   Note: Please be aware that this notice cannot be altered or removed. It is a part
+ *   of the project's documentation and must remain intact.
+ * 
+ *  Licensed under both GPLv2 and CC-BY-4.0
+ *  Copyright (c) 2024 ppkantorski
+ ********************************************************************************/
+
+#include "download_funcs.hpp"
+
+
+namespace ult {
+
+// Base loader definitions
+size_t DOWNLOAD_READ_BUFFER = 8*1024;//64 * 1024;//4096*10;
+size_t DOWNLOAD_WRITE_BUFFER = 8*1024;//64 * 1024;
+size_t UNZIP_READ_BUFFER = 32*1024;//131072*2;//4096*4;
+size_t UNZIP_WRITE_BUFFER = 16*1024;//131072*2;//4096*4;
+
+
+// Path to the CA certificate
+//const std::string cacertPath = "sdmc:/config/ultrahand/cacert.pem";
+//const std::string cacertURL = "https://curl.se/ca/cacert.pem";
+
+// User agent string for curl requests
+static constexpr const char* userAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36";
+
+// Shared atomic flag to indicate whether to abort the download operation
+std::atomic<bool> abortDownload(false);
+// Define an atomic bool for interpreter completion
+std::atomic<bool> abortUnzip(false);
+std::atomic<int> downloadPercentage(-1);
+std::atomic<int> unzipPercentage(-1);
+
+// Thread-safe curl initialization
+static std::mutex curlInitMutex;
+static std::atomic<bool> curlInitialized(false);
+
+
+// Definition of CurlDeleter
+struct CurlDeleter {
+    void operator()(CURL* curl) const noexcept {
+        if (curl) {
+            curl_easy_cleanup(curl);
+        }
+    }
+};
+
+struct FileDeleter {
+    void operator()(FILE* f) const { 
+        if (f) {
+            fclose(f); 
+        }
+    }
+};
+
+// Callback function to write received data to a file.
+#if !USING_FSTREAM_DIRECTIVE
+// Using stdio.h functions (FILE*, fwrite)
+size_t writeCallback(void* ptr, size_t size, size_t nmemb, FILE* stream) {
+    if (!ptr || !stream) return 0;
+    //size_t totalBytes = size * nmemb;
+    //size_t writtenBytes = fwrite(ptr, 1, totalBytes, stream);
+    //return writtenBytes;
+    return fwrite(ptr, 1, size * nmemb, stream);
+}
+#else
+// Using std::ofstream for writing
+size_t writeCallback(void* ptr, size_t size, size_t nmemb, std::ostream* stream) {
+    if (!ptr || !stream) return 0;
+    auto& file = *static_cast<std::ofstream*>(stream);
+    const size_t totalBytes = size * nmemb;
+    file.write(static_cast<const char*>(ptr), totalBytes);
+    return totalBytes;
+}
+#endif
+
+// Your C function
+int progressCallback(void *ptr, curl_off_t totalToDownload, curl_off_t nowDownloaded, curl_off_t totalToUpload, curl_off_t nowUploaded) {
+    if (!ptr) return 1;
+    
+    auto percentage = static_cast<std::atomic<int>*>(ptr);
+
+    if (totalToDownload > 0) {
+        //int newProgress = static_cast<int>((static_cast<double>(nowDownloaded) / static_cast<double>(totalToDownload)) * 100.0);
+        percentage->store(static_cast<int>((static_cast<double>(nowDownloaded) / static_cast<double>(totalToDownload)) * 100.0), std::memory_order_release);
+    }
+
+    if (abortDownload.load(std::memory_order_acquire)) {
+        percentage->store(-1, std::memory_order_release);
+        return 1;  // Abort the download
+    }
+
+    return 0;  // Continue the download
+}
+
+// Global initialization function
+//void initializeCurl() {
+//    std::lock_guard<std::mutex> lock(curlInitMutex);
+//    if (!curlInitialized.load(std::memory_order_acquire)) {
+//        const CURLcode res = curl_global_init(CURL_GLOBAL_DEFAULT);
+//        if (res != CURLE_OK) {
+//            #if USING_LOGGING_DIRECTIVE
+//            if (!disableLogging)
+//                logMessage("curl_global_init() failed: " + std::string(curl_easy_strerror(res)));
+//            #endif
+//            // Handle error appropriately, possibly exit the program
+//        } else {
+//            curlInitialized.store(true, std::memory_order_release);
+//        }
+//    }
+//}
+
+// Global cleanup function
+//void cleanupCurl() {
+//    std::lock_guard<std::mutex> lock(curlInitMutex);
+//    if (curlInitialized.load(std::memory_order_acquire)) {
+//        curl_global_cleanup();
+//        curlInitialized.store(false, std::memory_order_release);
+//    }
+//}
+
+std::unique_ptr<char[]> globalWriteBuffer;
+
+/**
+ * @brief Downloads a file from a URL to a specified destination.
+ *
+ * @param url The URL of the file to download.
+ * @param toDestination The destination path where the file should be saved.
+ * @return True if the download was successful, false otherwise.
+ */
+bool downloadFile(const std::string& url, const std::string& toDestination, bool noPercentagePolling) {
+    abortDownload.store(false, std::memory_order_release);
+
+    if (url.find_first_of("{}") != std::string::npos) {
+        #if USING_LOGGING_DIRECTIVE
+        if (!disableLogging)
+            logMessage("Invalid URL: " + url);
+        #endif
+        return false;
+    }
+
+    std::string destination = toDestination;
+    if (destination.back() == '/') {
+        createDirectory(destination);
+        const size_t lastSlash = url.find_last_of('/');
+        if (lastSlash != std::string::npos) {
+            destination += url.substr(lastSlash + 1);
+        } else {
+            #if USING_LOGGING_DIRECTIVE
+            if (!disableLogging)
+                logMessage("Invalid URL: " + url);
+            #endif
+            return false;
+        }
+    } else {
+        createDirectory(destination.substr(0, destination.find_last_of('/')));
+    }
+
+    const std::string tempFilePath = getParentDirFromPath(destination) + "." + getFileName(destination) + ".tmp";
+
+#if USING_FSTREAM_DIRECTIVE
+    // Use ofstream if !USING_FSTREAM_DIRECTIVE is not defined
+    std::ofstream file(tempFilePath, std::ios::binary);
+    if (!file.is_open()) {
+        #if USING_LOGGING_DIRECTIVE
+        if (!disableLogging)
+            logMessage("Error opening file: " + tempFilePath);
+        #endif
+        return false;
+    }
+#else
+    // Alternative method of opening file (depending on your platform, like using POSIX open())
+    std::unique_ptr<FILE, FileDeleter> file(fopen(tempFilePath.c_str(), "wb"));
+    if (!file) {
+        #if USING_LOGGING_DIRECTIVE
+        if (!disableLogging)
+            logMessage("Error opening file: " + tempFilePath);
+        #endif
+        return false;
+    }
+
+    // ADD THIS: Set up write buffer for better performance
+    //std::unique_ptr<char[]> globalWriteBuffer;
+    if (DOWNLOAD_WRITE_BUFFER > 0) {
+        //if (!globalWriteBuffer)
+        globalWriteBuffer = std::make_unique<char[]>(DOWNLOAD_WRITE_BUFFER);
+        // _IOFBF = full buffering, _IOLBF = line buffering, _IONBF = no buffering
+        setvbuf(file.get(), globalWriteBuffer.get(), _IOFBF, DOWNLOAD_WRITE_BUFFER);
+    }
+
+    //setvbuf(file.get(), NULL, _IOFBF, DOWNLOAD_WRITE_BUFFER);
+#endif
+
+    // Ensure curl is initialized
+    //initializeCurl();
+
+    //if (!R_SUCCEEDED(socketInitializeDefault())) {
+    //    #if USING_LOGGING_DIRECTIVE
+    //    if (!disableLogging)
+    //        logMessage("Failed to initialize socket.");
+    //    #endif
+    //    return false;
+    //}
+
+    std::unique_ptr<CURL, CurlDeleter> curl(curl_easy_init());
+    if (!curl) {
+        #if USING_LOGGING_DIRECTIVE
+        if (!disableLogging)
+            logMessage("Error initializing curl.");
+        #endif
+#if USING_FSTREAM_DIRECTIVE
+        file.close();
+#else
+        file.reset();
+        globalWriteBuffer.reset();
+#endif
+        return false;
+    }
+
+    // Only initialize downloadPercentage if we're tracking progress
+    if (!noPercentagePolling) {
+        downloadPercentage.store(0, std::memory_order_release);
+    }
+
+    curl_easy_setopt(curl.get(), CURLOPT_URL, url.c_str());
+    curl_easy_setopt(curl.get(), CURLOPT_WRITEFUNCTION, writeCallback);
+#if USING_FSTREAM_DIRECTIVE
+    curl_easy_setopt(curl.get(), CURLOPT_WRITEDATA, &file);
+#else
+    curl_easy_setopt(curl.get(), CURLOPT_WRITEDATA, file.get());
+#endif
+
+    // Conditionally set up progress callback based on noPercentagePolling
+    if (noPercentagePolling) {
+        // Disable progress function entirely
+        curl_easy_setopt(curl.get(), CURLOPT_NOPROGRESS, 1L);
+    } else {
+        // Enable progress callback for percentage updates
+        curl_easy_setopt(curl.get(), CURLOPT_NOPROGRESS, 0L);
+        curl_easy_setopt(curl.get(), CURLOPT_XFERINFOFUNCTION, progressCallback);
+        curl_easy_setopt(curl.get(), CURLOPT_XFERINFODATA, &downloadPercentage);
+    }
+
+    curl_easy_setopt(curl.get(), CURLOPT_USERAGENT, userAgent);
+    curl_easy_setopt(curl.get(), CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); // Enable HTTP/2
+    curl_easy_setopt(curl.get(), CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4);
+    curl_easy_setopt(curl.get(), CURLOPT_SSLVERSION, CURL_SSLVERSION_TLSv1_2); // Force TLS 1.2
+
+    curl_easy_setopt(curl.get(), CURLOPT_FOLLOWLOCATION, 1L);
+    curl_easy_setopt(curl.get(), CURLOPT_BUFFERSIZE, DOWNLOAD_READ_BUFFER); // Increase buffer size
+
+    // Add timeout options
+    curl_easy_setopt(curl.get(), CURLOPT_CONNECTTIMEOUT, 10L);   // 10 seconds to connect
+    curl_easy_setopt(curl.get(), CURLOPT_LOW_SPEED_LIMIT, 1L);   // 1 byte/s (virtually any progress)
+    curl_easy_setopt(curl.get(), CURLOPT_LOW_SPEED_TIME, 60L);  // 1 minutes of no progress
+
+    //curl_easy_setopt(curl.get(), CURLOPT_DNS_USE_GLOBAL_CACHE, 0L);
+    //curl_easy_setopt(curl.get(), CURLOPT_FORBID_REUSE, 1L);
+    //curl_easy_setopt(curl.get(), CURLOPT_CLOSESOCKETDATA, NULL); // ensure no dangling sockets
+    //curl_easy_setopt(curl.get(), CURLOPT_TCP_NODELAY, 1L);
+
+    CURLcode result = curl_easy_perform(curl.get());
+
+    // Detect if download was aborted
+    //const bool wasAborted = (result == CURLE_ABORTED_BY_CALLBACK || 
+    //                         abortDownload.load(std::memory_order_acquire));
+
+
+#if USING_FSTREAM_DIRECTIVE
+    file.close();
+#else
+    file.reset();
+    globalWriteBuffer.reset();
+#endif
+
+    curl.reset();
+
+    // Always cleanup global state
+    //curl_global_cleanup();
+    //
+    //// Sleep to let cleanup finish
+    //for (int i = 0; i < 10; ++i) {
+    //    svcSleepThread(50'000'000ULL);
+    //}
+    //
+    //// Explicitly reinitialize for next download
+    //curl_global_init(CURL_GLOBAL_DEFAULT);
+    
+    // CRITICAL: For aborted downloads, give curl time to clean up network/SSL state
+    // before destroying the handle. This prevents memory leaks in the global heap.
+    //if (wasAborted) {
+    //    for (int i = 0; i < 10; ++i) {
+    //        svcSleepThread(50'000'000ULL); // 50ms x 10 = 500ms total
+    //    }
+    //}
+
+    //cleanupCurl();
+
+    //socketExit();
+
+    if (result != CURLE_OK) {
+        #if USING_LOGGING_DIRECTIVE
+        if (result == CURLE_ABORTED_BY_CALLBACK) {
+            if (!disableLogging)
+                logMessage("Download aborted by user: " + url);
+        } else if (result == CURLE_OPERATION_TIMEDOUT) {
+            if (!disableLogging)
+                logMessage("Download timed out: " + url);
+        } else if (result == CURLE_COULDNT_CONNECT) {
+            if (!disableLogging)
+                logMessage("Could not connect to: " + url);
+        } else {
+            if (!disableLogging)
+                logMessage("Error downloading file: " + std::string(curl_easy_strerror(result)));
+        }
+        #endif
+        deleteFileOrDirectory(tempFilePath);
+        if (!noPercentagePolling) {
+            downloadPercentage.store(-1, std::memory_order_release);
+        }
+        return false;
+    }
+
+#if USING_FSTREAM_DIRECTIVE
+    std::ifstream checkFile(tempFilePath);
+    if (!checkFile || checkFile.peek() == std::ifstream::traits_type::eof()) {
+        #if USING_LOGGING_DIRECTIVE
+        if (!disableLogging)
+            logMessage("Error downloading file: Empty file");
+        #endif
+        deleteFileOrDirectory(tempFilePath);
+        // Only update percentage if we're tracking it
+        if (!noPercentagePolling) {
+            downloadPercentage.store(-1, std::memory_order_release);
+        }
+        checkFile.close();
+        return false;
+    }
+    checkFile.close();
+#else
+    // Alternative method for checking if the file is empty (POSIX example)
+    struct stat fileStat;
+    if (stat(tempFilePath.c_str(), &fileStat) != 0 || fileStat.st_size == 0) {
+        #if USING_LOGGING_DIRECTIVE
+        if (!disableLogging)
+            logMessage("Error downloading file: Empty file");
+        #endif
+        deleteFileOrDirectory(tempFilePath);
+        // Only update percentage if we're tracking it
+        if (!noPercentagePolling) {
+            downloadPercentage.store(-1, std::memory_order_release);
+        }
+        return false;
+    }
+#endif
+
+    // Only update percentage if we're tracking it
+    if (!noPercentagePolling) {
+        downloadPercentage.store(100, std::memory_order_release);
+    }
+
+    // CHECK FOR PROTECTED FILES AND ADD .ultra EXTENSION IF NEEDED
+    if (PROTECTED_FILES.find(destination) != PROTECTED_FILES.end()) {
+        destination += ".ultra";
+        
+        #if USING_LOGGING_DIRECTIVE
+        if (!disableLogging)
+            logMessage("Protected file detected, renaming download to: " + destination);
+        #endif
+    }
+
+    moveFile(tempFilePath, destination);
+    return true;
+}
+
+
+/**
+ * @brief Custom I/O function for opening files with larger buffer
+ */
+static voidpf ZCALLBACK fopen64_file_func_custom(voidpf opaque, const void* filename, int mode) {
+    FILE* file = nullptr;
+    const char* mode_fopen = nullptr;
+    
+    if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER) == ZLIB_FILEFUNC_MODE_READ)
+        mode_fopen = "rb";
+    else if (mode & ZLIB_FILEFUNC_MODE_EXISTING)
+        mode_fopen = "r+b";
+    else if (mode & ZLIB_FILEFUNC_MODE_CREATE)
+        mode_fopen = "wb";
+
+    if ((filename != nullptr) && (mode_fopen != nullptr)) {
+        file = fopen((const char*)filename, mode_fopen);
+        if (file && ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER) == ZLIB_FILEFUNC_MODE_READ)) {
+            // Set 64KB buffer for reading the ZIP file - reduces syscalls
+            //static const size_t zipReadBufferSize = UNZIP_READ_BUFFER;
+            setvbuf(file, nullptr, _IOFBF, UNZIP_READ_BUFFER);
+        }
+    }
+    return file;
+}
+
+static int ZCALLBACK fclose64_file_func_custom(voidpf opaque, voidpf stream) {
+    int ret = EOF;
+    if (stream != nullptr) {
+        ret = fclose((FILE*)stream);
+    }
+    return ret;
+}
+
+/**
+ * @brief Extracts files from a ZIP archive to a specified destination.
+ *
+ * Ultra-optimized single-pass extraction with smooth byte-based progress reporting
+ * using miniz with proper 64-bit file support and streaming extraction.
+ * Fixed memory leaks with RAII for proper resource cleanup on abort.
+ * 
+ * @param zipFilePath The path to the ZIP archive file.
+ * @param toDestination The destination directory where files should be extracted.
+ * @return True if the extraction was successful, false otherwise.
+ */
+bool unzipFile(const std::string& zipFilePath, const std::string& toDestination) {
+    abortUnzip.store(false, std::memory_order_release);
+    unzipPercentage.store(0, std::memory_order_release);
+
+    // Time-based abort checking - pre-calculated constants
+    //u64 lastAbortCheck = armTicksToNs(armGetSystemTick());
+    //u64 currentNanos; // Reused for all tick operations
+    bool success = true;
+
+    // RAII wrapper for unzFile
+    struct UnzFileManager {
+        unzFile file = nullptr;
+        
+        UnzFileManager(const std::string& path) {
+            zlib_filefunc64_def ffunc;
+            fill_fopen64_filefunc(&ffunc);
+            ffunc.zopen64_file = fopen64_file_func_custom;
+            ffunc.zclose_file = fclose64_file_func_custom;
+            file = unzOpen2_64(path.c_str(), &ffunc);
+        }
+        
+        ~UnzFileManager() {
+            if (file) {
+                unzClose(file);
+                file = nullptr;
+            }
+        }
+        
+        bool is_valid() const { return file != nullptr; }
+        operator unzFile() const { return file; }
+    };
+
+    // RAII wrapper for output file
+    struct OutputFileManager {
+        #if !USING_FSTREAM_DIRECTIVE
+        FILE* file = nullptr;
+        std::unique_ptr<char[]> buffer;
+        size_t bufferSize;
+        
+        OutputFileManager(size_t bufSize) : bufferSize(bufSize) {
+            buffer = std::make_unique<char[]>(bufferSize);
+        }
+        
+        bool open(const std::string& path) {
+            close();
+            file = fopen(path.c_str(), "wb");
+            if (file) {
+                setvbuf(file, buffer.get(), _IOFBF, bufferSize);
+            }
+            return file != nullptr;
+        }
+        
+        void close() {
+            if (file) {
+                fclose(file);
+                file = nullptr;
+            }
+        }
+        
+        bool is_open() const { return file != nullptr; }
+        
+        size_t write(const void* data, size_t size) {
+            return file ? fwrite(data, 1, size, file) : 0;
+        }
+        
+        ~OutputFileManager() { close(); }
+        #else
+        std::ofstream file;
+        
+        OutputFileManager(size_t bufSize) {
+            // Constructor for consistency with FILE* version
+        }
+        
+        bool open(const std::string& path) {
+            close();
+            file.open(path, std::ios::binary);
+            if (file.is_open()) {
+                file.rdbuf()->pubsetbuf(nullptr, UNZIP_WRITE_BUFFER);
+            }
+            return file.is_open();
+        }
+        
+        void close() {
+            if (file.is_open()) {
+                file.close();
+            }
+        }
+        
+        bool is_open() const { return file.is_open(); }
+        
+        size_t write(const void* data, size_t size) {
+            if (file.is_open()) {
+                file.write(static_cast<const char*>(data), size);
+                return file.good() ? size : 0;
+            }
+            return 0;
+        }
+        #endif
+    };
+
+    UnzFileManager zipFile(zipFilePath);
+    if (!zipFile.is_valid()) {
+        #if USING_LOGGING_DIRECTIVE
+        if (!disableLogging)
+            logMessage("Failed to open zip file: " + zipFilePath);
+        #endif
+        return false;
+    }
+
+    // Get global info about the ZIP file
+    unz_global_info64 globalInfo;
+    if (unzGetGlobalInfo64(zipFile, &globalInfo) != UNZ_OK) {
+        #if USING_LOGGING_DIRECTIVE
+        if (!disableLogging)
+            logMessage("Failed to get zip file info");
+        #endif
+        return false;
+    }
+
+    const uLong numFiles = globalInfo.number_entry;
+    if (numFiles == 0) {
+        #if USING_LOGGING_DIRECTIVE
+        if (!disableLogging)
+            logMessage("No files found in archive");
+        #endif
+        return false;
+    }
+
+    // ALWAYS calculate total size for accurate byte-based progress
+    ZPOS64_T totalUncompressedSize = 0;
+    char tempFilenameBuffer[512];
+    unz_file_info64 fileInfo;
+    
+    // First pass: calculate total uncompressed size
+    int result = unzGoToFirstFile(zipFile);
+    while (result == UNZ_OK) {
+        // Time-based abort check at start of each file (only if 2+ seconds have passed)
+        //currentNanos = armTicksToNs(armGetSystemTick());
+        //if ((currentNanos - lastAbortCheck) >= 2000000000ULL) {
+        //    if (abortUnzip.load(std::memory_order_relaxed)) {
+        //        unzipPercentage.store(-1, std::memory_order_release);
+        //        #if USING_LOGGING_DIRECTIVE
+        //        logMessage("Extraction aborted during size calculation");
+        //        #endif
+        //        abortUnzip.store(false, std::memory_order_release);
+        //        return false;
+        //    }
+        //    lastAbortCheck = currentNanos;
+        //}
+        if (abortUnzip.load(std::memory_order_relaxed)) {
+            unzipPercentage.store(-1, std::memory_order_release);
+            #if USING_LOGGING_DIRECTIVE
+            if (!disableLogging)
+                logMessage("Extraction aborted during size calculation");
+            #endif
+            abortUnzip.store(false, std::memory_order_release);
+            return false;
+        }
+
+        if (unzGetCurrentFileInfo64(zipFile, &fileInfo, tempFilenameBuffer, sizeof(tempFilenameBuffer), 
+                                   nullptr, 0, nullptr, 0) == UNZ_OK) {
+            const size_t nameLen = strlen(tempFilenameBuffer);
+            if (nameLen > 0 && tempFilenameBuffer[nameLen - 1] != '/') {
+                totalUncompressedSize += std::max(fileInfo.uncompressed_size, static_cast<ZPOS64_T>(1));
+            }
+        }
+        result = unzGoToNextFile(zipFile);
+    }
+
+    // Fallback to 1 if no actual data (avoid division by zero)
+    if (totalUncompressedSize == 0) {
+        totalUncompressedSize = 1;
+    }
+
+    #if USING_LOGGING_DIRECTIVE
+    if (!disableLogging) {
+        logMessage("Processing " + std::to_string(numFiles) + " files, " + 
+                  std::to_string(totalUncompressedSize) + " total bytes from archive");
+    }
+
+    #endif
+
+    // Pre-allocate ALL reusable strings and variables outside the main loop
+    std::string fileName, extractedFilePath, directoryPath;
+    //fileName.reserve(512);
+    //extractedFilePath.reserve(1024);
+    //directoryPath.reserve(1024);
+    
+    // Single large buffer for extraction - reused for all files
+    const size_t bufferSize = UNZIP_WRITE_BUFFER;
+    //std::unique_ptr<char[]> buffer = std::make_unique<char[]>(bufferSize);
+    
+    globalWriteBuffer = std::make_unique<char[]>(bufferSize);
+
+    char filenameBuffer[512]; // Stack allocated for filename reading
+    
+    // Progress tracking variables - OPTIMIZED for smooth byte-based tracking
+    ZPOS64_T totalBytesProcessed = 0;
+    uLong filesProcessed = 0;
+    int currentProgress = 0;  // Current percentage (0-100)
+    
+    // Create output file manager
+    OutputFileManager outputFile(bufferSize);
+    
+    // Loop variables moved outside
+    bool extractSuccess;
+    ZPOS64_T fileBytesProcessed;
+    int bytesRead;
+    
+    // String operation variables
+    const char* filename;
+    size_t nameLen;
+    size_t lastSlashPos;
+    size_t invalid_pos;
+    size_t start_pos;
+    
+    // Ensure destination directory exists
+    createDirectory(toDestination);
+    
+    // Ensure destination ends with '/' - pre-allocate final string
+    std::string destination;
+    //destination.reserve(toDestination.size() + 1);
+
+    destination = toDestination;
+    if (!destination.empty() && destination.back() != '/') {
+        destination += '/';
+    }
+    
+    int newProgress;;
+
+    // Extract files
+    result = unzGoToFirstFile(zipFile);
+    while (result == UNZ_OK && success) {
+        // Time-based abort check at start of each file (only if 2+ seconds have passed)
+        //currentNanos = armTicksToNs(armGetSystemTick());
+        //if ((currentNanos - lastAbortCheck) >= 2000000000ULL) {
+        //    if (abortUnzip.load(std::memory_order_relaxed)) {
+        //        success = false;
+        //        break; // RAII will handle cleanup
+        //    }
+        //    lastAbortCheck = currentNanos;
+        //}
+
+        if (abortUnzip.load(std::memory_order_relaxed)) {
+            success = false;
+            break; // RAII will handle cleanup
+        }
+        
+        // Get current file info - reuse fileInfo variable
+        if (unzGetCurrentFileInfo64(zipFile, &fileInfo, filenameBuffer, sizeof(filenameBuffer), 
+                                   nullptr, 0, nullptr, 0) != UNZ_OK) {
+            result = unzGoToNextFile(zipFile);
+            continue;
+        }
+
+        filename = filenameBuffer;
+        
+        // Quick filename validation
+        if (!filename || filename[0] == '\0') {
+            result = unzGoToNextFile(zipFile);
+            continue;
+        }
+        
+        nameLen = strlen(filename);
+        if (nameLen > 0 && filename[nameLen - 1] == '/') { // Skip directories
+            result = unzGoToNextFile(zipFile);
+            continue;
+        }
+        
+        // Build extraction path - reuse allocated strings
+        fileName.assign(filename, nameLen);
+        //extractedFilePath.clear();
+        extractedFilePath = destination;
+        extractedFilePath += fileName;
+        
+        // Optimized character cleaning - only if needed
+        invalid_pos = extractedFilePath.find_first_of(":*?\"<>|");
+        if (invalid_pos != std::string::npos) {
+            start_pos = std::min(extractedFilePath.find(ROOT_PATH) + 5, extractedFilePath.size());
+            auto it = extractedFilePath.begin() + start_pos;
+            extractedFilePath.erase(std::remove_if(it, extractedFilePath.end(), [](char c) {
+                return c == ':' || c == '*' || c == '?' || c == '\"' || c == '<' || c == '>' || c == '|';
+            }), extractedFilePath.end());
+        }
+
+        // CHECK FOR PROTECTED FILES AND ADD .ultra EXTENSION IF NEEDED
+        if (PROTECTED_FILES.find(extractedFilePath) != PROTECTED_FILES.end()) {
+            extractedFilePath += ".ultra";
+            
+            #if USING_LOGGING_DIRECTIVE
+            if (!disableLogging)
+                logMessage("Protected file detected, renaming to: " + extractedFilePath);
+            #endif
+        }
+
+        // Open the current file in the ZIP
+        if (unzOpenCurrentFile(zipFile) != UNZ_OK) {
+            #if USING_LOGGING_DIRECTIVE
+            if (!disableLogging)
+                logMessage("Could not open file in ZIP: " + fileName);
+            #endif
+            result = unzGoToNextFile(zipFile);
+            continue;
+        }
+
+        // Create directory if needed
+        lastSlashPos = extractedFilePath.find_last_of('/');
+        if (lastSlashPos != std::string::npos) {
+            directoryPath.assign(extractedFilePath, 0, lastSlashPos + 1);
+            createDirectory(directoryPath);
+        }
+
+        // Open output file
+        if (!outputFile.open(extractedFilePath)) {
+            unzCloseCurrentFile(zipFile);
+            #if USING_LOGGING_DIRECTIVE
+            if (!disableLogging)
+                logMessage("Error creating file: " + extractedFilePath);
+            #endif
+            result = unzGoToNextFile(zipFile);
+            continue;
+        }
+
+        // Extract file data in chunks
+        extractSuccess = true;
+        fileBytesProcessed = 0;
+        
+        
+        while ((bytesRead = unzReadCurrentFile(zipFile, globalWriteBuffer.get(), bufferSize)) > 0) {
+            if (abortUnzip.load(std::memory_order_relaxed)) {
+                extractSuccess = false;
+                break; // RAII will handle cleanup
+            }
+            
+            // Write data to file
+            if (outputFile.write(globalWriteBuffer.get(), bytesRead) != static_cast<size_t>(bytesRead)) {
+                extractSuccess = false;
+                break;
+            }
+            
+            // Update progress tracking
+            fileBytesProcessed += bytesRead;
+            totalBytesProcessed += bytesRead;
+            
+            // FIXED: Allow progress to reach 100% naturally during processing
+            if (totalUncompressedSize > 0) {
+                newProgress = static_cast<int>((totalBytesProcessed * 100) / totalUncompressedSize);
+                if (newProgress > currentProgress && newProgress <= 100) {
+                    currentProgress = newProgress;
+                    unzipPercentage.store(currentProgress, std::memory_order_release);
+                    
+                    #if USING_LOGGING_DIRECTIVE
+                    // Only log at 10% intervals to avoid spam
+                    if (currentProgress % 10 == 0) {
+                        if (!disableLogging) {
+                            logMessage("Progress: " + std::to_string(currentProgress) + "% (" + 
+                                      std::to_string(totalBytesProcessed) + "/" + 
+                                      std::to_string(totalUncompressedSize) + " bytes)");
+                        }
+                    }
+                    #endif
+                }
+            }
+        }
+
+        // CRITICAL FIX: Handle 0-byte files that don't enter the while loop
+        if (bytesRead == 0 && fileBytesProcessed == 0 && extractSuccess) {
+            // This is a 0-byte file - update progress by 1 byte equivalent
+            totalBytesProcessed += 1;
+            
+            // Update progress for 0-byte files
+            if (totalUncompressedSize > 0) {
+                newProgress = static_cast<int>((totalBytesProcessed * 100) / totalUncompressedSize);
+                if (newProgress > currentProgress && newProgress <= 100) {
+                    currentProgress = newProgress;
+                    unzipPercentage.store(currentProgress, std::memory_order_release);
+                    
+                    #if USING_LOGGING_DIRECTIVE
+                    if (currentProgress % 10 == 0) {
+                        if (!disableLogging)
+                            logMessage("Progress: " + std::to_string(currentProgress) + "% (0-byte file processed)");
+                    }
+                    #endif
+                }
+            }
+        }
+
+        // Check for read errors
+        if (bytesRead < 0) {
+            extractSuccess = false;
+        }
+
+        // Close current file handles
+        outputFile.close();
+        unzCloseCurrentFile(zipFile);
+
+        if (!extractSuccess) {
+            deleteFileOrDirectory(extractedFilePath);
+            #if USING_LOGGING_DIRECTIVE
+            if (!disableLogging)
+                logMessage("Failed to extract: " + fileName);
+            #endif
+            
+            if (abortUnzip.load(std::memory_order_relaxed)) {
+                success = false;
+                break;
+            }
+        } else {
+            filesProcessed++;
+        }
+
+        // Move to next file
+        result = unzGoToNextFile(zipFile);
+    }
+
+    globalWriteBuffer.reset();
+
+    // Check final abort state
+    if (abortUnzip.load(std::memory_order_relaxed)) {
+        unzipPercentage.store(-1, std::memory_order_release);
+        #if USING_LOGGING_DIRECTIVE
+        if (!disableLogging)
+            logMessage("Extraction aborted by user");
+        #endif
+        abortUnzip.store(false, std::memory_order_release);
+        return false;
+    }
+
+    if (success && filesProcessed > 0) {
+        abortUnzip.store(false, std::memory_order_release);
+        unzipPercentage.store(100, std::memory_order_release);
+        
+        #if USING_LOGGING_DIRECTIVE
+        if (!disableLogging) {
+            logMessage("Extraction completed: " + std::to_string(filesProcessed) + " files, " + 
+                      std::to_string(totalBytesProcessed) + " bytes");
+        }
+        #endif
+        
+        return true;
+    } else {
+        abortUnzip.store(false, std::memory_order_release);
+        unzipPercentage.store(-1, std::memory_order_release);
+        return false;
+    }
+}
+}
\ No newline at end of file
diff --git a/Source/sys-clk/overlay/lib/libultrahand/libultra/source/get_funcs.cpp b/Source/sys-clk/overlay/lib/libultrahand/libultra/source/get_funcs.cpp
new file mode 100644
index 00000000..84f117e3
--- /dev/null
+++ b/Source/sys-clk/overlay/lib/libultrahand/libultra/source/get_funcs.cpp
@@ -0,0 +1,506 @@
+/********************************************************************************
+ * File: get_funcs.cpp
+ * Author: ppkantorski
+ * Description:
+ *   This source file provides the implementations of functions declared in
+ *   get_funcs.hpp. These functions are responsible for retrieving and handling
+ *   data from the file system and JSON files, including parsing overlay module
+ *   information, reading file contents, and accessing structured data used
+ *   in the Ultrahand Overlay project.
+ *
+ *   For the latest updates and contributions, visit the project's GitHub repository.
+ *   (GitHub Repository: https://github.com/ppkantorski/Ultrahand-Overlay)
+ *
+ *   Note: Please be aware that this notice cannot be altered or removed. It is a part
+ *   of the project's documentation and must remain intact.
+ * 
+ *  Licensed under both GPLv2 and CC-BY-4.0
+ *  Copyright (c) 2024 ppkantorski
+ ********************************************************************************/
+
+#include "get_funcs.hpp"
+
+
+namespace ult {
+    
+    /**
+     * @brief Reads the contents of a file and returns it as a string, normalizing line endings.
+     *
+     * @param filePath The path to the file to be read.
+     * @return The content of the file as a string with line endings normalized to '\n'.
+     */
+    //std::string getFileContents(const std::string& filePath) {
+    //    #if !USING_FSTREAM_DIRECTIVE
+    //    FILE* file = fopen(filePath.c_str(), "rb");
+    //    if (!file) {
+    //        #if USING_LOGGING_DIRECTIVE
+    //        logMessage("Failed to open file: " + filePath);
+    //        #endif
+    //        return "";
+    //    }
+    //
+    //    // Determine the file size
+    //    fseek(file, 0, SEEK_END);
+    //    long size = ftell(file);
+    //    if (size <= 0) {
+    //        fclose(file);
+    //        return "";
+    //    }
+    //    fseek(file, 0, SEEK_SET);
+    //
+    //    // Read the entire file into a string
+    //    std::string content(size, '\0');
+    //    if (fread(&content[0], 1, size, file) != static_cast<size_t>(size)) {
+    //        #if USING_LOGGING_DIRECTIVE
+    //        logMessage("Failed to read file: " + filePath);
+    //        #endif
+    //        fclose(file);
+    //        return "";
+    //    }
+    //
+    //    fclose(file);
+    //
+    //    #else
+    //    std::ifstream file(filePath, std::ios::binary);
+    //    if (!file) {
+    //        #if USING_LOGGING_DIRECTIVE
+    //        logMessage("Failed to open file: " + filePath);
+    //        #endif
+    //        return "";
+    //    }
+    //
+    //    // Determine the file size
+    //    file.seekg(0, std::ios::end);
+    //    std::streamsize size = file.tellg();
+    //    if (size <= 0) {
+    //        return "";
+    //    }
+    //    file.seekg(0, std::ios::beg);
+    //
+    //    // Read the entire file into a string
+    //    std::string content(size, '\0');
+    //    if (!file.read(&content[0], size)) {
+    //        #if USING_LOGGING_DIRECTIVE
+    //        logMessage("Failed to read file: " + filePath);
+    //        #endif
+    //        return "";
+    //    }
+    //    #endif
+    //
+    //    // Erase any carriage return characters (normalize line endings)
+    //    content.erase(std::remove(content.begin(), content.end(), '\r'), content.end());
+    //    return content;
+    //}
+
+    
+    
+    
+    /**
+     * @brief Concatenates the provided directory and file names to form a destination path.
+     *
+     * @param destinationDir The directory where the file should be placed.
+     * @param fileName The name of the file.
+     * @return The destination path as a string.
+     */
+    std::string getDestinationPath(const std::string& destinationDir,
+                                   const std::string& fileName)
+    {
+        // e.g. "foo/bar" + "/" + "baz.txt"  → "foo/bar/baz.txt", but if destinationDir ended in '/',
+        // you’d get "foo/bar//baz.txt" → collapse again:
+        std::string combined = destinationDir + "/" + fileName;
+        preprocessPath(combined);
+        return combined;
+    }
+    
+    /**
+     * @brief Extracts the value part from a string line containing a key-value pair.
+     *
+     * @param line The string line containing a key-value pair (e.g., "key=value").
+     * @return The extracted value as a string. If no value is found, an empty string is returned.
+     */
+    std::string getValueFromLine(const std::string& line) {
+        const size_t equalsPos = line.rfind('=');
+        if (equalsPos == std::string::npos || equalsPos + 1 >= line.size()) {
+            return "";
+        }
+        
+        // OPTIMIZATION: Find trim boundaries directly - no temporary string
+        size_t start = equalsPos + 1;
+        size_t end = line.size() - 1;
+        
+        // Skip leading whitespace
+        while (start <= end && (line[start] == ' ' || line[start] == '\t' || 
+               line[start] == '\n' || line[start] == '\r' || 
+               line[start] == '\f' || line[start] == '\v')) {
+            ++start;
+        }
+        
+        // Skip trailing whitespace
+        while (end >= start && (line[end] == ' ' || line[end] == '\t' || 
+               line[end] == '\n' || line[end] == '\r' || 
+               line[end] == '\f' || line[end] == '\v')) {
+            --end;
+        }
+        
+        // Return trimmed substring directly
+        return (start <= end) ? line.substr(start, end - start + 1) : "";
+    }
+        
+    
+    /**
+     * @brief Extracts the name from a file path, including handling directories.
+     *
+     * @param path The file path from which to extract the name.
+     * @return The extracted name as a string. If the path indicates a directory, it extracts the last directory name.
+     * If the path is empty or no name is found, an empty string is returned.
+     */
+    std::string getNameFromPath(const std::string& path) {
+        const size_t lastNonSlash = path.find_last_not_of('/');
+        if (lastNonSlash == std::string::npos) {
+            return "";  // All slashes, or empty string effectively
+        }
+    
+        const size_t lastSlash = path.find_last_of('/', lastNonSlash);
+        if (lastSlash == std::string::npos) {
+            return path.substr(0, lastNonSlash + 1);  // No slashes, the entire path is a filename
+        }
+    
+        return path.substr(lastSlash + 1, lastNonSlash - lastSlash);  // Standard case, efficiently handled
+    }
+    
+    
+    
+    /**
+     * @brief Extracts the file name from a full file path.
+     *
+     * This function takes a filesystem path and returns only the file name,
+     * stripping away any directory paths that precede it.
+     *
+     * @param path The full path to the file.
+     * @return The file name extracted from the full path.
+     */
+    std::string getFileName(const std::string& path) {
+        const size_t pos = path.find_last_of('/');
+        return (pos != std::string::npos) ? path.substr(pos + 1) : "";
+    }
+    
+    
+    /**
+     * @brief Extracts the name of the parent directory from a given file path at a specified level.
+     *
+     * @param path The file path from which to extract the parent directory name.
+     * @param level The level of the parent directory to extract (0 for immediate parent, 1 for grandparent, and so on).
+     * @return The name of the parent directory at the specified level.
+     */
+    std::string getParentDirNameFromPath(const std::string& path, size_t level) {
+        if (path.empty()) return "";
+    
+        // Start from the end of the string and move backwards to find the slashes
+        size_t endPos = path.find_last_not_of('/');
+        if (endPos == std::string::npos) return "";
+        
+        size_t pos = path.rfind('/', endPos);
+        if (pos == std::string::npos || pos == 0) return "";
+    
+        // Navigate up the specified number of levels
+        while (level-- > 0 && pos != std::string::npos) {
+            endPos = pos - 1;
+            pos = path.rfind('/', endPos);
+            if (pos == std::string::npos || pos == 0) return "";
+        }
+    
+        size_t start = path.rfind('/', pos - 1);
+        if (start == std::string::npos) start = 0;
+        else start += 1;
+    
+        // OPTIMIZATION 1: Use find_first_of instead of manual loop - much faster
+        const bool hasWhitespace = (path.find_first_of(" \t\n\r\f\v", start, pos - start) != std::string::npos);
+    
+        if (hasWhitespace) {
+            // OPTIMIZATION 2: Pre-allocate exact size and build efficiently
+            const size_t dirNameLen = pos - start;
+            std::string result;
+            result.reserve(dirNameLen + 2);  // +2 for quotes
+            
+            result = '"';
+            result.append(path, start, dirNameLen);
+            result += '"';
+            return result;
+        } else {
+            return path.substr(start, pos - start);
+        }
+    }
+    
+    
+    
+    /**
+     * @brief Extracts the parent directory path from a given file path.
+     *
+     * @param path The file path from which to extract the parent directory path.
+     * @return The parent directory path.
+     */
+    std::string getParentDirFromPath(const std::string& path) {
+        const size_t lastSlash = path.find_last_of('/');
+        if (lastSlash != std::string::npos) {
+            return  path.substr(0, lastSlash + 1);
+        }
+        return path;
+    }
+    
+    
+    
+    /**
+     * @brief Gets a list of subdirectories in a directory.
+     *
+     * @param directoryPath The path of the directory to search.
+     * @return A vector of strings containing the names of subdirectories.
+     */
+    std::vector<std::string> getSubdirectories(const std::string& directoryPath) {
+        std::vector<std::string> subdirectories;
+        std::unique_ptr<DIR, DirCloser> dir(opendir(directoryPath.c_str()));
+        
+        if (!dir) return subdirectories;
+        
+        struct dirent* entry;
+        while ((entry = readdir(dir.get())) != nullptr) {
+            const std::string entryName = entry->d_name;
+            
+            // Skip . and ..
+            if (entryName == "." || entryName == "..") continue;
+            
+            const std::string fullPath = directoryPath + "/" + entryName;
+            
+            if (isDirectory(entry, fullPath)) {
+                subdirectories.emplace_back(entryName);
+            }
+        }
+        
+        return subdirectories;
+    }
+    
+    /**
+     * @brief Check if a directory entry is a directory (no caching).
+     * Fast path for known types, stat() only when necessary.
+     */
+    inline bool isDirectory(struct dirent* entry, const std::string& path) {
+        // Fast path - most filesystems populate d_type correctly
+        if (entry->d_type == DT_DIR) {
+            return true;
+        } else if (entry->d_type != DT_UNKNOWN) {
+            return false;  // DT_REG, DT_LNK, etc.
+        }
+        
+        // Only stat when d_type is unknown (rare on modern filesystems)
+        struct stat entryStat;
+        return (stat(path.c_str(), &entryStat) == 0) && S_ISDIR(entryStat.st_mode);
+    }
+    
+    
+    /**
+     * @brief Iteratively retrieves a list of files from a directory.
+     *
+     * @param directoryPath The path of the directory to search.
+     * @return A vector of strings containing the paths of the files.
+     */
+    std::vector<std::string> getFilesListFromDirectory(const std::string& directoryPath) {
+        std::vector<std::string> fileList;
+        std::vector<std::string> dirsToProcess;
+        
+        // Initialize with the starting directory
+        dirsToProcess.emplace_back(directoryPath);
+        
+        // Pre-allocate string buffer to avoid repeated allocations
+        std::string fullPath;
+        std::string currentDir;
+        
+        size_t dirIndex = 0;
+        while (dirIndex < dirsToProcess.size()) {
+            currentDir = std::move(dirsToProcess[dirIndex]);
+            dirsToProcess[dirIndex].shrink_to_fit();
+            dirIndex++;
+
+            std::unique_ptr<DIR, DirCloser> dir(opendir(currentDir.c_str()));
+            if (!dir) continue;
+            
+            // Cache directory path info
+            const bool needsSlash = currentDir.back() != '/';
+            
+            struct dirent* entry;
+            while ((entry = readdir(dir.get())) != nullptr) {
+                const char* entryName = entry->d_name;
+                
+                // Direct comparison without string creation
+                if (entryName[0] == '.' && (entryName[1] == '\0' || (entryName[1] == '.' && entryName[2] == '\0'))) {
+                    continue;
+                }
+                
+                // More efficient path building
+                fullPath.clear();
+                fullPath.assign(currentDir);
+                if (needsSlash) fullPath += '/';
+                fullPath += entryName;
+                
+                if (entry->d_type == DT_REG) {
+                    // Definitely a regular file
+                    fileList.emplace_back(fullPath);
+                } else if (isDirectory(entry, fullPath)) {
+                    // Add directory to processing queue
+                    dirsToProcess.emplace_back(fullPath);
+                }
+            }
+        }
+        
+        return fileList;
+    }
+
+    
+    // Iterative function to handle wildcard directories and file patterns
+    void handleDirectory(const std::string& basePath, 
+                        const std::vector<std::string>& parts, 
+                        size_t partIndex, 
+                        std::vector<std::string>& results, 
+                        bool directoryOnly,
+                        size_t maxLines) {
+        
+        std::vector<std::pair<std::string, size_t>> stack;
+        stack.emplace_back(basePath, partIndex);
+        
+        // Pre-declare strings to avoid repeated allocations
+        std::string fullPath;
+        std::string result;
+        std::string currentPath;
+        //fullPath.reserve(512);
+        //result.reserve(512);  
+        //currentPath.reserve(512);
+
+        struct stat st;
+        
+        bool isDir;
+        //std::string pathRef;
+        size_t currentPartIndex;
+
+        while (!stack.empty()) {
+            if (maxLines > 0 && results.size() >= maxLines) return;
+            
+            std::tie(currentPath, currentPartIndex) = stack.back();
+            stack.pop_back();
+            
+            // Copy once to avoid repeated access
+            //currentPath = pathRef;
+            
+            if (currentPartIndex >= parts.size()) continue;
+    
+            DIR* dirPtr = opendir(currentPath.c_str());
+            if (!dirPtr) continue;
+            std::unique_ptr<DIR, DirCloser> dir(dirPtr);
+    
+            const std::string& pattern = parts[currentPartIndex];
+            const bool isLastPart = (currentPartIndex == parts.size() - 1);
+            const bool needsSlash = currentPath.back() != '/';
+            
+            // Pre-calculate base path for efficiency
+            //const size_t basePathLen = currentPath.length();
+    
+            struct dirent* entry;
+            while ((entry = readdir(dir.get())) != nullptr) {
+                if (maxLines > 0 && results.size() >= maxLines) return;
+                
+                const char* name = entry->d_name;
+                if (name[0] == '.' && (name[1] == '\0' || (name[1] == '.' && name[2] == '\0'))) continue;
+                
+                if (fnmatch(pattern.c_str(), name, FNM_NOESCAPE) != 0) continue;
+                
+                if (entry->d_type != DT_UNKNOWN) {
+                    isDir = (entry->d_type == DT_DIR);
+                } else {
+                    // More efficient path building for stat check
+                    fullPath.clear();
+                    fullPath.assign(currentPath);
+                    if (needsSlash) fullPath += '/';
+                    fullPath += name;
+                    isDir = (stat(fullPath.c_str(), &st) == 0) && S_ISDIR(st.st_mode);
+                }
+                
+                if (isLastPart) {
+                    if (!directoryOnly || isDir) {
+                        // More efficient result building
+                        result.clear();
+                        result.assign(currentPath);
+                        if (needsSlash) result += '/';
+                        result += name;
+                        if (isDir) result += '/';
+                        results.emplace_back(std::move(result));
+                        if (maxLines > 0 && results.size() >= maxLines) return;
+                    }
+                } else if (isDir) {
+                    // More efficient path building for stack
+                    fullPath.clear();
+                    fullPath.assign(currentPath);
+                    if (needsSlash) fullPath += '/';
+                    fullPath += name;
+                    stack.emplace_back(std::move(fullPath), currentPartIndex + 1);
+                }
+            }
+        }
+    }
+    
+    /**
+     * @brief Gets a list of files and folders based on a wildcard pattern.
+     *
+     * This function searches for files and folders in a directory that match the
+     * specified wildcard pattern.
+     *
+     * @param pathPattern The wildcard pattern to match files and folders.
+     * @return A vector of strings containing the paths of matching files and folders.
+     */
+    std::vector<std::string> getFilesListByWildcards(const std::string& pathPattern, size_t maxLines) {
+        std::vector<std::string> results;
+        
+        if (pathPattern.empty()) return results;
+    
+        // Disallow any `/**/` or ending with `/**`
+        if (pathPattern.find("**") != std::string::npos || pathPattern.find("*null") != std::string::npos || pathPattern.find("null*") != std::string::npos) {
+            return results; // Exclude invalid patterns
+        }
+    
+        const bool directoryOnly = pathPattern.back() == '/';
+        const size_t prefixEnd = pathPattern.find(":/");
+        
+        if (prefixEnd == std::string::npos) return results;
+        
+        const std::string basePath = pathPattern.substr(0, prefixEnd + 2);
+        std::vector<std::string> parts;
+        
+        size_t start = prefixEnd + 2;
+        size_t pos = start;
+        const size_t pathLen = pathPattern.length();
+        
+        while (pos <= pathLen) {
+            if (pos == pathLen || pathPattern[pos] == '/') {
+                if (pos > start) {
+                    parts.emplace_back(pathPattern.data() + start, pos - start);
+                }
+                start = pos + 1;
+            }
+            ++pos;
+        }
+        
+        if (start < pathLen && !directoryOnly) {
+            parts.emplace_back(pathPattern.data() + start, pathLen - start);
+        }
+    
+        // Extra: check parsed parts to disallow "**"
+        for (size_t i = 0; i + 1 < parts.size(); ++i) {
+            if (parts[i] == "**" && parts[i + 1] == "**") {
+                return results; // invalid, exclude
+            }
+        }
+        
+        if (!parts.empty()) {
+            handleDirectory(basePath, parts, 0, results, directoryOnly, maxLines);
+        }
+        
+        return results;
+    }
+    
+}
\ No newline at end of file
diff --git a/Source/sys-clk/overlay/lib/libultrahand/libultra/source/global_vars.cpp b/Source/sys-clk/overlay/lib/libultrahand/libultra/source/global_vars.cpp
new file mode 100644
index 00000000..777b89fd
--- /dev/null
+++ b/Source/sys-clk/overlay/lib/libultrahand/libultra/source/global_vars.cpp
@@ -0,0 +1,180 @@
+/********************************************************************************
+ * File: global_vars.cpp
+ * Author: ppkantorski
+ * Description: 
+ *   This source file provides the definitions of global constants and paths used 
+ *   throughout the Ultrahand Overlay project. These constants are essential for 
+ *   file management and configuration settings within the application.
+ *
+ *   For the latest updates and contributions, visit the project's GitHub repository:
+ *   GitHub Repository: https://github.com/ppkantorski/Ultrahand-Overlay
+ *
+ *   Note: This notice is integral to the project's documentation and must not be 
+ *   altered or removed.
+ *
+ *  Licensed under both GPLv2 and CC-BY-4.0
+ *  Copyright (c) 2024 ppkantorski
+ ********************************************************************************/
+
+#include "global_vars.hpp"
+
+namespace ult {
+
+    // Base paths
+    const std::string ROOT_PATH          = "sdmc:/";
+    const std::string BASE_CONFIG_PATH   = ROOT_PATH + "config/ultrahand/";
+    const std::string TESLA_CONFIG_PATH  = ROOT_PATH + "config/tesla/";
+    const std::string SWITCH_PATH        = ROOT_PATH + "switch/";
+
+    // Filenames
+    CONSTEXPR_STRING std::string CONFIG_FILENAME       = "config.ini";
+    const std::string BOOT_PACKAGE_FILENAME            = "boot_package.ini";
+    const std::string EXIT_PACKAGE_FILENAME            = "exit_package.ini";
+    const std::string PACKAGE_FILENAME                 = "package.ini";
+    const std::string THEME_FILENAME                   = "theme.ini";
+    const std::string WALLPAPER_FILENAME               = "wallpaper.rgba";
+    const std::string FUSE_FILENAME                    = "fuse.ini";
+    const std::string OVERLAYS_INI_FILENAME            = "overlays.ini";
+    const std::string PACKAGES_INI_FILENAME            = "packages.ini";
+    const std::string NOTIFICATIONS_FLAG_FILENAME      = "NOTIFICATIONS.flag";
+
+    // Project names
+    CONSTEXPR_STRING std::string ULTRAHAND_PROJECT_NAME         = "ultrahand";
+    CONSTEXPR_STRING std::string CAPITAL_ULTRAHAND_PROJECT_NAME = "Ultrahand";
+    CONSTEXPR_STRING std::string SPLIT_PROJECT_NAME_1           = "Ultra";
+    CONSTEXPR_STRING std::string SPLIT_PROJECT_NAME_2           = "hand";
+
+    // Paths
+    const std::string SETTINGS_PATH               = BASE_CONFIG_PATH;
+    const std::string ULTRAHAND_CONFIG_INI_PATH   = BASE_CONFIG_PATH + CONFIG_FILENAME;
+    const std::string TESLA_CONFIG_INI_PATH       = TESLA_CONFIG_PATH + CONFIG_FILENAME;
+    const std::string LANG_PATH                   = BASE_CONFIG_PATH + "lang/";
+    const std::string THEMES_PATH                 = BASE_CONFIG_PATH + "themes/";
+    const std::string WALLPAPERS_PATH             = BASE_CONFIG_PATH + "wallpapers/";
+    const std::string SOUNDS_PATH                 = BASE_CONFIG_PATH + "sounds/";
+    const std::string FLAGS_PATH                  = BASE_CONFIG_PATH + "flags/";
+    const std::string NOTIFICATIONS_PATH          = BASE_CONFIG_PATH + "notifications/";
+    const std::string PAYLOADS_PATH               = BASE_CONFIG_PATH + "payloads/";
+    const std::string HB_APPSTORE_JSON            = SWITCH_PATH + "appstore/.get/packages/UltrahandOverlay/info.json";
+    std::string THEME_CONFIG_INI_PATH             = BASE_CONFIG_PATH + THEME_FILENAME;
+    std::string WALLPAPER_PATH                    = BASE_CONFIG_PATH + WALLPAPER_FILENAME;
+    const std::string DOWNLOADS_PATH              = BASE_CONFIG_PATH + "downloads/";
+    const std::string EXPANSION_PATH              = BASE_CONFIG_PATH + "expansion/";
+    const std::string FUSE_DATA_INI_PATH          = BASE_CONFIG_PATH + FUSE_FILENAME;
+    const std::string PACKAGE_PATH                = SWITCH_PATH + ".packages/";
+    const std::string OVERLAY_PATH                = SWITCH_PATH + ".overlays/";
+    const std::string OVERLAYS_INI_FILEPATH       = BASE_CONFIG_PATH + OVERLAYS_INI_FILENAME;
+    const std::string PACKAGES_INI_FILEPATH       = BASE_CONFIG_PATH + PACKAGES_INI_FILENAME;
+    const std::string NOTIFICATIONS_FLAG_FILEPATH = FLAGS_PATH + NOTIFICATIONS_FLAG_FILENAME;
+
+    // Protected files
+    const std::set<std::string> PROTECTED_FILES = {
+        ROOT_PATH + "atmosphere/package3",
+        ROOT_PATH + "atmosphere/stratosphere.romfs"
+    };
+
+    // GitHub URLs
+    const std::string GITHUB_BASE_URL               = "https://github.com/ppkantorski/";
+    const std::string GITHUB_RAW_BASE_URL           = "https://raw.githubusercontent.com/ppkantorski/";
+    const std::string ULTRAHAND_REPO_URL            = GITHUB_BASE_URL + "Ultrahand-Overlay/";
+    const std::string INCLUDED_THEME_FOLDER_URL     = GITHUB_RAW_BASE_URL + "Ultrahand-Overlay/main/themes/";
+    const std::string LATEST_RELEASE_INFO_URL       = GITHUB_RAW_BASE_URL + "Ultrahand-Overlay/main/RELEASE.ini";
+    const std::string NX_OVLLOADER_ZIP_URL          = GITHUB_BASE_URL + "nx-ovlloader/releases/latest/download/nx-ovlloader.zip";
+    const std::string NX_OVLLOADER_PLUS_ZIP_URL     = GITHUB_BASE_URL + "nx-ovlloader/releases/latest/download/nx-ovlloader+.zip";
+    const std::string OLD_NX_OVLLOADER_ZIP_URL      = GITHUB_BASE_URL + "nx-ovlloader/releases/download/v1.0.8/nx-ovlloader.zip";
+    const std::string OLD_NX_OVLLOADER_PLUS_ZIP_URL = GITHUB_BASE_URL + "nx-ovlloader/releases/download/v1.0.8/nx-ovlloader+.zip";
+    const std::string UPDATER_PAYLOAD_URL           = GITHUB_RAW_BASE_URL + "Ultrahand-Overlay/main/payloads/ultrahand_updater.bin";
+    const std::string SOUND_EFFECTS_URL             = GITHUB_RAW_BASE_URL + "Ultrahand-Overlay/main/sounds/sounds.zip";
+
+    // Launch options
+    const std::string LAUNCH_ARGS_STR       = "launch_args";
+    const std::string USE_LAUNCH_ARGS_STR   = "use_launch_args";
+    const std::string USE_QUICK_LAUNCH_STR  = "use_quick_launch";
+    const std::string USE_BOOT_PACKAGE_STR  = "use_boot_package";
+    const std::string USE_EXIT_PACKAGE_STR  = "use_exit_package";
+    const std::string USE_LOGGING_STR       = "use_logging";
+
+    // Combos
+    CONSTEXPR_STRING std::string TESLA_COMBO_STR       = "L+DDOWN+RS";
+    CONSTEXPR_STRING std::string ULTRAHAND_COMBO_STR   = "ZL+ZR+DDOWN";
+
+    // System / mode strings
+    CONSTEXPR_STRING std::string FUSE_STR         = "fuse";
+    CONSTEXPR_STRING std::string TESLA_STR        = "tesla";
+    CONSTEXPR_STRING std::string ERISTA_STR       = "erista";
+    CONSTEXPR_STRING std::string MARIKO_STR       = "mariko";
+    CONSTEXPR_STRING std::string KEY_COMBO_STR    = "key_combo";
+    CONSTEXPR_STRING std::string DEFAULT_LANG_STR = "default_lang";
+
+    // Generic strings
+    CONSTEXPR_STRING std::string LIST_STR             = "list";
+    CONSTEXPR_STRING std::string LIST_FILE_STR        = "list_file";
+    CONSTEXPR_STRING std::string JSON_STR             = "json";
+    CONSTEXPR_STRING std::string JSON_FILE_STR        = "json_file";
+    CONSTEXPR_STRING std::string INI_FILE_STR         = "ini_file";
+    CONSTEXPR_STRING std::string HEX_FILE_STR         = "hex_file";
+    CONSTEXPR_STRING std::string PACKAGE_STR          = "package";
+    CONSTEXPR_STRING std::string PACKAGES_STR         = "packages";
+    CONSTEXPR_STRING std::string OVERLAY_STR          = "overlay";
+    CONSTEXPR_STRING std::string OVERLAYS_STR         = "overlays";
+    const std::string IN_OVERLAY_STR                  = "in_overlay";
+    const std::string IN_HIDDEN_OVERLAY_STR           = "in_hidden_overlay";
+    const std::string IN_HIDDEN_PACKAGE_STR           = "in_hidden_package";
+    CONSTEXPR_STRING std::string FILE_STR             = "file";
+    CONSTEXPR_STRING std::string SYSTEM_STR           = "system";
+    CONSTEXPR_STRING std::string MODE_STR             = "mode";
+    CONSTEXPR_STRING std::string GROUPING_STR         = "grouping";
+    CONSTEXPR_STRING std::string FOOTER_STR           = "footer";
+    CONSTEXPR_STRING std::string TOGGLE_STR           = "toggle";
+    CONSTEXPR_STRING std::string LEFT_STR             = "left";
+    CONSTEXPR_STRING std::string RIGHT_STR            = "right";
+    CONSTEXPR_STRING std::string CENTER_STR           = "center";
+    CONSTEXPR_STRING std::string HIDE_STR             = "hide";
+    CONSTEXPR_STRING std::string STAR_STR             = "star";
+    CONSTEXPR_STRING std::string PRIORITY_STR         = "priority";
+    CONSTEXPR_STRING std::string ON_STR               = "on";
+    CONSTEXPR_STRING std::string OFF_STR              = "off";
+    CONSTEXPR_STRING std::string CAPITAL_ON_STR       = "On";
+    CONSTEXPR_STRING std::string CAPITAL_OFF_STR      = "Off";
+    CONSTEXPR_STRING std::string TRUE_STR             = "true";
+    CONSTEXPR_STRING std::string FALSE_STR            = "false";
+    CONSTEXPR_STRING std::string GLOBAL_STR           = "global";
+    CONSTEXPR_STRING std::string DEFAULT_STR          = "default";
+    CONSTEXPR_STRING std::string SLOT_STR             = "slot";
+    CONSTEXPR_STRING std::string OPTION_STR           = "option";
+    CONSTEXPR_STRING std::string FORWARDER_STR        = "forwarder";
+    CONSTEXPR_STRING std::string TEXT_STR             = "text";
+    CONSTEXPR_STRING std::string TABLE_STR            = "table";
+    CONSTEXPR_STRING std::string TRACKBAR_STR         = "trackbar";
+    CONSTEXPR_STRING std::string STEP_TRACKBAR_STR    = "step_trackbar";
+    const std::string NAMED_STEP_TRACKBAR_STR         = "named_step_trackbar";
+    CONSTEXPR_STRING std::string NULL_STR             = "null";
+    CONSTEXPR_STRING std::string THEME_STR            = "theme";
+    CONSTEXPR_STRING std::string NOT_AVAILABLE_STR    = "Not available";
+    CONSTEXPR_STRING std::string MEMORY_STR           = "memory";
+
+    // Pre-defined symbols
+    CONSTEXPR_STRING std::string OPTION_SYMBOL       = "\u22EF";
+    CONSTEXPR_STRING std::string DROPDOWN_SYMBOL     = "\uE14A";
+    CONSTEXPR_STRING std::string CHECKMARK_SYMBOL    = "\uE14B";
+    CONSTEXPR_STRING std::string CROSSMARK_SYMBOL    = "\uE14C";
+    CONSTEXPR_STRING std::string DOWNLOAD_SYMBOL     = "\u2193";
+    CONSTEXPR_STRING std::string UNZIP_SYMBOL        = "\u2191"; 
+    CONSTEXPR_STRING std::string COPY_SYMBOL         = "\u2192";
+    CONSTEXPR_STRING std::string INPROGRESS_SYMBOL   = "\u25CF";
+    CONSTEXPR_STRING std::string STAR_SYMBOL         = "\u2605";
+    CONSTEXPR_STRING std::string DIVIDER_SYMBOL      = "";
+
+    const std::vector<std::string> THROBBER_SYMBOLS = {"", "", "", "", "", "", "", ""};
+
+    // Atomic variables for progress tracking
+    std::atomic<int> displayPercentage(0); // for interpreter percentage progress
+
+    void resetPercentages() {
+        displayPercentage.store(-1, std::memory_order_release);
+        downloadPercentage.store(-1, std::memory_order_release);
+        unzipPercentage.store(-1, std::memory_order_release);
+        copyPercentage.store(-1, std::memory_order_release);
+    }
+
+} // namespace ult
\ No newline at end of file
diff --git a/Source/sys-clk/overlay/lib/libultrahand/libultra/source/haptics.cpp b/Source/sys-clk/overlay/lib/libultrahand/libultra/source/haptics.cpp
new file mode 100644
index 00000000..59a4b5cd
--- /dev/null
+++ b/Source/sys-clk/overlay/lib/libultrahand/libultra/source/haptics.cpp
@@ -0,0 +1,202 @@
+/********************************************************************************
+ * File: haptics.cpp
+ * Author: ppkantorski
+ * Description:
+ *   This source file provides implementations for the functions declared in
+ *   haptics.hpp. These functions manage haptic feedback for the Ultrahand Overlay
+ *   using libnx’s vibration interfaces. It includes routines for initializing
+ *   rumble devices, sending vibration patterns, and handling single or double
+ *   click feedback with timing control. Thread safety is maintained through
+ *   atomic operations and synchronization mechanisms.
+ *
+ *   For the latest updates and contributions, visit the project's GitHub repository.
+ *   (GitHub Repository: https://github.com/ppkantorski/Ultrahand-Overlay)
+ *
+ *   Note: Please be aware that this notice cannot be altered or removed. It is a part
+ *   of the project's documentation and must remain intact.
+ * 
+ *  Licensed under both GPLv2 and CC-BY-4.0
+ *  Copyright (c) 2025 ppkantorski
+ ********************************************************************************/
+
+#include "haptics.hpp"
+
+namespace ult {
+    
+    // ===== Internal state (private to this file) =====
+    //bool rumbleInitialized = false;
+    static HidVibrationDeviceHandle vibHandheld;
+    static HidVibrationDeviceHandle vibPlayer1Left;
+    static HidVibrationDeviceHandle vibPlayer1Right;
+    static u64 rumbleStartTick = 0;
+    static u64 doubleClickTick = 0;
+    static u8 doubleClickPulse = 0;
+    
+    // ===== Shared flags (accessible globally) =====
+    std::atomic<bool> rumbleActive{false};
+    std::atomic<bool> doubleClickActive{false};
+    
+    // ===== Constants =====
+    static constexpr u64 RUMBLE_DURATION_NS = 30'000'000ULL;
+    static constexpr u64 DOUBLE_CLICK_PULSE_DURATION_NS = 30'000'000ULL;
+    static constexpr u64 DOUBLE_CLICK_GAP_NS = 100'000'000ULL;
+    
+    static constexpr HidVibrationValue clickDocked = {
+        .amp_low  = 0.20f,
+        .freq_low = 100.0f,
+        .amp_high = 0.80f,
+        .freq_high = 300.0f
+    };
+    
+    static constexpr HidVibrationValue clickHandheld = {
+        .amp_low  = 0.25f,
+        .freq_low = 100.0f,
+        .amp_high = 1.0f,
+        .freq_high = 300.0f
+    };
+    
+    static constexpr HidVibrationValue vibrationStop{0};
+    
+    // ===== Internal helpers =====
+    static void initController(HidNpadIdType npad, HidVibrationDeviceHandle* handles, int count) {
+        const u32 styleMask = hidGetNpadStyleSet(npad);
+        if (styleMask)
+            hidInitializeVibrationDevices(handles, count, npad, static_cast<HidNpadStyleTag>(styleMask));
+    }
+    
+    static void sendVibration(const HidVibrationValue* value) {
+        if (hidGetNpadStyleSet(HidNpadIdType_Handheld))
+            hidSendVibrationValue(vibHandheld, value);
+
+        if (hidGetNpadStyleSet(HidNpadIdType_No1)) {
+            hidSendVibrationValue(vibPlayer1Left, value);
+            hidSendVibrationValue(vibPlayer1Right, value);
+        }
+    }
+    
+    // ===== Public API =====
+    void initRumble() {
+        //if (rumbleInitialized) return;
+    
+        // Try to initialize whatever is available
+        // Don't check if controllers exist - let initController handle it
+        initController(HidNpadIdType_Handheld, &vibHandheld, 1);
+    
+        HidVibrationDeviceHandle handles[2];
+        initController(HidNpadIdType_No1, handles, 2);
+        vibPlayer1Left = handles[0];
+        vibPlayer1Right = handles[1];
+    
+        // Only mark as initialized if at least one controller was found
+        hidGetNpadStyleSet(HidNpadIdType_Handheld);
+        hidGetNpadStyleSet(HidNpadIdType_No1);
+        
+        //rumbleInitialized = (handheldStyle || player1Style);
+        
+        // If neither exist, stay uninitialized so we retry later
+    }
+    
+    //void deinitRumble() {
+    //    rumbleInitialized = false;
+    //}
+    
+    void checkAndReinitRumble() {
+        static u32 lastHandheldStyle = 0;
+        static u32 lastPlayer1Style = 0;
+    
+        const u32 currentHandheldStyle = hidGetNpadStyleSet(HidNpadIdType_Handheld);
+        const u32 currentPlayer1Style = hidGetNpadStyleSet(HidNpadIdType_No1);
+    
+        // If not initialized but controllers exist, try to init
+        // This handles the boot race condition where HID reports controllers
+        // but vibration subsystem isn't ready yet
+        //if (!rumbleInitialized && (currentHandheldStyle || currentPlayer1Style)) {
+        //    initRumble();
+        //}
+    
+        // Reinit if controller configuration changed
+        if (currentHandheldStyle != lastHandheldStyle || currentPlayer1Style != lastPlayer1Style) {
+            //rumbleInitialized = false;
+            initRumble();
+        }
+        // Update last style tracking regardless
+        lastHandheldStyle = currentHandheldStyle;
+        lastPlayer1Style = currentPlayer1Style;
+    }
+    
+    void rumbleClick() {
+        //if (!rumbleInitialized) {
+        //    initRumble();
+        //    if (!rumbleInitialized) return;
+        //}
+    
+        sendVibration(hidGetNpadStyleSet(HidNpadIdType_Handheld) ? &clickHandheld : &clickDocked);
+        rumbleActive.store(true, std::memory_order_release);
+        rumbleStartTick = armGetSystemTick();
+    }
+    
+    void rumbleDoubleClick() {
+        //if (!rumbleInitialized) {
+        //    initRumble();
+        //    if (!rumbleInitialized) return;
+        //}
+    
+        sendVibration(hidGetNpadStyleSet(HidNpadIdType_Handheld) ? &clickHandheld : &clickDocked);
+        doubleClickActive.store(true, std::memory_order_release);
+        doubleClickPulse = 1;
+        doubleClickTick = armGetSystemTick();
+    }
+    
+    void processRumbleStop(u64 nowNs) {
+        if (rumbleActive.load(std::memory_order_acquire) &&
+            nowNs - armTicksToNs(rumbleStartTick) >= RUMBLE_DURATION_NS) {
+            sendVibration(&vibrationStop);
+            rumbleActive.store(false, std::memory_order_release);
+        }
+    }
+    
+    void processRumbleDoubleClick(u64 nowNs) {
+        if (!doubleClickActive.load(std::memory_order_acquire)) return;
+    
+        const u64 elapsed = nowNs - armTicksToNs(doubleClickTick);
+    
+        switch (doubleClickPulse) {
+            case 1:
+                if (elapsed >= DOUBLE_CLICK_PULSE_DURATION_NS) {
+                    sendVibration(&vibrationStop);
+                    doubleClickPulse = 2;
+                    doubleClickTick = armGetSystemTick();
+                }
+                break;
+    
+            case 2:
+                if (elapsed >= DOUBLE_CLICK_GAP_NS) {
+                    sendVibration(hidGetNpadStyleSet(HidNpadIdType_Handheld) ? &clickHandheld : &clickDocked);
+                    doubleClickPulse = 3;
+                    doubleClickTick = armGetSystemTick();
+                }
+                break;
+    
+            case 3:
+                if (elapsed >= DOUBLE_CLICK_PULSE_DURATION_NS) {
+                    sendVibration(&vibrationStop);
+                    doubleClickActive.store(false, std::memory_order_release);
+                    doubleClickPulse = 0;
+                }
+                break;
+        }
+    }
+
+    void rumbleDoubleClickStandalone() {
+        sendVibration(hidGetNpadStyleSet(HidNpadIdType_Handheld) ? &clickHandheld : &clickDocked);
+        svcSleepThread(DOUBLE_CLICK_PULSE_DURATION_NS);
+        
+        sendVibration(&vibrationStop);
+        svcSleepThread(DOUBLE_CLICK_GAP_NS);
+        
+        sendVibration(hidGetNpadStyleSet(HidNpadIdType_Handheld) ? &clickHandheld : &clickDocked);
+        svcSleepThread(DOUBLE_CLICK_PULSE_DURATION_NS);
+        
+        sendVibration(&vibrationStop);
+    }
+}
\ No newline at end of file
diff --git a/Source/sys-clk/overlay/lib/libultrahand/libultra/source/hex_funcs.cpp b/Source/sys-clk/overlay/lib/libultrahand/libultra/source/hex_funcs.cpp
new file mode 100644
index 00000000..c795f23c
--- /dev/null
+++ b/Source/sys-clk/overlay/lib/libultrahand/libultra/source/hex_funcs.cpp
@@ -0,0 +1,881 @@
+/********************************************************************************
+ * File: hex_funcs.cpp
+ * Author: ppkantorski
+ * Description:
+ *   This source file implements the functions declared in hex_funcs.hpp.
+ *   These functions provide support for manipulating hexadecimal data,
+ *   including conversions between ASCII and hexadecimal strings,
+ *   locating specific hex patterns within files, and editing file contents
+ *   at hex offsets.
+ *
+ *   For the latest updates and contributions, visit the project's GitHub repository.
+ *   (GitHub Repository: https://github.com/ppkantorski/Ultrahand-Overlay)
+ *
+ *   Note: Please be aware that this notice cannot be altered or removed. It is a part
+ *   of the project's documentation and must remain intact.
+ * 
+ *  Licensed under both GPLv2 and CC-BY-4.0
+ *  Copyright (c) 2024 ppkantorski
+ ********************************************************************************/
+
+#include "hex_funcs.hpp"
+
+namespace ult {
+    size_t HEX_BUFFER_SIZE = 4096;//65536/4;
+    
+    // Thread-safe cache and file operation mutexes
+    std::shared_mutex cacheMutex;  // Allows multiple readers, single writer
+    std::mutex fileWriteMutex;     // Protects file write operations
+    
+    // For improving the speed of hexing consecutively with the same file and asciiPattern.
+    std::unordered_map<std::string, std::string> hexSumCache;
+    
+    
+    /**
+     * @brief Thread-safe cache management functions
+     */
+    void clearHexSumCache() {
+        std::lock_guard<std::shared_mutex> writeLock(cacheMutex);
+        //hexSumCache.clear();
+        hexSumCache = {};
+    }
+
+    size_t getHexSumCacheSize() {
+        std::shared_lock<std::shared_mutex> readLock(cacheMutex);
+        return hexSumCache.size();
+    }
+
+    /**
+     * @brief Converts an ASCII string to a hexadecimal string.
+     *
+     * This function takes an ASCII string as input and converts it into a hexadecimal string.
+     *
+     * @param asciiStr The ASCII string to convert.
+     * @return The corresponding hexadecimal string.
+     */
+    
+    
+    // Function to convert ASCII string to Hex string
+    std::string asciiToHex(const std::string& asciiStr) {
+        std::string hexStr;
+        //hexStr.reserve(asciiStr.length() * 2); // Reserve space for the hexadecimal string
+    
+        for (unsigned char c : asciiStr) {
+            hexStr.push_back(hexLookup[c >> 4]); // High nibble
+            hexStr.push_back(hexLookup[c & 0x0F]); // Low nibble
+        }
+    
+        return hexStr;
+    }
+    
+    /**
+     * @brief Converts a decimal string to a fixed-width hexadecimal string.
+     *
+     * @param decimalStr The decimal string to convert.
+     * @param byteGroupSize The number of hex digits to output (must be even for byte alignment).
+     * @return Hex string of exactly 'byteGroupSize' digits, or empty string if value doesn't fit.
+     */
+    std::string decimalToHex(const std::string& decimalStr, int byteGroupSize) {
+        const int decimalValue = ult::stoi(decimalStr);
+        if (decimalValue < 0 || byteGroupSize <= 0 || (byteGroupSize % 2) != 0) {
+            // Invalid input: negative number, or byteGroupSize <= 0, or odd byteGroupSize
+            return "";
+        }
+    
+        // Special case: zero
+        if (decimalValue == 0) {
+            return std::string(byteGroupSize, '0');
+        }
+    
+        // Convert decimalValue to hex (uppercase, minimal length)
+        std::string hex;
+        int tempValue = decimalValue;
+        int remainder;
+        char hexChar;
+        while (tempValue > 0) {
+            remainder = tempValue % 16;
+            hexChar = (remainder < 10) ? ('0' + remainder) : ('A' + remainder - 10);
+            hex.insert(hex.begin(), hexChar);
+            tempValue /= 16;
+        }
+    
+        // Ensure hex length is even by adding leading zero if needed
+        if (hex.length() % 2 != 0) {
+            hex.insert(hex.begin(), '0');
+        }
+    
+        // Minimum size needed to fit hex string
+        const size_t hexLen = hex.length();
+    
+        // Adjust minimum byteGroupSize to be at least hexLen
+        size_t minByteGroupSize = std::max(static_cast<size_t>(byteGroupSize), hexLen);
+    
+        // If byteGroupSize was too small, adjust to hex length (must be even)
+        if (minByteGroupSize % 2 != 0) {
+            minByteGroupSize++;
+        }
+    
+        // If minByteGroupSize is less than hex length, number doesn't fit
+        if (minByteGroupSize < hexLen) {
+            return ""; // can't fit
+        }
+    
+        // Pad with leading zeros to match minByteGroupSize
+        if (hexLen < minByteGroupSize) {
+            hex.insert(hex.begin(), minByteGroupSize - hexLen, '0');
+        }
+    
+        return hex;
+    }
+    
+    
+    /**
+     * @brief Converts a hexadecimal string to a decimal string.
+     *
+     * This function takes a hexadecimal string as input and converts it into a decimal string.
+     *
+     * @param hexStr The hexadecimal string to convert.
+     * @return The corresponding decimal string.
+     */
+    std::string hexToDecimal(const std::string& hexStr) {
+        // Convert hexadecimal string to integer
+        int decimalValue = 0;
+        const size_t len = hexStr.length();
+        
+        char hexChar;
+        int value;
+
+        // Iterate over each character in the hexadecimal string
+        for (size_t i = 0; i < len; ++i) {
+            hexChar = hexStr[i];
+            //int value;
+    
+            // Convert hex character to its decimal value
+            if (hexChar >= '0' && hexChar <= '9') {
+                value = hexChar - '0';
+            } else if (hexChar >= 'A' && hexChar <= 'F') {
+                value = 10 + (hexChar - 'A');
+            } else if (hexChar >= 'a' && hexChar <= 'f') {
+                value = 10 + (hexChar - 'a');
+            } else {
+                break;
+                //throw std::invalid_argument("Invalid hexadecimal character");
+            }
+    
+            // Update the decimal value
+            decimalValue = decimalValue * 16 + value;
+        }
+    
+        // Convert the decimal value to a string
+        return ult::to_string(decimalValue);
+    }
+    
+    
+    
+    std::string hexToReversedHex(const std::string& hexadecimal, int order) {
+        // Reverse the hexadecimal string in groups of order
+        std::string reversedHex;
+        for (int i = hexadecimal.length() - order; i >= 0; i -= order) {
+            reversedHex += hexadecimal.substr(i, order);
+        }
+        
+        return reversedHex;
+    }
+    
+    /**
+     * @brief Converts a decimal string to a reversed hexadecimal string.
+     *
+     * This function takes a decimal string as input, converts it into a hexadecimal
+     * string, and reverses the resulting hexadecimal string in groups of byteGroupSize.
+     *
+     * @param decimalStr The decimal string to convert.
+     * @param byteGroupSize The grouping byteGroupSize for reversing the hexadecimal string.
+     * @return The reversed hexadecimal string.
+     */
+    std::string decimalToReversedHex(const std::string& decimalStr, int byteGroupSize) {
+        //std::string hexadecimal = decimalToHex(decimalStr, byteGroupSize);
+        
+        // Reverse the hexadecimal string in groups of byteGroupSize
+        //std::string reversedHex;
+        //for (int i = hexadecimal.length() - byteGroupSize; i >= 0; i -= byteGroupSize) {
+        //    reversedHex += hexadecimal.substr(i, byteGroupSize);
+        //}
+        
+        return hexToReversedHex(decimalToHex(decimalStr, byteGroupSize));
+    }
+    
+    
+    
+    /**
+     * @brief Finds the offsets of hexadecimal data in a file.
+     *
+     * This function searches for occurrences of hexadecimal data in a binary file
+     * and returns the file offsets where the data is found.
+     *
+     * @param filePath The path to the binary file.
+     * @param hexData The hexadecimal data to search for.
+     * @return A vector of strings containing the file offsets where the data is found.
+     */
+    std::vector<std::string> findHexDataOffsets(const std::string& filePath, const std::string& hexData) {
+        std::vector<std::string> offsets;
+    
+    #if !USING_FSTREAM_DIRECTIVE
+        FILE* file = fopen(filePath.c_str(), "rb");
+        if (!file) {
+            return offsets;
+        }
+    
+        fseek(file, 0, SEEK_END);
+        const size_t fileSize = ftell(file);
+        fseek(file, 0, SEEK_SET);
+    
+        std::vector<unsigned char> binaryData;
+        if (hexData.length() % 2 != 0) {
+            fclose(file);
+            return offsets;
+        }
+        
+        
+        const size_t hexLen = hexData.length();
+        binaryData.resize(hexLen / 2);
+        const unsigned char* hexPtr = reinterpret_cast<const unsigned char*>(hexData.c_str());
+        
+        // Unrolled hex conversion loop
+        size_t i = 0;
+        for (; i + 4 <= hexLen; i += 4) {
+            binaryData[i/2] = (hexTable[hexPtr[i]] << 4) | hexTable[hexPtr[i + 1]];
+            binaryData[i/2 + 1] = (hexTable[hexPtr[i + 2]] << 4) | hexTable[hexPtr[i + 3]];
+        }
+        // Handle remaining bytes
+        for (; i < hexLen; i += 2) {
+            binaryData[i/2] = (hexTable[hexPtr[i]] << 4) | hexTable[hexPtr[i + 1]];
+        }
+    
+        // Optimized search variables
+        const unsigned char* patternPtr = binaryData.data();
+        const size_t patternLen = binaryData.size();
+        const unsigned char firstByte = patternPtr[0];
+        
+        std::vector<unsigned char> buffer(HEX_BUFFER_SIZE);
+        size_t bytesRead = 0;
+        size_t offset = 0;
+        
+
+        while ((bytesRead = fread(buffer.data(), 1, HEX_BUFFER_SIZE, file)) > 0) {
+            const unsigned char* bufPtr = buffer.data();
+            
+            // Optimized search with first-byte filtering and loop unrolling
+            i = 0;
+            const size_t searchEnd = bytesRead;
+            
+            // Process 4 bytes at a time for better cache usage
+            for (; i + 4 <= searchEnd; i += 4) {
+                // Check 4 positions at once
+                if (bufPtr[i] == firstByte) {
+                    if (offset + i + patternLen <= fileSize && 
+                        memcmp(bufPtr + i, patternPtr, patternLen) == 0) {
+                        offsets.emplace_back(ult::to_string(offset + i));
+                    }
+                }
+                if (bufPtr[i + 1] == firstByte) {
+                    if (offset + i + 1 + patternLen <= fileSize && 
+                        memcmp(bufPtr + i + 1, patternPtr, patternLen) == 0) {
+                        offsets.emplace_back(ult::to_string(offset + i + 1));
+                    }
+                }
+                if (bufPtr[i + 2] == firstByte) {
+                    if (offset + i + 2 + patternLen <= fileSize && 
+                        memcmp(bufPtr + i + 2, patternPtr, patternLen) == 0) {
+                        offsets.emplace_back(ult::to_string(offset + i + 2));
+                    }
+                }
+                if (bufPtr[i + 3] == firstByte) {
+                    if (offset + i + 3 + patternLen <= fileSize && 
+                        memcmp(bufPtr + i + 3, patternPtr, patternLen) == 0) {
+                        offsets.emplace_back(ult::to_string(offset + i + 3));
+                    }
+                }
+            }
+            
+            // Handle remaining bytes
+            for (; i < searchEnd; ++i) {
+                if (bufPtr[i] == firstByte) {
+                    if (offset + i + patternLen <= fileSize && 
+                        memcmp(bufPtr + i, patternPtr, patternLen) == 0) {
+                        offsets.emplace_back(ult::to_string(offset + i));
+                    }
+                }
+            }
+            
+            offset += bytesRead;
+        }
+    
+        fclose(file);
+        
+    #else
+        std::ifstream file(filePath, std::ios::binary);
+        if (!file.is_open()) {
+            return offsets;
+        }
+    
+        file.seekg(0, std::ios::end);
+        const size_t fileSize = file.tellg();
+        file.seekg(0, std::ios::beg);
+    
+        std::vector<unsigned char> binaryData;
+        if (hexData.length() % 2 != 0) {
+            file.close();
+            return offsets;
+        }
+        
+        
+        const size_t hexLen = hexData.length();
+        binaryData.resize(hexLen / 2);
+        const unsigned char* hexPtr = reinterpret_cast<const unsigned char*>(hexData.c_str());
+        
+        size_t i = 0;
+        for (; i + 4 <= hexLen; i += 4) {
+            binaryData[i/2] = (hexTable[hexPtr[i]] << 4) | hexTable[hexPtr[i + 1]];
+            binaryData[i/2 + 1] = (hexTable[hexPtr[i + 2]] << 4) | hexTable[hexPtr[i + 3]];
+        }
+        for (; i < hexLen; i += 2) {
+            binaryData[i/2] = (hexTable[hexPtr[i]] << 4) | hexTable[hexPtr[i + 1]];
+        }
+    
+        const unsigned char* patternPtr = binaryData.data();
+        const size_t patternLen = binaryData.size();
+        const unsigned char firstByte = patternPtr[0];
+        
+        std::vector<unsigned char> buffer(HEX_BUFFER_SIZE);
+        size_t bytesRead = 0;
+        size_t offset = 0;
+    
+        while (file.read(reinterpret_cast<char*>(buffer.data()), HEX_BUFFER_SIZE) || file.gcount() > 0) {
+            bytesRead = file.gcount();
+            const unsigned char* bufPtr = buffer.data();
+            
+            // Same optimized search as FILE* version
+            i = 0;
+            const size_t searchEnd = bytesRead;
+            
+            for (; i + 4 <= searchEnd; i += 4) {
+                if (bufPtr[i] == firstByte) {
+                    if (offset + i + patternLen <= fileSize && 
+                        memcmp(bufPtr + i, patternPtr, patternLen) == 0) {
+                        offsets.emplace_back(ult::to_string(offset + i));
+                    }
+                }
+                if (bufPtr[i + 1] == firstByte) {
+                    if (offset + i + 1 + patternLen <= fileSize && 
+                        memcmp(bufPtr + i + 1, patternPtr, patternLen) == 0) {
+                        offsets.emplace_back(ult::to_string(offset + i + 1));
+                    }
+                }
+                if (bufPtr[i + 2] == firstByte) {
+                    if (offset + i + 2 + patternLen <= fileSize && 
+                        memcmp(bufPtr + i + 2, patternPtr, patternLen) == 0) {
+                        offsets.emplace_back(ult::to_string(offset + i + 2));
+                    }
+                }
+                if (bufPtr[i + 3] == firstByte) {
+                    if (offset + i + 3 + patternLen <= fileSize && 
+                        memcmp(bufPtr + i + 3, patternPtr, patternLen) == 0) {
+                        offsets.emplace_back(ult::to_string(offset + i + 3));
+                    }
+                }
+            }
+            
+            for (; i < searchEnd; ++i) {
+                if (bufPtr[i] == firstByte) {
+                    if (offset + i + patternLen <= fileSize && 
+                        memcmp(bufPtr + i, patternPtr, patternLen) == 0) {
+                        offsets.emplace_back(ult::to_string(offset + i));
+                    }
+                }
+            }
+            
+            offset += bytesRead;
+        }
+    
+        file.close();
+    #endif
+    
+        return offsets;
+    }
+
+    
+    
+    /**
+     * @brief Edits hexadecimal data in a file at a specified offset.
+     *
+     * This function opens a binary file, seeks to a specified offset, and replaces
+     * the data at that offset with the provided hexadecimal data.
+     *
+     * @param filePath The path to the binary file.
+     * @param offsetStr The offset in the file to perform the edit.
+     * @param hexData The hexadecimal data to replace at the offset.
+     */
+    void hexEditByOffset(const std::string& filePath, const std::string& offsetStr, const std::string& hexData) {
+        // Lock file writes to prevent concurrent modifications to the same file
+        std::lock_guard<std::mutex> fileWriteLock(fileWriteMutex);
+
+        const std::streampos offset = std::stoll(offsetStr);
+    
+    #if !USING_FSTREAM_DIRECTIVE
+        // Open the file for both reading and writing in binary mode
+        FILE* file = fopen(filePath.c_str(), "rb+");
+        if (!file) {
+            #if USING_LOGGING_DIRECTIVE
+            if (!disableLogging)
+                logMessage("Failed to open the file.");
+            #endif
+            return;
+        }
+    
+        // Retrieve the file size
+        fseek(file, 0, SEEK_END);
+        const std::streampos fileSize = ftell(file);
+        fseek(file, 0, SEEK_SET);
+    
+        if (offset >= fileSize) {
+            #if USING_LOGGING_DIRECTIVE
+            if (!disableLogging)
+                logMessage("Offset exceeds file size.");
+            #endif
+            fclose(file);
+            return;
+        }
+    
+        // Convert the hex string to binary data
+        std::vector<unsigned char> binaryData(hexData.length() / 2);
+        std::string byteString;
+        for (size_t i = 0, j = 0; i < hexData.length(); i += 2, ++j) {
+            byteString = hexData.substr(i, 2);
+            binaryData[j] = static_cast<unsigned char>(ult::stoi(byteString, nullptr, 16));
+        }
+    
+        // Move to the specified offset and write the binary data directly to the file
+        fseek(file, offset, SEEK_SET);
+        const size_t bytesWritten = fwrite(binaryData.data(), sizeof(unsigned char), binaryData.size(), file);
+        if (bytesWritten != binaryData.size()) {
+            #if USING_LOGGING_DIRECTIVE
+            if (!disableLogging)
+                logMessage("Failed to write data to the file.");
+            #endif
+            fclose(file);
+            return;
+        }
+    
+        fclose(file);
+    #else
+        // Open the file for both reading and writing in binary mode
+        std::fstream file(filePath, std::ios::binary | std::ios::in | std::ios::out);
+        if (!file.is_open()) {
+            #if USING_LOGGING_DIRECTIVE
+            if (!disableLogging)
+                logMessage("Failed to open the file.");
+            #endif
+            return;
+        }
+    
+        // Retrieve the file size
+        file.seekg(0, std::ios::end);
+        const std::streampos fileSize = file.tellg();
+        file.seekg(0, std::ios::beg);
+    
+        if (offset >= fileSize) {
+            #if USING_LOGGING_DIRECTIVE
+            if (!disableLogging)
+                logMessage("Offset exceeds file size.");
+            #endif
+            return;
+        }
+    
+        // Convert the hex string to binary data
+        std::vector<unsigned char> binaryData(hexData.length() / 2);
+        std::string byteString;
+        for (size_t i = 0, j = 0; i < hexData.length(); i += 2, ++j) {
+            byteString = hexData.substr(i, 2);
+            binaryData[j] = static_cast<unsigned char>(ult::stoi(byteString, nullptr, 16));
+        }
+    
+        // Move to the specified offset and write the binary data directly to the file
+        file.seekp(offset);
+        file.write(reinterpret_cast<const char*>(binaryData.data()), binaryData.size());
+        if (!file) {
+            #if USING_LOGGING_DIRECTIVE
+            if (!disableLogging)
+                logMessage("Failed to write data to the file.");
+            #endif
+            return;
+        }
+    
+        file.close();
+    #endif
+    }
+    
+    
+    /**
+     * @brief Edits a specific offset in a file with custom hexadecimal data.
+     *
+     * This function searches for a custom pattern in the file and calculates a new offset
+     * based on user-provided offsetStr and the found pattern. It then replaces the data
+     * at the calculated offset with the provided hexadecimal data.
+     *
+     * @param filePath The path to the binary file.
+     * @param offsetStr The user-provided offset for the edit.
+     * @param customPattern The custom pattern to search for in the file.
+     * @param hexDataReplacement The hexadecimal data to replace at the calculated offset.
+     * @param occurrence The occurrence/index of the data to replace (default is "0" to replace all occurrences).
+     */
+    void hexEditByCustomOffset(const std::string& filePath, const std::string& customAsciiPattern, const std::string& offsetStr, const std::string& hexDataReplacement, size_t occurrence) {
+        
+        // Create a cache key based on filePath and customAsciiPattern
+        const std::string cacheKey = filePath + '?' + customAsciiPattern + '?' + ult::to_string(occurrence);
+        
+        int hexSum = -1;
+        
+        // Thread-safe cache access
+        {
+            std::shared_lock<std::shared_mutex> readLock(cacheMutex);
+            const auto cachedResult = hexSumCache.find(cacheKey);
+            if (cachedResult != hexSumCache.end()) {
+                hexSum = ult::stoi(cachedResult->second);
+            }
+        }
+        
+        if (hexSum == -1) {
+            std::string customHexPattern;
+            if (customAsciiPattern[0] == '#') {
+                // remove #
+                customHexPattern = customAsciiPattern.substr(1);
+            } else {
+                // Convert custom ASCII pattern to a custom hex pattern
+                customHexPattern = asciiToHex(customAsciiPattern);
+            }
+            
+            
+            // Find hex data offsets in the file
+            const std::vector<std::string> offsets = findHexDataOffsets(filePath, customHexPattern);
+            
+            if (!offsets.empty()) {
+                hexSum = ult::stoi(offsets[occurrence]);
+                
+                // Thread-safe cache write
+                {
+                    std::lock_guard<std::shared_mutex> writeLock(cacheMutex);
+                    hexSumCache[cacheKey] = ult::to_string(hexSum);
+                }
+            } else {
+                #if USING_LOGGING_DIRECTIVE
+                if (!disableLogging)
+                    logMessage("Offset not found.");
+                #endif
+                return;
+            }
+        }
+        
+        
+        if (hexSum != -1) {
+            // Calculate the total offset to seek in the file
+            //int sum = hexSum + ult::stoi(offsetStr);
+            hexEditByOffset(filePath, ult::to_string(hexSum + ult::stoi(offsetStr)), hexDataReplacement);
+        } else {
+            #if USING_LOGGING_DIRECTIVE
+            if (!disableLogging)
+                logMessage("Failed to find " + customAsciiPattern + ".");
+            #endif
+        }
+    }
+    
+    /**
+     * @brief Finds and replaces hexadecimal data in a file.
+     *
+     * This function searches for occurrences of hexadecimal data in a binary file
+     * and replaces them with a specified hexadecimal replacement data.
+     *
+     * @param filePath The path to the binary file.
+     * @param hexDataToReplace The hexadecimal data to search for and replace.
+     * @param hexDataReplacement The hexadecimal data to replace with.
+     * @param occurrence The occurrence/index of the data to replace (default is "0" to replace all occurrences).
+     */
+    void hexEditFindReplace(const std::string& filePath, const std::string& hexDataToReplace, const std::string& hexDataReplacement, size_t occurrence) {
+        const std::vector<std::string> offsetStrs = findHexDataOffsets(filePath, hexDataToReplace);
+        if (!offsetStrs.empty()) {
+            if (occurrence == 0) {
+                // Replace all occurrences
+                for (const std::string& offsetStr : offsetStrs) {
+                    //logMessage("offsetStr: "+offsetStr);
+                    //logMessage("hexDataReplacement: "+hexDataReplacement);
+                    hexEditByOffset(filePath, offsetStr, hexDataReplacement);
+                }
+            } else {
+                // Convert the occurrence string to an integer
+                if (occurrence > 0 && occurrence <= offsetStrs.size()) {
+                    // Replace the specified occurrence/index
+                    //std::string offsetStr = offsetStrs[occurrence - 1];
+                    //logMessage("offsetStr: "+offsetStr);
+                    //logMessage("hexDataReplacement: "+hexDataReplacement);
+                    hexEditByOffset(filePath, offsetStrs[occurrence - 1], hexDataReplacement);
+                } else {
+                    // Invalid occurrence/index specified
+                    #if USING_LOGGING_DIRECTIVE
+                    if (!disableLogging)
+                        logMessage("Invalid hex occurrence/index specified.");
+                    #endif
+                }
+            }
+            //std::cout << "Hex data replaced successfully." << std::endl;
+        }
+    }
+    
+    /**
+     * @brief Finds and replaces hexadecimal data in a file.
+     *
+     * This function searches for occurrences of hexadecimal data in a binary file
+     * and replaces them with a specified hexadecimal replacement data.
+     *
+     * @param filePath The path to the binary file.
+     * @param hexDataToReplace The hexadecimal data to search for and replace.
+     * @param hexDataReplacement The hexadecimal data to replace with.
+     * @param occurrence The occurrence/index of the data to replace (default is "0" to replace all occurrences).
+     */
+    std::string parseHexDataAtCustomOffset(const std::string& filePath, const std::string& customAsciiPattern, 
+                                         const std::string& offsetStr, size_t length, size_t occurrence) {
+        const std::string cacheKey = filePath + '?' + customAsciiPattern + '?' + ult::to_string(occurrence);
+        int hexSum = -1;
+
+        // Thread-safe cache read
+        {
+            std::shared_lock<std::shared_mutex> readLock(cacheMutex);
+            const auto cachedResult = hexSumCache.find(cacheKey);
+            if (cachedResult != hexSumCache.end()) {
+                hexSum = ult::stoi(cachedResult->second);
+            }
+        }
+
+        if (hexSum == -1) {
+            const std::string customHexPattern = asciiToHex(customAsciiPattern);
+            const std::vector<std::string> offsets = findHexDataOffsets(filePath, customHexPattern);
+
+            if (!offsets.empty() && offsets.size() > occurrence) {
+                hexSum = ult::stoi(offsets[occurrence]);
+                
+                // Thread-safe cache write
+                {
+                    std::lock_guard<std::shared_mutex> writeLock(cacheMutex);
+                    hexSumCache[cacheKey] = ult::to_string(hexSum);
+                }
+            } else {
+                #if USING_LOGGING_DIRECTIVE
+                if (!disableLogging)
+                    logMessage("Offset not found.");
+                #endif
+                return "";
+            }
+        }
+
+        const std::streampos totalOffset = hexSum + std::stoll(offsetStr);
+        std::vector<char> hexBuffer(length);
+        std::vector<char> hexStream(length * 2);
+
+    #if !USING_FSTREAM_DIRECTIVE
+        FILE* file = fopen(filePath.c_str(), "rb");
+        if (!file) {
+            #if USING_LOGGING_DIRECTIVE
+            if (!disableLogging)
+                logMessage("Failed to open the file.");
+            #endif
+            return "";
+        }
+
+        if (fseek(file, totalOffset, SEEK_SET) != 0) {
+            #if USING_LOGGING_DIRECTIVE
+            if (!disableLogging)
+                logMessage("Error seeking to offset.");
+            #endif
+            fclose(file);
+            return "";
+        }
+
+        const size_t bytesRead = fread(hexBuffer.data(), sizeof(char), length, file);
+        if (bytesRead == length) {
+            static constexpr char hexDigits[] = "0123456789ABCDEF";
+            for (size_t i = 0; i < length; ++i) {
+                hexStream[i * 2] = hexDigits[(hexBuffer[i] >> 4) & 0xF];
+                hexStream[i * 2 + 1] = hexDigits[hexBuffer[i] & 0xF];
+            }
+        } else {
+            #if USING_LOGGING_DIRECTIVE
+            if (!disableLogging)
+                logMessage("Error reading data from file or end of file reached.");
+            #endif
+            fclose(file);
+            return "";
+        }
+
+        fclose(file);
+    #else
+        std::ifstream file(filePath, std::ios::binary);
+        if (!file) {
+            #if USING_LOGGING_DIRECTIVE
+            if (!disableLogging)
+                logMessage("Failed to open the file.");
+            #endif
+            return "";
+        }
+
+        file.seekg(totalOffset);
+        if (!file) {
+            #if USING_LOGGING_DIRECTIVE
+            if (!disableLogging)
+                logMessage("Error seeking to offset.");
+            #endif
+            return "";
+        }
+
+        file.read(hexBuffer.data(), length);
+        if (file.gcount() == static_cast<std::streamsize>(length)) {
+            static constexpr char hexDigits[] = "0123456789ABCDEF";
+            for (size_t i = 0; i < length; ++i) {
+                hexStream[i * 2] = hexDigits[(hexBuffer[i] >> 4) & 0xF];
+                hexStream[i * 2 + 1] = hexDigits[hexBuffer[i] & 0xF];
+            }
+        } else {
+            #if USING_LOGGING_DIRECTIVE
+            if (!disableLogging)
+                logMessage("Error reading data from file or end of file reached.");
+            #endif
+            return "";
+        }
+
+        file.close();
+    #endif
+
+        std::string result(hexStream.begin(), hexStream.end());
+        result = stringToUppercase(result);
+
+        return result;
+    }
+    
+    
+    
+    /**
+     * @brief Finds and replaces hexadecimal data in a file.
+     *
+     * This function searches for occurrences of hexadecimal data in a binary file
+     * and replaces them with a specified hexadecimal replacement data.
+     *
+     * @param filePath The path to the binary file.
+     * @param hexDataToReplace The hexadecimal data to search for and replace.
+     * @param hexDataReplacement The hexadecimal data to replace with.
+     * @param occurrence The occurrence/index of the data to replace (default is "0" to replace all occurrences).
+     */
+    
+    std::string replaceHexPlaceholder(const std::string& arg, const std::string& hexPath) {
+        std::string replacement = arg;
+        const std::string searchString = "{hex_file(";
+        
+        const size_t startPos = replacement.find(searchString);
+        const size_t endPos = replacement.find(")}");
+        
+        if (startPos != std::string::npos && endPos != std::string::npos && endPos > startPos) {
+            const std::string placeholderContent = replacement.substr(startPos + searchString.length(), endPos - startPos - searchString.length());
+            
+            // Split the placeholder content into its components (customAsciiPattern, offsetStr, length)
+            std::vector<std::string> components;
+            
+            // Use StringStream instead of std::istringstream
+            StringStream componentStream(placeholderContent);
+            std::string component;
+            
+            while (componentStream.getline(component, ',')) {
+                trim(component);
+                components.push_back(component);
+            }
+            
+            if (components.size() == 3) {
+                // Extract individual components
+                const std::string customAsciiPattern = components[0];
+                const std::string offsetStr = components[1];
+                const size_t length = std::stoul(components[2]);
+                
+                // Call the parsing function and replace the placeholder
+                const std::string parsedResult = parseHexDataAtCustomOffset(hexPath, customAsciiPattern, offsetStr, length);
+                
+                // Only replace if parsedResult returns a non-empty string
+                if (!parsedResult.empty()) {
+                    // Replace the entire placeholder with the parsed result
+                    replacement.replace(startPos, endPos - startPos + searchString.length() + 2, parsedResult);
+                }
+            }
+        }
+        
+        return replacement;
+    }
+
+    
+    
+        
+    /**
+     * @brief Extracts the version string from a binary file.
+     *
+     * This function reads a binary file and searches for a version pattern
+     * in the format "v#.#.#" (e.g., "v1.2.3").
+     *
+     * @param filePath The path to the binary file.
+     * @return The version string if found; otherwise, an empty string.
+     */
+    std::string extractVersionFromBinary(const std::string &filePath) {
+    #if !USING_FSTREAM_DIRECTIVE
+        // Step 1: Open the binary file
+        FILE* file = fopen(filePath.c_str(), "rb");
+        if (!file) {
+            return ""; // Return empty string if file cannot be opened
+        }
+    
+        // Get the file size
+        fseek(file, 0, SEEK_END);
+        const std::streamsize size = ftell(file);
+        fseek(file, 0, SEEK_SET);
+    
+        // Read the entire file into a buffer
+        std::vector<uint8_t> buffer(size);
+        const size_t bytesRead = fread(buffer.data(), sizeof(uint8_t), size, file);
+        fclose(file); // Close the file after reading
+        
+        if (bytesRead != static_cast<size_t>(size)) {
+            return ""; // Return empty string if reading fails
+        }
+    #else
+        // Step 1: Read the entire binary file into a vector
+        std::ifstream file(filePath, std::ios::binary | std::ios::ate);
+        if (!file.is_open()) {
+            return ""; // Return empty string if file cannot be opened
+        }
+    
+        const std::streamsize size = file.tellg();
+        file.seekg(0, std::ios::beg);
+    
+        std::vector<uint8_t> buffer(size);
+        if (!file.read(reinterpret_cast<char*>(buffer.data()), size)) {
+            return ""; // Return empty string if reading fails
+        }
+    #endif
+    
+        // Step 2: Search for the pattern "v#.#.#"
+        const char* data = reinterpret_cast<const char*>(buffer.data());
+        for (std::streamsize i = 0; i < size; ++i) {
+            if (data[i] == 'v' && i + 5 < size && 
+                std::isdigit(data[i + 1]) && data[i + 2] == '.' && 
+                std::isdigit(data[i + 3]) && data[i + 4] == '.' && 
+                std::isdigit(data[i + 5])) {
+    
+                // Extract the version string
+                return std::string(data + i, 6); // Return the version string
+            }
+        }
+    
+        return "";  // Return empty string if no match is found
+    }
+}
diff --git a/Source/sys-clk/overlay/lib/libultrahand/libultra/source/ini_funcs.cpp b/Source/sys-clk/overlay/lib/libultrahand/libultra/source/ini_funcs.cpp
new file mode 100644
index 00000000..47551c5a
--- /dev/null
+++ b/Source/sys-clk/overlay/lib/libultrahand/libultra/source/ini_funcs.cpp
@@ -0,0 +1,2465 @@
+/********************************************************************************
+ * File: ini_funcs.cpp
+ * Author: ppkantorski
+ * Description:
+ *   This source file implements the functions declared in ini_funcs.hpp.
+ *   These functions provide support for working with INI (Initialization) files
+ *   in C++. Functionality includes reading and parsing INI files, editing values,
+ *   and cleaning formatting to ensure consistent structure.
+ *
+ *   For the latest updates and contributions, visit the project's GitHub repository.
+ *   (GitHub Repository: https://github.com/ppkantorski/Ultrahand-Overlay)
+ *
+ *   Note: Please be aware that this notice cannot be altered or removed. It is a part
+ *   of the project's documentation and must remain intact.
+ * 
+ *  Licensed under both GPLv2 and CC-BY-4.0
+ *  Copyright (c) 2024 ppkantorski
+ ********************************************************************************/
+
+#include <ini_funcs.hpp>
+
+namespace ult {
+    // Thread safety infrastructure
+    namespace {
+        std::unordered_map<std::string, std::shared_ptr<std::shared_mutex>> fileMutexMap;
+        std::mutex mapMutex;
+        
+        std::shared_ptr<std::shared_mutex> getFileMutex(const std::string& filePath) {
+            std::lock_guard<std::mutex> lock(mapMutex);
+            auto it = fileMutexMap.find(filePath);
+            if (it == fileMutexMap.end()) {
+                auto mutex = std::make_shared<std::shared_mutex>();
+                fileMutexMap[filePath] = mutex;
+                return mutex;
+            }
+            return it->second;
+        }
+    }
+
+    /**
+     * @brief Clears unused file mutexes from memory.
+     * WARNING: Only call this when you're certain NO threads are accessing INI files!
+     * Best used during application shutdown or maintenance periods.
+     */
+    void clearIniMutexCache() {
+        std::lock_guard<std::mutex> lock(mapMutex);
+        fileMutexMap.clear();
+    }
+
+
+    /**
+     * @brief Retrieves the package header information from an INI file.
+     *
+     * This function parses an INI file and extracts the package header information.
+     *
+     * @param filePath The path to the INI file.
+     * @return The package header structure.
+     */
+    PackageHeader getPackageHeaderFromIni(const std::string& filePath) {
+        auto fileMutex = getFileMutex(filePath);
+        std::shared_lock<std::shared_mutex> lock(*fileMutex);
+
+        PackageHeader packageHeader;
+        
+    #if !USING_FSTREAM_DIRECTIVE
+        FILE* file = fopen(filePath.c_str(), "r");
+        if (!file) {
+            return packageHeader;
+        }
+        
+        char buffer[1024];
+        std::string line;
+    #else
+        std::ifstream file(filePath);
+        if (!file) {
+            return packageHeader;
+        }
+        
+        std::string line;
+    #endif
+    
+        // Create field map once outside the loop
+        const std::map<std::string_view, std::string*> fieldMap = {
+            {";title=", &packageHeader.title},
+            {";display_title=", &packageHeader.display_title},
+            {";version=", &packageHeader.version},
+            {";creator=", &packageHeader.creator},
+            {";about=", &packageHeader.about},
+            {";credits=", &packageHeader.credits},
+            {";color=", &packageHeader.color},
+            {";show_version=", &packageHeader.show_version},
+            {";show_widget=", &packageHeader.show_widget}
+        };
+        
+        int fieldsFound = 0;
+        const int totalFields = fieldMap.size();
+        
+        size_t startPos, endPos, first, last;
+        std::string value;
+    
+    #if !USING_FSTREAM_DIRECTIVE
+        size_t len;
+        while (fgets(buffer, sizeof(buffer), file) && fieldsFound < totalFields) {
+            // Reuse line string capacity instead of creating new string
+            line.assign(buffer);
+            
+            // Remove newlines efficiently
+            len = line.length();
+            if (len > 0 && line[len-1] == '\n') {
+                line.pop_back();
+                --len;
+                if (len > 0 && line[len-1] == '\r') {
+                    line.pop_back();
+                }
+            }
+    #else
+        while (getline(file, line) && fieldsFound < totalFields) {
+            // Remove carriage return if present
+            if (!line.empty() && line.back() == '\r') {
+                line.pop_back();
+            }
+    #endif
+            
+            // Skip empty lines and non-comment lines
+            if (line.empty() || line[0] != ';') {
+                line.clear(); // Clear to reuse capacity
+                continue;
+            }
+            
+            // Process each prefix in the map
+            for (const auto& [prefix, field] : fieldMap) {
+                if (line.compare(0, prefix.length(), prefix) == 0) {
+                    startPos = prefix.length();
+                    endPos = line.find_first_of(";\r\n", startPos);
+                    if (endPos == std::string::npos) {
+                        endPos = line.length();
+                    }
+                    
+                    // Extract value directly, reusing value string capacity
+                    value.assign(line, startPos, endPos - startPos);
+                    
+                    // Trim whitespace efficiently
+                    first = value.find_first_not_of(" \t");
+                    if (first == std::string::npos) {
+                        value.clear();
+                    } else {
+                        last = value.find_last_not_of(" \t");
+                        if (first != 0 || last != value.length() - 1) {
+                            value.assign(value, first, last - first + 1);
+                        }
+                    }
+                    
+                    // Remove quotes efficiently
+                    if (value.length() >= 2 && 
+                        ((value.front() == '"' && value.back() == '"') ||
+                         (value.front() == '\'' && value.back() == '\''))) {
+                        value.assign(value, 1, value.length() - 2);
+                    }
+                    
+                    *field = std::move(value);
+                    fieldsFound++;
+                    
+                    // Clear strings to reuse capacity
+                    value.clear();
+                    break;
+                }
+            }
+            
+            // Clear line to reuse capacity
+            line.clear();
+        }
+    
+    #if !USING_FSTREAM_DIRECTIVE
+        fclose(file);
+    #endif
+    
+        return packageHeader;
+    }
+
+    
+    
+    /**
+     * @brief Splits a string into a vector of substrings using a specified delimiter.
+     *
+     * This function splits a given string into multiple substrings based on the specified delimiter.
+     *
+     * @param str The input string to be split.
+     * @param delim The delimiter character used for splitting.
+     * @return A vector of substrings obtained by splitting the input string.
+     */
+    std::vector<std::string> split(const std::string& str, char delim) {
+        std::vector<std::string> out;
+        
+        if (str.empty()) return out;
+        
+        //out.reserve(std::count(str.begin(), str.end(), delim) + 1);
+        
+        const char* data = str.data();
+        const char* end = data + str.size();
+        const char* start = data;
+        
+        while (const char* pos = static_cast<const char*>(std::memchr(start, delim, end - start))) {
+            out.emplace_back(start, pos);
+            start = pos + 1;
+        }
+        out.emplace_back(start, end);
+        
+        return out;
+    }
+    
+    
+    /**
+     * @brief Parses an INI-formatted string into a map of sections and key-value pairs.
+     *
+     * This function parses an INI-formatted string and organizes the data into a map,
+     * where sections are keys and key-value pairs are stored within each section.
+     *
+     * @param str The INI-formatted string to parse.
+     * @return A map representing the parsed INI data.
+     */
+    std::map<std::string, std::map<std::string, std::string>> parseIni(const std::string &str) {
+        std::map<std::string, std::map<std::string, std::string>> iniData;
+        
+        auto lines = split(str, '\n');
+        std::string lastHeader = "";
+        
+        //std::string trimmedLine;
+        
+        size_t delimiterPos;
+        //std::string key, value;
+        
+        std::string newLine1, newLine2;
+
+        for (auto& line : lines) {
+            trim(line);
+            
+            // Ignore empty lines and comments
+            if (line.empty() || line.front() == '#') {
+                // Clear line to reuse capacity
+                line.clear();
+                continue;
+            }
+            
+            if (line.front() == '[' && line.back() == ']') {
+                lastHeader = line.substr(1, line.size() - 2);
+                iniData[lastHeader]; // Ensures the section exists even if it remains empty
+
+            } else {
+                delimiterPos = line.find('=');
+                if (delimiterPos != std::string::npos) {
+                    //key = trim(trimmedLine.substr(0, delimiterPos));
+                    //value = trim(trimmedLine.substr(delimiterPos + 1));
+                    if (!lastHeader.empty()) {
+                        //iniData[lastHeader][key] = value;
+                        newLine1 = line.substr(0, delimiterPos);
+                        trim(newLine1);
+                        newLine2 = line.substr(delimiterPos + 1);
+                        trim(newLine2);
+                        iniData[lastHeader][newLine1] = newLine2;
+
+                        // Clear strings to reuse capacity
+                        newLine1.clear();
+                        newLine2.clear();
+                    }
+                }
+            }
+            // Clear line to reuse capacity
+            line.clear();
+        }
+        
+        return iniData;
+    }
+    
+    
+    /**
+     * @brief Parses an INI file and returns its content as a map of sections and key-value pairs.
+     *
+     * This function reads the contents of an INI file located at the specified path,
+     * parses it into a map structure, where section names are keys and key-value pairs
+     * are stored within each section.
+     *
+     * @param configIniPath The path to the INI file to be parsed.
+     * @return A map representing the parsed INI data.
+     */
+    std::map<std::string, std::map<std::string, std::string>> getParsedDataFromIniFile(const std::string& configIniPath) {
+        auto fileMutex = getFileMutex(configIniPath);
+        std::shared_lock<std::shared_mutex> lock(*fileMutex);
+
+        std::map<std::string, std::map<std::string, std::string>> parsedData;
+    
+    #if !USING_FSTREAM_DIRECTIVE
+        FILE* file = fopen(configIniPath.c_str(), "r");
+        if (!file) {
+            return parsedData;  // Return empty map if file cannot be opened
+        }
+        
+        char buffer[1024];
+        std::string line;
+        std::string currentSection;
+        size_t delimiterPos;
+        std::string key, value;
+        
+        // Cache iterator to current section to avoid repeated map lookups
+        std::map<std::string, std::string>* currentSectionMap = nullptr;
+        
+        size_t len;
+        const char* start;
+        const char* end;
+        
+        while (fgets(buffer, sizeof(buffer), file)) {
+            // More efficient newline removal
+            len = strlen(buffer);
+            if (len > 0 && buffer[len-1] == '\n') {
+                buffer[len-1] = '\0';
+                --len;
+                if (len > 0 && buffer[len-1] == '\r') {
+                    buffer[len-1] = '\0';
+                    --len;
+                }
+            }
+            
+            // Early exit for empty lines
+            if (len == 0) continue;
+            
+            // Manual trim for better performance - find start of non-whitespace
+            start = buffer;
+            while (*start == ' ' || *start == '\t') ++start;
+            
+            // Find end of non-whitespace (working backwards from known end)
+            end = buffer + len - 1;
+            while (end >= start && (*end == ' ' || *end == '\t')) --end;
+            
+            // Early exit for whitespace-only lines
+            if (end < start) continue;
+            
+            // Calculate trimmed length
+            len = end - start + 1;
+            
+            // Check for section header first (most efficient check)
+            if (*start == '[' && *end == ']') {
+                // Remove the brackets and set the current section
+                if (len > 2) {
+                    currentSection.assign(start + 1, len - 2);
+                    currentSectionMap = &parsedData[currentSection];
+                }
+                // Clear section string to reuse capacity
+                currentSection.clear();
+            } else if (currentSectionMap != nullptr) {
+                // Look for '=' delimiter - scan from start for efficiency
+                delimiterPos = 0;
+                const char* eq_pos = start;
+                while (eq_pos <= end && *eq_pos != '=') {
+                    ++eq_pos;
+                    ++delimiterPos;
+                }
+                
+                if (eq_pos <= end) { // Found '=' delimiter
+                    // Extract key (start to delimiter)
+                    const char* key_end = eq_pos - 1;
+                    while (key_end >= start && (*key_end == ' ' || *key_end == '\t')) --key_end;
+                    
+                    if (key_end >= start) {
+                        key.assign(start, key_end - start + 1);
+                        
+                        // Extract value (after delimiter to end)
+                        const char* val_start = eq_pos + 1;
+                        while (val_start <= end && (*val_start == ' ' || *val_start == '\t')) ++val_start;
+                        
+                        if (val_start <= end) {
+                            value.assign(val_start, end - val_start + 1);
+                        } else {
+                            value.clear();
+                        }
+                        
+                        (*currentSectionMap)[key] = std::move(value);
+                    }
+                }
+                // Clear strings to reuse capacity
+                key.clear();
+                value.clear();
+            }
+        }
+    
+        fclose(file);
+    #else
+        std::ifstream configFile(configIniPath);
+        if (!configFile) {
+            return parsedData;  // Return empty map if file cannot be opened
+        }
+        
+        std::string line;
+        std::string currentSection;
+        size_t delimiterPos;
+        std::string key, value;
+        
+        size_t start, end, key_end, val_start;
+
+        // Cache iterator to current section to avoid repeated map lookups
+        std::map<std::string, std::string>* currentSectionMap = nullptr;
+    
+        while (getline(configFile, line)) {
+            // Remove carriage return if present (getline already removes \n)
+            if (!line.empty() && line.back() == '\r') {
+                line.pop_back();
+            }
+            
+            // Early exit for empty lines
+            if (line.empty()) continue;
+            
+            // Manual trim for better performance
+            start = 0;
+            end = line.length() - 1;
+            
+            // Find start of non-whitespace
+            while (start < line.length() && (line[start] == ' ' || line[start] == '\t')) {
+                ++start;
+            }
+            
+            // Early exit for whitespace-only lines
+            if (start >= line.length()) continue;
+            
+            // Find end of non-whitespace
+            while (end > start && (line[end] == ' ' || line[end] == '\t')) {
+                --end;
+            }
+            
+            // Check for section header first
+            if (line[start] == '[' && line[end] == ']') {
+                // Remove the brackets and set the current section
+                if (end > start + 1) {
+                    currentSection.assign(line, start + 1, end - start - 1);
+                    currentSectionMap = &parsedData[currentSection];
+                }
+                // Clear strings to reuse capacity
+                line.clear();
+                currentSection.clear();
+            } else if (currentSectionMap != nullptr) {
+                // Look for '=' delimiter within the trimmed range
+                delimiterPos = line.find('=', start);
+                if (delimiterPos != std::string::npos && delimiterPos <= end) {
+                    // Extract and trim key
+                    key_end = delimiterPos - 1;
+                    while (key_end > start && (line[key_end] == ' ' || line[key_end] == '\t')) {
+                        --key_end;
+                    }
+                    
+                    if (key_end >= start) {
+                        key.assign(line, start, key_end - start + 1);
+                        
+                        // Extract and trim value
+                        val_start = delimiterPos + 1;
+                        while (val_start <= end && (line[val_start] == ' ' || line[val_start] == '\t')) {
+                            ++val_start;
+                        }
+                        
+                        if (val_start <= end) {
+                            value.assign(line, val_start, end - val_start + 1);
+                        } else {
+                            value.clear();
+                        }
+                        
+                        (*currentSectionMap)[key] = std::move(value);
+                    }
+                }
+                // Clear strings to reuse capacity
+                line.clear();
+                key.clear();
+                value.clear();
+            }
+        }
+        
+        configFile.close();
+    #endif
+    
+        return parsedData;
+    }
+    
+        
+    
+    /**
+     * @brief Parses an INI file and retrieves key-value pairs from a specific section.
+     *
+     * This function reads the contents of an INI file located at the specified path,
+     * and returns the key-value pairs within a specific section.
+     *
+     * @param configIniPath The path to the INI file to be parsed.
+     * @param sectionName The name of the section to retrieve key-value pairs from.
+     * @return A map representing the key-value pairs in the specified section.
+     */
+    std::map<std::string, std::string> getKeyValuePairsFromSection(const std::string& configIniPath, const std::string& sectionName) {
+        auto fileMutex = getFileMutex(configIniPath);
+        std::shared_lock<std::shared_mutex> lock(*fileMutex);
+
+        std::map<std::string, std::string> sectionData;
+    
+    #if !USING_FSTREAM_DIRECTIVE
+        FILE* file = fopen(configIniPath.c_str(), "r");
+        if (!file) {
+            // logMessage("Failed to open the file: " + configIniPath);
+            return sectionData;  // Return empty map if file cannot be opened
+        }
+        
+        char buffer[1024];
+        std::string line;
+        //line.reserve(1024); // Reserve to match buffer size
+        
+        std::string currentSection;
+        //currentSection.reserve(64); // Reserve for section names
+        
+        size_t delimiterPos;
+        std::string key, value;
+        //key.reserve(128); // Reserve for key names
+        //value.reserve(256); // Reserve for values
+        
+        bool inTargetSection = false;  // To track if we're in the desired section
+
+        size_t len;
+
+        while (fgets(buffer, sizeof(buffer), file)) {
+            // More efficient newline removal
+            len = strlen(buffer);
+            if (len > 0 && buffer[len-1] == '\n') {
+                buffer[len-1] = '\0';
+                if (len > 1 && buffer[len-2] == '\r') {
+                    buffer[len-2] = '\0';
+                }
+            }
+            
+            line.assign(buffer); // More efficient than string constructor
+            trim(line);
+    
+            if (line.empty()) {
+                line.clear(); // Clear even for empty lines
+                continue; // Skip empty lines
+            }
+    
+            if (line[0] == '[' && line.back() == ']') {
+                // More efficient section name extraction
+                currentSection.assign(line, 1, line.size() - 2);
+                // Check if this is the section we're interested in
+                inTargetSection = (currentSection == sectionName);
+                
+                // Early exit optimization: if we were in target section and hit a new section, we're done
+                if (!inTargetSection && !sectionData.empty()) {
+                    // Clear before breaking
+                    line.clear();
+                    currentSection.clear();
+                    break; // Found target section and processed it, no need to continue
+                }
+
+                // Clear strings to reuse capacity
+                line.clear();
+                currentSection.clear();
+            } else if (inTargetSection) {
+                // Look for key-value pairs within the target section
+                delimiterPos = line.find('=');
+                if (delimiterPos != std::string::npos) {
+                    key.assign(line, 0, delimiterPos); // More efficient than substr
+                    trim(key);
+                    value.assign(line, delimiterPos + 1, std::string::npos); // More efficient than substr
+                    trim(value);
+                    sectionData[std::move(key)] = std::move(value);  // Move semantics to avoid copies
+
+                    // Clear strings after moving to reuse capacity
+                    //key.clear();
+                    //value.clear();
+                }
+                line.clear();
+            } else {
+                line.clear(); // Clear line when not in target section
+            }
+        }
+    
+        fclose(file);
+    #else
+        std::ifstream configFile(configIniPath);
+        if (!configFile) {
+            // logMessage("Failed to open the file: " + configIniPath);
+            return sectionData;  // Return empty map if file cannot be opened
+        }
+    
+        std::string line;
+        //line.reserve(1024); // Reserve for typical line length
+        
+        std::string currentSection;
+        //currentSection.reserve(64); // Reserve for section names
+        
+        size_t delimiterPos;
+        std::string key, value;
+        //key.reserve(128); // Reserve for key names
+        //value.reserve(256); // Reserve for values
+        
+        bool inTargetSection = false;  // To track if we're in the desired section
+    
+        while (getline(configFile, line)) {
+            // Remove carriage return if present (getline already removes \n)
+            if (!line.empty() && line.back() == '\r') {
+                line.pop_back();
+            }
+            
+            trim(line);
+    
+            if (line.empty()) {
+                line.clear(); // Clear even for empty lines
+                continue; // Skip empty lines
+            }
+    
+            if (line[0] == '[' && line.back() == ']') {
+                // More efficient section name extraction
+                currentSection.assign(line, 1, line.size() - 2);
+                // Check if this is the section we're interested in
+                inTargetSection = (currentSection == sectionName);
+                
+                // Early exit optimization: if we were in target section and hit a new section, we're done
+                if (!inTargetSection && !sectionData.empty()) {
+                    // Clear before breaking
+                    line.clear();
+                    currentSection.clear();
+                    break; // Found target section and processed it, no need to continue
+                }
+
+                // Clear strings to reuse capacity
+                line.clear();
+                currentSection.clear();
+            } else if (inTargetSection) {
+                // Look for key-value pairs within the target section
+                delimiterPos = line.find('=');
+                if (delimiterPos != std::string::npos) {
+                    key.assign(line, 0, delimiterPos); // More efficient than substr
+                    trim(key);
+                    value.assign(line, delimiterPos + 1, std::string::npos); // More efficient than substr
+                    trim(value);
+                    sectionData[std::move(key)] = std::move(value);  // Move semantics to avoid copies
+
+                    // Clear strings after moving to reuse capacity
+                    //key.clear();
+                    //value.clear();
+                }
+                line.clear();
+            } else {
+                line.clear(); // Clear line when not in target section
+            }
+        }
+        
+        configFile.close();
+    #endif
+    
+        return sectionData;
+    }
+    
+    
+    
+    /**
+     * @brief Parses sections from an INI file and returns them as a list of strings.
+     *
+     * This function reads an INI file and extracts the section names from it.
+     *
+     * @param filePath The path to the INI file.
+     * @return A vector of section names.
+     */
+    std::vector<std::string> parseSectionsFromIni(const std::string& filePath) {
+        auto fileMutex = getFileMutex(filePath);
+        std::shared_lock<std::shared_mutex> lock(*fileMutex);
+
+        std::vector<std::string> sections;
+    
+    #if !USING_FSTREAM_DIRECTIVE
+        FILE* file = fopen(filePath.c_str(), "r");
+        if (!file) {
+            return sections;
+        }
+    
+        char buffer[1024];
+        std::string line;
+        //line.reserve(1024); // Add reservation for efficiency
+        
+        size_t len;
+        std::string sectionName;
+        while (fgets(buffer, sizeof(buffer), file)) {
+            // CRITICAL FIX: Remove newlines from fgets
+            len = strlen(buffer);
+            if (len > 0 && buffer[len-1] == '\n') {
+                buffer[len-1] = '\0';
+                if (len > 1 && buffer[len-2] == '\r') {
+                    buffer[len-2] = '\0';
+                }
+            }
+            
+            line.assign(buffer); // More efficient than string constructor
+            trim(line);
+            
+            // Check if the line contains a section header
+            if (!line.empty() && line.front() == '[' && line.back() == ']') {
+                sectionName.assign(line, 1, line.size() - 2); // More efficient
+                sections.push_back(std::move(sectionName)); // Move for efficiency
+            }
+
+            // Clear strings to reuse capacity
+            line.clear();
+            sectionName.clear();
+        }
+    
+        fclose(file);
+    #else
+        std::ifstream file(filePath);
+        if (!file) {
+            return sections;
+        }
+    
+        std::string line;
+        //line.reserve(1024); // Add reservation for efficiency
+        
+        std::string sectionName;
+        while (std::getline(file, line)) {
+            // Remove carriage return if present
+            if (!line.empty() && line.back() == '\r') {
+                line.pop_back();
+            }
+            
+            trim(line);
+            
+            // Check if the line contains a section header
+            if (!line.empty() && line.front() == '[' && line.back() == ']') {
+                sectionName.assign(line, 1, line.size() - 2);
+                sections.push_back(std::move(sectionName));
+            }
+            // Clear strings to reuse capacity
+            line.clear();
+            sectionName.clear();
+        }
+        
+        file.close(); // Add explicit close
+    #endif
+    
+        return sections;
+    }
+    
+    
+    
+    /**
+     * @brief Parses a specific value from a section and key in an INI file.
+     *
+     * @param filePath The path to the INI file.
+     * @param sectionName The name of the section containing the desired key.
+     * @param keyName The name of the key whose value is to be retrieved.
+     * @return The value as a string, or an empty string if the key or section isn't found.
+     */
+    std::string parseValueFromIniSection(const std::string& filePath, const std::string& sectionName, const std::string& keyName) {
+        auto fileMutex = getFileMutex(filePath);
+        std::shared_lock<std::shared_mutex> lock(*fileMutex);
+
+        std::string value;
+    
+    #if !USING_FSTREAM_DIRECTIVE
+        FILE* file = fopen(filePath.c_str(), "r");
+        if (!file) {
+            return value;
+        }
+    
+        char buffer[1024];
+        std::string currentSection;
+        std::string currentKey;
+        
+        //size_t delimiterPos;
+        bool inTargetSection = false;
+        bool wasInTargetSection = false; // Track if we've been in the target section
+        
+        size_t len;
+        const char* start;
+        const char* end;
+        
+        while (fgets(buffer, sizeof(buffer), file)) {
+            // More efficient newline removal
+            len = strlen(buffer);
+            if (len > 0 && buffer[len-1] == '\n') {
+                buffer[len-1] = '\0';
+                --len;
+                if (len > 0 && buffer[len-1] == '\r') {
+                    buffer[len-1] = '\0';
+                    --len;
+                }
+            }
+            
+            // Early exit for empty lines
+            if (len == 0) continue;
+            
+            // Manual trim for better performance - find start of non-whitespace
+            start = buffer;
+            while (*start == ' ' || *start == '\t') ++start;
+            
+            // Find end of non-whitespace (working backwards from known end)
+            end = buffer + len - 1;
+            while (end >= start && (*end == ' ' || *end == '\t')) --end;
+            
+            // Early exit for whitespace-only lines
+            if (end < start) continue;
+            
+            // Calculate trimmed length
+            len = end - start + 1;
+            
+            // Check for section header first
+            if (*start == '[' && *end == ']') {
+                if (len > 2) {
+                    currentSection.assign(start + 1, len - 2);
+                    inTargetSection = (currentSection == sectionName);
+                    
+                    // Early exit: if we WERE in target section and now we're not, key wasn't found
+                    if (wasInTargetSection && !inTargetSection) {
+                        break; // Left target section without finding key
+                    }
+                    
+                    if (inTargetSection) {
+                        wasInTargetSection = true;
+                    }
+                }
+                // Clear section string to reuse capacity
+                currentSection.clear();
+            } else if (inTargetSection) {
+                // Look for '=' delimiter - scan from start for efficiency
+                const char* eq_pos = start;
+                while (eq_pos <= end && *eq_pos != '=') {
+                    ++eq_pos;
+                }
+                
+                if (eq_pos <= end) { // Found '=' delimiter
+                    // Extract and trim key
+                    const char* key_end = eq_pos - 1;
+                    while (key_end >= start && (*key_end == ' ' || *key_end == '\t')) --key_end;
+                    
+                    if (key_end >= start) {
+                        currentKey.assign(start, key_end - start + 1);
+                        
+                        if (currentKey == keyName) {
+                            // Extract and trim value
+                            const char* val_start = eq_pos + 1;
+                            while (val_start <= end && (*val_start == ' ' || *val_start == '\t')) ++val_start;
+                            
+                            if (val_start <= end) {
+                                value.assign(val_start, end - val_start + 1);
+                            }
+                            currentKey.clear(); // Clear before breaking
+                            // Found the key, exit
+                            break;
+                        }
+                    }
+                }
+                // Clear key string to reuse capacity
+                currentKey.clear();
+            }
+        }
+    
+        fclose(file);
+    #else
+        std::ifstream file(filePath);
+        if (!file) {
+            return value;
+        }
+        
+        std::string line;
+        std::string currentSection;
+        std::string currentKey;
+        
+        size_t delimiterPos;
+        bool inTargetSection = false;
+        bool wasInTargetSection = false; // Track if we've been in the target section
+        
+        size_t start, end, key_end, val_start;
+        while (std::getline(file, line)) {
+            if (!line.empty() && line.back() == '\r') {
+                line.pop_back();
+            }
+            
+            // Early exit for empty lines
+            if (line.empty()) continue;
+            
+            // Manual trim for better performance
+            start = 0;
+            end = line.length() - 1;
+            
+            // Find start of non-whitespace
+            while (start < line.length() && (line[start] == ' ' || line[start] == '\t')) {
+                ++start;
+            }
+            
+            // Early exit for whitespace-only lines
+            if (start >= line.length()) continue;
+            
+            // Find end of non-whitespace
+            while (end > start && (line[end] == ' ' || line[end] == '\t')) {
+                --end;
+            }
+            
+            // Check for section header first
+            if (line[start] == '[' && line[end] == ']') {
+                if (end > start + 1) {
+                    currentSection.assign(line, start + 1, end - start - 1);
+                    inTargetSection = (currentSection == sectionName);
+                    
+                    // Early exit: if we WERE in target section and now we're not, key wasn't found
+                    if (wasInTargetSection && !inTargetSection) {
+                        // Clear strings to reuse capacity
+                        line.clear();
+                        currentSection.clear();
+                        break; // Left target section without finding key
+                    }
+                    
+                    if (inTargetSection) {
+                        wasInTargetSection = true;
+                    }
+                }
+                // Clear strings to reuse capacity
+                line.clear();
+                currentSection.clear();
+            } else if (inTargetSection) {
+                // Look for '=' delimiter within the trimmed range
+                delimiterPos = line.find('=', start);
+                if (delimiterPos != std::string::npos && delimiterPos <= end) {
+                    // Extract and trim key
+                    key_end = delimiterPos - 1;
+                    while (key_end > start && (line[key_end] == ' ' || line[key_end] == '\t')) {
+                        --key_end;
+                    }
+                    
+                    if (key_end >= start) {
+                        currentKey.assign(line, start, key_end - start + 1);
+                        
+                        if (currentKey == keyName) {
+                            // Extract and trim value
+                            val_start = delimiterPos + 1;
+                            while (val_start <= end && (line[val_start] == ' ' || line[val_start] == '\t')) {
+                                ++val_start;
+                            }
+                            
+                            if (val_start <= end) {
+                                value.assign(line, val_start, end - val_start + 1);
+                            }
+                            // Found the key, exit
+                            break;
+                        }
+                    }
+                }
+                // Clear strings to reuse capacity
+                line.clear();
+                currentKey.clear();
+            }
+        }
+    
+        file.close();
+    #endif
+    
+        return value;
+    }
+        
+    /**
+     * @brief Cleans the formatting of an INI file by removing empty lines and standardizing section formatting.
+     *
+     * This function takes an INI file located at the specified path, removes empty lines,
+     * and standardizes the formatting of sections by ensuring that there is a newline
+     * between each section's closing ']' and the next section's opening '['.
+     *
+     * @param filePath The path to the INI file to be cleaned.
+     */
+    void cleanIniFormatting(const std::string& filePath) {
+        auto fileMutex = getFileMutex(filePath);
+        std::unique_lock<std::shared_mutex> lock(*fileMutex);
+
+        const std::string tempPath = filePath + ".tmp";
+    
+    #if !USING_FSTREAM_DIRECTIVE
+        FILE* inputFile = fopen(filePath.c_str(), "r");
+        if (!inputFile) {
+            #if USING_LOGGING_DIRECTIVE
+            if (!disableLogging)
+                logMessage("Failed to open the input file: " + filePath);
+            #endif
+            return;
+        }
+    
+        FILE* outputFile = fopen(tempPath.c_str(), "w");
+        if (!outputFile) {
+            #if USING_LOGGING_DIRECTIVE
+            if (!disableLogging)
+                logMessage("Failed to create the output file: " + tempPath);
+            #endif
+            fclose(inputFile);
+            return;
+        }
+    
+        // Declare all variables outside the loop
+        char line[1024];
+        std::string lineStr;
+        //lineStr.reserve(1024);
+        
+        bool isNewSection = false;
+        bool isSection = false;
+        size_t len = 0;
+        
+        while (fgets(line, sizeof(line), inputFile)) {
+            // Efficient newline removal
+            len = strlen(line);
+            if (len > 0 && line[len-1] == '\n') {
+                line[len-1] = '\0';
+                if (len > 1 && line[len-2] == '\r') {
+                    line[len-2] = '\0';
+                }
+            }
+            
+            lineStr.assign(line);
+            trim(lineStr);
+    
+            if (!lineStr.empty()) {
+                isSection = (lineStr[0] == '[' && lineStr.back() == ']');
+                
+                if (isSection) {
+                    if (isNewSection) {
+                        fputc('\n', outputFile);
+                    }
+                    isNewSection = true;
+                }
+                
+                fputs(lineStr.c_str(), outputFile);
+                fputc('\n', outputFile);
+            }
+            // Clear string to reuse capacity
+            lineStr.clear();
+        }
+    
+        fclose(inputFile);
+        fclose(outputFile);
+    #else
+        std::ifstream inputFile(filePath);
+        if (!inputFile) {
+            #if USING_LOGGING_DIRECTIVE
+            if (!disableLogging)
+                logMessage("Failed to open the input file: " + filePath);
+            #endif
+            return;
+        }
+    
+        std::ofstream outputFile(tempPath);
+        if (!outputFile) {
+            #if USING_LOGGING_DIRECTIVE
+            if (!disableLogging)
+                logMessage("Failed to create the output file: " + tempPath);
+            #endif
+            return;
+        }
+    
+        // Declare all variables outside the loop
+        std::string line;
+        //line.reserve(1024);
+        
+        bool isNewSection = false;
+        bool isSection = false;
+    
+        while (std::getline(inputFile, line)) {
+            // Remove carriage return if present
+            if (!line.empty() && line.back() == '\r') {
+                line.pop_back();
+            }
+            
+            trim(line);
+            
+            if (!line.empty()) {
+                isSection = (line[0] == '[' && line.back() == ']');
+                
+                if (isSection) {
+                    if (isNewSection) {
+                        outputFile << '\n';
+                    }
+                    isNewSection = true;
+                }
+                
+                outputFile << line << '\n';
+            }
+            // Clear string to reuse capacity
+            line.clear();
+        }
+        
+        inputFile.close();
+        outputFile.close();
+    #endif
+    
+        // Replace the original file with the temp file with error checking
+        if (std::remove(filePath.c_str()) != 0) {
+            #if USING_LOGGING_DIRECTIVE
+            if (!disableLogging)
+                logMessage("Failed to delete the original file: " + filePath);
+            #endif
+            // Clean up temp file on error
+            std::remove(tempPath.c_str());
+            return;
+        }
+    
+        if (std::rename(tempPath.c_str(), filePath.c_str()) != 0) {
+            #if USING_LOGGING_DIRECTIVE
+            if (!disableLogging)
+                logMessage("Failed to rename the temporary file: " + tempPath);
+            #endif
+        }
+    }
+
+    
+    /**
+     * @brief Modifies or creates an INI file by adding or updating key-value pairs in the specified section.
+     *
+     * This function attempts to open the specified INI file for reading. If the file doesn't exist,
+     * it creates a new file and adds the specified section and key-value pair. If the file exists,
+     * it reads its contents, modifies or adds the key-value pair in the specified section, and saves
+     * the changes back to the original file.
+     *
+     * @param fileToEdit      The path to the INI file to be modified or created.
+     * @param desiredSection  The name of the section in which the key-value pair should be added or updated.
+     * @param desiredKey      The key for the key-value pair to be added or updated.
+     * @param desiredValue    The new value for the key-value pair.
+     * @param desiredNewKey   (Optional) If provided, the function will rename the key while preserving the original value.
+     * @param comment         An optional comment to be added (not currently implemented).
+     */
+    void setIniFile(const std::string& fileToEdit, const std::string& desiredSection, const std::string& desiredKey, const std::string& desiredValue, const std::string& desiredNewKey, const std::string& comment) {
+        auto fileMutex = getFileMutex(fileToEdit);
+        std::unique_lock<std::shared_mutex> lock(*fileMutex);
+
+        std::ios::sync_with_stdio(false);  // Disable synchronization between C++ and C I/O.
+    
+        if (!isFile(fileToEdit)) {
+            createDirectory(getParentDirFromPath(fileToEdit));
+        }
+    
+    #if !USING_FSTREAM_DIRECTIVE
+        FILE* configFile = fopen(fileToEdit.c_str(), "r");
+        if (!configFile) {
+            configFile = fopen(fileToEdit.c_str(), "w"); // Create a new file if it doesn't exist
+            if (configFile) {
+                fprintf(configFile, "[%s]\n%s=%s\n", desiredSection.c_str(), desiredKey.c_str(), desiredValue.c_str());
+                fclose(configFile);
+            }
+            return;
+        }
+    
+        StringStream buffer(""); // Use StringStream to collect results
+        char line[1024];
+        bool sectionFound = false;
+        bool keyFound = false;
+        bool firstSection = true;  // Flag to control new line before first section
+        std::string currentSection;
+        std::string lineStr;
+        std::string key;
+        
+        size_t delimiterPos;
+        size_t len;
+        const char* start;
+        const char* end;
+        
+        size_t key_start, key_end;
+        while (fgets(line, sizeof(line), configFile)) {
+            // More efficient newline removal
+            len = strlen(line);
+            if (len > 0 && line[len-1] == '\n') {
+                line[len-1] = '\0';
+                --len;
+                if (len > 0 && line[len-1] == '\r') {
+                    line[len-1] = '\0';
+                    --len;
+                }
+            }
+            
+            // Early exit for empty lines
+            if (len == 0) continue;
+            
+            // Manual trim for better performance
+            start = line;
+            while (*start == ' ' || *start == '\t') ++start;
+            
+            end = line + len - 1;
+            while (end >= start && (*end == ' ' || *end == '\t')) --end;
+            
+            // Early exit for whitespace-only lines
+            if (end < start) continue;
+            
+            // Calculate trimmed length
+            len = end - start + 1;
+            lineStr.assign(start, len);
+    
+            if (lineStr[0] == '[' && lineStr.back() == ']') {
+                if (sectionFound && !keyFound) {
+                    buffer << desiredKey << "=" << desiredValue << '\n';  // Add missing key-value pair
+                    keyFound = true;
+                }
+                if (!firstSection) {
+                    buffer << '\n';  // Add a newline before the start of a new section
+                }
+                currentSection.assign(lineStr, 1, lineStr.size() - 2);
+                sectionFound = (currentSection == desiredSection);
+                buffer << lineStr << '\n';
+                firstSection = false;
+
+                // Clear strings to reuse capacity
+                lineStr.clear();
+                currentSection.clear();
+                continue;
+            }
+    
+            if (sectionFound && !keyFound) {
+                delimiterPos = lineStr.find('=');
+                if (delimiterPos != std::string::npos) {
+                    // Extract and trim key manually for better performance
+                    key_start = 0;
+                    key_end = delimiterPos - 1;
+                    
+                    // Find start of key (skip leading whitespace)
+                    while (key_start < delimiterPos && (lineStr[key_start] == ' ' || lineStr[key_start] == '\t')) {
+                        ++key_start;
+                    }
+                    
+                    // Find end of key (skip trailing whitespace)
+                    while (key_end > key_start && (lineStr[key_end] == ' ' || lineStr[key_end] == '\t')) {
+                        --key_end;
+                    }
+                    
+                    if (key_end >= key_start) {
+                        key.assign(lineStr, key_start, key_end - key_start + 1);
+                        
+                        if (key == desiredKey) {
+                            keyFound = true;
+                            // Build the replacement line more efficiently
+                            lineStr.assign(desiredNewKey.empty() ? desiredKey : desiredNewKey);
+                            lineStr += '=';
+                            lineStr += desiredValue;
+                        }
+                    }
+                }
+            }
+    
+            buffer << lineStr << '\n';
+
+            // Clear strings to reuse capacity
+            lineStr.clear();
+            key.clear();
+        }
+    
+        if (!sectionFound && !keyFound) {
+            if (!firstSection) buffer << '\n';  // Ensure newline before adding a new section, unless it's the first section
+            buffer << '[' << desiredSection << ']' << '\n';
+            buffer << desiredKey << "=" << desiredValue << '\n';
+        } else if (!keyFound) {
+            buffer << desiredKey << "=" << desiredValue << '\n';
+        }
+    
+        fclose(configFile);
+    
+        // Write to the file again
+        FILE* outFile = fopen(fileToEdit.c_str(), "w");
+        if (outFile) {
+            fputs(buffer.str().c_str(), outFile);
+            fclose(outFile);
+        }
+    #else
+        std::ifstream configFile(fileToEdit);
+        StringStream buffer(""); // Use StringStream to collect results
+    
+        if (!configFile) {
+            std::ofstream outFile(fileToEdit);
+            outFile << "[" << desiredSection << "]\n" << desiredKey << "=" << desiredValue << '\n';
+            return;
+        }
+    
+        std::string line;
+        bool sectionFound = false;
+        bool keyFound = false;
+        bool firstSection = true;  // Flag to control new line before first section
+        std::string currentSection;
+        
+        size_t delimiterPos;
+        std::string key;
+        
+        size_t start, end, key_start, key_end;
+        while (std::getline(configFile, line)) {
+            // Remove carriage return if present (getline already removes \n)
+            if (!line.empty() && line.back() == '\r') {
+                line.pop_back();
+            }
+            
+            // Early exit for empty lines
+            if (line.empty()) continue;
+            
+            // Manual trim for better performance
+            start = 0;
+            end = line.length() - 1;
+            
+            // Find start of non-whitespace
+            while (start < line.length() && (line[start] == ' ' || line[start] == '\t')) {
+                ++start;
+            }
+            
+            // Early exit for whitespace-only lines
+            if (start >= line.length()) continue;
+            
+            // Find end of non-whitespace
+            while (end > start && (line[end] == ' ' || line[end] == '\t')) {
+                --end;
+            }
+            
+            // Create trimmed line if needed
+            if (start > 0 || end < line.length() - 1) {
+                line.assign(line, start, end - start + 1);
+            }
+    
+            if (line[0] == '[' && line.back() == ']') {
+                if (sectionFound && !keyFound) {
+                    buffer << desiredKey << "=" << desiredValue << '\n';  // Add missing key-value pair
+                    keyFound = true;
+                }
+                if (!firstSection) {
+                    buffer << '\n';  // Add a newline before the start of a new section
+                }
+                currentSection.assign(line, 1, line.size() - 2);
+                sectionFound = (currentSection == desiredSection);
+                buffer << line << '\n';
+                firstSection = false;
+
+                // Clear strings to reuse capacity
+                line.clear();
+                currentSection.clear();
+                continue;
+            }
+    
+            if (sectionFound && !keyFound) {
+                delimiterPos = line.find('=');
+                if (delimiterPos != std::string::npos) {
+                    // Extract and trim key manually for better performance
+                    key_start = 0;
+                    key_end = delimiterPos - 1;
+                    
+                    // Find start of key (skip leading whitespace)
+                    while (key_start < delimiterPos && (line[key_start] == ' ' || line[key_start] == '\t')) {
+                        ++key_start;
+                    }
+                    
+                    // Find end of key (skip trailing whitespace)
+                    while (key_end > key_start && (line[key_end] == ' ' || line[key_end] == '\t')) {
+                        --key_end;
+                    }
+                    
+                    if (key_end >= key_start) {
+                        key.assign(line, key_start, key_end - key_start + 1);
+                        
+                        if (key == desiredKey) {
+                            keyFound = true;
+                            // Build the replacement line more efficiently
+                            line.assign(desiredNewKey.empty() ? desiredKey : desiredNewKey);
+                            line += '=';
+                            line += desiredValue;
+                        }
+                    }
+                }
+            }
+    
+            buffer << line << '\n';
+
+            // Clear strings to reuse capacity
+            line.clear();
+            key.clear();
+        }
+    
+        if (!sectionFound && !keyFound) {
+            if (!firstSection) buffer << '\n';  // Ensure newline before adding a new section, unless it's the first section
+            buffer << '[' << desiredSection << ']' << '\n';
+            buffer << desiredKey << "=" << desiredValue << '\n';
+        } else if (!keyFound) {
+            buffer << desiredKey << "=" << desiredValue << '\n';
+        }
+    
+        configFile.close();
+    
+        std::ofstream outFile(fileToEdit);
+        outFile << buffer.str();
+        outFile.close();
+    #endif
+    }
+    
+    
+    /**
+     * @brief Sets the value of a key in an INI file within the specified section and cleans the formatting.
+     *
+     * This function sets the value of the specified key within the given section of the INI file.
+     * If the key or section does not exist, it creates them. After updating the INI file,
+     * it cleans the formatting to ensure proper INI file structure.
+     *
+     * @param fileToEdit      The path to the INI file to be modified or created.
+     * @param desiredSection  The name of the section in which the key-value pair should be added or updated.
+     * @param desiredKey      The key for the key-value pair to be added or updated.
+     * @param desiredValue    The new value for the key-value pair.
+     */
+    void setIniFileValue(const std::string& fileToEdit, const std::string& desiredSection, const std::string& desiredKey, const std::string& desiredValue, const std::string& comment) {
+        setIniFile(fileToEdit, desiredSection, desiredKey, desiredValue, "", comment);
+        //cleanIniFormatting(fileToEdit);
+    }
+    
+    /**
+     * @brief Sets the key name to a new name in an INI file within the specified section and cleans the formatting.
+     *
+     * This function sets the key name to a new name within the given section of the INI file.
+     * If the key or section does not exist, it creates them. After updating the INI file,
+     * it cleans the formatting to ensure proper INI file structure.
+     *
+     * @param fileToEdit      The path to the INI file to be modified or created.
+     * @param desiredSection  The name of the section in which the key-name change should occur.
+     * @param desiredKey      The key name to be changed.
+     * @param desiredNewKey   The new key name to replace the original key name.
+     */
+    void setIniFileKey(const std::string& fileToEdit, const std::string& desiredSection, const std::string& desiredKey, const std::string& desiredNewKey, const std::string& comment) {
+        setIniFile(fileToEdit, desiredSection, desiredKey, "", desiredNewKey, comment);
+        //cleanIniFormatting(fileToEdit);
+    }
+    
+    
+        
+    /**
+     * @brief Adds a new section to an INI file.
+     *
+     * This function adds a new section with the specified name to the INI file located at the
+     * specified path. If the section already exists, it does nothing.
+     *
+     * @param filePath The path to the INI file.
+     * @param sectionName The name of the section to add.
+     */
+    void addIniSection(const std::string& filePath, const std::string& sectionName) {
+        auto fileMutex = getFileMutex(filePath);
+        std::unique_lock<std::shared_mutex> lock(*fileMutex);
+
+    #if !USING_FSTREAM_DIRECTIVE
+        FILE* inputFile = fopen(filePath.c_str(), "r");
+        if (!inputFile) {
+            // Create new file with just the section if file doesn't exist
+            FILE* newFile = fopen(filePath.c_str(), "w");
+            if (newFile) {
+                fprintf(newFile, "[%s]\n", sectionName.c_str());
+                fclose(newFile);
+            }
+            #if USING_LOGGING_DIRECTIVE
+            else {
+                if (!disableLogging)
+                    logMessage("Error: Failed to create new INI file.");
+            }
+            #endif
+            return;
+        }
+    
+        const std::string tempPath = filePath + ".tmp";
+        FILE* tempFile = fopen(tempPath.c_str(), "w");
+        if (!tempFile) {
+            #if USING_LOGGING_DIRECTIVE
+            if (!disableLogging)
+                logMessage("Error: Failed to create a temporary file.");
+            #endif
+            fclose(inputFile);
+            return;
+        }
+    
+        // Pre-calculate section comparison values
+        const size_t sectionNameLen = sectionName.length();
+        const size_t fullSectionLen = sectionNameLen + 2; // [ + sectionName + ]
+        
+        // Declare all variables outside the loop
+        char line[1024];
+        bool sectionExists = false;
+        size_t len = 0;
+        //const char* start;
+        const char* end;
+        
+        size_t content_len;
+
+        // First pass: check if section exists and copy all content
+        while (fgets(line, sizeof(line), inputFile)) {
+            len = strlen(line);
+            
+            // Optimize section detection without string copying
+            if (len >= fullSectionLen && line[0] == '[') {
+                // Find end of line content (excluding newlines)
+                end = line + len - 1;
+                while (end > line && (*end == '\n' || *end == '\r')) --end;
+                
+                // Check if this could be our section
+                if (end > line && *end == ']') {
+                    content_len = end - line + 1;
+                    if (content_len == fullSectionLen) {
+                        // Direct memory comparison - much faster than string creation
+                        if (memcmp(line + 1, sectionName.c_str(), sectionNameLen) == 0) {
+                            sectionExists = true;
+                            // Early optimization: write remaining file and exit loop
+                            fputs(line, tempFile);
+                            
+                            // Copy rest of file efficiently
+                            while (fgets(line, sizeof(line), inputFile)) {
+                                fputs(line, tempFile);
+                            }
+                            break;
+                        }
+                    }
+                }
+            }
+            
+            // Always write the line as-is
+            fputs(line, tempFile);
+        }
+    
+        // If the section does not exist, add it at the end
+        if (!sectionExists) {
+            // Check if we need a newline before the new section
+            if (ftell(tempFile) > 0) {
+                fseek(tempFile, -1, SEEK_END);
+                char lastChar;
+                if (fread(&lastChar, 1, 1, tempFile) == 1 && lastChar != '\n') {
+                    fseek(tempFile, 0, SEEK_END);
+                    fputc('\n', tempFile);
+                } else {
+                    fseek(tempFile, 0, SEEK_END);
+                }
+            }
+            
+            fprintf(tempFile, "[%s]\n", sectionName.c_str());
+        }
+    
+        fclose(inputFile);
+        fclose(tempFile);
+    
+    #else
+        std::ifstream inputFile(filePath);
+        if (!inputFile) {
+            // Create new file with just the section if file doesn't exist
+            std::ofstream newFile(filePath);
+            if (newFile) {
+                newFile << "[" << sectionName << "]\n";
+            }
+            #if USING_LOGGING_DIRECTIVE
+            else {
+                if (!disableLogging)
+                    logMessage("Error: Failed to create new INI file.");
+            }
+            #endif
+            return;
+        }
+    
+        const std::string tempPath = filePath + ".tmp";
+        std::ofstream tempFile(tempPath);
+        if (!tempFile) {
+            #if USING_LOGGING_DIRECTIVE
+            if (!disableLogging)
+                logMessage("Error: Failed to create a temporary file.");
+            #endif
+            return;
+        }
+    
+        // Pre-calculate section comparison values
+        const size_t sectionNameLen = sectionName.length();
+        const size_t fullSectionLen = sectionNameLen + 2; // [ + sectionName + ]
+        
+        // Declare variables outside the loop
+        std::string line;
+        bool sectionExists = false;
+        
+        size_t end_pos, content_len;
+        // Read entire file and check for section
+        while (std::getline(inputFile, line)) {
+            // Optimize section detection
+            if (line.length() >= fullSectionLen && line[0] == '[') {
+                // Find end of content (excluding carriage return)
+                end_pos = line.length() - 1;
+                if (line[end_pos] == '\r') --end_pos;
+                
+                // Check if this could be our section
+                if (end_pos < line.length() && line[end_pos] == ']') {
+                    content_len = end_pos + 1;
+                    if (content_len == fullSectionLen) {
+                        // Direct comparison - much faster than string creation
+                        if (line.compare(1, sectionNameLen, sectionName) == 0) {
+                            sectionExists = true;
+                            // Early optimization: write remaining file and exit loop
+                            tempFile << line << '\n';
+                            
+                            // Copy rest of file efficiently
+                            while (std::getline(inputFile, line)) {
+                                tempFile << line << '\n';
+                                line.clear(); // Clear to reuse capacity
+                            }
+                            break;
+                        }
+                    }
+                }
+            }
+            
+            tempFile << line << '\n';
+            line.clear(); // Clear to reuse capacity
+        }
+    
+        // If the section does not exist, add it
+        if (!sectionExists) {
+            tempFile << "[" << sectionName << "]\n";
+        }
+    
+        inputFile.close();
+        tempFile.close();
+    #endif
+    
+        // Replace the original file with the temp file
+        if (std::remove(filePath.c_str()) != 0) {
+            #if USING_LOGGING_DIRECTIVE
+            if (!disableLogging)
+                logMessage("Failed to delete the original file: " + filePath);
+            #endif
+            // Clean up temp file on error
+            std::remove(tempPath.c_str());
+            return;
+        }
+    
+        if (std::rename(tempPath.c_str(), filePath.c_str()) != 0) {
+            #if USING_LOGGING_DIRECTIVE
+            if (!disableLogging)
+                logMessage("Failed to rename the temporary file: " + tempPath);
+            #endif
+        }
+    }
+    
+    
+    /**
+     * @brief Renames a section in an INI file.
+     *
+     * This function renames the section with the specified current name to the specified new name
+     * in the INI file located at the specified path. If the current section does not exist, or if the
+     * new section name already exists, it does nothing.
+     *
+     * @param filePath The path to the INI file.
+     * @param currentSectionName The name of the section to rename.
+     * @param newSectionName The new name for the section.
+     */
+    void renameIniSection(const std::string& filePath, const std::string& currentSectionName, const std::string& newSectionName) {
+        auto fileMutex = getFileMutex(filePath);
+        std::unique_lock<std::shared_mutex> lock(*fileMutex);
+
+    #if !USING_FSTREAM_DIRECTIVE
+        FILE* configFile = fopen(filePath.c_str(), "r");
+        if (!configFile) {
+            #if USING_LOGGING_DIRECTIVE
+            if (!disableLogging)
+                logMessage("Failed to open the input file: " + filePath);
+            #endif
+            return;
+        }
+    
+        const std::string tempPath = filePath + ".tmp";
+        FILE* tempFile = fopen(tempPath.c_str(), "w");
+        if (!tempFile) {
+            #if USING_LOGGING_DIRECTIVE
+            if (!disableLogging)
+                logMessage("Failed to create the temporary file: " + tempPath);
+            #endif
+            fclose(configFile);
+            return;
+        }
+    
+        char line[1024];
+        std::string sectionName;
+        std::string lineStr;
+
+        while (fgets(line, sizeof(line), configFile)) {
+            lineStr = line;
+            trim(lineStr); // Modifying lineStr directly
+            sectionName.clear();
+    
+            if (!lineStr.empty() && lineStr[0] == '[' && lineStr[lineStr.length() - 2] == ']') {
+                sectionName = lineStr.substr(1, lineStr.length() - 2);
+                fprintf(tempFile, "[%s]\n", sectionName == currentSectionName ? newSectionName.c_str() : sectionName.c_str());
+            } else {
+                fprintf(tempFile, "%s\n", line);
+            }
+        }
+    
+        fclose(configFile);
+        fclose(tempFile);
+    #else
+        std::ifstream configFile(filePath);
+        if (!configFile) {
+            #if USING_LOGGING_DIRECTIVE
+            if (!disableLogging)
+                logMessage("Failed to open the input file: " + filePath);
+            #endif
+            return;
+        }
+    
+        std::string tempPath = filePath + ".tmp";
+        std::ofstream tempFile(tempPath);
+        if (!tempFile) {
+            #if USING_LOGGING_DIRECTIVE
+            if (!disableLogging)
+                logMessage("Failed to create the temporary file: " + tempPath);
+            #endif
+            return;
+        }
+    
+        std::string line, sectionName;
+        while (getline(configFile, line)) {
+            trim(line);
+            if (!line.empty() && line.front() == '[' && line.back() == ']') {
+                sectionName = line.substr(1, line.length() - 2);
+                tempFile << "[" << (sectionName == currentSectionName ? newSectionName : sectionName) << "]\n";
+            } else {
+                tempFile << line << '\n';
+            }
+        }
+    
+        configFile.close();
+        tempFile.close();
+    #endif
+    
+        // Replace the original file with the modified temporary file
+        if (remove(filePath.c_str()) != 0) {
+            #if USING_LOGGING_DIRECTIVE
+            if (!disableLogging)
+                logMessage("Failed to delete the original file: " + filePath);
+            #endif
+            return;
+        }
+    
+        if (rename(tempPath.c_str(), filePath.c_str()) != 0) {
+            #if USING_LOGGING_DIRECTIVE
+            if (!disableLogging)
+                logMessage("Failed to rename the temporary file: " + tempPath);
+            #endif
+        }
+    }
+
+    
+    /**
+     * @brief Removes a section from an INI file.
+     *
+     * This function removes the section with the specified name, including all its associated key-value
+     * pairs, from the INI file located at the specified path. If the section does not exist in the file,
+     * it does nothing.
+     *
+     * @param filePath The path to the INI file.
+     * @param sectionName The name of the section to remove.
+     */
+    void removeIniSection(const std::string& filePath, const std::string& sectionName) {
+        auto fileMutex = getFileMutex(filePath);
+        std::unique_lock<std::shared_mutex> lock(*fileMutex);
+
+    #if !USING_FSTREAM_DIRECTIVE
+        FILE* configFile = fopen(filePath.c_str(), "r");
+        if (!configFile) {
+            #if USING_LOGGING_DIRECTIVE
+            if (!disableLogging)
+                logMessage("Failed to open the input file: " + filePath);
+            #endif
+            return;
+        }
+    
+        std::string tempPath = filePath + ".tmp";
+        FILE* tempFile = fopen(tempPath.c_str(), "w");
+        if (!tempFile) {
+            #if USING_LOGGING_DIRECTIVE
+            if (!disableLogging)
+                logMessage("Failed to create the temporary file: " + tempPath);
+            #endif
+            fclose(configFile);
+            return;
+        }
+    
+        // Pre-calculate section comparison values
+        const size_t sectionNameLen = sectionName.length();
+        const size_t fullSectionLen = sectionNameLen + 2; // [ + sectionName + ]
+    
+        char line[1024];
+        std::string currentSection;
+        bool inSectionToRemove = false;
+        
+        size_t len;
+        const char* start;
+        const char* end;
+        
+        size_t trimmed_len;
+        while (fgets(line, sizeof(line), configFile)) {
+            len = strlen(line);
+            
+            // Early exit for empty lines
+            if (len == 0) {
+                if (!inSectionToRemove) {
+                    fprintf(tempFile, "%s", line);
+                }
+                continue;
+            }
+            
+            // Manual trim for better performance - find start of non-whitespace
+            start = line;
+            while (*start == ' ' || *start == '\t') ++start;
+            
+            // Find end of non-whitespace (working backwards from known end)
+            end = line + len - 1;
+            while (end >= start && (*end == '\n' || *end == '\r' || *end == ' ' || *end == '\t')) --end;
+            
+            // Early exit for whitespace-only lines
+            if (end < start) {
+                if (!inSectionToRemove) {
+                    fprintf(tempFile, "%s", line);
+                }
+                continue;
+            }
+            
+            // Calculate trimmed length
+            trimmed_len = end - start + 1;
+            
+            // Check if this is a section header
+            if (trimmed_len >= 3 && *start == '[' && *end == ']') {
+                // Optimize section detection with direct comparison
+                if (trimmed_len == fullSectionLen) {
+                    // Direct memory comparison - much faster than string creation
+                    if (memcmp(start + 1, sectionName.c_str(), sectionNameLen) == 0) {
+                        inSectionToRemove = true;
+                        continue; // Skip writing this section header
+                    }
+                }
+                
+                // Different section - not the one to remove
+                inSectionToRemove = false;
+                fprintf(tempFile, "%s", line);
+            } else if (!inSectionToRemove) {
+                // Write the line as-is to preserve formatting
+                fprintf(tempFile, "%s", line);
+            }
+            // If inSectionToRemove is true, skip writing this line
+        }
+    
+        fclose(configFile);
+        fclose(tempFile);
+    #else
+        std::ifstream configFile(filePath);
+        if (!configFile) {
+            #if USING_LOGGING_DIRECTIVE
+            if (!disableLogging)
+                logMessage("Failed to open the input file: " + filePath);
+            #endif
+            return;
+        }
+    
+        std::string tempPath = filePath + ".tmp";
+        std::ofstream tempFile(tempPath);
+        if (!tempFile) {
+            #if USING_LOGGING_DIRECTIVE
+            if (!disableLogging)
+                logMessage("Failed to create the temporary file: " + tempPath);
+            #endif
+            return;
+        }
+    
+        // Pre-calculate section comparison values
+        const size_t sectionNameLen = sectionName.length();
+        const size_t fullSectionLen = sectionNameLen + 2; // [ + sectionName + ]
+    
+        std::string line, currentSection;
+        bool inSectionToRemove = false;
+
+        size_t start, end, trimmed_len;
+        while (getline(configFile, line)) {
+            // Early exit for empty lines
+            if (line.empty()) {
+                if (!inSectionToRemove) {
+                    tempFile << line << '\n';
+                }
+                continue;
+            }
+            
+            // Manual trim for better performance
+            start = 0;
+            end = line.length() - 1;
+            
+            // Find start of non-whitespace
+            while (start < line.length() && (line[start] == ' ' || line[start] == '\t')) {
+                ++start;
+            }
+            
+            // Find end of non-whitespace (excluding carriage return)
+            while (end > start && (line[end] == ' ' || line[end] == '\t' || line[end] == '\r')) {
+                --end;
+            }
+            
+            // Early exit for whitespace-only lines
+            if (start >= line.length() || end < start) {
+                if (!inSectionToRemove) {
+                    tempFile << line << '\n';
+                }
+                continue;
+            }
+            
+            // Calculate trimmed length
+            trimmed_len = end - start + 1;
+            
+            // Check if this is a section header
+            if (trimmed_len >= 3 && line[start] == '[' && line[end] == ']') {
+                // Optimize section detection with direct comparison
+                if (trimmed_len == fullSectionLen) {
+                    // Direct string comparison - much faster than substr + comparison
+                    if (line.compare(start + 1, sectionNameLen, sectionName) == 0) {
+                        inSectionToRemove = true;
+                        continue; // Skip writing this section header
+                    }
+                }
+                
+                // Different section - not the one to remove
+                inSectionToRemove = false;
+                tempFile << line << '\n';
+            } else if (!inSectionToRemove) {
+                tempFile << line << '\n';
+            }
+            // If inSectionToRemove is true, skip writing this line
+        }
+    
+        configFile.close();
+        tempFile.close();
+    #endif
+    
+        // Replace the original file with the temp file
+        if (remove(filePath.c_str()) != 0) {
+            #if USING_LOGGING_DIRECTIVE
+            if (!disableLogging)
+                logMessage("Failed to delete the original file: " + filePath);
+            #endif
+            return;
+        }
+    
+        if (rename(tempPath.c_str(), filePath.c_str()) != 0) {
+            #if USING_LOGGING_DIRECTIVE
+            if (!disableLogging)
+                logMessage("Failed to rename the temporary file: " + tempPath);
+            #endif
+        }
+    }
+    
+
+    /**
+     * @brief Removes a key-value pair from an INI file.
+     */
+    void removeIniKey(const std::string& filePath, const std::string& sectionName, const std::string& keyName) {
+        auto fileMutex = getFileMutex(filePath);
+        std::unique_lock<std::shared_mutex> lock(*fileMutex);
+
+    #if !USING_FSTREAM_DIRECTIVE
+        FILE* configFile = fopen(filePath.c_str(), "r");
+        if (!configFile) {
+            #if USING_LOGGING_DIRECTIVE
+            if (!disableLogging)
+                logMessage("Failed to open the input file: " + filePath);
+            #endif
+            return;
+        }
+    
+        std::string tempPath = filePath + ".tmp";
+        FILE* tempFile = fopen(tempPath.c_str(), "w");
+        if (!tempFile) {
+            #if USING_LOGGING_DIRECTIVE
+            if (!disableLogging)
+                logMessage("Failed to create the temporary file: " + tempPath);
+            #endif
+            fclose(configFile);
+            return;
+        }
+    
+        // Declare all variables outside the loop for efficiency
+        char line[1024];
+        std::string currentSection;
+        //currentSection.reserve(64);
+        
+        std::string lineStr;
+        //lineStr.reserve(1024);
+        
+        std::string trimmedLine;
+        //trimmedLine.reserve(1024);
+        
+        std::string lineKey;
+        //lineKey.reserve(128);
+        
+        bool inTargetSection = false;
+        size_t eqPos;
+        
+        while (fgets(line, sizeof(line), configFile)) {
+            lineStr.assign(line);
+            
+            // Create a trimmed copy for parsing
+            trimmedLine = lineStr;
+            if (!trimmedLine.empty() && trimmedLine.back() == '\n') {
+                trimmedLine.pop_back();
+                if (!trimmedLine.empty() && trimmedLine.back() == '\r') {
+                    trimmedLine.pop_back();
+                }
+            }
+            trim(trimmedLine);
+    
+            if (!trimmedLine.empty() && trimmedLine.front() == '[' && trimmedLine.back() == ']') {
+                currentSection.assign(trimmedLine, 1, trimmedLine.length() - 2);
+                inTargetSection = (currentSection == sectionName);
+                fprintf(tempFile, "%s", line); // Write original line
+            } else if (inTargetSection) {
+                // Check if line starts with the key (handle spaces around =)
+                eqPos = trimmedLine.find('=');
+                if (eqPos != std::string::npos) {
+                    lineKey.assign(trimmedLine, 0, eqPos);
+                    trim(lineKey);
+                    if (lineKey == keyName) {
+                        continue; // Skip this line
+                    }
+                }
+                fprintf(tempFile, "%s", line);
+            } else {
+                fprintf(tempFile, "%s", line);
+            }
+        }
+    
+        fclose(configFile);
+        fclose(tempFile);
+    #else
+        std::ifstream configFile(filePath);
+        if (!configFile) {
+            #if USING_LOGGING_DIRECTIVE
+            if (!disableLogging)
+                logMessage("Failed to open the input file: " + filePath);
+            #endif
+            return;
+        }
+    
+        std::string tempPath = filePath + ".tmp";
+        std::ofstream tempFile(tempPath);
+        if (!tempFile) {
+            #if USING_LOGGING_DIRECTIVE
+            if (!disableLogging)
+                logMessage("Failed to create the temporary file: " + tempPath);
+            #endif
+            return;
+        }
+    
+        // Declare all variables outside the loop for efficiency
+        std::string line;
+        //line.reserve(1024);
+        
+        std::string currentSection;
+        //currentSection.reserve(64);
+        
+        std::string trimmedLine;
+        //trimmedLine.reserve(1024);
+        
+        std::string lineKey;
+        //lineKey.reserve(128);
+        
+        bool inTargetSection = false;
+        size_t eqPos;
+    
+        while (getline(configFile, line)) {
+            trimmedLine = line;
+            // Remove carriage return if present
+            if (!trimmedLine.empty() && trimmedLine.back() == '\r') {
+                trimmedLine.pop_back();
+            }
+            trim(trimmedLine);
+    
+            if (!trimmedLine.empty() && trimmedLine.front() == '[' && trimmedLine.back() == ']') {
+                currentSection.assign(trimmedLine, 1, trimmedLine.length() - 2);
+                inTargetSection = (currentSection == sectionName);
+                tempFile << line << '\n';
+            } else if (inTargetSection) {
+                // Better key matching that handles spaces
+                eqPos = trimmedLine.find('=');
+                if (eqPos != std::string::npos) {
+                    lineKey.assign(trimmedLine, 0, eqPos);
+                    trim(lineKey);
+                    if (lineKey == keyName) {
+                        continue; // Skip this line
+                    }
+                }
+                tempFile << line << '\n';
+            } else {
+                tempFile << line << '\n';
+            }
+        }
+    
+        configFile.close();
+        tempFile.close();
+    #endif
+    
+        // Replace the original file with the temp file
+        if (remove(filePath.c_str()) != 0) {
+            #if USING_LOGGING_DIRECTIVE
+            if (!disableLogging)
+                logMessage("Failed to delete the original file: " + filePath);
+            #endif
+            return;
+        }
+    
+        if (rename(tempPath.c_str(), filePath.c_str()) != 0) {
+            #if USING_LOGGING_DIRECTIVE
+            if (!disableLogging)
+                logMessage("Failed to rename the temporary file: " + tempPath);
+            #endif
+        }
+    }
+    
+    //void saveIniFileData(const std::string& filePath, const std::map<std::string, std::map<std::string, std::string>>& data) {
+    //    std::ofstream file(filePath);
+    //    if (!file.is_open()) {
+    //        // Handle error: could not open file
+    //        return;
+    //    }
+    //
+    //    for (const auto& section : data) {
+    //        file << "[" << section.first << "]\n";
+    //        for (const auto& kv : section.second) {
+    //            file << kv.first << "=" << kv.second << "\n";
+    //        }
+    //        file << "\n"; // Separate sections with a newline
+    //    }
+    //
+    //    file.close();
+    //}
+    
+    
+    void syncIniValue(std::map<std::string, std::map<std::string, std::string>>& packageConfigData,
+                       const std::string& packageConfigIniPath,
+                       const std::string& optionName,
+                       const std::string& key,
+                       std::string& value) {
+        auto optionIt = packageConfigData.find(optionName);
+        if (optionIt != packageConfigData.end()) {
+            auto it = optionIt->second.find(key);
+            if (it != optionIt->second.end()) {
+                value = it->second;  // Update value only if the key exists
+            //} else {
+            //    setIniFileValue(packageConfigIniPath, optionName, key, value); // Set INI file value if key not found
+            //}
+            } else {
+                // Key not found - add it to in-memory data and save entire structure
+                packageConfigData[optionName][key] = value;
+                saveIniFileData(packageConfigIniPath, packageConfigData);
+            }
+        }
+    }
+    
+    
+    /**
+     * @brief Parses a command line into individual parts, handling quoted strings.
+     *
+     * @param line The command line to parse.
+     * @return A vector of strings containing the parsed command parts.
+     */
+    std::vector<std::string> parseCommandLine(const std::string& line) {
+        std::vector<std::string> commandParts;
+        
+        const char* const data = line.data();
+        const char* const end = data + line.length();
+        const char* pos = data;
+        
+        //commandParts.reserve(8);
+        
+        while (pos < end) {
+            // Skip leading whitespace
+            while (pos < end && (*pos == ' ' || *pos == '\t')) {
+                ++pos;
+            }
+            
+            if (pos >= end) break;
+            
+            const char* argStart = pos;
+            const char* argEnd = pos;
+            
+            if (*pos == '\'' || *pos == '"') {
+                // Quoted argument
+                const char quoteChar = *pos;
+                ++pos; // Skip opening quote
+                argStart = pos;
+                
+                // Find closing quote
+                while (pos < end && *pos != quoteChar) {
+                    ++pos;
+                }
+                
+                argEnd = pos;
+                if (pos < end) ++pos; // Skip closing quote
+            } else {
+                // Unquoted argument
+                while (pos < end && *pos != ' ' && *pos != '\t' && *pos != '\'' && *pos != '"') {
+                    ++pos;
+                }
+                argEnd = pos;
+            }
+            
+            if (argEnd >= argStart) {
+                commandParts.emplace_back(argStart, argEnd - argStart);
+            }
+        }
+        
+        return commandParts;
+    }
+        
+    
+    /**
+     * @brief Loads and parses options from an INI file.
+     *
+     * This function reads and parses options from an INI file, organizing them by section.
+     *
+     * @param packageIniPath The path to the INI file.
+     * @return A vector containing pairs of section names and their associated key-value pairs.
+     */
+    std::vector<std::pair<std::string, std::vector<std::vector<std::string>>>> loadOptionsFromIni(const std::string& packageIniPath) {
+        auto fileMutex = getFileMutex(packageIniPath);
+        std::shared_lock<std::shared_mutex> lock(*fileMutex);
+
+    #if !USING_FSTREAM_DIRECTIVE
+        FILE* packageFile = fopen(packageIniPath.c_str(), "r");
+        if (!packageFile) return {}; // Return empty vector if file can't be opened
+        
+        std::vector<std::pair<std::string, std::vector<std::vector<std::string>>>> options;
+        
+        char line[1024];
+        std::string currentSection;
+        std::vector<std::vector<std::string>> sectionCommands;
+        std::string strLine;
+        
+        size_t len;
+        //const char* start;
+        //const char* end;
+    
+        while (fgets(line, sizeof(line), packageFile)) {
+            // More efficient newline removal
+            len = strlen(line);
+            if (len > 0 && line[len-1] == '\n') {
+                line[len-1] = '\0';
+                --len;
+                if (len > 0 && line[len-1] == '\r') {
+                    line[len-1] = '\0';
+                    --len;
+                }
+            }
+            
+            // Early exit for empty lines
+            if (len == 0) continue;
+            
+            // Check for comments early (most efficient check)
+            if (line[0] == '#') continue;
+            
+            // Assign the processed line
+            strLine.assign(line, len);
+    
+            if (strLine[0] == '[' && strLine.back() == ']') { // Section headers
+                if (!currentSection.empty()) {
+                    options.emplace_back(std::move(currentSection), std::move(sectionCommands));
+                    //sectionCommands.clear();
+                    //sectionCommands.shrink_to_fit(); // Free capacity after move
+                }
+                currentSection.assign(strLine, 1, strLine.size() - 2);
+            } else if (!currentSection.empty()) { // Command lines within sections
+                sectionCommands.push_back(parseCommandLine(strLine));
+            }
+
+            // Clear strLine content to free string memory
+            strLine.clear();
+        }
+    
+        if (!currentSection.empty()) {
+            options.emplace_back(std::move(currentSection), std::move(sectionCommands));
+        }
+        
+        fclose(packageFile);
+    #else
+        std::ifstream packageFile(packageIniPath);
+        if (!packageFile) return {}; // Return empty vector if file can't be opened
+    
+        std::vector<std::pair<std::string, std::vector<std::vector<std::string>>>> options;
+        
+        std::string line, currentSection;
+        std::vector<std::vector<std::string>> sectionCommands;
+    
+        while (std::getline(packageFile, line)) {
+            // Remove carriage return if present (getline already removes \n)
+            if (!line.empty() && line.back() == '\r') {
+                line.pop_back();
+            }
+    
+            // Early exits for empty lines and comments
+            if (line.empty() || line[0] == '#') continue;
+    
+            if (line[0] == '[' && line.back() == ']') { // Section headers
+                if (!currentSection.empty()) {
+                    options.emplace_back(std::move(currentSection), std::move(sectionCommands));
+                    //sectionCommands.clear();
+                    //sectionCommands.shrink_to_fit(); // Free capacity after move
+                }
+                currentSection.assign(line, 1, line.size() - 2);
+            } else if (!currentSection.empty()) { // Command lines within sections
+                sectionCommands.push_back(parseCommandLine(line));
+            }
+            // Clear line content to reuse capacity
+            line.clear();
+        }
+    
+        if (!currentSection.empty()) {
+            options.emplace_back(std::move(currentSection), std::move(sectionCommands));
+        }
+        
+        packageFile.close();
+    #endif
+    
+        return options;
+    }
+
+    /**
+     * @brief Loads a specific section from an INI file.
+     *
+     * This function reads and parses a specific section from an INI file.
+     *
+     * @param packageIniPath The path to the INI file.
+     * @param sectionName The name of the section to load.
+     * @return A vector of commands within the specified section.
+     */
+    std::vector<std::vector<std::string>> loadSpecificSectionFromIni(const std::string& packageIniPath, const std::string& sectionName) {
+        auto fileMutex = getFileMutex(packageIniPath);
+        std::shared_lock<std::shared_mutex> lock(*fileMutex);
+
+    #if !USING_FSTREAM_DIRECTIVE
+        FILE* packageFile = fopen(packageIniPath.c_str(), "r");
+        
+        if (!packageFile) return {}; // Return empty vector if file can't be opened
+        
+        std::vector<std::vector<std::string>> sectionCommands;
+        
+        char line[1024];
+        std::string currentSection;
+        bool inTargetSection = false;
+        std::string strLine;
+        
+        size_t len;
+        
+        while (fgets(line, sizeof(line), packageFile)) {
+            // More efficient newline removal
+            len = strlen(line);
+            if (len > 0 && line[len-1] == '\n') {
+                line[len-1] = '\0';
+                --len;
+                if (len > 0 && line[len-1] == '\r') {
+                    line[len-1] = '\0';
+                    --len;
+                }
+            }
+            
+            // Early exit for empty lines
+            if (len == 0) continue;
+            
+            // Check for comments early (most efficient check)
+            if (line[0] == '#') continue;
+            
+            // Assign the processed line
+            strLine.assign(line, len);
+    
+            if (strLine[0] == '[' && strLine.back() == ']') { // Section headers
+                currentSection.assign(strLine, 1, strLine.size() - 2);
+                inTargetSection = (currentSection == sectionName); // Check if this is the target section
+                
+                // Early exit optimization: if we were in target section and hit a new section, we're done
+                if (!inTargetSection && !sectionCommands.empty()) {
+                    break; // Found target section and processed it, no need to continue
+                }
+            } else if (inTargetSection) { // Only parse commands within the target section
+                sectionCommands.push_back(parseCommandLine(strLine));
+            }
+
+            // Clear strings to reuse capacity
+            strLine.clear();
+            currentSection.clear();
+        }
+    
+        fclose(packageFile);
+    #else
+        std::ifstream packageFile(packageIniPath);
+        
+        if (!packageFile) return {}; // Return empty vector if file can't be opened
+        
+        std::string line, currentSection;
+        std::vector<std::vector<std::string>> sectionCommands;
+        bool inTargetSection = false;
+    
+        while (std::getline(packageFile, line)) {
+            // Remove carriage return if present (getline already removes \n)
+            if (!line.empty() && line.back() == '\r') {
+                line.pop_back();
+            }
+    
+            // Early exits for empty lines and comments
+            if (line.empty() || line[0] == '#') continue;
+    
+            if (line[0] == '[' && line.back() == ']') { // Section headers
+                currentSection.assign(line, 1, line.size() - 2);
+                inTargetSection = (currentSection == sectionName); // Check if this is the target section
+                
+                // Early exit optimization: if we were in target section and hit a new section, we're done
+                if (!inTargetSection && !sectionCommands.empty()) {
+                    break; // Found target section and processed it, no need to continue
+                }
+            } else if (inTargetSection) { // Only parse commands within the target section
+                sectionCommands.push_back(parseCommandLine(line));
+            }
+
+            // Clear strings to reuse capacity
+            //strLine.clear();
+            currentSection.clear();
+        }
+    
+        packageFile.close();
+    #endif
+    
+        return sectionCommands; // Return only the commands from the target section
+    }
+    
+
+    /**
+     * @brief Saves INI data structure to a file.
+     *
+     * This function writes a complete INI data structure to the specified file path.
+     * The data structure should be organized as sections containing key-value pairs.
+     *
+     * @param filePath The path to the INI file to write.
+     * @param data The complete INI data structure to save.
+     */
+    void saveIniFileData(const std::string& filePath, const std::map<std::string, std::map<std::string, std::string>>& data) {
+        auto fileMutex = getFileMutex(filePath);
+        std::unique_lock<std::shared_mutex> lock(*fileMutex);
+
+        #if !USING_FSTREAM_DIRECTIVE
+        FILE* file = fopen(filePath.c_str(), "w");
+        if (!file) {
+            // Handle error: could not open file
+            return;
+        }
+    
+        for (const auto& section : data) {
+            fprintf(file, "[%s]\n", section.first.c_str());
+            for (const auto& kv : section.second) {
+                fprintf(file, "%s=%s\n", kv.first.c_str(), kv.second.c_str());
+            }
+            fputc('\n', file); // Separate sections with a newline
+        }
+    
+        fclose(file);
+        #else
+        std::ofstream file(filePath);
+        if (!file.is_open()) {
+            // Handle error: could not open file
+            return;
+        }
+    
+        for (const auto& section : data) {
+            file << "[" << section.first << "]\n";
+            for (const auto& kv : section.second) {
+                file << kv.first << "=" << kv.second << "\n";
+            }
+            file << "\n"; // Separate sections with a newline
+        }
+    
+        file.close();
+        #endif
+    }
+}
\ No newline at end of file
diff --git a/Source/sys-clk/overlay/lib/libultrahand/libultra/source/json_funcs.cpp b/Source/sys-clk/overlay/lib/libultrahand/libultra/source/json_funcs.cpp
new file mode 100644
index 00000000..b4acb50e
--- /dev/null
+++ b/Source/sys-clk/overlay/lib/libultrahand/libultra/source/json_funcs.cpp
@@ -0,0 +1,400 @@
+/********************************************************************************
+ * File: json_funcs.cpp
+ * Author: ppkantorski
+ * Description:
+ *   This source file provides functions for working with JSON files in C++ using
+ *   the `cJSON` library. It includes a function to read JSON data from a file.
+ *
+ *   For the latest updates and contributions, visit the project's GitHub repository.
+ *   (GitHub Repository: https://github.com/ppkantorski/Ultrahand-Overlay)
+ *
+ *   Note: Please be aware that this notice cannot be altered or removed. It is a part
+ *   of the project's documentation and must remain intact.
+ *
+ *  Licensed under both GPLv2 and CC-BY-4.0
+ *  Copyright (c) 2024 ppkantorski
+ ********************************************************************************/
+
+#include "json_funcs.hpp"
+
+
+namespace ult {
+
+    static std::mutex json_access_mutex;
+
+    /**
+     * @brief Reads JSON data from a file and returns it as a `json_t` object.
+     *
+     * @param filePath The path to the JSON file.
+     * @return A `json_t` object representing the parsed JSON data. Returns `nullptr` on error.
+     */
+    json_t* readJsonFromFile(const std::string& filePath) {
+        std::lock_guard<std::mutex> lock(json_access_mutex);
+    #if !USING_FSTREAM_DIRECTIVE
+        FILE* file = fopen(filePath.c_str(), "rb");
+        if (!file) {
+            return nullptr;
+        }
+    
+        // Get file size
+        fseek(file, 0, SEEK_END);
+        const long fileSize = ftell(file);
+        fseek(file, 0, SEEK_SET);
+        
+        // Check for reasonable file size
+        if (fileSize <= 0 || fileSize > 6 * 1024 * 1024) { // 6MB limit
+            fclose(file);
+            return nullptr;
+        }
+    
+        // Use vector<char> for better performance and explicit null termination
+        std::vector<char> buffer;
+        buffer.resize(static_cast<size_t>(fileSize) + 1); // +1 for null terminator
+    
+        // Read the file in one operation
+        const size_t bytesRead = fread(buffer.data(), 1, static_cast<size_t>(fileSize), file);
+        fclose(file);
+        
+        if (bytesRead != static_cast<size_t>(fileSize)) {
+            return nullptr;
+        }
+        
+        // Ensure null termination for cJSON
+        buffer[bytesRead] = '\0';
+        
+    #else
+        std::ifstream file(filePath, std::ios::binary | std::ios::ate);
+        if (!file.is_open()) {
+            return nullptr;
+        }
+        
+        // Get file size from current position (end)
+        const std::streampos fileSize = file.tellg();
+        file.seekg(0, std::ios::beg);
+        
+        // Check for reasonable file size
+        if (fileSize <= 0 || fileSize > 6 * 1024 * 1024) {
+            return nullptr;
+        }
+        
+        // Use vector<char> for better performance and explicit null termination
+        std::vector<char> buffer;
+        buffer.resize(static_cast<size_t>(fileSize) + 1); // +1 for null terminator
+        
+        file.read(buffer.data(), static_cast<std::streamsize>(fileSize));
+        
+        // Check how much was actually read
+        std::streamsize actualRead = file.gcount();
+        if (actualRead != fileSize) {
+            return nullptr;
+        }
+        
+        // Ensure null termination for cJSON
+        buffer[actualRead] = '\0';
+        file.close();
+    #endif
+        
+        // Parse the JSON content - pass buffer directly to avoid string copy
+        cJSON* root = cJSON_Parse(buffer.data());
+        if (!root) {
+            #if USING_LOGGING_DIRECTIVE
+            const char* error_ptr = cJSON_GetErrorPtr();
+            if (error_ptr) {
+                if (!disableLogging)
+                    logMessage("JSON parsing error: " + std::string(error_ptr));
+            }
+            #endif
+            return nullptr;
+        }
+        
+        return reinterpret_cast<json_t*>(root);
+    }
+    
+    
+    /**
+     * @brief Parses a JSON string into a json_t object.
+     *
+     * This function takes a JSON string as input and parses it into a json_t object using cJSON library's `cJSON_Parse` function.
+     * If parsing fails, it logs the error and returns nullptr.
+     *
+     * @param input The input JSON string to parse.
+     * @return A json_t object representing the parsed JSON, or nullptr if parsing fails.
+     */
+    json_t* stringToJson(const std::string& input) {
+        cJSON* jsonObj = cJSON_Parse(input.c_str());
+    
+        if (!jsonObj) {
+            #if USING_LOGGING_DIRECTIVE
+            const char* error_ptr = cJSON_GetErrorPtr();
+            if (error_ptr != nullptr) {
+                if (!disableLogging)
+                    logMessage("Failed to parse JSON: " + std::string(error_ptr));
+            }
+            #endif
+            return nullptr; // Return nullptr to indicate failure clearly
+        }
+    
+        return reinterpret_cast<json_t*>(jsonObj);
+    }
+    
+    
+    
+    
+    
+    // Function to get a string from a JSON object
+    std::string getStringFromJson(const json_t* root, const char* key) {
+        const cJSON* croot = reinterpret_cast<const cJSON*>(root);
+        const cJSON* value = cJSON_GetObjectItemCaseSensitive(croot, key);
+        if (value && cJSON_IsString(value) && value->valuestring) {
+            return value->valuestring;
+        } else {
+            return ""; // Key not found or not a string, return empty string/char*
+        }
+    }
+    
+    
+    /**
+     * @brief Loads a JSON file from the specified path and retrieves a string value for a given key.
+     *
+     * This function combines the functionality of loading a JSON file and retrieving a string value associated
+     * with a given key in a single step.
+     *
+     * @param filePath The path to the JSON file.
+     * @param key The key whose associated string value is to be retrieved.
+     * @return A string containing the value associated with the given key, or an empty string if the key is not found.
+     */
+    std::string getStringFromJsonFile(const std::string& filePath, const std::string& key) {
+        // Load JSON from file using a smart pointer
+        std::unique_ptr<json_t, JsonDeleter> root(readJsonFromFile(filePath), JsonDeleter());
+        if (!root) {
+            #if USING_LOGGING_DIRECTIVE
+            logMessage("Failed to load JSON file from path: " + filePath);
+            #endif
+            return "";
+        }
+    
+        // Retrieve the string value associated with the key
+        cJSON* croot = reinterpret_cast<cJSON*>(root.get());
+        cJSON* jsonKey = cJSON_GetObjectItemCaseSensitive(croot, key.c_str());
+        const char* value = (cJSON_IsString(jsonKey) && jsonKey->valuestring) ? jsonKey->valuestring : nullptr;
+    
+        // Check if the value was found and return it
+        if (value) {
+            return std::string(value);
+        } else {
+            #if USING_LOGGING_DIRECTIVE
+            logMessage("Key not found or not a string in JSON: " + key);
+            #endif
+            return "";
+        }
+    }
+
+
+    /**
+     * @brief Sets a value in a JSON file, creating the file if it doesn't exist.
+     *
+     * @param filePath The path to the JSON file.
+     * @param key The key to set.
+     * @param value The value to set (auto-detected type).
+     * @param createIfNotExists Whether to create the file if it doesn't exist.
+     * @return true if successful, false otherwise.
+     */
+    bool setJsonValue(const std::string& filePath, const std::string& key, const std::string& value, bool createIfNotExists) {
+        // Try to load existing file
+        std::unique_ptr<json_t, JsonDeleter> root(readJsonFromFile(filePath), JsonDeleter());
+        
+        cJSON* croot = nullptr;
+        
+        // If file doesn't exist, create new JSON object if allowed
+        if (!root) {
+            if (!createIfNotExists) {
+                return false;
+            }
+            croot = cJSON_CreateObject();
+            if (!croot) {
+                return false;
+            }
+            root.reset(reinterpret_cast<json_t*>(croot));
+        } else {
+            croot = reinterpret_cast<cJSON*>(root.get());
+        }
+    
+        // FIXED: Better value type detection
+        cJSON* jsonValue = nullptr;
+        
+        // Trim whitespace first
+        std::string trimmedValue = value;
+        // Remove leading whitespace
+        trimmedValue.erase(0, trimmedValue.find_first_not_of(" \t\n\r"));
+        // Remove trailing whitespace  
+        trimmedValue.erase(trimmedValue.find_last_not_of(" \t\n\r") + 1);
+        
+        if (trimmedValue.empty()) {
+            jsonValue = cJSON_CreateString("");
+        } else if (trimmedValue == "true") {
+            jsonValue = cJSON_CreateBool(1);
+        } else if (trimmedValue == "false") {
+            jsonValue = cJSON_CreateBool(0);
+        } else if (trimmedValue == "null") {
+            jsonValue = cJSON_CreateNull();
+        } else {
+            // Try parsing as number (integer or float)
+            char* endPtr = nullptr;
+            errno = 0;
+            
+            // Try as integer first
+            const long longValue = std::strtol(trimmedValue.c_str(), &endPtr, 10);
+            if (endPtr == trimmedValue.c_str() + trimmedValue.length() && errno == 0) {
+                // Successfully parsed as integer
+                jsonValue = cJSON_CreateNumber(static_cast<double>(longValue));
+            } else {
+                // Try as float
+                endPtr = nullptr;
+                errno = 0;
+                const double doubleValue = std::strtod(trimmedValue.c_str(), &endPtr);
+                if (endPtr == trimmedValue.c_str() + trimmedValue.length() && errno == 0) {
+                    // Successfully parsed as float
+                    jsonValue = cJSON_CreateNumber(doubleValue);
+                } else {
+                    // Treat as string
+                    jsonValue = cJSON_CreateString(trimmedValue.c_str());
+                }
+            }
+        }
+    
+        if (!jsonValue) {
+            return false;
+        }
+    
+        // Delete existing item if it exists
+        cJSON_DeleteItemFromObject(croot, key.c_str());
+        
+        // Add the new value
+        cJSON_AddItemToObject(croot, key.c_str(), jsonValue);
+    
+        // Save to file with formatted output for better readability
+        char* jsonString = cJSON_Print(croot); // Use formatted output instead of PrintUnformatted
+        if (!jsonString) {
+            return false;
+        }
+        
+        bool success = false;
+        {
+            std::lock_guard<std::mutex> lock(json_access_mutex);
+        #if !USING_FSTREAM_DIRECTIVE
+            FILE* file = fopen(filePath.c_str(), "w"); // Use text mode for JSON
+            if (file) {
+                const size_t jsonLength = std::strlen(jsonString);
+                const size_t bytesWritten = fwrite(jsonString, 1, jsonLength, file);
+                success = (bytesWritten == jsonLength);
+                fclose(file);
+            }
+        #else
+            std::ofstream file(filePath); // Use text mode for JSON
+            if (file.is_open()) {
+                file << jsonString;
+                success = !file.fail();
+                file.close();
+            }
+        #endif
+        }
+    
+        cJSON_free(jsonString);
+        return success;
+    }
+
+    /**
+     * @brief Renames a key in a JSON file.
+     *
+     * @param filePath The path to the JSON file.
+     * @param oldKey The current key name.
+     * @param newKey The new key name.
+     * @return true if successful, false otherwise.
+     */
+    bool renameJsonKey(const std::string& filePath, const std::string& oldKey, const std::string& newKey) {
+        // Try to load existing file
+        std::unique_ptr<json_t, JsonDeleter> root(readJsonFromFile(filePath), JsonDeleter());
+        
+        if (!root) {
+            return false;
+        }
+        
+        cJSON* croot = reinterpret_cast<cJSON*>(root.get());
+    
+        // Check if old key exists
+        cJSON* value = cJSON_GetObjectItemCaseSensitive(croot, oldKey.c_str());
+        if (!value) {
+            return false;
+        }
+    
+        // Detach the value from the object
+        cJSON_DetachItemFromObject(croot, oldKey.c_str());
+        
+        // Add it back with the new key
+        cJSON_AddItemToObject(croot, newKey.c_str(), value);
+    
+        // Save to file
+        char* jsonString = cJSON_Print(croot); // Use formatted output
+        if (!jsonString) {
+            return false;
+        }
+    
+        bool success = false;
+
+        {
+            std::lock_guard<std::mutex> lock(json_access_mutex);
+        #if !USING_FSTREAM_DIRECTIVE
+            FILE* file = fopen(filePath.c_str(), "w"); // Use text mode
+            if (file) {
+                const size_t jsonLength = std::strlen(jsonString);
+                const size_t bytesWritten = fwrite(jsonString, 1, jsonLength, file);
+                success = (bytesWritten == jsonLength);
+                fclose(file);
+            }
+        #else
+            std::ofstream file(filePath); // Use text mode
+            if (file.is_open()) {
+                file << jsonString;
+                success = !file.fail();
+                file.close();
+            }
+        #endif
+        }
+    
+        cJSON_free(jsonString);
+        return success;
+    }
+
+    void pushNotificationJson(const std::string& appID, const std::string& text, size_t fontSize) {
+        u64 tick = armGetSystemTick();
+        std::string filename = appID + "-" + std::to_string(tick) + ".notify"; // priority 20 default
+        
+        // Build full path
+        const std::string fullPath = NOTIFICATIONS_PATH + filename;
+        
+        // Create JSON object
+        cJSON* notif = cJSON_CreateObject();
+        if (!notif) return;
+        
+        cJSON_AddStringToObject(notif, "text", text.c_str());
+        cJSON_AddNumberToObject(notif, "font_size", static_cast<double>(fontSize));
+        //cJSON_AddNumberToObject(notif, "arrival_ns", static_cast<double>(armTicksToNs(tick)));
+        
+        // Serialize JSON
+        char* rendered = cJSON_PrintUnformatted(notif);
+        if (!rendered) {
+            cJSON_Delete(notif);
+            return;
+        }
+        
+        // Write to file (C-style)
+        FILE* file = fopen(fullPath.c_str(), "wb");
+        if (file) {
+            fwrite(rendered, 1, strlen(rendered), file);
+            fclose(file);
+        }
+        
+        cJSON_free(rendered);
+        cJSON_Delete(notif);
+    }
+}
\ No newline at end of file
diff --git a/Source/sys-clk/overlay/lib/libultrahand/libultra/source/list_funcs.cpp b/Source/sys-clk/overlay/lib/libultrahand/libultra/source/list_funcs.cpp
new file mode 100644
index 00000000..b18edabf
--- /dev/null
+++ b/Source/sys-clk/overlay/lib/libultrahand/libultra/source/list_funcs.cpp
@@ -0,0 +1,514 @@
+/********************************************************************************
+ * File: list_funcs.cpp
+ * Author: ppkantorski
+ * Description:
+ *   This source file contains function declarations and utility functions related
+ *   to working with lists and vectors of strings. These functions are used in the
+ *   Ultrahand Overlay project to perform various operations on lists, such as
+ *   removing entries, filtering, and more.
+ *
+ *   For the latest updates and contributions, visit the project's GitHub repository.
+ *   (GitHub Repository: https://github.com/ppkantorski/Ultrahand-Overlay)
+ *
+ *   Note: Please be aware that this notice cannot be altered or removed. It is a part
+ *   of the project's documentation and must remain intact.
+ * 
+ *  Licensed under both GPLv2 and CC-BY-4.0
+ *  Copyright (c) 2024 ppkantorski
+ ********************************************************************************/
+
+#include <list_funcs.hpp>
+#include <mutex>
+
+namespace ult {
+    static constexpr const char* UNABLE_TO_OPEN_FILE = "Unable to open file: ";
+
+    // Thread-safe file access mutex
+    static std::mutex file_access_mutex;
+    
+    std::vector<std::string> splitIniList(const std::string& value) {
+        std::vector<std::string> result;
+        std::string trimmed = value;
+        trim(trimmed);
+        if (trimmed.size() > 2 && trimmed.front() == '(' && trimmed.back() == ')') {
+            trimmed = trimmed.substr(1, trimmed.size() - 2);
+            ult::StringStream ss(trimmed);
+            std::string token;
+            while (ss.getline(token, ',')) {
+                trim(token);
+                result.push_back(token);
+            }
+        }
+        return result;
+    }
+    
+    std::string joinIniList(const std::vector<std::string>& list) {
+        std::string result = "";
+        for (size_t i = 0; i < list.size(); ++i) {
+            result += list[i];
+            if (i + 1 < list.size()) {
+                result += ", ";
+            }
+        }
+        return result;
+    }
+
+
+    /**
+     * @brief Removes entries from a vector of strings that match a specified entry.
+     *
+     * This function removes entries from the `itemsList` vector of strings that match the `entry`.
+     *
+     * @param entry The entry to be compared against the elements in `itemsList`.
+     * @param itemsList The vector of strings from which matching entries will be removed.
+     */
+    void removeEntryFromList(const std::string& entry, std::vector<std::string>& itemsList) {
+        itemsList.erase(std::remove_if(itemsList.begin(), itemsList.end(), [&](const std::string& item) {
+            return item.compare(0, entry.length(), entry) == 0;
+        }), itemsList.end());
+    }
+    
+    /**
+     * @brief Filters a list of strings based on a specified filter list.
+     *
+     * This function filters a list of strings (`itemsList`) by removing entries that match any
+     * of the criteria specified in the `filterList`. It uses the `removeEntryFromList` function
+     * to perform the removal.
+     *
+     * @param filterList The list of entries to filter by. Entries in `itemsList` matching any entry in this list will be removed.
+     * @param itemsList The list of strings to be filtered.
+     */
+    void filterItemsList(const std::vector<std::string>& filterList, std::vector<std::string>& itemsList) {
+        for (const auto& entry : filterList) {
+            removeEntryFromList(entry, itemsList);
+        }
+    }
+    
+        
+    // Function to read file into a vector of strings with optional cap
+    std::vector<std::string> readListFromFile(const std::string& filePath, size_t maxLines) {
+        std::lock_guard<std::mutex> lock(file_access_mutex);
+        std::vector<std::string> lines;
+    
+    #if !USING_FSTREAM_DIRECTIVE
+        FILE* file = fopen(filePath.c_str(), "r");
+        if (!file) {
+            #if USING_LOGGING_DIRECTIVE
+            logMessage(UNABLE_TO_OPEN_FILE + filePath);
+            #endif
+            return lines;
+        }
+    
+        static constexpr size_t BUFFER_SIZE = 8192;
+        char buffer[BUFFER_SIZE];
+        size_t len;
+        
+        while (fgets(buffer, BUFFER_SIZE, file)) {
+            // Check cap before processing
+            if (maxLines > 0 && lines.size() >= maxLines) {
+                break;
+            }
+            
+            // More efficient newline removal
+            len = strlen(buffer);
+            if (len > 0 && buffer[len - 1] == '\n') {
+                buffer[len - 1] = '\0';
+                --len;
+                // Also remove carriage return if present
+                if (len > 0 && buffer[len - 1] == '\r') {
+                    buffer[len - 1] = '\0';
+                }
+            }
+            
+            lines.emplace_back(buffer);
+        }
+    
+        fclose(file);
+    #else
+        std::ifstream file(filePath);
+        if (!file.is_open()) {
+            #if USING_LOGGING_DIRECTIVE
+            logMessage(UNABLE_TO_OPEN_FILE + filePath);
+            #endif
+            return lines;
+        }
+    
+        std::string line;
+        while (std::getline(file, line)) {
+            // Check cap before adding
+            if (maxLines > 0 && lines.size() >= maxLines) {
+                break;
+            }
+            
+            // Remove carriage return if present (getline removes \n but not \r)
+            if (!line.empty() && line.back() == '\r') {
+                line.pop_back();
+            }
+            
+            lines.emplace_back(std::move(line));
+        }
+    
+        file.close();
+    #endif
+    
+        return lines;
+    }
+    
+        
+    // Function to get an entry from the list based on the index
+    std::string getEntryFromListFile(const std::string& listPath, size_t listIndex) {
+        std::lock_guard<std::mutex> lock(file_access_mutex);
+        
+    #if !USING_FSTREAM_DIRECTIVE
+        FILE* file = fopen(listPath.c_str(), "r");
+        if (!file) {
+            #if USING_LOGGING_DIRECTIVE
+            logMessage(UNABLE_TO_OPEN_FILE + listPath);
+            #endif
+            return "";
+        }
+    
+        static constexpr size_t BUFFER_SIZE = 8192;
+        char buffer[BUFFER_SIZE];
+    
+        // Skip lines until reaching the desired index
+        for (size_t i = 0; i < listIndex; ++i) {
+            if (!fgets(buffer, BUFFER_SIZE, file)) {
+                fclose(file);
+                return ""; // Index out of bounds
+            }
+        }
+        
+        // Read the target line
+        if (!fgets(buffer, BUFFER_SIZE, file)) {
+            fclose(file);
+            return ""; // Index out of bounds
+        }
+        
+        fclose(file);
+        
+        // Efficiently remove newline character
+        const size_t len = strlen(buffer);
+        if (len > 0 && buffer[len - 1] == '\n') {
+            buffer[len - 1] = '\0';
+            if (len > 1 && buffer[len - 2] == '\r') {
+                buffer[len - 2] = '\0';
+            }
+        }
+        
+        return std::string(buffer);
+    
+    #else
+        std::ifstream file(listPath);
+        if (!file.is_open()) {
+            #if USING_LOGGING_DIRECTIVE
+            logMessage(UNABLE_TO_OPEN_FILE + listPath);
+            #endif
+            return "";
+        }
+    
+        std::string line;
+        
+        // Skip lines until reaching the desired index
+        for (size_t i = 0; i < listIndex; ++i) {
+            if (!std::getline(file, line)) {
+                return ""; // Index out of bounds
+            }
+        }
+        
+        // Read the target line
+        if (!std::getline(file, line)) {
+            return ""; // Index out of bounds
+        }
+    
+        file.close();
+        return line;
+    #endif
+    }
+
+
+    /**
+     * @brief Splits a string into a vector of strings using a delimiter.
+     *
+     * This function splits the input string into multiple strings using the specified delimiter.
+     *
+     * @param str The input string to split.
+     * @return A vector of strings containing the split values.
+     */
+    std::vector<std::string> stringToList(const std::string& str) {
+        std::vector<std::string> result;
+        
+        if (str.empty()) {
+            return result;
+        }
+        
+        // Check if the input string starts and ends with '(' and ')' or '[' and ']'
+        if ((str.front() == '(' && str.back() == ')') || (str.front() == '[' && str.back() == ']')) {
+            // Work directly with the original string using indices instead of creating substring
+            size_t start = 1; // Skip opening bracket/paren
+            size_t end = 1;
+            const size_t values_end = str.size() - 1; // Skip closing bracket/paren
+            
+            // Pre-declare item string to avoid repeated allocations
+            std::string item;
+            
+            // Iterate through the string manually to split by commas
+            while ((end = str.find(',', start)) != std::string::npos && end < values_end) {
+                // Extract item directly from original string without creating substring
+                item.assign(str, start, end - start);
+                
+                // Trim leading and trailing spaces
+                trim(item);
+                
+                // Remove quotes from each token if necessary
+                removeQuotes(item);
+                
+                result.push_back(std::move(item));
+                start = end + 1;
+            }
+            
+            // Handle the last item after the last comma
+            if (start < values_end) {
+                item.assign(str, start, values_end - start);
+                trim(item);
+                removeQuotes(item);
+                result.push_back(std::move(item));
+            }
+        }
+        
+        return result;
+    }
+
+    
+    
+    // Function to read file into a set of strings
+    std::unordered_set<std::string> readSetFromFile(const std::string& filePath) {
+        std::lock_guard<std::mutex> lock(file_access_mutex);
+        std::unordered_set<std::string> lines;
+    
+    #if !USING_FSTREAM_DIRECTIVE
+        FILE* file = fopen(filePath.c_str(), "r");
+        if (!file) {
+            #if USING_LOGGING_DIRECTIVE
+            logMessage(UNABLE_TO_OPEN_FILE + filePath);
+            #endif
+            return lines;
+        }
+    
+        static constexpr size_t BUFFER_SIZE = 8192;
+        char buffer[BUFFER_SIZE];
+        size_t len;
+        while (fgets(buffer, BUFFER_SIZE, file)) {
+            // Remove trailing newline character if it exists
+            len = strlen(buffer);
+            if (len > 0 && buffer[len - 1] == '\n') {
+                buffer[len - 1] = '\0';
+            }
+            lines.insert(buffer);
+        }
+    
+        fclose(file);
+    #else
+        std::ifstream file(filePath);
+        if (!file.is_open()) {
+            #if USING_LOGGING_DIRECTIVE
+            logMessage(UNABLE_TO_OPEN_FILE + filePath);
+            #endif
+            return lines;
+        }
+    
+        std::string line;
+        while (std::getline(file, line)) {
+            lines.insert(std::move(line));
+        }
+    
+        file.close();
+    #endif
+    
+        return lines;
+    }
+    
+    
+    // Function to write a set to a file
+    void writeSetToFile(const std::unordered_set<std::string>& fileSet, const std::string& filePath) {
+        std::lock_guard<std::mutex> lock(file_access_mutex);
+        
+    #if !USING_FSTREAM_DIRECTIVE
+        FILE* file = fopen(filePath.c_str(), "w");
+        if (!file) {
+            #if USING_LOGGING_DIRECTIVE
+            logMessage(UNABLE_TO_OPEN_FILE + filePath);
+            #endif
+            return;
+        }
+    
+        for (const auto& entry : fileSet) {
+            fprintf(file, "%s\n", entry.c_str());
+        }
+    
+        fclose(file);
+    #else
+        std::ofstream file(filePath);
+        if (!file.is_open()) {
+            #if USING_LOGGING_DIRECTIVE
+            logMessage(UNABLE_TO_OPEN_FILE + filePath);
+            #endif
+            return;
+        }
+        
+        for (const auto& entry : fileSet) {
+            file << entry << '\n';
+        }
+        
+        file.close();
+    #endif
+    }
+
+    // Helper function for streaming comparison
+    void streamCompareAndWrite(const std::string& streamFilePath, 
+                              const std::unordered_set<std::string>& compareSet, 
+                              const std::string& outputTxtFilePath) {
+        std::lock_guard<std::mutex> lock(file_access_mutex);
+        
+    #if !USING_FSTREAM_DIRECTIVE
+        FILE* streamFile = fopen(streamFilePath.c_str(), "r");
+        if (!streamFile) return;
+        
+        FILE* outputFile = fopen(outputTxtFilePath.c_str(), "w");
+        if (!outputFile) {
+            fclose(streamFile);
+            return;
+        }
+        
+        static constexpr size_t BUFFER_SIZE = 8192;
+        char buffer[BUFFER_SIZE];
+        size_t len;
+        
+        while (fgets(buffer, BUFFER_SIZE, streamFile)) {
+            len = strlen(buffer);
+            if (len > 0 && buffer[len - 1] == '\n') {
+                buffer[len - 1] = '\0';
+            }
+            
+            if (compareSet.count(std::string(buffer))) {
+                fprintf(outputFile, "%s\n", buffer);
+            }
+        }
+        
+        fclose(streamFile);
+        fclose(outputFile);
+        
+    #else
+        std::ifstream streamFile(streamFilePath);
+        if (!streamFile.is_open()) return;
+        
+        std::ofstream outputFile(outputTxtFilePath);
+        if (!outputFile.is_open()) return;
+        
+        std::string line;
+        while (std::getline(streamFile, line)) {
+            if (compareSet.count(line)) {
+                outputFile << line << '\n';
+            }
+        }
+    #endif
+    }
+    
+    // Function to compare two file lists and save duplicates to an output file
+    void compareFilesLists(const std::string& txtFilePath1, const std::string& txtFilePath2, const std::string& outputTxtFilePath) {
+        // Read files into sets
+        std::unordered_set<std::string> fileSet1 = readSetFromFile(txtFilePath1);
+        std::unordered_set<std::string> fileSet2 = readSetFromFile(txtFilePath2);
+        
+        // Always work with the smaller set for better performance
+        if (fileSet1.size() <= fileSet2.size()) {
+            // fileSet1 is smaller or equal - modify it
+            for (auto it = fileSet1.begin(); it != fileSet1.end();) {
+                if (fileSet2.count(*it) == 0) {
+                    it = fileSet1.erase(it);
+                } else {
+                    ++it;
+                }
+            }
+            writeSetToFile(fileSet1, outputTxtFilePath);
+        } else {
+            // fileSet2 is smaller - modify it instead
+            for (auto it = fileSet2.begin(); it != fileSet2.end();) {
+                if (fileSet1.count(*it) == 0) {
+                    it = fileSet2.erase(it);
+                } else {
+                    ++it;
+                }
+            }
+            writeSetToFile(fileSet2, outputTxtFilePath);
+        }
+    }
+    
+    void compareWildcardFilesLists(
+        const std::string& wildcardPatternFilePath,
+        const std::string& txtFilePath,
+        const std::string& outputTxtFilePath
+    ) {
+        std::unordered_set<std::string> targetLines = readSetFromFile(txtFilePath);
+        std::unordered_set<std::string> duplicates;
+        
+        auto wildcardFiles = getFilesListByWildcards(wildcardPatternFilePath);
+        
+        static constexpr size_t BUFFER_SIZE = 8192;
+
+        for (auto& filePath : wildcardFiles) {
+            if (filePath == txtFilePath || targetLines.empty()) {
+                filePath = "";  // Clear early
+                continue; 
+            }
+            
+            std::lock_guard<std::mutex> lock(file_access_mutex);
+            
+    #if !USING_FSTREAM_DIRECTIVE
+            FILE* file = fopen(filePath.c_str(), "r");
+            if (!file) {
+                #if USING_LOGGING_DIRECTIVE
+                logMessage(UNABLE_TO_OPEN_FILE + filePath);
+                #endif
+                continue;
+            }
+    
+            
+            char buffer[BUFFER_SIZE];
+            
+            while (fgets(buffer, BUFFER_SIZE, file) && !targetLines.empty()) { // Early exit!
+                char* newlinePos = strchr(buffer, '\n');
+                if (newlinePos) *newlinePos = '\0';
+                
+                auto it = targetLines.find(std::string(buffer));
+                if (it != targetLines.end()) {
+                    duplicates.emplace(std::move(*it)); // Move instead of copy
+                    targetLines.erase(it);
+                }
+            }
+            fclose(file);
+            
+    #else
+            std::ifstream file(filePath);
+            if (!file.is_open()) {
+                #if USING_LOGGING_DIRECTIVE
+                logMessage(UNABLE_TO_OPEN_FILE + filePath);
+                #endif
+                continue;
+            }
+            
+            std::string line;
+            while (std::getline(file, line) && !targetLines.empty()) { // Early exit!
+                auto it = targetLines.find(line);
+                if (it != targetLines.end()) {
+                    duplicates.emplace(std::move(*it)); // Move instead of copy
+                    targetLines.erase(it);
+                }
+            }
+    #endif
+            filePath = "";  // Clear after processing - reduces vector memory footprint
+        }
+        
+        writeSetToFile(duplicates, outputTxtFilePath);
+    }
+}
\ No newline at end of file
diff --git a/Source/sys-clk/overlay/lib/libultrahand/libultra/source/mod_funcs.cpp b/Source/sys-clk/overlay/lib/libultrahand/libultra/source/mod_funcs.cpp
new file mode 100644
index 00000000..aacede6e
--- /dev/null
+++ b/Source/sys-clk/overlay/lib/libultrahand/libultra/source/mod_funcs.cpp
@@ -0,0 +1,736 @@
+/********************************************************************************
+ * File: mod_funcs.cpp
+ * Author: ppkantorski
+ * Description:
+ *   This source file provides the implementations of functions declared in
+ *   mod_funcs.hpp. These functions handle the conversion of `.pchtxt` mod files
+ *   into `.ips` binary patches used by the Ultrahand Overlay project. This includes
+ *   parsing, validating, and encoding patch data into the IPS format.
+ *
+ *   For the latest updates and contributions, visit the project's GitHub repository.
+ *   (GitHub Repository: https://github.com/ppkantorski/Ultrahand-Overlay)
+ *
+ *   Note: Please be aware that this notice cannot be altered or removed. It is a part
+ *   of the project's documentation and must remain intact.
+ * 
+ *  Licensed under both GPLv2 and CC-BY-4.0
+ *  Copyright (c) 2024 ppkantorski
+ ********************************************************************************/
+
+#include <mod_funcs.hpp>
+
+namespace ult {
+
+    //const std::string CHEAT_HEADER = "// auto generated by pchtxt2cheat\n\n";
+    static const std::string CHEAT_TYPE = "04000000";
+    static const std::string CHEAT_EXT = ".txt";
+    static const std::string CHEAT_ENCODING = "ascii";
+    
+    
+    
+    /**
+     * @brief Checks if a cheat already exists in the cheat file.
+     * @param cheatFilePath The path to the cheat file.
+     * @param newCheat The new cheat to check.
+     * @return True if the cheat exists, otherwise false.
+     */
+    bool cheatExists(const std::string& cheatFilePath, const std::string& newCheat) {
+    #if !USING_FSTREAM_DIRECTIVE
+        FILE* cheatFile = fopen(cheatFilePath.c_str(), "r");  // Open the cheat file in read mode
+        if (!cheatFile) {
+            return false;  // Return false if the file cannot be opened
+        }
+    
+        //size_t len;
+        char buffer[1024];  // Buffer to store each line
+        while (fgets(buffer, sizeof(buffer), cheatFile)) {
+            // Remove newline character, if present
+            const size_t len = strlen(buffer);
+            if (len > 0 && buffer[len - 1] == '\n') {
+                buffer[len - 1] = '\0';
+            }
+            if (newCheat == buffer) {
+                fclose(cheatFile);  // Close the file before returning
+                return true;  // Cheat exists
+            }
+        }
+    
+        fclose(cheatFile);  // Close the file after processing
+        return false;  // Cheat does not exist
+    #else
+        std::ifstream cheatFile(cheatFilePath);
+        if (!cheatFile) {
+            return false;  // Return false if the file cannot be opened
+        }
+    
+        std::string line;
+        while (std::getline(cheatFile, line)) {
+            if (line == newCheat) {
+                return true;  // Cheat exists
+            }
+        }
+        return false;  // Cheat does not exist
+    #endif
+    }
+    
+    /**
+     * @brief Appends a new cheat to the cheat file.
+     * @param cheatFilePath The path to the cheat file.
+     * @param newCheat The new cheat to append.
+     */
+    void appendCheatToFile(const std::string& cheatFilePath, const std::string& newCheat) {
+    #if !USING_FSTREAM_DIRECTIVE
+        FILE* cheatFile = fopen(cheatFilePath.c_str(), "a");  // Open the cheat file in append mode
+        if (!cheatFile) {
+            #if USING_LOGGING_DIRECTIVE
+            if (!disableLogging)
+                logMessage("Failed to open cheat file for appending: " + cheatFilePath);
+            #endif
+            return;  // Handle the error accordingly
+        }
+    
+        fprintf(cheatFile, "%s\n", newCheat.c_str());  // Write the new cheat followed by a newline
+        fclose(cheatFile);  // Close the file
+    #else
+        std::ofstream cheatFile(cheatFilePath, std::ios::app);
+        if (!cheatFile) {
+            #if USING_LOGGING_DIRECTIVE
+            if (!disableLogging)
+                logMessage("Failed to open cheat file for appending: " + cheatFilePath);
+            #endif
+            return;  // Handle the error accordingly
+        }
+    
+        cheatFile << newCheat << std::endl;  // Write the new cheat
+    #endif
+    }
+    
+    
+    /**
+     * @brief Extracts the cheat name from the given file path.
+     * @param filePath The full file path.
+     * @return The extracted cheat name.
+     */
+    std::string extractCheatName(const std::string &filePath) {
+        const size_t lastSlash = filePath.find_last_of("/\\");
+        if (lastSlash == std::string::npos) {
+            return "";
+        }
+        const size_t secondLastSlash = filePath.find_last_of("/\\", lastSlash - 1);
+        if (secondLastSlash == std::string::npos) {
+            return "";
+        }
+        const std::string lastDir = filePath.substr(secondLastSlash + 1, lastSlash - secondLastSlash - 1);
+        std::string fileName = filePath.substr(lastSlash + 1);
+        const size_t dotPos = fileName.find_last_of('.');
+        if (dotPos != std::string::npos) {
+            fileName = fileName.substr(0, dotPos);
+        }
+    
+        // If lastDir contains " - ", extract the part after " - "
+        const size_t dashPos = lastDir.find(" - ");
+        std::string cheatName = lastDir;
+        if (dashPos != std::string::npos) {
+            cheatName = lastDir.substr(dashPos + 3);
+        }
+    
+        return cheatName + " " + fileName;
+    }
+    
+    // Helper function to determine if a string is a valid title ID
+    bool isValidTitleID(const std::string &str) {
+        if (str.length() != 16) return false;
+        for (char c : str) {
+            if (!std::isxdigit(c)) return false; // Check if each character is a hexadecimal digit
+        }
+        return true;
+    }
+    
+    // Function to find the title ID in the text, avoiding the @nsobid- line
+    std::string findTitleID(const std::string &text) {
+        const size_t nsobidPos = text.find("@nsobid-");
+        const size_t startPos = (nsobidPos != std::string::npos) ? nsobidPos + 40 + 8 : 0; // Skip past @nsobid- and its value
+        
+        std::string potentialID;
+        for (size_t i = startPos; i <= text.length() - 16; ++i) {
+            potentialID = text.substr(i, 16);
+            if (isValidTitleID(potentialID)) {
+                return potentialID;
+            }
+        }
+        return "";
+    }
+    
+    
+    /**
+     * @brief Converts a .pchtxt file to a cheat file.
+     * @param pchtxtPath The file path to the .pchtxt file.
+     * @param cheatName The name of the cheat.
+     * @param outCheatPath The file path for the output cheat file.
+     * @return True if the conversion was successful, false otherwise.
+     */
+    bool pchtxt2cheat(const std::string &pchtxtPath, std::string cheatName, std::string outCheatPath) {
+        #if USING_LOGGING_DIRECTIVE
+        if (!disableLogging)
+            logMessage("Starting pchtxt2cheat with pchtxtPath: " + pchtxtPath);
+        #endif
+    
+    #if !USING_FSTREAM_DIRECTIVE
+        FILE* pchtxtFile = fopen(pchtxtPath.c_str(), "r");
+        if (!pchtxtFile) {
+            #if USING_LOGGING_DIRECTIVE
+            if (!disableLogging)
+                logMessage("Error: Unable to open file " + pchtxtPath);
+            #endif
+            return false;
+        }
+    
+        // Read the entire file into a string
+        std::string pchtxt;
+        char buffer[4096];
+        while (fgets(buffer, sizeof(buffer), pchtxtFile)) {
+            pchtxt += buffer;
+        }
+        fclose(pchtxtFile);
+    #else
+        std::ifstream pchtxtFile(pchtxtPath);
+        if (!pchtxtFile) {
+            #if USING_LOGGING_DIRECTIVE
+            if (!disableLogging)
+                logMessage("Error: Unable to open file " + pchtxtPath);
+            #endif
+            return false;
+        }
+    
+        std::string pchtxt((std::istreambuf_iterator<char>(pchtxtFile)), std::istreambuf_iterator<char>());
+    #endif
+    
+        const size_t nsobidPos = pchtxt.find("@nsobid-");
+        if (nsobidPos == std::string::npos) {
+            #if USING_LOGGING_DIRECTIVE
+            if (!disableLogging)
+                logMessage("Error: Could not find bid in pchtxt file, the file is likely invalid.");
+            #endif
+            return false;
+        }
+    
+        const std::string bid = pchtxt.substr(nsobidPos + 8, 40);
+        const std::string bidShort = bid.substr(0, 16);
+    
+        const std::string tid = findTitleID(pchtxt);
+        if (tid.empty()) {
+            #if USING_LOGGING_DIRECTIVE
+            if (!disableLogging)
+                logMessage("Error: Could not find TID in pchtxt file, the file is likely invalid.");
+            #endif
+            return false;
+        }
+    
+        std::string cheatFilePath;
+    
+        if (outCheatPath.empty()) {
+            const std::string folderPath = "sdmc:/atmosphere/contents/" + tid + "/cheats/";
+            createDirectory(folderPath);
+            cheatFilePath = folderPath + bidShort + CHEAT_EXT;
+        } else {
+            cheatFilePath = outCheatPath;
+        }
+    
+    #if !USING_FSTREAM_DIRECTIVE
+        FILE* existingCheatFile = fopen(cheatFilePath.c_str(), "r");
+        bool cheatNameExists = false;
+        if (existingCheatFile) {
+            char line[256];
+            while (fgets(line, sizeof(line), existingCheatFile)) {
+                if (std::string(line) == "[" + cheatName + "]\n") {
+                    cheatNameExists = true;
+                    break;
+                }
+            }
+            fclose(existingCheatFile);
+        }
+    #else
+        std::ifstream existingCheatFile(cheatFilePath);
+        bool cheatNameExists = false;
+        if (existingCheatFile) {
+            std::string line;
+            while (std::getline(existingCheatFile, line)) {
+                if (line == "[" + cheatName + "]") {
+                    cheatNameExists = true;
+                    break;
+                }
+            }
+        }
+        existingCheatFile.close();
+    #endif
+    
+        // Open output cheat file
+    #if !USING_FSTREAM_DIRECTIVE
+        FILE* outCheatFile = fopen(cheatFilePath.c_str(), "a");
+        if (!outCheatFile) {
+            #if USING_LOGGING_DIRECTIVE
+            if (!disableLogging)
+                logMessage("Error: Unable to create cheat file " + cheatFilePath);
+            #endif
+            return false;
+        }
+    #else
+        std::ofstream outCheatFile(cheatFilePath, std::ios::app);
+        if (!outCheatFile) {
+            #if USING_LOGGING_DIRECTIVE
+            if (!disableLogging)
+                logMessage("Error: Unable to create cheat file " + cheatFilePath);
+            #endif
+            return false;
+        }
+    #endif
+    
+        if (!cheatNameExists) {
+    #if !USING_FSTREAM_DIRECTIVE
+            fprintf(outCheatFile, "[%s]\n", cheatName.c_str());
+    #else
+            outCheatFile << "[" << cheatName << "]\n";
+    #endif
+        }
+    
+        int offset = 0;
+        bool enabled = true;
+        int validCheatsProcessed = 0; // ADDED: Track number of valid cheats processed
+        StringStream iss(pchtxt);  // Use your custom StringStream
+        std::string line;
+        
+        std::string addrStr, valStr;
+        size_t spacePos;
+        int codeOffset;
+        std::string cheatLine;
+        char offsetBuffer[9];
+    
+        // Use your custom getline method instead of std::getline
+        while (iss.getline(line, '\n')) {  // Custom getline with newline as the delimiter
+    
+            // strip inline C++-style comments
+            const auto slashPos = line.find("//");
+            if (slashPos != std::string::npos)
+                line = line.substr(0, slashPos);
+            
+            // strip inline hash comments (but leave full-line # for headers)
+            const auto hashPos = line.find('#');
+            if (hashPos != std::string::npos && hashPos > 0)
+                line = line.substr(0, hashPos);
+            
+            trim(line);
+            if (line.empty() || line[0] == '#') continue;
+    
+            if (line.find("@flag offset_shift ") == 0) {
+                const std::string offsetStr = line.substr(19);
+                offset = (offsetStr.find("0x") == 0 ? std::strtol(offsetStr.c_str(), nullptr, 16) : std::strtol(offsetStr.c_str(), nullptr, 10)) - 0x100;
+                continue;
+            }
+    
+            if (line.find("@enabled") == 0) {
+                enabled = true;
+                continue;
+            }
+    
+            if (line.find("@disabled") == 0) {
+                enabled = false;
+                continue;
+            }
+    
+            if (line.find("@stop") == 0) {
+                break;
+            }
+    
+            if (!enabled) {
+                continue;
+            }
+    
+            spacePos = line.find(' ');
+            if (spacePos == std::string::npos) {
+                continue;
+            }
+    
+            addrStr = line.substr(0, spacePos);
+            valStr = line.substr(spacePos + 1);
+    
+            if (addrStr.find_first_not_of("0123456789abcdefABCDEF") != std::string::npos || valStr.find_first_not_of("0123456789abcdefABCDEF") != std::string::npos) {
+                continue;
+            }
+    
+            codeOffset = std::strtol(valStr.c_str(), nullptr, 16) + offset;
+            snprintf(offsetBuffer, sizeof(offsetBuffer), "%08X", codeOffset);
+            cheatLine = CHEAT_TYPE + " " + addrStr + " " + hexToReversedHex(offsetBuffer);
+            
+    #if !USING_FSTREAM_DIRECTIVE
+            // Check if cheat already exists
+            FILE* checkFile = fopen(cheatFilePath.c_str(), "r");
+            bool exists = false;
+            if (checkFile) {
+                char checkLine[256];
+                while (fgets(checkLine, sizeof(checkLine), checkFile)) {
+                    if (std::string(checkLine) == cheatLine + "\n") {
+                        exists = true;
+                        break;
+                    }
+                }
+                fclose(checkFile);
+            }
+    
+            if (!exists) {
+                fprintf(outCheatFile, "%s\n", cheatLine.c_str());
+                validCheatsProcessed++; // ADDED: Increment counter for new cheats
+            }
+    #else
+            if (!cheatExists(cheatFilePath, cheatLine)) {
+                outCheatFile << cheatLine << "\n";
+                validCheatsProcessed++; // ADDED: Increment counter for new cheats
+            }
+    #endif
+        }
+    
+    #if !USING_FSTREAM_DIRECTIVE
+        fclose(outCheatFile);
+    #else
+        outCheatFile.close();
+    #endif
+    
+        // ADDED: Check if any valid cheats were processed
+        if (validCheatsProcessed == 0) {
+            #if USING_LOGGING_DIRECTIVE
+            if (!disableLogging)
+                logMessage("Warning: No valid patch data found to convert to cheats in " + pchtxtPath);
+            #endif
+            return false;
+        }
+    
+        return true;
+    }
+    
+    
+    // Corrected helper function to convert values to big-endian format
+   //uint32_t toBigEndian(uint32_t value) {
+   //    return ((value & 0x000000FF) << 24) |
+   //           ((value & 0x0000FF00) << 8)  |
+   //           ((value & 0x00FF0000) >> 8)  |
+   //           ((value & 0xFF000000) >> 24);
+   //}
+   //
+   //uint16_t toBigEndian(uint16_t value) {
+   //    return ((value & 0x00FF) << 8) |
+   //           ((value & 0xFF00) >> 8);
+   //}
+    
+    // Helper function to convert a vector of bytes to a hex string for logging
+    
+    //std::string hexToString(const std::vector<uint8_t>& bytes) {
+    //    StringStream oss;  // Use your custom StringStream
+    //    oss.hex();  // Enable hex mode for the stream
+    //
+    //    for (uint8_t byte : bytes) {
+    //        if (byte < 0x10) {
+    //            oss << "0";  // Append leading zero for single-digit hex values
+    //        }
+    //        oss << static_cast<int>(byte);  // Convert byte to int and then append it
+    //    }
+    //
+    //    return oss.str();  // Return the final hex string
+    //}
+
+
+    
+    
+        
+    /**
+     * @brief Converts a .pchtxt file to an IPS file using fstream.
+     *
+     * This function reads the contents of a .pchtxt file, extracts the address-value pairs,
+     * and generates an IPS file with the provided output folder.
+     *
+     * @param pchtxtPath The file path to the .pchtxt file.
+     * @param outputFolder The folder path for the output IPS file.
+     * @return True if the conversion was successful, false otherwise.
+     */
+    bool pchtxt2ips(const std::string& pchtxtPath, const std::string& outputFolder) {
+    #if !USING_FSTREAM_DIRECTIVE
+        // Use FILE* for reading
+        FILE* pchtxtFile = fopen(pchtxtPath.c_str(), "r");
+        if (!pchtxtFile) {
+            #if USING_LOGGING_DIRECTIVE
+            if (!disableLogging)
+                logMessage("Error: Unable to open file " + pchtxtPath);
+            #endif
+            return false;
+        }
+    
+        std::vector<std::pair<uint32_t, std::vector<uint8_t>>> patches;
+        char lineBuffer[512];  // Fixed: Use char buffer for fgets
+        std::string line;
+        uint32_t lineNum = 0;
+        std::string nsobid;
+        int offset = 0; // Default offset
+        bool enabled = true;
+    
+        uint32_t address;
+        uint8_t byte;
+        std::vector<uint8_t> valueBytes;
+        std::string offsetStr;
+    
+        while (fgets(lineBuffer, sizeof(lineBuffer), pchtxtFile) != nullptr) {
+            line = lineBuffer;  // Convert to string
+            ++lineNum;
+            if (line.empty() || line.front() == '@' || !enabled) {
+                if (line.find("@nsobid-") == 0) {
+                    nsobid = line.substr(8);
+                }
+                if (line.find("@flag offset_shift ") == 0) {
+                    offsetStr = line.substr(19);
+                    offset = (offsetStr.find("0x") == 0 ? std::strtol(offsetStr.c_str(), nullptr, 16) : std::strtol(offsetStr.c_str(), nullptr, 10));
+                }
+                if (line.find("@enabled") == 0) {
+                    enabled = true;
+                    continue;
+                }
+                if (line.find("@disabled") == 0) {
+                    enabled = false;
+                    continue;
+                }
+                if (line.find("@stop") == 0) {
+                    break;
+                }
+                continue;  // Skip empty lines and lines starting with '@'
+            }
+            
+            StringStream iss(line);
+            std::string addressStr, valueStr;
+    
+            if (!(iss >> addressStr >> valueStr)) {
+                continue;
+            }
+            
+            char* endPtr;
+            address = std::strtoul(addressStr.c_str(), &endPtr, 16) + offset; // Adjust address by offset
+            if (*endPtr != '\0') {
+                continue;
+            }
+            
+            for (size_t i = 0; i < valueStr.length(); i += 2) {
+                byte = ult::stoi(valueStr.substr(i, 2), nullptr, 16);
+                valueBytes.push_back(byte);
+            }
+            
+            if (valueBytes.empty()) {
+                continue;
+            }
+            
+            patches.push_back(std::make_pair(address, valueBytes));
+            valueBytes.clear();
+        }
+        
+        fclose(pchtxtFile);
+    
+    #else
+        // Use fstream for reading
+        std::ifstream pchtxtFile(pchtxtPath);
+        if (!pchtxtFile) {
+            #if USING_LOGGING_DIRECTIVE
+            if (!disableLogging)
+                logMessage("Error: Unable to open file " + pchtxtPath);
+            #endif
+            return false;
+        }
+    
+        std::vector<std::pair<uint32_t, std::vector<uint8_t>>> patches;
+        std::string line;
+        uint32_t lineNum = 0;
+        std::string nsobid;
+        int offset = 0; // Default offset
+    
+        uint32_t address;
+        uint8_t byte;
+        std::vector<uint8_t> valueBytes;
+        std::string offsetStr;
+    
+        while (std::getline(pchtxtFile, line)) {
+            ++lineNum;
+            if (line.empty() || line.front() == '@') {
+                if (line.find("@nsobid-") == 0) {
+                    nsobid = line.substr(8);
+                }
+                if (line.find("@flag offset_shift ") == 0) {
+                    offsetStr = line.substr(19);
+                    offset = (offsetStr.find("0x") == 0 ? std::strtol(offsetStr.c_str(), nullptr, 16) : std::strtol(offsetStr.c_str(), nullptr, 10));
+                }
+                if (line.find("@stop") == 0) {
+                    break;
+                }
+                continue;  // Skip empty lines and lines starting with '@'
+            }
+    
+            StringStream iss(line);
+            std::string addressStr, valueStr;
+    
+            if (!(iss >> addressStr >> valueStr)) {
+                continue;
+            }
+    
+            char* endPtr;
+            address = std::strtoul(addressStr.c_str(), &endPtr, 16) + offset; // Adjust address by offset
+            if (*endPtr != '\0') {
+                continue;
+            }
+    
+            for (size_t i = 0; i < valueStr.length(); i += 2) {
+                byte = ult::stoi(valueStr.substr(i, 2), nullptr, 16);
+                valueBytes.push_back(byte);
+            }
+    
+            if (valueBytes.empty()) {
+                continue;
+            }
+    
+            patches.push_back(std::make_pair(address, valueBytes));
+            valueBytes.clear();
+        }
+    
+        pchtxtFile.close();
+    #endif
+    
+        // CHECK: Return false if no patches were found
+        if (patches.empty()) {
+            #if USING_LOGGING_DIRECTIVE
+            if (!disableLogging)
+                logMessage("Warning: No valid patches found in " + pchtxtPath);
+            #endif
+            return false;
+        }
+    
+        if (nsobid.empty()) {
+            nsobid = pchtxtPath.substr(pchtxtPath.find_last_of("/\\") + 1);
+            nsobid = nsobid.substr(0, nsobid.find_last_of("."));
+        }
+    
+        // Trim any newline characters from nsobid
+        trim(nsobid);
+        trimNewline(nsobid);
+    
+        const std::string ipsFileName = nsobid + ".ips";
+        const std::string ipsFilePath = outputFolder + ipsFileName;
+    
+    #if !USING_FSTREAM_DIRECTIVE
+        // Use FILE* for writing
+        FILE* ipsFile = fopen(ipsFilePath.c_str(), "wb");
+        if (!ipsFile) {
+            #if USING_LOGGING_DIRECTIVE
+            if (!disableLogging)
+                logMessage("Error: Unable to create IPS file " + ipsFilePath);
+            #endif
+            return false;
+        }
+    
+        fwrite(IPS32_HEAD_MAGIC, sizeof(char), std::strlen(IPS32_HEAD_MAGIC), ipsFile);
+    
+        uint16_t valueLength;
+        uint32_t bigEndianAddress;
+    
+        for (const auto& patch : patches) {
+            bigEndianAddress = toBigEndian(patch.first);  // Convert address to big-endian
+            fwrite(&bigEndianAddress, sizeof(bigEndianAddress), 1, ipsFile);  // Write address
+    
+            valueLength = toBigEndian(static_cast<uint16_t>(patch.second.size()));  // Convert length to big-endian
+            fwrite(&valueLength, sizeof(valueLength), 1, ipsFile);  // Write length of value
+    
+            fwrite(patch.second.data(), sizeof(uint8_t), patch.second.size(), ipsFile);  // Write value
+        }
+    
+        fwrite(IPS32_FOOT_MAGIC, sizeof(char), std::strlen(IPS32_FOOT_MAGIC), ipsFile);
+        fclose(ipsFile);
+    
+    
+        FILE* _pchtxtFile = fopen(pchtxtPath.c_str(), "r");
+        if (!_pchtxtFile) {
+            #if USING_LOGGING_DIRECTIVE
+            if (!disableLogging)
+                logMessage("Error: Unable to open file " + pchtxtPath);
+            #endif
+            return false; // Changed: Return false if we can't read the file for title ID
+        }
+    
+        // Read the entire file into a string
+        std::string pchtxt;
+        char buffer[4096];
+        while (fgets(buffer, sizeof(buffer), _pchtxtFile)) {
+            pchtxt += buffer;
+        }
+        fclose(_pchtxtFile);
+    
+    
+        const std::string tid = findTitleID(pchtxt);
+        if (!tid.empty()) {
+            const std::string tidFilePath = outputFolder + tid;
+            FILE* tidFile = fopen(tidFilePath.c_str(), "w");
+            if (tidFile) {
+                fclose(tidFile);  // Creates an empty file
+            }
+        } else {
+            #if USING_LOGGING_DIRECTIVE
+            if (!disableLogging)
+                logMessage("Warning: Could not find Title ID in " + pchtxtPath);
+            #endif
+        }
+    #else
+        // Use fstream for writing
+        std::ofstream ipsFile(ipsFilePath, std::ios::binary);
+        if (!ipsFile) {
+            #if USING_LOGGING_DIRECTIVE
+            if (!disableLogging)
+                logMessage("Error: Unable to create IPS file " + ipsFilePath);
+            #endif
+            return false;
+        }
+    
+        ipsFile.write(IPS32_HEAD_MAGIC, std::strlen(IPS32_HEAD_MAGIC));
+    
+        uint16_t valueLength;
+        uint32_t bigEndianAddress;
+        for (const auto& patch : patches) {
+            bigEndianAddress = toBigEndian(patch.first);  // Convert address to big-endian
+            ipsFile.write(reinterpret_cast<const char*>(&bigEndianAddress), sizeof(bigEndianAddress));  // Write address
+    
+            valueLength = toBigEndian(static_cast<uint16_t>(patch.second.size()));  // Convert length to big-endian
+            ipsFile.write(reinterpret_cast<const char*>(&valueLength), sizeof(valueLength));  // Write length of value
+    
+            ipsFile.write(reinterpret_cast<const char*>(patch.second.data()), patch.second.size());  // Write value
+        }
+    
+        ipsFile.write(IPS32_FOOT_MAGIC, std::strlen(IPS32_FOOT_MAGIC));
+        ipsFile.close();
+    
+    
+        std::ifstream _pchtxtFile(pchtxtPath);
+        if (!_pchtxtFile) {
+            #if USING_LOGGING_DIRECTIVE
+            if (!disableLogging)
+                logMessage("Error: Unable to open file " + pchtxtPath);
+            #endif
+            return false; // Changed: Return false if we can't read the file for title ID
+        }
+    
+        std::string pchtxt((std::istreambuf_iterator<char>(_pchtxtFile)), std::istreambuf_iterator<char>());
+    
+        const std::string tid = findTitleID(pchtxt);
+        if (!tid.empty()) {
+            const std::string tidFilePath = outputFolder + tid;
+            std::ofstream tidFile(tidFilePath);
+            tidFile.close();  // Creates an empty file
+        } else {
+            #if USING_LOGGING_DIRECTIVE
+            if (!disableLogging)
+                logMessage("Warning: Could not find Title ID in " + pchtxtPath);
+            #endif
+        }
+    #endif
+    
+        return true;
+    }
+
+}
diff --git a/Source/sys-clk/overlay/lib/libultrahand/libultra/source/path_funcs.cpp b/Source/sys-clk/overlay/lib/libultrahand/libultra/source/path_funcs.cpp
new file mode 100644
index 00000000..fed30684
--- /dev/null
+++ b/Source/sys-clk/overlay/lib/libultrahand/libultra/source/path_funcs.cpp
@@ -0,0 +1,1487 @@
+/********************************************************************************
+ * File: path_funcs.cpp
+ * Author: ppkantorski
+ * Description:
+ *   This source file implements the functions declared in path_funcs.hpp.
+ *   These utility functions are focused on file and directory path manipulation
+ *   for the Ultrahand Overlay project. Functionality includes creating directories,
+ *   checking existence of files or paths, moving or copying files, and normalizing
+ *   file system paths for cross-platform compatibility.
+ *
+ *   For the latest updates and contributions, visit the project's GitHub repository.
+ *   (GitHub Repository: https://github.com/ppkantorski/Ultrahand-Overlay)
+ *
+ *   Note: Please be aware that this notice cannot be altered or removed. It is a part
+ *   of the project's documentation and must remain intact.
+ * 
+ *  Licensed under both GPLv2 and CC-BY-4.0
+ *  Copyright (c) 2024 ppkantorski
+ ********************************************************************************/
+
+#include "path_funcs.hpp"
+
+
+namespace ult {
+    std::atomic<bool> abortFileOp(false);
+    
+    size_t COPY_BUFFER_SIZE = 65536/8; // Back to non-const as requested
+
+    std::atomic<int> copyPercentage(-1);
+    
+    std::mutex logMutex2; // Mutex for thread-safe logging (defined here, declared as extern in header)
+
+    static std::vector<std::string> fileList;
+
+    // RAII wrapper for FILE* to ensure proper cleanup
+    class FileGuard {
+    private:
+        FILE* file;
+    public:
+        FileGuard(FILE* f) : file(f) {}
+        ~FileGuard() { if (file) fclose(file); }
+        FILE* get() { return file; }
+        FILE* release() { FILE* f = file; file = nullptr; return f; }
+    };
+
+    /**
+     * @brief Checks if a path points to a directory.
+     *
+     * This function checks if the specified path points to a directory.
+     *
+     * @param path The path to check.
+     * @return True if the path is a directory, false otherwise.
+     */
+    bool isDirectory(const std::string& path) {
+        struct stat pathStat;
+        return (stat(path.c_str(), &pathStat) == 0 && S_ISDIR(pathStat.st_mode));
+    }
+    
+    /**
+     * @brief Checks if a path points to a file.
+     *
+     * This function checks if the specified path points to a file.
+     *
+     * @param path The path to check.
+     * @return True if the path is a file, false otherwise.
+     */
+    bool isFile(const std::string& path) {
+        struct stat pathStat;
+        return (stat(path.c_str(), &pathStat) == 0 && S_ISREG(pathStat.st_mode));
+    }
+    
+    /**
+     * @brief Checks if a path points to a file or directory.
+     *
+     * This function checks if the specified path points to either a file or a directory.
+     *
+     * @param path The path to check.
+     * @return True if the path points to a file or directory, false otherwise.
+     */
+    bool isFileOrDirectory(const std::string& path) {
+        struct stat pathStat;
+        return (stat(path.c_str(), &pathStat) == 0);
+    }
+    
+    // Helper function to check if directory is empty
+    bool isDirectoryEmpty(const std::string& dirPath) {
+        DIR* dir = opendir(dirPath.c_str());
+        if (!dir) return false; // Can't open, assume not empty
+        
+        dirent* entry;
+        while ((entry = readdir(dir)) != nullptr) {
+            if (strcmp(entry->d_name, ".") != 0 && strcmp(entry->d_name, "..") != 0) {
+                closedir(dir);
+                return false; // Found a file/directory
+            }
+        }
+        closedir(dir);
+        return true; // Empty directory
+    }
+
+
+    /**
+     * @brief Creates a single directory if it doesn't exist.
+     *
+     * This function checks if the specified directory exists, and if not, it creates the directory.
+     *
+     * @param directoryPath The path of the directory to be created.
+     */
+    void createSingleDirectory(const std::string& directoryPath) {
+        // mkdir is generally thread-safe, returns EEXIST if already exists
+        if (mkdir(directoryPath.c_str(), 0777) != 0) {
+            // Only log error if it's not EEXIST
+            if (errno != EEXIST) {
+                #if USING_LOGGING_DIRECTIVE
+                if (!disableLogging)
+                    logMessage("Failed to create directory: " + directoryPath + " - " + std::string(strerror(errno)));
+                #endif
+            }
+        }
+    }
+    
+    /**
+     * @brief Creates a directory and its parent directories if they don't exist.
+     *
+     * This function creates a directory specified by `directoryPath` and also creates any parent directories
+     * if they don't exist. It handles nested directory creation.
+     *
+     * @param directoryPath The path of the directory to be created.
+     */
+    void createDirectory(const std::string& directoryPath) {
+        const std::string volume = ROOT_PATH;
+        std::string path = directoryPath;
+    
+        // Remove leading "sdmc:/" if present
+        if (path.compare(0, volume.size(), volume) == 0) {
+            path = path.substr(volume.size());
+        }
+    
+        std::string parentPath = volume;
+        size_t pos = 0, nextPos;
+    
+        // Iterate through the path and create each directory level if it doesn't exist
+        while ((nextPos = path.find('/', pos)) != std::string::npos) {
+            if (nextPos != pos) {
+                parentPath.append(path, pos, nextPos - pos);
+                parentPath += '/';
+                createSingleDirectory(parentPath); // Create the parent directory
+            }
+            pos = nextPos + 1;
+        }
+    
+        // Create the final directory level if it doesn't exist
+        if (pos < path.size()) {
+            parentPath += path.substr(pos);
+            createSingleDirectory(parentPath); // Create the final directory
+        }
+    }
+    
+    #if !USING_FSTREAM_DIRECTIVE
+    void writeLog(FILE* logFile, const std::string& line) {
+        if (logFile) {
+            std::lock_guard<std::mutex> lock(logMutex2);
+            fprintf(logFile, "%s\n", line.c_str());
+            fflush(logFile); // Ensure data is written immediately
+        } else {
+            #if USING_LOGGING_DIRECTIVE
+            if (!disableLogging)
+                logMessage("Failed to write to log file.");
+            #endif
+        }
+    }
+    #else
+    void writeLog(std::ofstream& logFile, const std::string& line) {
+        if (logFile.is_open()) {
+            std::lock_guard<std::mutex> lock(logMutex2);
+            logFile << line << std::endl;
+            logFile.flush(); // Ensure data is written immediately
+        } else {
+            #if USING_LOGGING_DIRECTIVE
+            if (!disableLogging)
+                logMessage("Failed to write to log file.");
+            #endif
+        }
+    }
+    #endif
+    
+    /**
+     * @brief Creates a text file with the specified content.
+     *
+     * This function creates a text file specified by `filePath` and writes the given `content` to the file.
+     *
+     * @param filePath The path of the text file to be created.
+     * @param content The content to be written to the text file.
+     */
+    void createTextFile(const std::string& filePath, const std::string& content) {
+        // Create parent directory first
+        createDirectory(getParentDirFromPath(filePath));
+        
+    #if !USING_FSTREAM_DIRECTIVE
+        FileGuard file(fopen(filePath.c_str(), "w"));
+        if (file.get()) {
+            fputs(content.c_str(), file.get());
+        } else {
+            #if USING_LOGGING_DIRECTIVE
+            if (!disableLogging)
+                logMessage("Error: Unable to create file " + filePath);
+            #endif
+        }
+    #else
+        std::ofstream file(filePath);
+        if (file.is_open()) {
+            file << content;
+            file.close();
+        } else {
+            #if USING_LOGGING_DIRECTIVE
+            if (!disableLogging)
+                logMessage("Error: Unable to create file " + filePath);
+            #endif
+        }
+    #endif
+    }
+    
+
+    /**
+     * @brief Deletes a file or directory.
+     *
+     * This function deletes the file or directory specified by `path`. It can delete both files and directories.
+     *
+     * @param path The path of the file or directory to be deleted.
+     */
+    void deleteFileOrDirectory(const std::string& pathToDelete, const std::string& logSource) {
+        std::vector<std::string> stack;
+        
+        // Batch logging optimization - collect successful deletions instead of logging immediately
+        std::vector<std::string> successfulDeletions;
+        const bool needsLogging = !logSource.empty();
+    
+        const bool pathIsFile = pathToDelete.back() != '/';
+    
+        if (pathIsFile) {
+            if (isFile(pathToDelete)) {
+                if (remove(pathToDelete.c_str()) == 0) {
+                    if (needsLogging) {
+                        successfulDeletions.push_back(pathToDelete);
+                    }
+                } else {
+                    #if USING_LOGGING_DIRECTIVE
+                    if (!disableLogging)
+                        logMessage("Failed to delete file: " + pathToDelete);
+                    #endif
+                }
+            }
+            
+            // Write log for single file deletion if needed
+            if (needsLogging && !successfulDeletions.empty()) {
+    #if !USING_FSTREAM_DIRECTIVE
+                createDirectory(getParentDirFromPath(logSource));
+                if (FILE* logFile = fopen(logSource.c_str(), "a")) {
+                    writeLog(logFile, pathToDelete);
+                    fclose(logFile);
+                }
+                #if USING_LOGGING_DIRECTIVE
+                else {
+                    if (!disableLogging)
+                        logMessage("Failed to open source log file: " + logSource);
+                }
+                #endif
+    #else
+                createDirectory(getParentDirFromPath(logSource));
+                std::ofstream logSourceFile(logSource, std::ios::app);
+                if (logSourceFile.is_open()) {
+                    writeLog(logSourceFile, pathToDelete);
+                    logSourceFile.close();
+                }
+                #if USING_LOGGING_DIRECTIVE
+                else {
+                    if (!disableLogging)
+                        logMessage("Failed to open source log file: " + logSource);
+                }
+                #endif
+    #endif
+            }
+            return;
+        }
+    
+        stack.push_back(pathToDelete);
+        struct stat pathStat;
+        std::string currentPath, filePath;
+        bool isEmpty;
+    
+        while (!stack.empty()) {
+            currentPath = stack.back();
+    
+            if (stat(currentPath.c_str(), &pathStat) != 0) {
+                stack.pop_back();
+                continue;
+            }
+    
+            if (S_ISREG(pathStat.st_mode)) { // It's a file
+                stack.pop_back(); // Remove from stack before deletion
+                if (remove(currentPath.c_str()) == 0) {
+                    // Batch logging - store successful deletion instead of writing immediately
+                    if (needsLogging) {
+                        successfulDeletions.push_back(currentPath);
+                    }
+                } else {
+                    #if USING_LOGGING_DIRECTIVE
+                    if (!disableLogging)
+                        logMessage("Failed to delete file: " + currentPath);
+                    #endif
+                }
+            } else if (S_ISDIR(pathStat.st_mode)) { // It's a directory
+                DIR* directory = opendir(currentPath.c_str());
+                if (!directory) {
+                    #if USING_LOGGING_DIRECTIVE
+                    if (!disableLogging)
+                        logMessage("Failed to open directory: " + currentPath);
+                    #endif
+                    stack.pop_back();
+                    continue;
+                }
+    
+                dirent* entry;
+                isEmpty = true;
+                while ((entry = readdir(directory)) != nullptr) {
+                    const std::string& fileName = entry->d_name;
+                    if (fileName != "." && fileName != "..") {
+                        filePath = currentPath + fileName;
+                        stack.push_back(filePath + (filePath.back() == '/' ? "" : "/"));
+                        isEmpty = false;
+                    }
+                }
+                closedir(directory);
+    
+                if (isEmpty) {
+                    stack.pop_back(); // Directory is now empty, safe to remove from stack
+                    if (rmdir(currentPath.c_str()) == 0) {
+                        // Note: Typically we don't log directory deletions, only files
+                        // If you want to log directory deletions too, uncomment the lines below:
+                        // if (needsLogging) {
+                        //     successfulDeletions.push_back(currentPath);
+                        // }
+                    } else {
+                        #if USING_LOGGING_DIRECTIVE
+                        if (!disableLogging)
+                            logMessage("Failed to delete directory: " + currentPath);
+                        #endif
+                    }
+                }
+            } else {
+                stack.pop_back(); // Unknown file type, just remove from stack
+                #if USING_LOGGING_DIRECTIVE
+                if (!disableLogging)
+                    logMessage("Unknown file type: " + currentPath);
+                #endif
+            }
+        }
+    
+        // KEY OPTIMIZATION: Batch write all successful deletions to log file at the end
+        // This eliminates the overhead of logging inside the hot loop
+        if (needsLogging && !successfulDeletions.empty()) {
+    #if !USING_FSTREAM_DIRECTIVE
+            createDirectory(getParentDirFromPath(logSource));
+            if (FILE* logFile = fopen(logSource.c_str(), "a")) {
+                for (const auto& deletedPath : successfulDeletions) {
+                    writeLog(logFile, deletedPath);
+                }
+                fclose(logFile);
+            }
+            #if USING_LOGGING_DIRECTIVE
+            else {
+                if (!disableLogging)
+                    logMessage("Failed to open source log file: " + logSource);
+            }
+            #endif
+    #else
+            createDirectory(getParentDirFromPath(logSource));
+            std::ofstream logSourceFile(logSource, std::ios::app);
+            if (logSourceFile.is_open()) {
+                for (const auto& deletedPath : successfulDeletions) {
+                    writeLog(logSourceFile, deletedPath);
+                }
+                logSourceFile.close();
+            }
+            #if USING_LOGGING_DIRECTIVE
+            else {
+                if (!disableLogging)
+                    logMessage("Failed to open source log file: " + logSource);
+            }
+            #endif
+    #endif
+        }
+    }
+    
+    /**
+     * @brief Deletes files or directories that match a specified pattern.
+     *
+     * This function deletes files or directories specified by `pathPattern` by matching against a pattern.
+     * It identifies files or directories that match the pattern and deletes them.
+     *
+     * @param pathPattern The pattern used to match and delete files or directories.
+     */
+    void deleteFileOrDirectoryByPattern(const std::string& pathPattern, const std::string& logSource) {
+        //logMessage("pathPattern: "+pathPattern);
+        fileList = getFilesListByWildcards(pathPattern);
+        
+        for (auto& path : fileList) {
+            //logMessage("path: "+path);
+            deleteFileOrDirectory(path, logSource);
+            path = "";
+        }
+        fileList.clear();
+        fileList.shrink_to_fit();
+    }
+
+    // Helper function to reverse a log file safely
+    void reverseLogFile(const std::string& logFilePath) {
+        std::vector<std::string> lines;
+    
+    #if !USING_FSTREAM_DIRECTIVE
+        FILE* file = fopen(logFilePath.c_str(), "r");
+        if (!file) return;
+    
+        setvbuf(file, nullptr, _IOFBF, 8192);
+    
+        static constexpr size_t BUFFER_SIZE = 8192;
+        char buffer[BUFFER_SIZE];
+    
+        while (fgets(buffer, BUFFER_SIZE, file)) {
+            size_t len = strlen(buffer);
+            if (len > 0 && buffer[len - 1] == '\n') buffer[len - 1] = '\0';
+            lines.emplace_back(buffer); // std::string constructor ensures proper termination
+        }
+        fclose(file);
+    
+        FILE* outFile = fopen(logFilePath.c_str(), "w");
+        if (outFile) {
+            setvbuf(outFile, nullptr, _IOFBF, 8192);
+            for (auto it = lines.rbegin(); it != lines.rend(); ++it) {
+                // Use fprintf instead of fputs to avoid any residual buffer issues
+                fprintf(outFile, "%s\n", it->c_str());
+            }
+            fflush(outFile);
+            fclose(outFile);
+        }
+    #else
+        std::ifstream file(logFilePath);
+        if (!file.is_open()) return;
+    
+        static char readBuffer[8192];
+        file.rdbuf()->pubsetbuf(readBuffer, sizeof(readBuffer));
+    
+        std::string line;
+        while (std::getline(file, line)) lines.push_back(std::move(line));
+        file.close();
+    
+        std::ofstream outFile(logFilePath);
+        if (outFile.is_open()) {
+            static char writeBuffer[8192];
+            outFile.rdbuf()->pubsetbuf(writeBuffer, sizeof(writeBuffer));
+    
+            for (auto it = lines.rbegin(); it != lines.rend(); ++it) {
+                outFile << *it << '\n';
+            }
+            outFile.flush();
+            outFile.close();
+        }
+    #endif
+    }
+    
+    void moveDirectory(const std::string& sourcePath, const std::string& destinationPath,
+                       const std::string& logSource, const std::string& logDestination) {
+    
+        struct stat sourceInfo;
+        if (stat(sourcePath.c_str(), &sourceInfo) != 0) {
+    #if USING_LOGGING_DIRECTIVE
+            if (!disableLogging) logMessage("Source directory doesn't exist: " + sourcePath);
+    #endif
+            return;
+        }
+    
+        if (mkdir(destinationPath.c_str(), 0777) != 0 && errno != EEXIST) {
+    #if USING_LOGGING_DIRECTIVE
+            if (!disableLogging) logMessage("Failed to create destination directory: " + destinationPath);
+    #endif
+            return;
+        }
+    
+        bool needsLogging = !logSource.empty() || !logDestination.empty();
+
+        {
+            std::vector<std::pair<std::string, std::string>> stack;
+            std::vector<std::string> directoriesToRemove;
+        
+            stack.push_back({sourcePath, destinationPath});
+        
+        #if !USING_FSTREAM_DIRECTIVE
+            FILE* logSrcFile = nullptr;
+            FILE* logDestFile = nullptr;
+        
+            if (needsLogging && !logSource.empty()) {
+                createDirectory(getParentDirFromPath(logSource));
+                logSrcFile = fopen(logSource.c_str(), "w");
+                if (logSrcFile) setvbuf(logSrcFile, nullptr, _IOFBF, 8192);
+            }
+            if (needsLogging && !logDestination.empty()) {
+                createDirectory(getParentDirFromPath(logDestination));
+                logDestFile = fopen(logDestination.c_str(), "w");
+                if (logDestFile) setvbuf(logDestFile, nullptr, _IOFBF, 8192);
+            }
+        #else
+            std::unique_ptr<std::ofstream> logSrcFile, logDestFile;
+            static char srcBuffer[8192], destBuffer[8192];
+        
+            if (needsLogging && !logSource.empty()) {
+                createDirectory(getParentDirFromPath(logSource));
+                logSrcFile = std::make_unique<std::ofstream>(logSource);
+                if (logSrcFile->is_open()) logSrcFile->rdbuf()->pubsetbuf(srcBuffer, sizeof(srcBuffer));
+            }
+            if (needsLogging && !logDestination.empty()) {
+                createDirectory(getParentDirFromPath(logDestination));
+                logDestFile = std::make_unique<std::ofstream>(logDestination);
+                if (logDestFile->is_open()) logDestFile->rdbuf()->pubsetbuf(destBuffer, sizeof(destBuffer));
+            }
+        #endif
+        
+            std::string fullPathSrc, fullPathDst;
+            //fullPathSrc.reserve(1024);
+            //fullPathDst.reserve(1024);
+        
+            dirent* entry;
+            DIR* dir;
+            const char* name;
+        
+            std::string currentSource, currentDestination;
+            while (!stack.empty()) {
+                std::tie(currentSource, currentDestination) = stack.back();
+                stack.pop_back();
+        
+                dir = opendir(currentSource.c_str());
+                if (!dir) {
+        #if USING_LOGGING_DIRECTIVE
+                    if (!disableLogging) logMessage("Failed to open source directory: " + currentSource);
+        #endif
+                    continue;
+                }
+        
+                while ((entry = readdir(dir)) != nullptr) {
+                    name = entry->d_name;
+                    if (name[0] == '.' && (name[1] == '\0' || (name[1] == '.' && name[2] == '\0'))) continue;
+        
+                    fullPathSrc.assign(currentSource);
+                    if (!fullPathSrc.empty() && fullPathSrc.back() != '/') fullPathSrc += '/';
+                    fullPathSrc += name;
+        
+                    fullPathDst.assign(currentDestination);
+                    if (!fullPathDst.empty() && fullPathDst.back() != '/') fullPathDst += '/';
+                    fullPathDst += name;
+        
+                    if (entry->d_type == DT_DIR) {
+                        if (mkdir(fullPathDst.c_str(), 0777) != 0 && errno != EEXIST) {
+        #if USING_LOGGING_DIRECTIVE
+                            if (!disableLogging) logMessage("Failed to create destination directory: " + fullPathDst);
+        #endif
+                            continue;
+                        }
+                        stack.emplace_back(fullPathSrc, fullPathDst);
+                        directoriesToRemove.emplace_back(fullPathSrc);
+        
+                        if (needsLogging) {
+        #if !USING_FSTREAM_DIRECTIVE
+                            if (logSrcFile) fprintf(logSrcFile, "%s/\n", fullPathSrc.c_str()), fflush(logSrcFile);
+                            if (logDestFile) fprintf(logDestFile, "%s/\n", fullPathDst.c_str()), fflush(logDestFile);
+        #else
+                            if (logSrcFile && logSrcFile->is_open()) { *logSrcFile << fullPathSrc << "/\n"; logSrcFile->flush(); }
+                            if (logDestFile && logDestFile->is_open()) { *logDestFile << fullPathDst << "/\n"; logDestFile->flush(); }
+        #endif
+                        }
+                    } else {
+                        remove(fullPathDst.c_str());
+                        if (rename(fullPathSrc.c_str(), fullPathDst.c_str()) == 0) {
+                            if (needsLogging) {
+        #if !USING_FSTREAM_DIRECTIVE
+                                if (logSrcFile) fprintf(logSrcFile, "%s\n", fullPathSrc.c_str()), fflush(logSrcFile);
+                                if (logDestFile) fprintf(logDestFile, "%s\n", fullPathDst.c_str()), fflush(logDestFile);
+        #else
+                                if (logSrcFile && logSrcFile->is_open()) { *logSrcFile << fullPathSrc << '\n'; logSrcFile->flush(); }
+                                if (logDestFile && logDestFile->is_open()) { *logDestFile << fullPathDst << '\n'; logDestFile->flush(); }
+        #endif
+                            }
+                        } else {
+        #if USING_LOGGING_DIRECTIVE
+                            if (!disableLogging) logMessage("Failed to move: " + fullPathSrc);
+        #endif
+                        }
+                    }
+                }
+                closedir(dir);
+            }
+        
+        #if !USING_FSTREAM_DIRECTIVE
+            if (logSrcFile) fclose(logSrcFile);
+            if (logDestFile) fclose(logDestFile);
+        #else
+            if (logSrcFile) { logSrcFile->flush(); logSrcFile->close(); }
+            if (logDestFile) { logDestFile->flush(); logDestFile->close(); }
+        #endif
+        
+            // Clean up directories
+            for (auto it = directoriesToRemove.rbegin(); it != directoriesToRemove.rend(); ++it) {
+                if (rmdir(it->c_str()) != 0) {
+        #if USING_LOGGING_DIRECTIVE
+                    if (!disableLogging) logMessage("Failed to delete source directory: " + *it);
+        #endif
+                }
+            }
+        
+            if (rmdir(sourcePath.c_str()) != 0) {
+        #if USING_LOGGING_DIRECTIVE
+                if (!disableLogging) logMessage("Failed to delete source directory: " + sourcePath);
+        #endif
+            }
+        }
+    
+        // Safely reverse logs now
+        if (needsLogging) {
+            if (!logSource.empty()) reverseLogFile(logSource);
+            if (!logDestination.empty()) reverseLogFile(logDestination);
+        }
+    }
+
+    
+    bool moveFile(const std::string& sourcePath,
+                  const std::string& destinationPath,
+                  const std::string& logSource,
+                  const std::string& logDestination) {
+        if (!isFileOrDirectory(sourcePath)) {
+            #if USING_LOGGING_DIRECTIVE
+            if (!disableLogging)
+                logMessage("Source file doesn't exist or is not a regular file: " + sourcePath);
+            #endif
+            return false;
+        }
+    
+        std::string finalDestPath;
+        bool moveSuccess = false;
+    
+        if (destinationPath.back() == '/') {
+            // Destination is a directory - construct full destination path
+            if (!isDirectory(destinationPath)) {
+                createDirectory(destinationPath);
+            }
+            
+            finalDestPath = destinationPath + getFileName(sourcePath);
+            remove(finalDestPath.c_str());
+            
+            if (rename(sourcePath.c_str(), finalDestPath.c_str()) == 0) {
+                moveSuccess = true;
+            } else {
+                #if USING_LOGGING_DIRECTIVE
+                if (!disableLogging)
+                    logMessage("Failed to move file to directory: " + sourcePath);
+                #endif
+            }
+        } else {
+            // Destination is a file path - directly rename the file
+            finalDestPath = destinationPath;
+            remove(finalDestPath.c_str());
+            createDirectory(getParentDirFromPath(finalDestPath));
+            
+            if (rename(sourcePath.c_str(), finalDestPath.c_str()) == 0) {
+                moveSuccess = true;
+            } else {
+                #if USING_LOGGING_DIRECTIVE
+                if (!disableLogging) {
+                    logMessage("Failed to move file: " + sourcePath + " -> " + finalDestPath);
+                    logMessage("Error: " + std::string(strerror(errno)));
+                }
+                #endif
+            }
+        }
+    
+        // Only write to log files if the move was successful
+        // This is the key optimization - logs are only opened when actually needed!
+        if (moveSuccess) {
+    #if !USING_FSTREAM_DIRECTIVE
+            if (!logSource.empty()) {
+                createDirectory(getParentDirFromPath(logSource));
+                if (FILE* logFile = fopen(logSource.c_str(), "a")) {
+                    writeLog(logFile, sourcePath);
+                    fclose(logFile);
+                }
+                #if USING_LOGGING_DIRECTIVE
+                else {
+                    if (!disableLogging)
+                        logMessage("Failed to open source log file: " + logSource);
+                }
+                #endif
+            }
+    
+            if (!logDestination.empty()) {
+                createDirectory(getParentDirFromPath(logDestination));
+                if (FILE* logFile = fopen(logDestination.c_str(), "a")) {
+                    writeLog(logFile, finalDestPath);
+                    fclose(logFile);
+                }
+                #if USING_LOGGING_DIRECTIVE
+                else {
+                    if (!disableLogging)
+                        logMessage("Failed to open destination log file: " + logDestination);
+                }
+                #endif
+            }
+    #else
+            if (!logSource.empty()) {
+                createDirectory(getParentDirFromPath(logSource));
+                std::ofstream logSourceFile(logSource, std::ios::app);
+                if (logSourceFile.is_open()) {
+                    writeLog(logSourceFile, sourcePath);
+                    logSourceFile.close();
+                }
+                #if USING_LOGGING_DIRECTIVE
+                else {
+                    if (!disableLogging)
+                        logMessage("Failed to open source log file: " + logSource);
+                }
+                #endif
+            }
+    
+            if (!logDestination.empty()) {
+                createDirectory(getParentDirFromPath(logDestination));
+                std::ofstream logDestFile(logDestination, std::ios::app);
+                if (logDestFile.is_open()) {
+                    writeLog(logDestFile, finalDestPath);
+                    logDestFile.close();
+                }
+                #if USING_LOGGING_DIRECTIVE
+                else {
+                    if (!disableLogging)
+                        logMessage("Failed to open destination log file: " + logDestination);
+                }
+                #endif
+            }
+    #endif
+        }
+    
+        return moveSuccess;
+    }
+    
+    /**
+     * @brief Moves a file or directory to a new destination.
+     *
+     * This function moves a file or directory from the `sourcePath` to the `destinationPath`. It can handle both
+     * files and directories and ensures that the destination directory exists before moving.
+     *
+     * @param sourcePath The path of the source file or directory.
+     * @param destinationPath The path of the destination where the file or directory will be moved.
+     */
+    void moveFileOrDirectory(const std::string& sourcePath, const std::string& destinationPath,
+        const std::string& logSource, const std::string& logDestination) {
+        if (sourcePath.back() == '/' && destinationPath.back() == '/') {
+            moveDirectory(sourcePath, destinationPath, logSource, logDestination);
+        } else {
+            moveFile(sourcePath, destinationPath, logSource, logDestination);
+        }
+    }
+    
+    
+    /**
+     * @brief Moves files or directories matching a specified pattern to a destination directory.
+     *
+     * This function identifies files or directories that match the `sourcePathPattern` and moves them to the `destinationPath`.
+     * It processes each matching entry in the source directory pattern and moves them to the specified destination.
+     *
+     * @param sourcePathPattern The pattern used to match files or directories to be moved.
+     * @param destinationPath The destination directory where matching files or directories will be moved.
+     */
+    void moveFilesOrDirectoriesByPattern(const std::string& sourcePathPattern, const std::string& destinationPath,
+        const std::string& logSource, const std::string& logDestination) {
+        
+        fileList = getFilesListByWildcards(sourcePathPattern);
+        
+        //std::string fileListAsString;
+        //for (const std::string& filePath : fileList)
+        //    fileListAsString += filePath + "\n";
+        //logMessage("File List:\n" + fileListAsString);
+        
+        //logMessage("pre loop");
+        std::string folderName, fixedDestinationPath;
+        
+        // Iterate through the file list
+        for (std::string& sourceFileOrDirectory : fileList) {
+            //logMessage("sourceFileOrDirectory: "+sourceFileOrDirectory);
+            // if sourceFile is a file (Needs condition handling)
+            if (!isDirectory(sourceFileOrDirectory)) {
+                //logMessage("destinationPath: "+destinationPath);
+                moveFileOrDirectory(sourceFileOrDirectory, destinationPath, logSource, logDestination);
+            } else if (isDirectory(sourceFileOrDirectory)) {
+                // if sourceFile is a directory (needs conditoin handling)
+                folderName = getNameFromPath(sourceFileOrDirectory);
+                fixedDestinationPath = destinationPath + folderName + "/";
+                
+                //logMessage("fixedDestinationPath: "+fixedDestinationPath);
+                
+                moveFileOrDirectory(sourceFileOrDirectory, fixedDestinationPath, logSource, logDestination);
+            }
+            sourceFileOrDirectory = "";
+        }
+        //logMessage("post loop");
+
+        fileList.clear();
+        fileList.shrink_to_fit();
+    }
+    
+    /**
+     * @brief Copies a single file from the source path to the destination path.
+     *
+     * This function copies a single file specified by `fromFile` to the location specified by `toFile`.
+     *
+     * @param fromFile The path of the source file to be copied.
+     * @param toFile The path of the destination where the file will be copied.
+     */
+    void copySingleFile(const std::string& fromFile, const std::string& toFile, long long& totalBytesCopied, 
+                        const long long totalSize, const std::string& logSource, const std::string& logDestination) {
+        static constexpr size_t maxRetries = 10;
+        const size_t bufferSize = COPY_BUFFER_SIZE;
+        
+        // Create destination directory once
+        createDirectory(getParentDirFromPath(toFile));
+        
+        // Use heap allocation for the buffer to avoid stack overflow with large buffer sizes
+        std::unique_ptr<char[]> buffer(new char[bufferSize]);
+    
+    #if !USING_FSTREAM_DIRECTIVE
+        FILE* srcFile = nullptr;
+        FILE* destFile = nullptr;
+        
+        // Retry loop for file opening
+        for (size_t retryCount = 0; retryCount <= maxRetries; ++retryCount) {
+            srcFile = fopen(fromFile.c_str(), "rb");
+            if (!srcFile) {
+                if (retryCount == maxRetries) {
+                    #if USING_LOGGING_DIRECTIVE
+                    if (!disableLogging)
+                        logMessage("Error: Failed to open source file after " + std::to_string(maxRetries) + " retries");
+                    #endif
+                    return;
+                }
+                continue;
+            }
+            
+            destFile = fopen(toFile.c_str(), "wb");
+            if (!destFile) {
+                fclose(srcFile);
+                if (retryCount == maxRetries) {
+                    #if USING_LOGGING_DIRECTIVE
+                    if (!disableLogging)
+                        logMessage("Error: Failed to open destination file after " + std::to_string(maxRetries) + " retries");
+                    #endif
+                    return;
+                }
+                continue;
+            }
+            
+            break; // Both files opened successfully
+        }
+        
+        // RAII cleanup
+        FileGuard srcGuard(srcFile);
+        FileGuard destGuard(destFile);
+        
+        // Main copy loop - optimized for performance
+        size_t bytesRead;
+        char* bufferPtr = buffer.get();
+        size_t remainingBytes, written;
+        while ((bytesRead = fread(bufferPtr, 1, bufferSize, srcFile)) > 0) {
+            if (abortFileOp.load(std::memory_order_acquire)) {
+                remove(toFile.c_str());
+                copyPercentage.store(-1, std::memory_order_release);
+                return;
+            }
+            
+            // Write all bytes - handle partial writes
+            char* writePtr = bufferPtr;
+            remainingBytes = bytesRead;
+            
+            while (remainingBytes > 0) {
+                written = fwrite(writePtr, 1, remainingBytes, destFile);
+                if (written == 0) {
+                    #if USING_LOGGING_DIRECTIVE
+                    if (!disableLogging)
+                        logMessage("Error writing to destination file");
+                    #endif
+                    remove(toFile.c_str());
+                    copyPercentage.store(-1, std::memory_order_release);
+                    return;
+                }
+                writePtr += written;
+                remainingBytes -= written;
+            }
+            
+            totalBytesCopied += bytesRead;
+            if (totalSize > 0) {
+                copyPercentage.store(static_cast<int>(100 * totalBytesCopied / totalSize), std::memory_order_release);
+            }
+        }
+        
+        // Check for read errors
+        if (ferror(srcFile)) {
+            #if USING_LOGGING_DIRECTIVE
+            if (!disableLogging)
+                logMessage("Error reading from source file");
+            #endif
+            remove(toFile.c_str());
+            copyPercentage.store(-1, std::memory_order_release);
+            return;
+        }
+    
+    #else
+        std::ifstream srcFile;
+        std::ofstream destFile;
+        
+        // Retry loop for file opening
+        for (size_t retryCount = 0; retryCount <= maxRetries; ++retryCount) {
+            srcFile.open(fromFile, std::ios::binary);
+            destFile.open(toFile, std::ios::binary);
+            
+            if (srcFile.is_open() && destFile.is_open()) {
+                break;
+            }
+            
+            srcFile.close();
+            destFile.close();
+            
+            if (retryCount == maxRetries) {
+                #if USING_LOGGING_DIRECTIVE
+                if (!disableLogging)
+                    logMessage("Error: Failed to open files after " + std::to_string(maxRetries) + " retries");
+                #endif
+                return;
+            }
+        }
+        
+        // Main copy loop
+        char* bufferPtr = buffer.get();
+        while (srcFile.read(bufferPtr, bufferSize) || srcFile.gcount() > 0) {
+            if (abortFileOp.load(std::memory_order_acquire)) {
+                srcFile.close();
+                destFile.close();
+                remove(toFile.c_str());
+                copyPercentage.store(-1, std::memory_order_release);
+                return;
+            }
+            
+            std::streamsize bytesToWrite = srcFile.gcount();
+            destFile.write(bufferPtr, bytesToWrite);
+            
+            if (!destFile.good()) {
+                #if USING_LOGGING_DIRECTIVE
+                if (!disableLogging)
+                    logMessage("Error writing to destination file");
+                #endif
+                srcFile.close();
+                destFile.close();
+                remove(toFile.c_str());
+                copyPercentage.store(-1, std::memory_order_release);
+                return;
+            }
+            
+            totalBytesCopied += bytesToWrite;
+            if (totalSize > 0) {
+                copyPercentage.store(static_cast<int>(100 * totalBytesCopied / totalSize), std::memory_order_release);
+            }
+        }
+        
+        srcFile.close();
+        destFile.close();
+    #endif
+        
+        // Only open and write to log files if they're needed - this is the key optimization!
+        if (!logSource.empty()) {
+            createDirectory(getParentDirFromPath(logSource));
+            if (FILE* logFile = fopen(logSource.c_str(), "a")) {
+                writeLog(logFile, fromFile);
+                fclose(logFile);
+            }
+            #if USING_LOGGING_DIRECTIVE
+            else {
+                if (!disableLogging)
+                    logMessage("Failed to open source log file: " + logSource);
+            }
+            #endif
+        }
+        
+        if (!logDestination.empty()) {
+            createDirectory(getParentDirFromPath(logDestination));
+            if (FILE* logFile = fopen(logDestination.c_str(), "a")) {
+                writeLog(logFile, toFile);
+                fclose(logFile);
+            }
+            #if USING_LOGGING_DIRECTIVE
+            else {
+                if (!disableLogging)
+                    logMessage("Failed to open destination log file: " + logDestination);
+            }
+            #endif
+        }
+    }
+
+    
+    /**
+     * Recursively calculates the total size of the given file or directory.
+     * @param path The path to the file or directory.
+     * @return The total size in bytes of all files within the directory or the size of a file.
+     */
+    long long getTotalSize(const std::string& path) {
+        struct stat statbuf;
+        if (lstat(path.c_str(), &statbuf) != 0) {
+            return 0; // Cannot stat file
+        }
+    
+        if (S_ISREG(statbuf.st_mode)) {
+            return statbuf.st_size;
+        }
+    
+        if (S_ISDIR(statbuf.st_mode)) {
+            long long totalSize = 0;
+            std::queue<std::string> directories;
+            directories.push(path);
+            std::string currentPath, newPath;
+    
+            while (!directories.empty()) {
+                currentPath = directories.front();
+                directories.pop();
+    
+                DIR* dir = opendir(currentPath.c_str());
+                if (!dir) {
+                    continue; // Cannot open directory, skip it
+                }
+    
+                dirent* entry;
+                while ((entry = readdir(dir)) != nullptr) {
+                    if (strcmp(entry->d_name, ".") == 0 || strcmp(entry->d_name, "..") == 0) {
+                        continue; // Skip "." and ".."
+                    }
+                    newPath = currentPath + "/" + entry->d_name;
+    
+                    if (lstat(newPath.c_str(), &statbuf) != 0) {
+                        continue; // Cannot stat file, skip it
+                    }
+    
+                    if (S_ISREG(statbuf.st_mode)) {
+                        totalSize += statbuf.st_size;
+                    } else if (S_ISDIR(statbuf.st_mode)) {
+                        directories.push(newPath); // Push subdirectory onto queue for processing
+                    }
+                }
+                closedir(dir);
+            }
+    
+            return totalSize;
+        }
+    
+        return 0; // Non-file/directory entries
+    }
+    
+    /**
+     * @brief Copies a file or directory from the source path to the destination path.
+     *
+     * This function copies a file or directory specified by `fromFileOrDirectory` to the location specified by `toFileOrDirectory`.
+     * If the source is a regular file, it copies the file to the destination. If the source is a directory, it recursively copies
+     * the entire directory and its contents to the destination.
+     *
+     * @param fromPath The path of the source file or directory to be copied.
+     * @param toPath The path of the destination where the file or directory will be copied.
+     */
+    void copyFileOrDirectory(const std::string& fromPath, const std::string& toPath, long long* totalBytesCopied, long long totalSize,
+        const std::string& logSource, const std::string& logDestination) {
+        bool isTopLevelCall = totalBytesCopied == nullptr;
+        long long tempBytesCopied = 0;
+    
+        // Batch logging optimization - collect successful operations instead of logging immediately
+        std::vector<std::string> successfulSources, successfulDestinations;
+        bool needsLogging = !logSource.empty() || !logDestination.empty();
+        bool filesCopied = false;
+    
+        if (isTopLevelCall) {
+            totalSize = getTotalSize(fromPath);
+            totalBytesCopied = &tempBytesCopied;
+        }
+    
+        if (toPath.back() != '/') {
+            // If toPath is a file, create its parent directory and copy the file
+            createDirectory(getParentDirFromPath(toPath));
+            copySingleFile(fromPath, toPath, *totalBytesCopied, totalSize, logSource, logDestination);
+            return;
+        }
+    
+        // Ensure the toPath directory exists
+        createDirectory(toPath);
+    
+        std::vector<std::pair<std::string, std::string>> directories;
+        directories.emplace_back(fromPath, toPath); // Use emplace_back for efficiency
+    
+        size_t currentDirectoryIndex = 0;
+        
+        // Pre-declare strings to avoid repeated allocations
+        std::string filename, toFilePath, toDirPath, currentFromPath, currentToPath;
+        std::string subFromPath, subToPath;
+    
+        struct stat fromStat;
+    
+        while (currentDirectoryIndex < directories.size()) {
+            if (abortFileOp.load(std::memory_order_acquire)) {
+                copyPercentage.store(-1, std::memory_order_release);
+                return;
+            }
+            
+            // Use structured binding more efficiently
+            const auto& [currentFrom, currentTo] = directories[currentDirectoryIndex++];
+            currentFromPath = currentFrom;
+            currentToPath = currentTo;
+    
+            if (stat(currentFromPath.c_str(), &fromStat) != 0) {
+                #if USING_LOGGING_DIRECTIVE
+                if (!disableLogging)
+                    logMessage("Failed to get stat of " + currentFromPath);
+                #endif
+                continue;
+            }
+    
+            if (S_ISREG(fromStat.st_mode)) {
+                // If it's a regular file, copy it to the toPath directory
+                filename = getNameFromPath(currentFromPath);
+                
+                // More efficient path building
+                toFilePath.assign(getParentDirFromPath(currentToPath));
+                toFilePath += '/';
+                toFilePath += filename;
+                
+                createDirectory(getParentDirFromPath(toFilePath)); // Ensure the parent directory exists
+                copySingleFile(currentFromPath, toFilePath, *totalBytesCopied, totalSize, logSource, logDestination);
+                
+                // Mark that files were copied
+                filesCopied = true;
+    
+                if (totalSize > 0) {
+                    copyPercentage.store(static_cast<int>((*totalBytesCopied * 100) / totalSize), std::memory_order_release); // Update progress
+                }
+            } else if (S_ISDIR(fromStat.st_mode)) {
+                // If it's a directory, iterate over its contents and add them to the vector for processing
+                DIR* dir = opendir(currentFromPath.c_str());
+                if (!dir) {
+                    #if USING_LOGGING_DIRECTIVE
+                    if (!disableLogging)
+                        logMessage("Failed to open directory: " + currentFromPath);
+                    #endif
+                    continue;
+                }
+    
+                bool hasContent = false;
+                // Cache current path lengths for efficient string building
+                dirent* entry;
+                while ((entry = readdir(dir)) != nullptr) {
+                    if (strcmp(entry->d_name, ".") == 0 || strcmp(entry->d_name, "..") == 0) continue;
+                    
+                    hasContent = true;
+                    
+                    // More efficient path building
+                    subFromPath.clear();
+                    subFromPath.assign(currentFromPath);
+                    subFromPath += '/';
+                    subFromPath += entry->d_name;
+                    
+                    subToPath.clear();
+                    subToPath.assign(currentToPath);
+                    subToPath += '/';
+                    subToPath += entry->d_name;
+                    
+                    directories.emplace_back(std::move(subFromPath), std::move(subToPath)); // Use move semantics
+                }
+                closedir(dir);
+                
+                // Log this directory if it has content and we need logging
+                if (hasContent && needsLogging) {
+                    successfulSources.push_back(currentFromPath + "/");
+                    successfulDestinations.push_back(currentToPath + "/");
+                }
+            }
+        }
+    
+        // Batch write all successful operations to log files at the end
+        if (isTopLevelCall && needsLogging && filesCopied && !successfulSources.empty()) {
+    #if !USING_FSTREAM_DIRECTIVE
+            if (!logSource.empty()) {
+                createDirectory(getParentDirFromPath(logSource));
+                if (FILE* logFile = fopen(logSource.c_str(), "a")) {
+                    for (auto it = successfulSources.rbegin(); it != successfulSources.rend(); ++it) {
+                        writeLog(logFile, *it);
+                    }
+                    fclose(logFile);
+                }
+                #if USING_LOGGING_DIRECTIVE
+                else {
+                    if (!disableLogging)
+                        logMessage("Failed to open source log file: " + logSource);
+                }
+                #endif
+            }
+    
+            if (!logDestination.empty()) {
+                createDirectory(getParentDirFromPath(logDestination));
+                if (FILE* logFile = fopen(logDestination.c_str(), "a")) {
+                    for (auto it = successfulDestinations.rbegin(); it != successfulDestinations.rend(); ++it) {
+                        writeLog(logFile, *it);
+                    }
+                    fclose(logFile);
+                }
+                #if USING_LOGGING_DIRECTIVE
+                else {
+                    if (!disableLogging)
+                        logMessage("Failed to open destination log file: " + logDestination);
+                }
+                #endif
+            }
+    #else
+            if (!logSource.empty()) {
+                createDirectory(getParentDirFromPath(logSource));
+                std::ofstream logSourceFile(logSource, std::ios::app);
+                if (logSourceFile.is_open()) {
+                    for (auto it = successfulSources.rbegin(); it != successfulSources.rend(); ++it) {
+                        writeLog(logSourceFile, *it);
+                    }
+                    logSourceFile.close();
+                }
+                #if USING_LOGGING_DIRECTIVE
+                else {
+                    if (!disableLogging)
+                        logMessage("Failed to open source log file: " + logSource);
+                }
+                #endif
+            }
+    
+            if (!logDestination.empty()) {
+                createDirectory(getParentDirFromPath(logDestination));
+                std::ofstream logDestFile(logDestination, std::ios::app);
+                if (logDestFile.is_open()) {
+                    for (auto it = successfulDestinations.rbegin(); it != successfulDestinations.rend(); ++it) {
+                        writeLog(logDestFile, *it);
+                    }
+                    logDestFile.close();
+                }
+                #if USING_LOGGING_DIRECTIVE
+                else {
+                    if (!disableLogging)
+                        logMessage("Failed to open destination log file: " + logDestination);
+                }
+                #endif
+            }
+    #endif
+        }
+    
+        if (isTopLevelCall) {
+            copyPercentage.store(100, std::memory_order_release); // Set progress to 100% on completion of top-level call
+        }
+    }
+
+
+    
+    /**
+     * @brief Copies files or directories matching a specified pattern to a destination directory.
+     *
+     * This function identifies files or directories that match the `sourcePathPattern` and copies them to the `toDirectory`.
+     * It processes each matching entry in the source directory pattern and copies them to the specified destination.
+     *
+     * @param sourcePathPattern The pattern used to match files or directories to be copied.
+     * @param toDirectory The destination directory where matching files or directories will be copied.
+     */
+    void copyFileOrDirectoryByPattern(const std::string& sourcePathPattern, const std::string& toDirectory,
+        const std::string& logSource, const std::string& logDestination) {
+        fileList = getFilesListByWildcards(sourcePathPattern);
+        long long totalSize = 0;
+        for (const std::string& path : fileList) {
+            totalSize += getTotalSize(path);
+        }
+    
+        long long totalBytesCopied = 0;
+        for (std::string& sourcePath : fileList) {
+            copyFileOrDirectory(sourcePath, toDirectory, &totalBytesCopied, totalSize, logSource, logDestination);
+            sourcePath = "";
+        }
+
+        fileList.clear();
+        fileList.shrink_to_fit();
+        //copyPercentage.store(-1, std::memory_order_release);  // Reset after operation
+    }
+
+
+    
+    /**
+     * @brief Mirrors the deletion of files from a source directory to a target directory.
+     *
+     * This function mirrors the deletion of files from a `sourcePath` directory to a `targetPath` directory.
+     * It deletes corresponding files in the `targetPath` that match the source directory structure.
+     *
+     * @param sourcePath The path of the source directory.
+     * @param targetPath The path of the target directory where files will be mirrored and deleted.
+     *                   Default is "sdmc:/". You can specify a different target path if needed.
+     */
+    void mirrorFiles(const std::string& sourcePath, const std::string targetPath, const std::string mode) {
+        fileList = getFilesListFromDirectory(sourcePath);
+        std::string updatedPath;
+        long long totalSize = 0;
+        long long totalBytesCopied = 0;
+        
+        if (mode == "copy") {
+            // Calculate total size for progress tracking
+            for (const auto& path : fileList) {
+                if (path != targetPath + path.substr(sourcePath.size())) {
+                    totalSize += getTotalSize(path);
+                }
+            }
+        }
+        
+        for (auto& path : fileList) {
+            // Generate the corresponding path in the target directory by replacing the source path
+            updatedPath = targetPath + path.substr(sourcePath.size());
+            //logMessage("mirror-delete: "+path+" "+updatedPath);
+            if (mode == "delete")
+                deleteFileOrDirectory(updatedPath);
+            else if (mode == "copy") {
+                if (path != updatedPath)
+                    copyFileOrDirectory(path, updatedPath, &totalBytesCopied, totalSize);
+            }
+            path = "";
+        }
+        //fileList.clear();
+        fileList.clear();
+        fileList.shrink_to_fit();
+    }
+    
+    /**
+     * @brief For each match of the wildcard pattern, creates an empty text file
+     *        named basename.txt inside the output directory.
+     *        Uses FILE* if !USING_FSTREAM_DIRECTIVE is defined, otherwise uses std::ofstream.
+     *
+     * @param wildcardPattern A path with a wildcard, such as /some/path/[*].
+     *                        Each match results in a file named after the basename.
+     * @param outputDir       Directory where the output files will be written.
+     *                        Created if it doesn't already exist.
+     */
+    void createFlagFiles(const std::string& wildcardPattern, const std::string& outputDir) {
+        // 1) Gather all matches from the wildcard pattern
+        fileList = ult::getFilesListByWildcards(wildcardPattern);
+        if (fileList.empty()) {
+            return; // No matches, nothing to do
+        }
+    
+        // 2) Ensure the output directory exists
+        createDirectory(outputDir);
+    
+        // 3) Generate empty .txt files for each matched path
+        std::string outputPrefix = outputDir;
+        if (!outputPrefix.empty() && outputPrefix.back() != '/')
+            outputPrefix.push_back('/');
+        
+        std::string baseName, outFile;
+        for (auto& fullPath : fileList) {
+            baseName = ult::getNameFromPath(fullPath);
+            if (baseName.empty()) {
+                fullPath = "";
+                continue;
+            }
+    
+            outFile = outputPrefix + baseName;
+    
+        #if !USING_FSTREAM_DIRECTIVE
+            FileGuard fp(std::fopen(outFile.c_str(), "wb"));
+            // File automatically closed by FileGuard destructor
+        #else
+            std::ofstream ofs(outFile, std::ios::binary | std::ios::trunc);
+            ofs.close();
+        #endif
+            fullPath = "";
+        }
+        fileList.clear();
+        fileList.shrink_to_fit();
+    }
+    
+    /**
+     * @brief Removes all files starting with "._" from a directory and its subdirectories.
+     *
+     * This function recursively scans the specified directory and removes all files
+     * whose names start with "._" (commonly macOS metadata files). It processes
+     * all subdirectories recursively.
+     *
+     * @param sourcePath The path of the directory to clean.
+     */
+    void dotCleanDirectory(const std::string& sourcePath) {
+        DIR* rootDir = opendir(sourcePath.c_str());
+        if (!rootDir) {
+            #if USING_LOGGING_DIRECTIVE
+            if (!disableLogging)
+                logMessage("Path is not a directory or cannot open: " + sourcePath);
+            #endif
+            return;
+        }
+        closedir(rootDir);
+    
+        std::vector<std::string> stack;
+        stack.push_back(sourcePath);
+    
+        struct dirent* entry;
+        struct stat pathStat{};
+        std::string subDirPath; // reuse for directories
+        std::string filePath;   // reuse for dot-underscore files
+    
+        while (!stack.empty()) {
+            const std::string currentPath = std::move(stack.back());
+            stack.pop_back();
+    
+            DIR* directory = opendir(currentPath.c_str());
+            if (!directory) {
+                #if USING_LOGGING_DIRECTIVE
+                if (!disableLogging)
+                    logMessage("Failed to open directory: " + currentPath);
+                #endif
+                continue;
+            }
+    
+            while ((entry = readdir(directory)) != nullptr) {
+                const char* fileName = entry->d_name;
+    
+                // Skip "." and ".."
+                if (fileName[0] == '.' &&
+                    (fileName[1] == '\0' || (fileName[1] == '.' && fileName[2] == '\0'))) {
+                    continue;
+                }
+    
+                // Handle directories first
+                if (entry->d_type == DT_DIR) {
+                    subDirPath.clear();
+                    subDirPath = currentPath;
+                    if (!subDirPath.empty() && subDirPath.back() != '/')
+                        subDirPath += '/';
+                    subDirPath += fileName;
+                    stack.push_back(std::move(subDirPath));
+                    continue;
+                }
+    
+                // Only care about "._" files
+                if (!(fileName[0] == '.' && fileName[1] == '_'))
+                    continue;
+    
+                // Only process files or unknown types
+                if (entry->d_type != DT_REG && entry->d_type != DT_UNKNOWN)
+                    continue;
+    
+                filePath.clear();
+                filePath = currentPath;
+                if (!filePath.empty() && filePath.back() != '/')
+                    filePath += '/';
+                filePath += fileName;
+    
+                // If type unknown, verify with stat
+                if (entry->d_type == DT_UNKNOWN) {
+                    if (stat(filePath.c_str(), &pathStat) != 0 || !S_ISREG(pathStat.st_mode))
+                        continue;
+                }
+    
+                if (remove(filePath.c_str()) == 0) {
+                    #if USING_LOGGING_DIRECTIVE
+                    if (!disableLogging)
+                        logMessage("Removed dot-underscore file: " + filePath);
+                    #endif
+                } else {
+                    #if USING_LOGGING_DIRECTIVE
+                    if (!disableLogging)
+                        logMessage("Failed to remove dot-underscore file: " + filePath);
+                    #endif
+                }
+            }
+    
+            closedir(directory);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Source/sys-clk/overlay/lib/libultrahand/libultra/source/string_funcs.cpp b/Source/sys-clk/overlay/lib/libultrahand/libultra/source/string_funcs.cpp
new file mode 100644
index 00000000..3788eb23
--- /dev/null
+++ b/Source/sys-clk/overlay/lib/libultrahand/libultra/source/string_funcs.cpp
@@ -0,0 +1,636 @@
+/********************************************************************************
+ * File: string_funcs.cpp
+ * Author: ppkantorski
+ * Description:
+ *   This source file provides implementations for the string manipulation
+ *   functions declared in string_funcs.hpp. These utility functions support
+ *   operations such as trimming whitespace, removing quotes, normalizing
+ *   slashes, and performing other string cleanup tasks used throughout
+ *   the Ultrahand Overlay project.
+ *
+ *   For the latest updates and contributions, visit the project's GitHub repository.
+ *   (GitHub Repository: https://github.com/ppkantorski/Ultrahand-Overlay)
+ *
+ *   Note: Please be aware that this notice cannot be altered or removed. It is a part
+ *   of the project's documentation and must remain intact.
+ * 
+ *  Licensed under both GPLv2 and CC-BY-4.0
+ *  Copyright (c) 2024 ppkantorski
+ ********************************************************************************/
+
+#include "string_funcs.hpp"
+
+namespace ult {
+
+
+    // Custom string conversion methods in place of std::
+    std::string to_string(int value) {
+        char buffer[12]; // Sufficient for 32-bit int
+        snprintf(buffer, sizeof(buffer), "%d", value);
+        return std::string(buffer);
+    }
+    
+    int stoi(const std::string& str, std::size_t* pos, int base) {
+        char* end;
+        const long result = std::strtol(str.c_str(), &end, base);
+    
+        if (pos) {
+            *pos = end - str.c_str();  // Set the position to the last character processed
+        }
+    
+        // Handle out-of-range or conversion issues here if needed
+        return static_cast<int>(result);
+    }
+
+    
+    float stof(const std::string& str) {
+        return strtof(str.c_str(), nullptr);
+    }
+
+
+    //bool canConvertToInt(const std::string& str) {
+    //    if (str.empty()) {
+    //        return false;
+    //    }
+    //    
+    //    size_t start = 0;
+    //    if (str[0] == '-' || str[0] == '+') {
+    //        if (str.length() == 1) return false;
+    //        start = 1;
+    //    }
+    //    
+    //    for (size_t i = start; i < str.length(); ++i) {
+    //        if (!std::isdigit(static_cast<unsigned char>(str[i]))) {
+    //            return false;
+    //        }
+    //    }
+    //    
+    //    return true;
+    //}
+
+
+    // Mimics std::getline() with a delimiter
+    bool StringStream::getline(std::string& output, char delimiter) {
+        if (position >= data.size()) {
+            return false;
+        }
+        
+        const size_t nextPos = data.find(delimiter, position);
+        
+        if (nextPos != std::string::npos) {
+            output.assign(data, position, nextPos - position);  // No temporary string creation
+            position = nextPos + 1;
+        } else {
+            output.assign(data, position, data.size() - position);  // No temporary string creation
+            position = data.size();
+        }
+    
+        return true;
+    }
+    
+    // Mimics operator >> to split by whitespace
+    StringStream& StringStream::operator>>(std::string& output) {
+        // Skip leading whitespace
+        while (position < data.size() && std::isspace(data[position])) {
+            ++position;
+        }
+    
+        if (position >= data.size()) {
+            output.clear();
+            validState = false;
+            return *this;
+        }
+    
+        size_t nextPos = position;
+        while (nextPos < data.size() && !std::isspace(data[nextPos])) {
+            ++nextPos;
+        }
+    
+        output.assign(data, position, nextPos - position);  // Replace substr() with assign()
+        position = nextPos;
+    
+        validState = true;
+        return *this;
+    }
+    
+    // Overload << operator for std::string
+    StringStream& StringStream::operator<<(const std::string& input) {
+        data += input;
+        return *this;
+    }
+    
+    // Overload << operator for const char*
+    StringStream& StringStream::operator<<(const char* input) {
+        data += input;
+        return *this;
+    }
+    
+    // Overload << operator for char
+    StringStream& StringStream::operator<<(char input) {
+        data += input;
+        return *this;
+    }
+    
+    // Overload << operator for int (handles hex mode)
+    StringStream& StringStream::operator<<(int input) {
+        if (hexMode) {
+            char buffer[20];  // Buffer large enough for hex conversion
+            sprintf(buffer, "%x", input);  // Convert integer to hex string
+            data += buffer;
+        } else {
+            data += ult::to_string(input);
+        }
+        return *this;
+    }
+
+    // Define the new overload for long long
+    StringStream& StringStream::operator<<(long long input) {
+        data += std::to_string(input);
+        return *this;
+    }
+    
+    // Return the current buffer content
+    std::string StringStream::str() const {
+        return data;
+    }
+    
+
+
+    /**
+     * @brief Trims leading and trailing whitespaces from a string.
+     *
+     * This function removes leading and trailing whitespaces, tabs, newlines, carriage returns, form feeds,
+     * and vertical tabs from the input string.
+     *
+     * @param str The input string to trim.
+     * @return The trimmed string.
+     */
+    void trim(std::string& str) {
+        const size_t first = str.find_first_not_of(" \t\n\r\f\v");
+        if (first == std::string::npos) {
+            str.clear(); // Fix: clear all-whitespace strings
+            return;
+        }
+    
+        const size_t last = str.find_last_not_of(" \t\n\r\f\v");
+        
+        // True in-place modification - no temporary string creation
+        if (last + 1 < str.length()) {
+            str.erase(last + 1);  // Remove trailing whitespace
+        }
+        if (first > 0) {
+            str.erase(0, first);  // Remove leading whitespace  
+        }
+    }
+    
+    
+    // Function to trim newline characters from the end of a string
+    void trimNewline(std::string& str) {
+        const size_t end = str.find_last_not_of("\n");
+        if (end == std::string::npos) {
+            str.clear();  // If the string consists entirely of newlines, clear it
+        } else {
+            str.erase(end + 1);  // Remove all characters after the last non-newline character
+        }
+    }
+    
+    
+    /**
+     * @brief Removes all white spaces from a string.
+     *
+     * This function removes all white spaces, including spaces, tabs, newlines, carriage returns, form feeds,
+     * and vertical tabs from the input string.
+     *
+     * @param str The input string to remove white spaces from.
+     * @return The string with white spaces removed.
+     */
+    std::string removeWhiteSpaces(const std::string& str) {
+        std::string result;
+        result.reserve(str.size()); // Reserve space for the result to avoid reallocations
+        
+        std::remove_copy_if(str.begin(), str.end(), std::back_inserter(result), [](unsigned char c) {
+            return std::isspace(c);
+        });
+        
+        return result;
+    }
+    
+    
+    
+    /**
+     * @brief Removes quotes from a string.
+     *
+     * This function removes single and double quotes from the beginning and end of the input string.
+     *
+     * @param str The input string to remove quotes from.
+     * @return The string with quotes removed.
+     */
+    void removeQuotes(std::string& str) {
+        if (str.size() >= 2) {
+            const char front = str[0];
+            const char back = str[str.size() - 1];
+            if ((front == '\'' && back == '\'') || (front == '"' && back == '"')) {
+                str.erase(0, 1);
+                str.pop_back();
+            }
+        }
+    }
+    
+    
+    /**
+     * @brief Replaces multiple consecutive slashes with a single slash in a string.
+     *
+     * This function replaces sequences of two or more consecutive slashes with a single slash in the input string.
+     *
+     * @param input The input string to process.
+     * @return The string with multiple slashes replaced.
+     */
+    std::string replaceMultipleSlashes(const std::string& input) {
+        std::string output;
+        output.reserve(input.size()); // Reserve space for the output string
+        
+        bool previousSlash = false;
+        for (char c : input) {
+            if (c == '/') {
+                if (!previousSlash) {
+                    output.push_back(c);
+                }
+                previousSlash = true;
+            } else {
+                output.push_back(c);
+                previousSlash = false;
+            }
+        }
+        
+        return output;
+    }
+    
+    
+    
+    /**
+     * @brief Preprocesses a path string by replacing multiple slashes and adding "sdmc:" prefix.
+     *
+     * This function preprocesses a path string by removing multiple consecutive slashes,
+     * resolving relative path components (. and ..), adding the "sdmc:" prefix if not present,
+     * and modifying the input string in place.
+     *
+     * @param path The input path string to preprocess, passed by reference.
+     * @param packagePath The base package path to resolve relative paths against.
+     */
+    void preprocessPath(std::string& path, const std::string& packagePath) {
+        removeQuotes(path);
+        
+        if (path.empty())
+            return;
+        
+        // In-place multiple slash removal
+        size_t writePos = 0;
+        bool previousSlash = false;
+        
+        for (size_t i = 0, len = path.length(); i < len; ++i) {
+            const char c = path[i];
+            if (c == '/') {
+                if (!previousSlash) {
+                    path[writePos++] = '/';
+                    previousSlash = true;
+                }
+            } else {
+                path[writePos++] = c;
+                previousSlash = false;
+            }
+        }
+        path.resize(writePos);
+    
+        // Handle "./" replacement if present
+        if (!packagePath.empty() && path.length() >= 2 && path[0] == '.' && path[1] == '/') {
+            path.replace(0, 2, packagePath);
+        }
+        
+        // Handle "../" sequences
+        size_t dotDotPos;
+        size_t searchEnd;
+        while ((dotDotPos = path.find("../")) != std::string::npos) {
+            // Check if there's a trailing slash before "../"
+            searchEnd = dotDotPos;
+            if (searchEnd > 0 && path[searchEnd - 1] == '/') {
+                --searchEnd;
+            }
+            
+            // Find the previous slash
+            const size_t lastSlash = (searchEnd > 0) ? path.rfind('/', searchEnd - 1) : std::string::npos;
+            
+            if (lastSlash != std::string::npos) {
+                // Erase from after lastSlash to after "../"
+                path.erase(lastSlash + 1, dotDotPos + 3 - lastSlash - 1);
+            } else {
+                // No slash found, replace with root
+                path.erase(0, dotDotPos);
+                path.insert(0, "/");
+            }
+        }
+    
+        // Check for sdmc: prefix
+        if (path.length() < 5 || 
+            path[0] != 's' || path[1] != 'd' || path[2] != 'm' || path[3] != 'c' || path[4] != ':') {
+            path.insert(0, "sdmc:");
+        }
+    }
+    
+    
+    /**
+     * @brief Preprocesses a URL string by adding "https://" prefix.
+     *
+     * This function preprocesses a URL string by adding the "https://" prefix if not already present.
+     *
+     * @param path The input URL string to preprocess, passed by reference and modified in-place.
+     */
+    void preprocessUrl(std::string& path) {
+        removeQuotes(path);
+        
+        if (path.size() >= 7 && path[0] == 'h' && path[1] == 't' && 
+            path[2] == 't' && path[3] == 'p') {
+            if ((path.size() >= 8 && path[4] == 's' && path[5] == ':') ||
+                (path[4] == ':')) {
+                return;
+            }
+        }
+        
+        path.insert(0, "https://");
+    }
+    
+    /**
+     * @brief Drops the file extension from a filename.
+     *
+     * This function removes the file extension (characters after the last dot) from the input filename string.
+     *
+     * @param filename The input filename from which to drop the extension, passed by reference and modified in-place.
+     */
+    void dropExtension(std::string& filename) {
+        const size_t lastDotPos = filename.find_last_of('.');  // Single char instead of string
+        if (lastDotPos != std::string::npos) {
+            filename.resize(lastDotPos);
+        }
+    }
+    
+    /**
+     * @brief Checks if a string starts with a given prefix.
+     *
+     * This function checks if the input string starts with the specified prefix.
+     *
+     * @param str The input string to check.
+     * @param prefix The prefix to check for.
+     * @return True if the string starts with the prefix, false otherwise.
+     */
+    bool startsWith(const std::string& str, const std::string& prefix) {
+        return str.compare(0, prefix.length(), prefix) == 0;
+    }
+    
+    
+    
+    
+    // Helper function to check if a string is a valid integer
+    bool isValidNumber(const std::string& str) {
+        if (str.empty()) {
+            return false;
+        }
+        
+        size_t start = 0;
+        if (str[0] == '-' || str[0] == '+') {
+            if (str.length() == 1) return false;
+            start = 1;
+        }
+        
+        for (size_t i = start; i < str.length(); ++i) {
+            if (!std::isdigit(static_cast<unsigned char>(str[i]))) {
+                return false;
+            }
+        }
+        
+        return true;
+    }
+    
+    std::string returnOrNull(const std::string& value) {
+        return value.empty() ? NULL_STR : value;
+    }
+
+    
+    // Function to slice a string from start to end index
+    std::string sliceString(const std::string& str, size_t start, size_t end) {
+        if (start < 0) start = 0;
+        if (end > static_cast<size_t>(str.length())) end = str.length();
+        if (start > end) start = end;
+        return str.substr(start, end - start);
+    }
+    
+    
+    
+    //std::string addQuotesIfNeeded(const std::string& str) {
+    //    if (str.find(' ') != std::string::npos) {
+    //        return "\"" + str + "\"";
+    //    }
+    //    return str;
+    //}
+    
+    
+    /**
+     * @brief Converts a string to lowercase.
+     *
+     * This function takes a string as input and returns a lowercase version of that string.
+     *
+     * @param str The input string to convert to lowercase.
+     * @return The lowercase version of the input string.
+     */
+    
+    std::string stringToLowercase(const std::string& str) {
+        std::string result = str;
+        //std::transform(result.begin(), result.end(), result.begin(),
+        //               [](unsigned char c) { return std::tolower(c); });
+        //return result;
+        for (char& c : result) {
+            if (c >= 'A' && c <= 'Z') {
+                c += 32;
+            }
+        }
+        return result;
+    }
+    
+    /**
+     * @brief Converts a string to uppercase.
+     *
+     * This function takes a string as input and returns an uppercase version of that string.
+     *
+     * @param str The input string to convert to uppercase.
+     * @return The uppercase version of the input string.
+     */
+    
+    std::string stringToUppercase(const std::string& str) {
+        std::string result = str;
+        for (char& c : result) {
+            if (c >= 'a' && c <= 'z') {
+                c -= 32;
+            }
+        }
+        return result;
+    }
+
+
+
+    /**
+     * @brief Formats a priority string to a desired width.
+     *
+     * This function takes a priority string and formats it to a specified desired width by padding with '0's if it's shorter
+     * or truncating with '9's if it's longer.
+     *
+     * @param priority The input priority string to format.
+     * @param desiredWidth The desired width of the formatted string (default is 4).
+     * @return A formatted priority string.
+     */
+    std::string formatPriorityString(const std::string& priority, int desiredWidth) {
+        const int priorityLength = priority.length();
+        
+        if (priorityLength > desiredWidth) {
+            // FASTEST: Single allocation with direct fill
+            return std::string(desiredWidth, '9');
+        } else {
+            // FASTEST: Single allocation + direct memory copy
+            std::string result(desiredWidth, '0');  // Pre-fill with zeros
+            memcpy(&result[desiredWidth - priorityLength], priority.data(), priorityLength);
+            return result;
+        }
+    }
+    
+    
+    
+    /**
+     * @brief Removes the part of the string after the first occurrence of '?' character.
+     *
+     * This function takes a string and removes the portion of the string that appears after
+     * the first '?' character, if found. If no '?' character is present, the string remains unchanged.
+     *
+     * @param input The input string from which to remove the tag, passed by reference and modified in-place.
+     */
+    void removeTag(std::string &input) {
+        const size_t pos = input.find('?');
+        if (pos != std::string::npos) {
+            input.resize(pos); // Modify the string in-place to remove everything after the '?'
+        }
+    }
+    
+    
+    std::string getFirstLongEntry(const std::string& input, size_t minLength) {
+        StringStream iss(input);  // Use custom StringStream
+        std::string word;
+    
+        // Split the input string based on spaces and get the first word
+        if (iss >> word) {
+            // Check if the first word's length is greater than the specified length
+            if (word.length() > minLength) {
+                return word;
+            }
+        }
+        
+        // Return an empty string if the first word is not longer than minLength
+        return input;
+    }
+    
+    
+    // This will take a string like "v1.3.5-abasdfasdfa" and output "1.3.5". string could also look like "test-1.3.5-1" or "v1.3.5" and we will only want "1.3.5"
+    std::string cleanVersionLabel(const std::string& input) {
+        std::string result;
+        result.reserve(input.size());
+        
+        size_t start = 0;
+        
+        // Find the start of the version number (first digit)
+        while (start < input.size() && !std::isdigit(input[start])) {
+            start++;
+        }
+        
+        if (start == input.size()) {
+            return ""; // No digits found
+        }
+        
+        
+        // Extract version number with dots and plus signs
+        for (size_t i = start; i < input.size(); ++i) {
+            const char c = input[i];
+            if (std::isdigit(c) || c == '.' || c == '+') {
+                result += c;
+            } else {
+                break; // Stop at first character that's not digit, dot, or plus
+            }
+        }
+        
+        return result;
+    }
+    
+    
+    std::string extractTitle(const std::string& input) {
+        const size_t spacePos = input.find(' '); // Find the position of the first space
+        
+        if (spacePos != std::string::npos) {
+            // Extract the substring before the first space
+            return input.substr(0, spacePos);
+        } else {
+            // If no space is found, return the original string
+            return input;
+        }
+    }
+    
+    
+    std::vector<std::string> splitString(const std::string& str, const std::string& delimiter) {
+        std::vector<std::string> tokens;
+        
+        // OPTIMIZATION: Pre-allocate space to avoid reallocations
+        tokens.reserve(str.length() / (delimiter.length() + 1) + 1);
+        
+        size_t start = 0;
+        size_t end = str.find(delimiter);
+        
+        while (end != std::string::npos) {
+            // OPTIMIZATION: Direct construction instead of substr() - no temporary string
+            tokens.emplace_back(str, start, end - start);
+            start = end + delimiter.length();
+            end = str.find(delimiter, start);
+        }
+        
+        // OPTIMIZATION: Direct construction for last token
+        tokens.emplace_back(str, start);
+        
+        return tokens;
+    }
+    
+    
+    // Function to split a string by a delimiter and return a specific index
+    std::string splitStringAtIndex(const std::string& str, const std::string& delimiter, size_t index) {
+        const std::vector<std::string> tokens = splitString(str, delimiter);
+    
+        if (index < tokens.size()) {
+            return tokens[index];
+        } else {
+            return ""; // Return empty string if index is out of bounds
+        }
+    }
+    
+    
+    std::string customAlign(int number) {
+        const std::string numStr = ult::to_string(number);
+        const int paddingSpaces = (4 - numStr.length()) * 2;
+        
+        // FASTEST: Single allocation + direct memory operations
+        std::string result(paddingSpaces + numStr.length(), ' ');
+        memcpy(&result[paddingSpaces], numStr.data(), numStr.length());
+        
+        return result;
+    }
+
+    //#if IS_LAUNCHER_DIRECTIVE
+    //std::string inputExists(const std::string& input) {
+    //    std::string e;
+    //    for (char c : input) {
+    //        e += (c + 5);
+    //    }
+    //    return e;
+    //}
+    //#endif
+}
diff --git a/Source/sys-clk/overlay/lib/libultrahand/libultra/source/tsl_utils.cpp b/Source/sys-clk/overlay/lib/libultrahand/libultra/source/tsl_utils.cpp
new file mode 100644
index 00000000..3518d190
--- /dev/null
+++ b/Source/sys-clk/overlay/lib/libultrahand/libultra/source/tsl_utils.cpp
@@ -0,0 +1,1855 @@
+/********************************************************************************
+ * File: tsl_utils.cpp
+ * Author: ppkantorski
+ * Description: 
+ *   'tsl_utils.cpp' provides the implementation of various utility functions
+ *   defined in 'tsl_utils.hpp' for the Ultrahand Overlay project. This source file
+ *   includes functionality for system checks, input handling, time-based interpolation,
+ *   and other application-specific features essential for operating custom overlays
+ *   on the Nintendo Switch.
+ *
+ *   For the latest updates and contributions, visit the project's GitHub repository:
+ *   GitHub Repository: https://github.com/ppkantorski/Ultrahand-Overlay
+ *
+ *   Note: This notice is integral to the project's documentation and must not be 
+ *   altered or removed.
+ *
+ *  Licensed under both GPLv2 and CC-BY-4.0
+ *  Copyright (c) 2024 ppkantorski
+ ********************************************************************************/
+
+#include <tsl_utils.hpp>
+
+#include <cstdlib>
+extern "C" { // assertion override
+    void __assert_func(const char *_file, int _line, const char *_func, const char *_expr ) {
+        abort();
+    }
+}
+
+namespace ult {
+    bool correctFrameSize; // for detecting the correct Overlay display size
+
+    u16 DefaultFramebufferWidth = 448;            ///< Width of the framebuffer
+    u16 DefaultFramebufferHeight = 720;           ///< Height of the framebuffer
+
+    std::unordered_map<std::string, std::string> translationCache;
+    
+    std::unordered_map<u64, OverlayCombo> g_entryCombos;
+    std::atomic<bool> launchingOverlay(false);
+    std::atomic<bool> settingsInitialized(false);
+    std::atomic<bool> currentForeground(false);
+    //std::mutex simulatedNextPageMutex;
+
+    // Helper function to read file content into a string
+    bool readFileContent(const std::string& filePath, std::string& content) {
+        #if !USING_FSTREAM_DIRECTIVE
+            FILE* file = fopen(filePath.c_str(), "r");
+            if (!file) {
+                #if USING_LOGGING_DIRECTIVE
+                logMessage("Failed to open JSON file: " + filePath);
+                #endif
+                return false;
+            }
+            char buffer[256];
+            while (fgets(buffer, sizeof(buffer), file) != nullptr) {
+                content += buffer;
+            }
+            fclose(file);
+        #else
+            std::ifstream file(filePath);
+            if (!file.is_open()) {
+                #if USING_LOGGING_DIRECTIVE
+                logMessage("Failed to open JSON file: " + filePath);
+                #endif
+                return false;
+            }
+            content.assign(std::istreambuf_iterator<char>(file), std::istreambuf_iterator<char>());
+            file.close();
+        #endif
+    
+        return true;
+    }
+    
+    // Helper function to parse JSON-like content into a map
+    void parseJsonContent(const std::string& content, std::unordered_map<std::string, std::string>& result) {
+        size_t pos = 0;
+        size_t keyStart, keyEnd, colonPos, valueStart, valueEnd;
+        std::string key, value;
+    
+        auto normalizeNewlines = [](std::string &s) {
+            size_t n = 0;
+            while ((n = s.find("\\n", n)) != std::string::npos) {
+                s.replace(n, 2, "\n");
+                n += 1;
+            }
+        };
+    
+        while ((pos = content.find('"', pos)) != std::string::npos) {
+            keyStart = pos + 1;
+            keyEnd = content.find('"', keyStart);
+            if (keyEnd == std::string::npos) break;
+    
+            key = content.substr(keyStart, keyEnd - keyStart);
+            colonPos = content.find(':', keyEnd);
+            if (colonPos == std::string::npos) break;
+    
+            valueStart = content.find('"', colonPos);
+            valueEnd = content.find('"', valueStart + 1);
+            if (valueStart == std::string::npos || valueEnd == std::string::npos) break;
+    
+            value = content.substr(valueStart + 1, valueEnd - valueStart - 1);
+    
+            // 🔹 Convert escaped newlines (\\n) into real ones
+            normalizeNewlines(key);
+            normalizeNewlines(value);
+    
+            result[key] = value;
+    
+            key.clear();
+            value.clear();
+            pos = valueEnd + 1; // Move to next pair
+        }
+    }
+    
+    // Function to parse JSON key-value pairs into a map
+    bool parseJsonToMap(const std::string& filePath, std::unordered_map<std::string, std::string>& result) {
+        std::string content;
+        if (!readFileContent(filePath, content)) {
+            return false;
+        }
+        
+        parseJsonContent(content, result);
+        return true;
+    }
+    
+    // Function to load translations from a JSON-like file into the translation cache
+    bool loadTranslationsFromJSON(const std::string& filePath) {
+        return parseJsonToMap(filePath, translationCache);
+    }
+    
+    
+    u16 activeHeaderHeight = 97;
+
+    bool consoleIsDocked() {
+        Result rc;
+        ApmPerformanceMode perfMode = ApmPerformanceMode_Invalid;
+    
+        // Initialize the APM service
+        rc = apmInitialize();
+        if (R_FAILED(rc)) {
+            return false;  // Fail early if initialization fails
+        }
+    
+        // Get the current performance mode
+        rc = apmGetPerformanceMode(&perfMode);
+        apmExit();  // Clean up the APM service
+    
+        if (R_FAILED(rc)) {
+            return false;  // Fail early if performance mode check fails
+        }
+    
+        // Check if the performance mode indicates docked state
+        if (perfMode == ApmPerformanceMode_Boost) {
+            return true;  // System is docked (boost mode active)
+        }
+    
+        return false;  // Not docked (normal mode or handheld)
+    }
+    
+    //static bool pminfoInitialized = false;
+    //static u64 lastPid = 0;
+    //static u64 lastTid = 0;
+    //
+    //std::string getTitleIdAsString() {
+    //    Result rc;
+    //    u64 pid = 0;
+    //    u64 tid = 0;
+    //
+    //    // Get the current application PID
+    //    rc = pmdmntGetApplicationProcessId(&pid);
+    //    if (R_FAILED(rc) || pid == 0) {
+    //        return NULL_STR;
+    //    }
+    //
+    //    // If it's the same PID as last time, return cached TID
+    //    if (pid == lastPid && lastTid != 0) {
+    //        char cachedTidStr[17];
+    //        snprintf(cachedTidStr, sizeof(cachedTidStr), "%016lX", lastTid);
+    //        return std::string(cachedTidStr);
+    //    }
+    //
+    //    // Initialize pminfo if not already
+    //    if (!pminfoInitialized) {
+    //        rc = pminfoInitialize();
+    //        if (R_FAILED(rc)) {
+    //            return NULL_STR;
+    //        }
+    //        pminfoInitialized = true;
+    //    }
+    //
+    //    // Retrieve the TID (Program ID)
+    //    rc = pminfoGetProgramId(&tid, pid);
+    //    if (R_FAILED(rc)) {
+    //        return NULL_STR;
+    //    }
+    //
+    //    lastPid = pid;
+    //    lastTid = tid;
+    //
+    //    char titleIdStr[17];
+    //    snprintf(titleIdStr, sizeof(titleIdStr), "%016lX", tid);
+    //    return std::string(titleIdStr);
+    //}
+    
+    //std::string getProcessIdAsString() {
+    //    u64 pid = 0;
+    //    if (R_FAILED(pmdmntGetApplicationProcessId(&pid)))
+    //        return NULL_STR;
+    //    
+    //    char pidStr[21];  // Max u64 is 20 digits + null terminator
+    //    snprintf(pidStr, sizeof(pidStr), "%llu", pid);
+    //    return std::string(pidStr);
+    //}
+
+    std::string getBuildIdAsString() {
+        u64 pid = 0;
+        if (R_FAILED(pmdmntGetApplicationProcessId(&pid)))
+            return NULL_STR;
+        
+        Service srv;
+        if (R_FAILED(smGetService(&srv, "dmnt:cht")))
+            return NULL_STR;
+        
+        if (R_FAILED(serviceDispatch(&srv, 65003))) {
+            serviceClose(&srv);
+            return NULL_STR;
+        }
+        
+        struct {
+            u64 process_id;
+            u64 title_id;
+            struct { u64 base; u64 size; } main_nso_extents;
+            struct { u64 base; u64 size; } heap_extents;
+            struct { u64 base; u64 size; } alias_extents;
+            struct { u64 base; u64 size; } address_space_extents;
+            u8 main_nso_build_id[0x20];
+        } metadata;
+        
+        Result rc = serviceDispatchOut(&srv, 65002, metadata);
+        serviceClose(&srv);
+        
+        if (R_FAILED(rc))
+            return NULL_STR;
+        
+        u64 buildid;
+        std::memcpy(&buildid, metadata.main_nso_build_id, sizeof(u64));
+        
+        char buildIdStr[17];
+        snprintf(buildIdStr, sizeof(buildIdStr), "%016lX", __builtin_bswap64(buildid));
+        return std::string(buildIdStr);
+    }
+    
+
+    std::string getTitleIdAsString() {
+        u64 pid = 0, tid = 0;
+        if (R_FAILED(pmdmntGetApplicationProcessId(&pid)) ||
+            R_FAILED(pmdmntGetProgramId(&tid, pid)))
+            return NULL_STR;
+    
+        char tidStr[17];
+        snprintf(tidStr, sizeof(tidStr), "%016lX", tid);
+        return std::string(tidStr);
+    }
+
+    
+    std::string lastTitleID;
+    std::atomic<bool> resetForegroundCheck(false); // initialize as true
+
+
+    
+
+    std::atomic<bool> internalTouchReleased(true);
+    u32 layerEdge = 0;
+    bool useRightAlignment = false;
+    bool useSwipeToOpen = true;
+    bool useLaunchCombos = true;
+    bool useNotifications = true;
+    bool useSoundEffects = true;
+    bool useHapticFeedback = false;
+    bool usePageSwap = false;
+    bool useDynamicLogo = true;
+    bool useSelectionBG = true;
+    bool useSelectionText = true;
+    bool useSelectionValue = false;
+
+    std::atomic<bool> noClickableItems{false};
+    
+    #if IS_LAUNCHER_DIRECTIVE
+    std::atomic<bool> overlayLaunchRequested{false};
+    std::string requestedOverlayPath;
+    std::string requestedOverlayArgs;
+    std::mutex overlayLaunchMutex;
+    #endif
+
+    // Define the duration boundaries (for smooth scrolling)
+    //const std::chrono::milliseconds initialInterval = std::chrono::milliseconds(67);  // Example initial interval
+    //const std::chrono::milliseconds shortInterval = std::chrono::milliseconds(10);    // Short interval after long hold
+    //const std::chrono::milliseconds transitionPoint = std::chrono::milliseconds(2000); // Point at which the shortest interval is reached
+    
+    // Function to interpolate between two durations
+    //std::chrono::milliseconds interpolateDuration(std::chrono::milliseconds start, std::chrono::milliseconds end, float t) {
+    //    using namespace std::chrono;
+    //    auto interpolated = start.count() + static_cast<long long>((end.count() - start.count()) * t);
+    //    return milliseconds(interpolated);
+    //}
+    
+    
+    
+    //#include <filesystem> // Comment out filesystem
+    
+    // CUSTOM SECTION START
+    //float backWidth, selectWidth, nextPageWidth;
+    std::atomic<float> backWidth;
+    std::atomic<float> selectWidth;
+    std::atomic<float> nextPageWidth;
+    std::atomic<bool> inMainMenu{false};
+    std::atomic<bool> inOverlaysPage{false};
+    std::atomic<bool> inPackagesPage{false};
+    
+    bool firstBoot = true; // for detecting first boot
+    
+    //std::unordered_map<std::string, std::string> hexSumCache;
+    
+    // Define an atomic bool for interpreter completion
+    std::atomic<bool> threadFailure(false);
+    std::atomic<bool> runningInterpreter(false);
+    std::atomic<bool> shakingProgress(true);
+    
+    std::atomic<bool> isHidden(false);
+    std::atomic<bool> externalAbortCommands(false);
+    
+    //bool progressAnimation = false;
+    bool disableTransparency = false;
+    //bool useCustomWallpaper = false;
+    bool useMemoryExpansion = false;
+    bool useOpaqueScreenshots = false;
+    
+    std::atomic<bool> onTrackBar(false);
+    std::atomic<bool> allowSlide(false);
+    std::atomic<bool> unlockedSlide(false);
+    
+    
+
+    void atomicToggle(std::atomic<bool>& b) {
+        bool expected = b.load(std::memory_order_relaxed);
+        for (;;) {
+            const bool desired = !expected;
+            if (b.compare_exchange_weak(expected, desired,
+                                        std::memory_order_acq_rel,
+                                        std::memory_order_relaxed)) {
+                break; // success
+            }
+            // expected has been updated with the current value on failure; loop continues
+        }
+    }
+
+    
+    bool updateMenuCombos = false;
+    
+    
+    //void convertComboToUnicode(std::string& combo);
+
+
+    std::array<KeyInfo, 18> KEYS_INFO = {{
+        { HidNpadButton_L, "L", "\uE0E4" }, { HidNpadButton_R, "R", "\uE0E5" },
+        { HidNpadButton_ZL, "ZL", "\uE0E6" }, { HidNpadButton_ZR, "ZR", "\uE0E7" },
+        { HidNpadButton_AnySL, "SL", "\uE0E8" }, { HidNpadButton_AnySR, "SR", "\uE0E9" },
+        { HidNpadButton_Left, "DLEFT", "\uE0ED" }, { HidNpadButton_Up, "DUP", "\uE0EB" },
+        { HidNpadButton_Right, "DRIGHT", "\uE0EE" }, { HidNpadButton_Down, "DDOWN", "\uE0EC" },
+        { HidNpadButton_A, "A", "\uE0E0" }, { HidNpadButton_B, "B", "\uE0E1" },
+        { HidNpadButton_X, "X", "\uE0E2" }, { HidNpadButton_Y, "Y", "\uE0E3" },
+        { HidNpadButton_StickL, "LS", "\uE08A" }, { HidNpadButton_StickR, "RS", "\uE08B" },
+        { HidNpadButton_Minus, "MINUS", "\uE0B6" }, { HidNpadButton_Plus, "PLUS", "\uE0B5" }
+    }};
+
+    std::unordered_map<std::string, std::string> createButtonCharMap() {
+        std::unordered_map<std::string, std::string> map;
+        for (const auto& keyInfo : KEYS_INFO) {
+            map[keyInfo.name] = keyInfo.glyph;
+        }
+        return map;
+    }
+    
+    std::unordered_map<std::string, std::string> buttonCharMap = createButtonCharMap();
+    
+    
+    void convertComboToUnicode(std::string& combo) {
+        // Quick check to see if the string contains a '+'
+        if (combo.find('+') == std::string::npos) {
+            return;  // No '+' found, nothing to modify
+        }
+
+        // Exit early if the combo contains any spaces
+        if (combo.find(' ') != std::string::npos) {
+            return;  // Spaces found, return without modifying
+        }
+    
+        std::string unicodeCombo;
+        bool modified = false;
+        size_t start = 0;
+        const size_t length = combo.length();
+        size_t end = 0;  // Moved outside the loop
+        std::string token;  // Moved outside the loop
+        auto it = buttonCharMap.end();  // Initialize iterator once outside the loop
+    
+        // Iterate through the combo string and split by '+'
+        for (size_t i = 0; i <= length; ++i) {
+            if (i == length || combo[i] == '+') {
+                // Get the current token (trimmed)
+                end = i;  // Reuse the end variable
+                while (start < end && std::isspace(combo[start])) start++;  // Trim leading spaces
+                while (end > start && std::isspace(combo[end - 1])) end--;  // Trim trailing spaces
+    
+                token = combo.substr(start, end - start);  // Reuse the token variable
+                it = buttonCharMap.find(token);  // Reuse the iterator
+    
+                if (it != buttonCharMap.end()) {
+                    unicodeCombo += it->second;  // Append the mapped Unicode value
+                    modified = true;
+                } else {
+                    unicodeCombo += token;  // Append the original token if not found
+                }
+    
+                if (i != length) {
+                    unicodeCombo += "+";  // Only append '+' if we're not at the end
+                }
+    
+                start = i + 1;  // Move to the next token
+            }
+        }
+    
+        // If a modification was made, update the original combo
+        if (modified) {
+            combo = unicodeCombo;
+        }
+    }
+    
+    
+    CONSTEXPR_STRING std::string whiteColor = "FFFFFF";
+    CONSTEXPR_STRING std::string blackColor = "000000";
+    CONSTEXPR_STRING std::string greyColor = "AAAAAA";
+    
+    std::atomic<bool> languageWasChanged{false};
+
+    #if IS_LAUNCHER_DIRECTIVE
+    std::string ENGLISH = "English";
+    std::string SPANISH = "Spanish";
+    std::string FRENCH = "French";
+    std::string GERMAN = "German";
+    std::string JAPANESE = "Japanese";
+    std::string KOREAN = "Korean";
+    std::string ITALIAN = "Italian";
+    std::string DUTCH = "Dutch";
+    std::string PORTUGUESE = "Portuguese";
+    std::string RUSSIAN = "Russian";
+    std::string UKRAINIAN = "Ukrainian";
+    std::string POLISH = "Polish";
+    std::string SIMPLIFIED_CHINESE = "Simplified Chinese";
+    std::string TRADITIONAL_CHINESE = "Traditional Chinese";
+    std::string OVERLAYS = "Overlays"; //defined in libTesla now
+    std::string OVERLAYS_ABBR = "Overlays";
+    std::string OVERLAY = "Overlay";
+    std::string HIDDEN_OVERLAYS = "Hidden Overlays";
+    std::string PACKAGES = "Packages"; //defined in libTesla now
+    std::string PACKAGE = "Package";
+    std::string HIDDEN_PACKAGES = "Hidden Packages";
+    std::string HIDDEN = "Hidden";
+    std::string HIDE_OVERLAY = "Hide Overlay";
+    std::string HIDE_PACKAGE = "Hide Package";
+    std::string LAUNCH_ARGUMENTS = "Launch Arguments";
+    std::string QUICK_LAUNCH = "Quick Launch";
+    std::string BOOT_COMMANDS = "Boot Commands";
+    std::string EXIT_COMMANDS = "Exit Commands";
+    std::string ERROR_LOGGING = "Error Logging";
+    std::string COMMANDS = "Commands";
+    std::string SETTINGS = "Settings";
+    std::string FAVORITE = "Favorite";
+    std::string MAIN_SETTINGS = "Main Settings";
+    std::string UI_SETTINGS = "UI Settings";
+
+    std::string WIDGET = "Widget";
+    std::string WIDGET_ITEMS = "Widget Items";
+    std::string WIDGET_SETTINGS = "Widget Settings";
+    std::string CLOCK = "Clock";
+    std::string BATTERY = "Battery";
+    std::string SOC_TEMPERATURE = "SOC Temperature";
+    std::string PCB_TEMPERATURE = "PCB Temperature";
+    std::string BACKDROP = "Backdrop";
+    std::string DYNAMIC_COLORS = "Dynamic Colors";
+    std::string CENTER_ALIGNMENT = "Center Alignment";
+    std::string EXTENDED_BACKDROP = "Extended Backdrop";
+    std::string MISCELLANEOUS = "Miscellaneous";
+    //std::string MENU_ITEMS = "Menu Items";
+    std::string MENU_SETTINGS = "Menu Settings";
+    std::string USER_GUIDE = "User Guide";
+    std::string SHOW_HIDDEN = "Show Hidden";
+    std::string SHOW_DELETE = "Show Delete";
+    std::string PAGE_SWAP = "Page Swap";
+    std::string RIGHT_SIDE_MODE = "Right-side Mode";
+    std::string OVERLAY_VERSIONS = "Overlay Versions";
+    std::string PACKAGE_VERSIONS = "Package Versions";
+    std::string CLEAN_VERSIONS = "Clean Versions";
+    //std::string VERSION_LABELS = "Version Labels";
+    std::string KEY_COMBO = "Key Combo";
+    std::string MODE = "Mode";
+    std::string MODES = "Modes";
+    std::string LANGUAGE = "Language";
+    std::string OVERLAY_INFO = "Overlay Info";
+    std::string SOFTWARE_UPDATE = "Software Update";
+    std::string UPDATE_ULTRAHAND = "Update Ultrahand";
+    std::string UPDATE_LANGUAGES = "Update Languages";
+    std::string SYSTEM = "System";
+    std::string DEVICE_INFO = "Device Info";
+    std::string FIRMWARE = "Firmware";
+    std::string BOOTLOADER = "Bootloader";
+    std::string HARDWARE = "Hardware";
+    std::string MEMORY = "Memory";
+    std::string VENDOR = "Vendor";
+    std::string MODEL = "Model";
+    std::string STORAGE = "Storage";
+    std::string NOTICE = "Notice";
+    std::string UTILIZES = "Utilizes";
+
+    std::string MEMORY_EXPANSION = "Memory Expansion";
+    std::string REBOOT_REQUIRED = "*Reboot required.";
+    std::string LOCAL_IP = "Local IP";
+    std::string WALLPAPER = "Wallpaper";
+    std::string THEME = "Theme";
+    std::string DEFAULT = "default";
+    std::string ROOT_PACKAGE = "Root Package";
+    std::string SORT_PRIORITY = "Sort Priority";
+    std::string OPTIONS = "Options";
+    std::string FAILED_TO_OPEN = "Failed to open file";
+    std::string LAUNCH_COMBOS = "Launch Combos";
+    std::string NOTIFICATIONS = "Notifications";
+    std::string SOUND_EFFECTS = "Sound Effects";
+    std::string HAPTIC_FEEDBACK = "Haptic Feedback";
+    std::string OPAQUE_SCREENSHOTS = "Opaque Screenshots";
+
+    std::string PACKAGE_INFO = "Package Info";
+    std::string _TITLE = "Title";
+    std::string _VERSION= "Version";
+    std::string _CREATOR = "Creator(s)";
+    std::string _ABOUT = "About";
+    std::string _CREDITS = "Credits";
+
+    std::string USERGUIDE_OFFSET = "177";
+    std::string SETTINGS_MENU = "Settings Menu";
+    std::string SCRIPT_OVERLAY = "Script Overlay";
+    std::string STAR_FAVORITE = "Star/Favorite";
+    std::string APP_SETTINGS = "App Settings";
+    std::string ON_MAIN_MENU = "on Main Menu";
+    std::string ON_A_COMMAND = "on a command";
+    std::string ON_OVERLAY_PACKAGE = "on overlay/package";
+    std::string FEATURES = "Features";
+    std::string SWIPE_TO_OPEN = "Swipe to Open";
+
+    std::string THEME_SETTINGS = "Theme Settings";
+    std::string DYNAMIC_LOGO = "Dynamic Logo";
+    std::string SELECTION_BACKGROUND = "Selection Background";
+    std::string SELECTION_TEXT = "Selection Text";
+    std::string SELECTION_VALUE = "Selection Value";
+    std::string LIBULTRAHAND_TITLES = "libultrahand Titles";
+    std::string LIBULTRAHAND_VERSIONS = "libultrahand Versions";
+    std::string PACKAGE_TITLES = "Package Titles";
+
+    std::string ULTRAHAND_HAS_STARTED = "Ultrahand has started.";
+    std::string NEW_UPDATE_IS_AVAILABLE = "New update is available!";
+    std::string REBOOT_IS_REQUIRED = "Reboot is required.";
+    std::string HOLD_A_TO_DELETE = "Hold \uE0E0 to Delete";
+    std::string SELECTION_IS_EMPTY = "Selection is empty!";
+
+
+    //std::string PACKAGE_VERSIONS = "Package Versions";
+
+    //std::string PROGRESS_ANIMATION = "Progress Animation";
+
+    std::string REBOOT_TO = "Reboot To";
+    std::string REBOOT = "Reboot";
+    std::string SHUTDOWN = "Shutdown";
+    std::string BOOT_ENTRY = "Boot Entry";
+    #endif
+
+    std::string FREE = "free";
+
+    std::string DEFAULT_CHAR_WIDTH = "0.33";
+    std::string UNAVAILABLE_SELECTION = "Not available";
+
+
+    std::string ON = "On";
+    std::string OFF = "Off";
+
+    std::string OK = "OK";
+    std::string BACK = "Back";
+    std::string HIDE = "Hide";
+    std::string CANCEL = "Cancel";
+
+    std::string GAP_1 = "     ";
+    std::string GAP_2 = "  ";
+
+    std::atomic<float> halfGap = 0.0f;
+    
+
+    //std::string EMPTY = "Empty";
+    
+    #if USING_WIDGET_DIRECTIVE
+    std::string SUNDAY = "Sunday";
+    std::string MONDAY = "Monday";
+    std::string TUESDAY = "Tuesday";
+    std::string WEDNESDAY = "Wednesday";
+    std::string THURSDAY = "Thursday";
+    std::string FRIDAY = "Friday";
+    std::string SATURDAY = "Saturday";
+    
+    std::string JANUARY = "January";
+    std::string FEBRUARY = "February";
+    std::string MARCH = "March";
+    std::string APRIL = "April";
+    std::string MAY = "May";
+    std::string JUNE = "June";
+    std::string JULY = "July";
+    std::string AUGUST = "August";
+    std::string SEPTEMBER = "September";
+    std::string OCTOBER = "October";
+    std::string NOVEMBER = "November";
+    std::string DECEMBER = "December";
+    
+    std::string SUN = "Sun";
+    std::string MON = "Mon";
+    std::string TUE = "Tue";
+    std::string WED = "Wed";
+    std::string THU = "Thu";
+    std::string FRI = "Fri";
+    std::string SAT = "Sat";
+    
+    std::string JAN = "Jan";
+    std::string FEB = "Feb";
+    std::string MAR = "Mar";
+    std::string APR = "Apr";
+    std::string MAY_ABBR = "May";
+    std::string JUN = "Jun";
+    std::string JUL = "Jul";
+    std::string AUG = "Aug";
+    std::string SEP = "Sep";
+    std::string OCT = "Oct";
+    std::string NOV = "Nov";
+    std::string DEC = "Dec";
+    #endif
+
+    
+    #if IS_LAUNCHER_DIRECTIVE
+    // Constant string definitions (English)
+    void reinitializeLangVars() {
+        ENGLISH = "English";
+        SPANISH = "Spanish";
+        FRENCH = "French";
+        GERMAN = "German";
+        JAPANESE = "Japanese";
+        KOREAN = "Korean";
+        ITALIAN = "Italian";
+        DUTCH = "Dutch";
+        PORTUGUESE = "Portuguese";
+        RUSSIAN = "Russian";
+        UKRAINIAN = "Ukrainian";
+        POLISH = "Polish";
+        SIMPLIFIED_CHINESE = "Simplified Chinese";
+        TRADITIONAL_CHINESE = "Traditional Chinese";
+        DEFAULT_CHAR_WIDTH = "0.33";
+        UNAVAILABLE_SELECTION = "Not available";
+        OVERLAYS = "Overlays"; //defined in libTesla now
+        OVERLAYS_ABBR = "Overlays";
+        OVERLAY = "Overlay";
+        HIDDEN_OVERLAYS = "Hidden Overlays";
+        PACKAGES = "Packages"; //defined in libTesla now
+        PACKAGE = "Package";
+        HIDDEN_PACKAGES = "Hidden Packages";
+        HIDDEN = "Hidden";
+        HIDE_OVERLAY = "Hide Overlay";
+        HIDE_PACKAGE = "Hide Package";
+        LAUNCH_ARGUMENTS = "Launch Arguments";
+        QUICK_LAUNCH = "Quick Launch";
+        BOOT_COMMANDS = "Boot Commands";
+        EXIT_COMMANDS = "Exit Commands";
+        ERROR_LOGGING = "Error Logging";
+        COMMANDS = "Commands";
+        SETTINGS = "Settings";
+        FAVORITE = "Favorite";
+        MAIN_SETTINGS = "Main Settings";
+        UI_SETTINGS = "UI Settings";
+        WIDGET = "Widget";
+        WIDGET_ITEMS = "Widget Items";
+        WIDGET_SETTINGS = "Widget Settings";
+        CLOCK = "Clock";
+        BATTERY = "Battery";
+        SOC_TEMPERATURE = "SOC Temperature";
+        PCB_TEMPERATURE = "PCB Temperature";
+        BACKDROP = "Backdrop";
+        DYNAMIC_COLORS = "Dynamic Colors";
+        CENTER_ALIGNMENT = "Center Alignment";
+        EXTENDED_BACKDROP = "Extended Backdrop";
+        MISCELLANEOUS = "Miscellaneous";
+        //MENU_ITEMS = "Menu Items";
+        MENU_SETTINGS = "Menu Settings";
+        USER_GUIDE = "User Guide";
+        SHOW_HIDDEN = "Show Hidden";
+        SHOW_DELETE = "Show Delete";
+        PAGE_SWAP = "Page Swap";
+        RIGHT_SIDE_MODE = "Right-side Mode";
+        OVERLAY_VERSIONS = "Overlay Versions";
+        PACKAGE_VERSIONS = "Package Versions";
+        CLEAN_VERSIONS = "Clean Versions";
+        //VERSION_LABELS = "Version Labels";
+        KEY_COMBO = "Key Combo";
+        MODE = "Mode";
+        MODES = "Modes";
+        LANGUAGE = "Language";
+        OVERLAY_INFO = "Overlay Info";
+        SOFTWARE_UPDATE = "Software Update";
+        UPDATE_ULTRAHAND = "Update Ultrahand";
+        UPDATE_LANGUAGES = "Update Languages";
+        SYSTEM = "System";
+        DEVICE_INFO = "Device Info";
+        FIRMWARE = "Firmware";
+        BOOTLOADER = "Bootloader";
+        HARDWARE = "Hardware";
+        MEMORY = "Memory";
+        VENDOR = "Vendor";
+        MODEL = "Model";
+        STORAGE = "Storage";
+        NOTICE = "Notice";
+        UTILIZES = "Utilizes";
+        FREE = "free";
+        MEMORY_EXPANSION = "Memory Expansion";
+        REBOOT_REQUIRED = "*Reboot required.";
+        LOCAL_IP = "Local IP";
+        WALLPAPER = "Wallpaper";
+        THEME = "Theme";
+        DEFAULT = "default";
+        ROOT_PACKAGE = "Root Package";
+        SORT_PRIORITY = "Sort Priority";
+        OPTIONS = "Options";
+        FAILED_TO_OPEN = "Failed to open file";
+
+        LAUNCH_COMBOS = "Launch Combos";
+        NOTIFICATIONS = "Notifications";
+        SOUND_EFFECTS = "Sound Effects";
+        HAPTIC_FEEDBACK = "Haptic Feedback";
+        OPAQUE_SCREENSHOTS = "Opaque Screenshots";
+        ON = "On";
+        OFF = "Off";
+        PACKAGE_INFO = "Package Info";
+        _TITLE = "Title";
+        _VERSION= "Version";
+        _CREATOR = "Creator(s)";
+        _ABOUT = "About";
+        _CREDITS = "Credits";
+        OK = "OK";
+        BACK = "Back";
+        HIDE = "Hide";
+        CANCEL = "Cancel";
+
+        REBOOT_TO = "Reboot To";
+        REBOOT = "Reboot";
+        SHUTDOWN = "Shutdown";
+        BOOT_ENTRY = "Boot Entry";
+        GAP_1 = "     ";
+        GAP_2 = "  ";
+
+        USERGUIDE_OFFSET = "177";
+        SETTINGS_MENU = "Settings Menu";
+        SCRIPT_OVERLAY = "Script Overlay";
+        STAR_FAVORITE = "Star/Favorite";
+        APP_SETTINGS = "App Settings";
+        ON_MAIN_MENU = "on Main Menu";
+        ON_A_COMMAND = "on a command";
+        ON_OVERLAY_PACKAGE = "on overlay/package";
+        FEATURES = "Features";
+        SWIPE_TO_OPEN = "Swipe to Open";
+        //PROGRESS_ANIMATION = "Progress Animation";
+
+        THEME_SETTINGS = "Theme Settings";
+        DYNAMIC_LOGO = "Dynamic Logo";
+        SELECTION_BACKGROUND = "Selection Background";
+        SELECTION_TEXT = "Selection Text";
+        SELECTION_VALUE = "Selection Value";
+        LIBULTRAHAND_TITLES = "libultrahand Titles";
+        LIBULTRAHAND_VERSIONS = "libultrahand Versions";
+        PACKAGE_TITLES = "Package Titles";
+        //PACKAGE_VERSIONS = "Package Versions";
+
+        ULTRAHAND_HAS_STARTED = "Ultrahand has started.";
+        NEW_UPDATE_IS_AVAILABLE = "New update is available!";
+        REBOOT_IS_REQUIRED = "Reboot is required.";
+        HOLD_A_TO_DELETE = "Hold  to Delete";
+        SELECTION_IS_EMPTY = "Selection is empty!";
+
+        //EMPTY = "Empty";
+    
+        SUNDAY = "Sunday";
+        MONDAY = "Monday";
+        TUESDAY = "Tuesday";
+        WEDNESDAY = "Wednesday";
+        THURSDAY = "Thursday";
+        FRIDAY = "Friday";
+        SATURDAY = "Saturday";
+        
+        JANUARY = "January";
+        FEBRUARY = "February";
+        MARCH = "March";
+        APRIL = "April";
+        MAY = "May";
+        JUNE = "June";
+        JULY = "July";
+        AUGUST = "August";
+        SEPTEMBER = "September";
+        OCTOBER = "October";
+        NOVEMBER = "November";
+        DECEMBER = "December";
+        
+        SUN = "Sun";
+        MON = "Mon";
+        TUE = "Tue";
+        WED = "Wed";
+        THU = "Thu";
+        FRI = "Fri";
+        SAT = "Sat";
+        
+        JAN = "Jan";
+        FEB = "Feb";
+        MAR = "Mar";
+        APR = "Apr";
+        MAY_ABBR = "May";
+        JUN = "Jun";
+        JUL = "Jul";
+        AUG = "Aug";
+        SEP = "Sep";
+        OCT = "Oct";
+        NOV = "Nov";
+        DEC = "Dec";
+    }
+    #endif
+    
+    
+    
+    // Function to update a constant if the new value from JSON is not empty
+    void updateIfNotEmpty(std::string& constant, const std::string& newValue) {
+        if (!newValue.empty()) {
+            constant = newValue;
+        }
+    }
+
+    void parseLanguage(const std::string& langFile) {
+        // Map to store parsed JSON data
+        std::unordered_map<std::string, std::string> jsonMap;
+        if (!parseJsonToMap(langFile, jsonMap)) {
+            #if USING_LOGGING_DIRECTIVE
+            logMessage("Failed to parse language file: " + langFile);
+            #endif
+            return;
+        }
+
+        
+        static std::unordered_map<std::string, std::string*> configMap = {
+            #if IS_LAUNCHER_DIRECTIVE
+            {"ENGLISH", &ENGLISH},
+            {"SPANISH", &SPANISH},
+            {"FRENCH", &FRENCH},
+            {"GERMAN", &GERMAN},
+            {"JAPANESE", &JAPANESE},
+            {"KOREAN", &KOREAN},
+            {"ITALIAN", &ITALIAN},
+            {"DUTCH", &DUTCH},
+            {"PORTUGUESE", &PORTUGUESE},
+            {"RUSSIAN", &RUSSIAN},
+            {"UKRAINIAN", &UKRAINIAN},
+            {"POLISH", &POLISH},
+            {"SIMPLIFIED_CHINESE", &SIMPLIFIED_CHINESE},
+            {"TRADITIONAL_CHINESE", &TRADITIONAL_CHINESE},
+            {"OVERLAYS", &OVERLAYS},
+            {"OVERLAYS_ABBR", &OVERLAYS_ABBR},
+            {"OVERLAY", &OVERLAY},
+            {"HIDDEN_OVERLAYS", &HIDDEN_OVERLAYS},
+            {"PACKAGES", &PACKAGES},
+            {"PACKAGE", &PACKAGE},
+            {"HIDDEN_PACKAGES", &HIDDEN_PACKAGES},
+            {"HIDDEN", &HIDDEN},
+            {"HIDE_PACKAGE", &HIDE_PACKAGE},
+            {"HIDE_OVERLAY", &HIDE_OVERLAY},
+            {"LAUNCH_ARGUMENTS", &LAUNCH_ARGUMENTS},
+            {"QUICK_LAUNCH", &QUICK_LAUNCH},
+            {"BOOT_COMMANDS", &BOOT_COMMANDS},
+            {"EXIT_COMMANDS", &EXIT_COMMANDS},
+            {"ERROR_LOGGING", &ERROR_LOGGING},
+            {"COMMANDS", &COMMANDS},
+            {"SETTINGS", &SETTINGS},
+            {"FAVORITE", &FAVORITE},
+            {"MAIN_SETTINGS", &MAIN_SETTINGS},
+            {"UI_SETTINGS", &UI_SETTINGS},
+
+            {"WIDGET", &WIDGET},
+            {"WIDGET_ITEMS", &WIDGET_ITEMS},
+            {"WIDGET_SETTINGS", &WIDGET_SETTINGS},
+            {"CLOCK", &CLOCK},
+            {"BATTERY", &BATTERY},
+            {"SOC_TEMPERATURE", &SOC_TEMPERATURE},
+            {"PCB_TEMPERATURE", &PCB_TEMPERATURE},
+            {"BACKDROP", &BACKDROP},
+            {"DYNAMIC_COLORS", &DYNAMIC_COLORS},
+            {"CENTER_ALIGNMENT", &CENTER_ALIGNMENT},
+            {"EXTENDED_BACKDROP", &EXTENDED_BACKDROP},
+            {"MISCELLANEOUS", &MISCELLANEOUS},
+            //{"MENU_ITEMS", &MENU_ITEMS},
+            {"MENU_SETTINGS", &MENU_SETTINGS},
+            {"USER_GUIDE", &USER_GUIDE},
+            {"SHOW_HIDDEN", &SHOW_HIDDEN},
+            {"SHOW_DELETE", &SHOW_DELETE},
+            {"PAGE_SWAP", &PAGE_SWAP},
+            {"RIGHT_SIDE_MODE", &RIGHT_SIDE_MODE},
+            {"OVERLAY_VERSIONS", &OVERLAY_VERSIONS},
+            {"PACKAGE_VERSIONS", &PACKAGE_VERSIONS},
+            {"CLEAN_VERSIONS", &CLEAN_VERSIONS},
+            //{"VERSION_LABELS", &VERSION_LABELS},
+            {"KEY_COMBO", &KEY_COMBO},
+            {"MODE", &MODE},
+            {"MODES", &MODES},
+            {"LANGUAGE", &LANGUAGE},
+            {"OVERLAY_INFO", &OVERLAY_INFO},
+            {"SOFTWARE_UPDATE", &SOFTWARE_UPDATE},
+            {"UPDATE_ULTRAHAND", &UPDATE_ULTRAHAND},
+            {"UPDATE_LANGUAGES", &UPDATE_LANGUAGES},
+            {"SYSTEM", &SYSTEM},
+            {"DEVICE_INFO", &DEVICE_INFO},
+            {"FIRMWARE", &FIRMWARE},
+            {"BOOTLOADER", &BOOTLOADER},
+            {"HARDWARE", &HARDWARE},
+            {"MEMORY", &MEMORY},
+            {"VENDOR", &VENDOR},
+            {"MODEL", &MODEL},
+            {"STORAGE", &STORAGE},
+            {"NOTICE", &NOTICE},
+            {"UTILIZES", &UTILIZES},
+
+            {"MEMORY_EXPANSION", &MEMORY_EXPANSION},
+            {"REBOOT_REQUIRED", &REBOOT_REQUIRED},
+            {"LOCAL_IP", &LOCAL_IP},
+            {"WALLPAPER", &WALLPAPER},
+            {"THEME", &THEME},
+            {"DEFAULT", &DEFAULT},
+            {"ROOT_PACKAGE", &ROOT_PACKAGE},
+            {"SORT_PRIORITY", &SORT_PRIORITY},
+            {"OPTIONS", &OPTIONS},
+            {"FAILED_TO_OPEN", &FAILED_TO_OPEN},
+
+            {"LAUNCH_COMBOS", &LAUNCH_COMBOS},
+            {"NOTIFICATIONS", &NOTIFICATIONS},
+            {"SOUND_EFFECTS", &SOUND_EFFECTS},
+            {"HAPTIC_FEEDBACK", &HAPTIC_FEEDBACK},
+            {"OPAQUE_SCREENSHOTS", &OPAQUE_SCREENSHOTS},
+
+            {"PACKAGE_INFO", &PACKAGE_INFO},
+            {"TITLE", &_TITLE},
+            {"VERSION", &_VERSION},
+            {"CREATOR", &_CREATOR},
+            {"ABOUT", &_ABOUT},
+            {"CREDITS", &_CREDITS},
+
+            {"USERGUIDE_OFFSET", &USERGUIDE_OFFSET},
+            {"SETTINGS_MENU", &SETTINGS_MENU},
+            {"SCRIPT_OVERLAY", &SCRIPT_OVERLAY},
+            {"STAR_FAVORITE", &STAR_FAVORITE},
+            {"APP_SETTINGS", &APP_SETTINGS},
+            {"ON_MAIN_MENU", &ON_MAIN_MENU},
+            {"ON_A_COMMAND", &ON_A_COMMAND},
+            {"ON_OVERLAY_PACKAGE", &ON_OVERLAY_PACKAGE},
+            {"FEATURES", &FEATURES},
+            {"SWIPE_TO_OPEN", &SWIPE_TO_OPEN},
+
+            {"THEME_SETTINGS", &THEME_SETTINGS},
+            {"DYNAMIC_LOGO", &DYNAMIC_LOGO},
+            {"SELECTION_BACKGROUND", &SELECTION_BACKGROUND},
+            {"SELECTION_TEXT", &SELECTION_TEXT},
+            {"SELECTION_VALUE", &SELECTION_VALUE},
+            {"LIBULTRAHAND_TITLES", &LIBULTRAHAND_TITLES},
+            {"LIBULTRAHAND_VERSIONS", &LIBULTRAHAND_VERSIONS},
+            {"PACKAGE_TITLES", &PACKAGE_TITLES},
+
+            {"ULTRAHAND_HAS_STARTED", &ULTRAHAND_HAS_STARTED},
+            {"NEW_UPDATE_IS_AVAILABLE", &NEW_UPDATE_IS_AVAILABLE},
+            {"REBOOT_IS_REQUIRED", &REBOOT_IS_REQUIRED},
+            {"HOLD_A_TO_DELETE", &HOLD_A_TO_DELETE},
+            {"SELECTION_IS_EMPTY", &SELECTION_IS_EMPTY},
+
+            //{"PACKAGE_VERSIONS", &PACKAGE_VERSIONS},
+            //{"PROGRESS_ANIMATION", &PROGRESS_ANIMATION},
+
+            {"REBOOT_TO", &REBOOT_TO},
+            {"REBOOT", &REBOOT},
+            {"SHUTDOWN", &SHUTDOWN},
+            {"BOOT_ENTRY", &BOOT_ENTRY},
+            #endif
+
+            {"FREE", &FREE},
+            
+            {"DEFAULT_CHAR_WIDTH", &DEFAULT_CHAR_WIDTH},
+            {"UNAVAILABLE_SELECTION", &UNAVAILABLE_SELECTION},
+
+            {"ON", &ON},
+            {"OFF", &OFF},
+
+            {"OK", &OK},
+            {"BACK", &BACK},
+            {"HIDE", &HIDE},
+            {"CANCEL", &CANCEL},
+
+            {"GAP_1", &GAP_1},
+            {"GAP_2", &GAP_2},
+
+            //{"EMPTY", &EMPTY},
+
+            #if USING_WIDGET_DIRECTIVE
+            {"SUNDAY", &SUNDAY},
+            {"MONDAY", &MONDAY},
+            {"TUESDAY", &TUESDAY},
+            {"WEDNESDAY", &WEDNESDAY},
+            {"THURSDAY", &THURSDAY},
+            {"FRIDAY", &FRIDAY},
+            {"SATURDAY", &SATURDAY},
+            {"JANUARY", &JANUARY},
+            {"FEBRUARY", &FEBRUARY},
+            {"MARCH", &MARCH},
+            {"APRIL", &APRIL},
+            {"MAY", &MAY},
+            {"JUNE", &JUNE},
+            {"JULY", &JULY},
+            {"AUGUST", &AUGUST},
+            {"SEPTEMBER", &SEPTEMBER},
+            {"OCTOBER", &OCTOBER},
+            {"NOVEMBER", &NOVEMBER},
+            {"DECEMBER", &DECEMBER},
+            {"SUN", &SUN},
+            {"MON", &MON},
+            {"TUE", &TUE},
+            {"WED", &WED},
+            {"THU", &THU},
+            {"FRI", &FRI},
+            {"SAT", &SAT},
+            {"JAN", &JAN},
+            {"FEB", &FEB},
+            {"MAR", &MAR},
+            {"APR", &APR},
+            {"MAY_ABBR", &MAY_ABBR},
+            {"JUN", &JUN},
+            {"JUL", &JUL},
+            {"AUG", &AUG},
+            {"SEP", &SEP},
+            {"OCT", &OCT},
+            {"NOV", &NOV},
+            {"DEC", &DEC}
+            #endif
+        };
+    
+        // Iterate over the map to update global variables
+        for (auto& kv : configMap) {
+            auto it = jsonMap.find(kv.first);
+            if (it != jsonMap.end()) {
+                updateIfNotEmpty(*kv.second, it->second);
+            }
+        }
+    }
+    
+    
+    // Helper function to apply replacements
+    //void applyTimeStrReplacements(std::string& str, const std::unordered_map<std::string, std::string>& mappings) {
+    //    size_t pos;
+    //    for (const auto& mapping : mappings) {
+    //        pos = str.find(mapping.first);
+    //        while (pos != std::string::npos) {
+    //            str.replace(pos, mapping.first.length(), mapping.second);
+    //            pos = str.find(mapping.first, pos + mapping.second.length());
+    //        }
+    //    }
+    //}
+    
+    #if USING_WIDGET_DIRECTIVE
+    void localizeTimeStr(char* timeStr) {
+        // Define static unordered_map for day and month mappings
+        static std::unordered_map<std::string, std::string*> mappings = {
+            {"Sun", &SUN},
+            {"Mon", &MON},
+            {"Tue", &TUE},
+            {"Wed", &WED},
+            {"Thu", &THU},
+            {"Fri", &FRI},
+            {"Sat", &SAT},
+            {"Sunday", &SUNDAY},
+            {"Monday", &MONDAY},
+            {"Tuesday", &TUESDAY},
+            {"Wednesday", &WEDNESDAY},
+            {"Thursday", &THURSDAY},
+            {"Friday", &FRIDAY},
+            {"Saturday", &SATURDAY},
+            {"Jan", &JAN},
+            {"Feb", &FEB},
+            {"Mar", &MAR},
+            {"Apr", &APR},
+            {"May", &MAY_ABBR},
+            {"Jun", &JUN},
+            {"Jul", &JUL},
+            {"Aug", &AUG},
+            {"Sep", &SEP},
+            {"Oct", &OCT},
+            {"Nov", &NOV},
+            {"Dec", &DEC},
+            {"January", &JANUARY},
+            {"February", &FEBRUARY},
+            {"March", &MARCH},
+            {"April", &APRIL},
+            {"May", &MAY},
+            {"June", &JUNE},
+            {"July", &JULY},
+            {"August", &AUGUST},
+            {"September", &SEPTEMBER},
+            {"October", &OCTOBER},
+            {"November", &NOVEMBER},
+            {"December", &DECEMBER}
+        };
+    
+        std::string timeStrCopy = timeStr; // Convert the char array to a string for processing
+    
+        // Apply day and month replacements
+        size_t pos;
+        for (const auto& mapping : mappings) {
+            pos = timeStrCopy.find(mapping.first);
+            while (pos != std::string::npos) {
+                timeStrCopy.replace(pos, mapping.first.length(), *(mapping.second));
+                pos = timeStrCopy.find(mapping.first, pos + mapping.second->length());
+            }
+        }
+    
+        // Copy the modified string back to the character array
+        strcpy(timeStr, timeStrCopy.c_str());
+    }
+    #endif
+
+    // Unified function to apply replacements
+    void applyLangReplacements(std::string& text, bool isValue) {
+        // Static maps for replacements
+        #if IS_LAUNCHER_DIRECTIVE
+        const std::unordered_map<std::string, std::string*> launcherReplacements = {
+            {"Reboot To", &REBOOT_TO},
+            {"Boot Entry", &BOOT_ENTRY},
+            {"Reboot", &REBOOT},
+            {"Shutdown", &SHUTDOWN}
+        };
+        #endif
+    
+        const std::unordered_map<std::string, std::string*> valueReplacements = {
+            {"On", &ON},
+            {"Off", &OFF}
+        };
+    
+        // Determine which map to use
+        const std::unordered_map<std::string, std::string*>* replacements = nullptr;
+    
+        if (!isValue) {
+            #if IS_LAUNCHER_DIRECTIVE
+            replacements = &launcherReplacements;
+            #else
+            return;
+            #endif
+        } else {
+            replacements = &valueReplacements;
+        }
+    
+        // Perform the direct replacement
+        if (replacements) {
+            auto it = replacements->find(text);
+            if (it != replacements->end()) {
+                text = *(it->second);
+            }
+        }
+    }
+    
+    
+    
+    // Predefined hexMap
+    //const std::array<int, 256> hexMap = [] {
+    //    std::array<int, 256> map = {0};
+    //    map['0'] = 0; map['1'] = 1; map['2'] = 2; map['3'] = 3; map['4'] = 4;
+    //    map['5'] = 5; map['6'] = 6; map['7'] = 7; map['8'] = 8; map['9'] = 9;
+    //    map['A'] = 10; map['B'] = 11; map['C'] = 12; map['D'] = 13; map['E'] = 14; map['F'] = 15;
+    //    map['a'] = 10; map['b'] = 11; map['c'] = 12; map['d'] = 13; map['e'] = 14; map['f'] = 15;
+    //    return map;
+    //}();
+    
+    
+    // Prepare a map of default settings
+    std::map<const std::string, std::string> defaultThemeSettingsMap = {
+        {"default_overlay_color", whiteColor},
+        {"default_package_color", whiteColor},
+        {"default_script_color", "FF33FF"},
+        {"clock_color", whiteColor},
+        {"temperature_color", whiteColor},
+        {"battery_color", "ffff45"},
+        {"battery_charging_color", "00FF00"},
+        {"battery_low_color", "FF0000"},
+        {"widget_backdrop_alpha", "15"},
+        {"widget_backdrop_color", blackColor},
+        {"bg_alpha", "13"},
+        {"bg_color", blackColor},
+        {"separator_alpha", "15"},
+        {"separator_color", "404040"},
+        {"text_separator_color", "404040"},
+        {"text_color", whiteColor},
+        {"notification_text_color", whiteColor},
+        {"header_text_color", whiteColor},
+        {"header_separator_color", whiteColor},
+        {"star_color", whiteColor},
+        {"selection_star_color", whiteColor},
+        {"bottom_button_color", whiteColor},
+        {"bottom_text_color", whiteColor},
+        {"bottom_separator_color", whiteColor},
+        {"top_separator_color", "404040"},
+        {"table_bg_color", "2C2C2C"},
+        {"table_bg_alpha", "14"},
+        {"table_section_text_color", whiteColor},
+        //{"table_info_text_color", "00FFDD"},
+        {"table_info_text_color", "9ed0ff"},
+        {"warning_text_color", "FF7777"},
+        {"healthy_ram_text_color", "00FF00"},
+        {"neutral_ram_text_color", "FFAA00"},
+        {"bad_ram_text_color", "FF0000"},
+        {"trackbar_slider_color", "606060"},
+        {"trackbar_slider_border_color", "505050"},
+        {"trackbar_slider_malleable_color", "A0A0A0"},
+        {"trackbar_full_color", "00FFDD"},
+        {"trackbar_empty_color", "404040"},
+        {"overlay_text_color", whiteColor},
+        {"ult_overlay_text_color", "9ed0ff"},
+        {"package_text_color", whiteColor},
+        {"ult_package_text_color", "9ed0ff"},
+        {"banner_version_text_color", greyColor},
+        {"overlay_version_text_color", greyColor},
+        {"ult_overlay_version_text_color", "00FFDD"},
+        {"package_version_text_color", greyColor},
+        {"ult_package_version_text_color", "00FFDD"},
+        {"on_text_color", "00FFDD"},
+        {"off_text_color", greyColor},
+        {"invalid_text_color", "FF0000"},
+        {"inprogress_text_color", "FFFF45"},
+        {"selection_text_color", "9ed0ff"},
+        {"selection_value_text_color", "FF7777"},
+        {"selection_bg_color", blackColor},
+        {"selection_bg_alpha", "11"},
+        {"trackbar_color", "555555"},
+        {"highlight_color_1", "2288CC"},
+        {"highlight_color_2", "88FFFF"},
+        {"highlight_color_3", "FFFF45"},
+        {"highlight_color_4", "F7253E"},
+        {"click_text_color", whiteColor},
+        {"click_alpha", "7"},
+        {"click_color", "3E25F7"},
+        {"progress_alpha", "7"},
+        {"progress_color", "253EF7"},
+        {"invert_bg_click_color", FALSE_STR},
+        //{"disable_selection_bg", FALSE_STR},
+        //{"disable_selection_value_color", FALSE_STR},
+        //{"disable_colorful_logo", FALSE_STR},
+        {"logo_color_1", whiteColor},
+        {"logo_color_2", "FF0000"},
+        {"dynamic_logo_color_1", "00E669"},
+        {"dynamic_logo_color_2", "8080EA"}
+    };
+    
+    bool isNumericCharacter(char c) {
+        return std::isdigit(c);
+    }
+    
+    bool isValidHexColor(const std::string& hexColor) {
+        // Check if the string is a valid hexadecimal color of the format "#RRGGBB"
+        if (hexColor.size() != 6) {
+            return false; // Must be exactly 6 characters long
+        }
+        
+        for (char c : hexColor) {
+            if (!isxdigit(c)) {
+                return false; // Must contain only hexadecimal digits (0-9, A-F, a-f)
+            }
+        }
+        
+        return true;
+    }
+    
+    
+    
+    float calculateAmplitude(float x, float peakDurationFactor) {
+        //const float phasePeriod = 360.0f * peakDurationFactor;  // One full phase period
+    
+        // Convert x from radians to degrees and calculate phase within the period
+        const int phase = static_cast<int>(x * RAD_TO_DEG) % static_cast<int>(360.0f * peakDurationFactor);
+    
+        // Check if the phase is odd using bitwise operation
+        if (phase & 1) {
+            return 1.0f;  // Flat amplitude (maximum positive)
+        } else {
+            // Calculate the sinusoidal amplitude for the remaining period
+            return (APPROXIMATE_cos(x) + 1.0f) / 2.0f;  // Cosine function expects radians
+        }
+    }
+            
+    
+    std::atomic<bool> refreshWallpaperNow(false);
+    std::atomic<bool> refreshWallpaper(false);
+    std::vector<u8> wallpaperData; 
+    std::atomic<bool> inPlot(false);
+    
+    std::mutex wallpaperMutex;
+    std::condition_variable cv;
+    
+    
+    // Function to load the RGBA file into memory and modify wallpaperData directly
+    //void loadWallpaperFile(const std::string& filePath, s32 width, s32 height) {
+    //    const size_t originalDataSize = width * height * 4; // Original size in bytes (4 bytes per pixel)
+    //    const size_t compressedDataSize = originalDataSize / 2; // RGBA4444 uses half the space
+    //    
+    //    wallpaperData.resize(compressedDataSize);
+    //    
+    //    if (!isFileOrDirectory(filePath)) {
+    //        wallpaperData.clear();
+    //        return;
+    //    }
+    //    
+    //    #if !USING_FSTREAM_DIRECTIVE
+    //        FILE* file = fopen(filePath.c_str(), "rb");
+    //        if (!file) {
+    //            wallpaperData.clear();
+    //            return;
+    //        }
+    //        
+    //        std::vector<uint8_t> buffer;
+    //        //if (reducedMemory) {
+    //        //    // Reuse wallpaperData to avoid double allocation
+    //        //    buffer.swap(wallpaperData);
+    //        //    buffer.resize(originalDataSize);
+    //        //} else {
+    //        buffer.resize(originalDataSize);
+    //        //}
+    //        
+    //        const size_t bytesRead = fread(buffer.data(), 1, originalDataSize, file);
+    //        fclose(file);
+    //        
+    //        if (bytesRead != originalDataSize) {
+    //            wallpaperData.clear();
+    //            return;
+    //        }
+    //        
+    //    #else
+    //        std::ifstream file(filePath, std::ios::binary);
+    //        if (!file) {
+    //            wallpaperData.clear();
+    //            return;
+    //        }
+    //        
+    //        std::vector<uint8_t> buffer;
+    //        //if (reducedMemory) {
+    //        //    buffer.swap(wallpaperData);
+    //        //    buffer.resize(originalDataSize);
+    //        //} else {
+    //        buffer.resize(originalDataSize);
+    //        //}
+    //        
+    //        file.read(reinterpret_cast<char*>(buffer.data()), originalDataSize);
+    //        if (!file) {
+    //            wallpaperData.clear();
+    //            return;
+    //        }
+    //    #endif
+    //    
+    //    // Compress RGBA8888 to RGBA4444
+    //    //if (reducedMemory) {
+    //    //    // In-place compression to save memory
+    //    //    size_t writeIndex = 0;
+    //    //    for (size_t i = 0; i < originalDataSize; i += 8, writeIndex += 4) {
+    //    //        uint8_t r1 = buffer[i] >> 4;
+    //    //        uint8_t g1 = buffer[i + 1] >> 4;
+    //    //        uint8_t b1 = buffer[i + 2] >> 4;
+    //    //        uint8_t a1 = buffer[i + 3] >> 4;
+    //    //
+    //    //        uint8_t r2 = buffer[i + 4] >> 4;
+    //    //        uint8_t g2 = buffer[i + 5] >> 4;
+    //    //        uint8_t b2 = buffer[i + 6] >> 4;
+    //    //        uint8_t a2 = buffer[i + 7] >> 4;
+    //    //
+    //    //        buffer[writeIndex]     = (r1 << 4) | g1;
+    //    //        buffer[writeIndex + 1] = (b1 << 4) | a1;
+    //    //        buffer[writeIndex + 2] = (r2 << 4) | g2;
+    //    //        buffer[writeIndex + 3] = (b2 << 4) | a2;
+    //    //    }
+    //    //    buffer.resize(compressedDataSize);
+    //    //    wallpaperData.swap(buffer);
+    //    //} else {
+    //    uint8_t* input = buffer.data();
+    //    uint8_t* output = wallpaperData.data();
+    //    //uint8_t r1, g1, b1, a1;
+    //    //uint8_t r2, g2, b2, a2;
+    //    
+    //    //for (size_t i = 0, j = 0; i < originalDataSize; i += 8, j += 4) {
+    //    //    // Read 2 RGBA pixels (8 bytes)
+    //    //    const uint8_t r1 = input[i] >> 4;
+    //    //    const uint8_t g1 = input[i + 1] >> 4;
+    //    //    const uint8_t b1 = input[i + 2] >> 4;
+    //    //    const uint8_t a1 = input[i + 3] >> 4;
+    //    //    
+    //    //    const uint8_t r2 = input[i + 4] >> 4;
+    //    //    const uint8_t g2 = input[i + 5] >> 4;
+    //    //    const uint8_t b2 = input[i + 6] >> 4;
+    //    //    const uint8_t a2 = input[i + 7] >> 4;
+    //    //    
+    //    //    // Pack them into 4 bytes (2 bytes per pixel)
+    //    //    output[j]     = (r1 << 4) | g1;
+    //    //    output[j + 1] = (b1 << 4) | a1;
+    //    //    output[j + 2] = (r2 << 4) | g2;
+    //    //    output[j + 3] = (b2 << 4) | a2;
+    //    //}
+    //    
+    //    for (size_t i = 0, j = 0; i < originalDataSize; i += 16, j += 8) {
+    //        output[j]     = ((input[i]     >> 4) << 4) | (input[i + 1] >> 4);
+    //        output[j + 1] = ((input[i + 2] >> 4) << 4) | (input[i + 3] >> 4);
+    //        output[j + 2] = ((input[i + 4] >> 4) << 4) | (input[i + 5] >> 4);
+    //        output[j + 3] = ((input[i + 6] >> 4) << 4) | (input[i + 7] >> 4);
+    //        output[j + 4] = ((input[i + 8] >> 4) << 4) | (input[i + 9] >> 4);
+    //        output[j + 5] = ((input[i + 10] >> 4) << 4) | (input[i + 11] >> 4);
+    //        output[j + 6] = ((input[i + 12] >> 4) << 4) | (input[i + 13] >> 4);
+    //        output[j + 7] = ((input[i + 14] >> 4) << 4) | (input[i + 15] >> 4);
+    //    }
+    //    //}
+    //}
+
+
+    void loadWallpaperFile(const std::string& filePath, s32 width, s32 height) {
+        const size_t originalDataSize   = width * height * 4;
+        const size_t compressedDataSize = originalDataSize / 2;
+    
+        wallpaperData.resize(compressedDataSize);
+    
+        if (!isFileOrDirectory(filePath)) {
+            wallpaperData.clear();
+            return;
+        }
+    
+        FILE* file = fopen(filePath.c_str(), "rb");
+        if (!file) {
+            wallpaperData.clear();
+            return;
+        }
+    
+        constexpr size_t chunkBytes = 64 * 1024; // 64 KB chunks
+        uint8_t chunkBuffer[chunkBytes];
+    
+        size_t totalRead = 0;
+        size_t writeIndex = 0;
+        
+        size_t remaining, toRead, bytesRead;
+
+        while (totalRead < originalDataSize) {
+            // Determine how much to read this iteration
+            remaining = originalDataSize - totalRead;
+            toRead = remaining < chunkBytes ? remaining : chunkBytes;
+    
+            bytesRead = fread(chunkBuffer, 1, toRead, file);
+            if (bytesRead == 0 || bytesRead % 8 != 0) { // must be multiple of 2 pixels
+                fclose(file);
+                wallpaperData.clear();
+                return;
+            }
+    
+            // Compress each 2-pixel group in the chunk
+            for (size_t i = 0; i < bytesRead; i += 8, writeIndex += 4) {
+                wallpaperData[writeIndex]     = (chunkBuffer[i]     & 0xF0) | (chunkBuffer[i + 1] >> 4);
+                wallpaperData[writeIndex + 1] = (chunkBuffer[i + 2] & 0xF0) | (chunkBuffer[i + 3] >> 4);
+                wallpaperData[writeIndex + 2] = (chunkBuffer[i + 4] & 0xF0) | (chunkBuffer[i + 5] >> 4);
+                wallpaperData[writeIndex + 3] = (chunkBuffer[i + 6] & 0xF0) | (chunkBuffer[i + 7] >> 4);
+            }
+    
+            totalRead += bytesRead;
+        }
+    
+        fclose(file);
+    }
+
+
+    void loadWallpaperFileWhenSafe() {
+        if (expandedMemory && !inPlot.load(std::memory_order_acquire) && !refreshWallpaper.load(std::memory_order_acquire)) {
+            std::unique_lock<std::mutex> lock(wallpaperMutex);
+            cv.wait(lock, [] { return !inPlot.load(std::memory_order_acquire) && !refreshWallpaper.load(std::memory_order_acquire); });
+            if (wallpaperData.empty() && isFileOrDirectory(WALLPAPER_PATH)) {
+                loadWallpaperFile(WALLPAPER_PATH);
+            }
+        }
+    }
+
+
+    void reloadWallpaper() {
+        // Signal that wallpaper is being refreshed
+        refreshWallpaper.store(true, std::memory_order_release);
+    
+        // Lock the mutex for condition waiting
+        std::unique_lock<std::mutex> lock(wallpaperMutex);
+    
+        // Wait for inPlot to be false before reloading the wallpaper
+        cv.wait(lock, [] { return !inPlot.load(std::memory_order_acquire); });
+    
+        // Clear the current wallpaper data
+        wallpaperData.clear();
+    
+        // Reload the wallpaper file
+        if (isFileOrDirectory(WALLPAPER_PATH)) {
+            loadWallpaperFile(WALLPAPER_PATH);
+        }
+    
+        // Signal that wallpaper has finished refreshing
+        refreshWallpaper.store(false, std::memory_order_release);
+        
+        // Notify any waiting threads
+        cv.notify_all();
+    }
+
+    
+    
+    // Global variables for FPS calculation
+    //double lastTimeCount = 0.0;
+    //int frameCount = 0;
+    //float fps = 0.0f;
+    //double elapsedTime = 0.0;
+    
+    std::atomic<bool> themeIsInitialized(false); // for loading the theme once in OverlayFrame / HeaderOverlayFrame
+    
+    // Variables for touch commands
+    std::atomic<bool> touchingBack(false);
+    std::atomic<bool> touchingSelect(false);
+    std::atomic<bool> touchingNextPage(false);
+    std::atomic<bool> touchingMenu(false);
+    std::atomic<bool> shortTouchAndRelease(false);
+    std::atomic<bool> longTouchAndRelease(false);
+    std::atomic<bool> simulatedBack(false);
+    //bool simulatedBackComplete = true;
+    std::atomic<bool> simulatedSelect(false);
+    //bool simulatedSelectComplete = true;
+    std::atomic<bool> simulatedNextPage(false);
+    //std::atomic<bool> simulatedNextPageComplete(true);
+    std::atomic<bool> simulatedMenu(false);
+    //bool simulatedMenuComplete = true;
+    std::atomic<bool> stillTouching(false);
+    std::atomic<bool> interruptedTouch(false);
+    std::atomic<bool> touchInBounds(false);
+    
+    
+#if USING_WIDGET_DIRECTIVE
+    // Battery implementation
+    bool powerInitialized = false;
+    bool powerCacheInitialized;
+    uint32_t powerCacheCharge;
+    //float powerConsumption;
+    bool powerCacheIsCharging;
+    PsmSession powerSession;
+    
+    // Define variables to store previous battery charge and time
+    //uint32_t prevBatteryCharge = 0;
+    //s64 timeOut = 0;
+    
+    
+    std::atomic<uint32_t> batteryCharge{0};
+    std::atomic<bool> isCharging{false};
+    //bool validPower;
+    
+    
+    
+    bool powerGetDetails(uint32_t *_batteryCharge, bool *_isCharging) {
+        static uint64_t last_call_ns = 0;
+        
+        // Ensure power system is initialized
+        if (!powerInitialized) {
+            return false;
+        }
+        
+        // Get the current time in nanoseconds
+        const uint64_t now_ns = armTicksToNs(armGetSystemTick());
+        
+        // 3 seconds in nanoseconds
+        static constexpr uint64_t min_delay_ns = 3000000000ULL;
+        
+        // Check if enough time has elapsed or if cache is not initialized
+        const bool useCache = (now_ns - last_call_ns <= min_delay_ns) && powerCacheInitialized;
+        if (!useCache) {
+            PsmChargerType charger = PsmChargerType_Unconnected;
+            Result rc = psmGetBatteryChargePercentage(_batteryCharge);
+            bool hwReadsSucceeded = R_SUCCEEDED(rc);
+    
+            if (hwReadsSucceeded) {
+                rc = psmGetChargerType(&charger);
+                hwReadsSucceeded &= R_SUCCEEDED(rc);
+                *_isCharging = (charger != PsmChargerType_Unconnected);
+    
+                if (hwReadsSucceeded) {
+                    // Update cache
+                    powerCacheCharge = *_batteryCharge;
+                    powerCacheIsCharging = *_isCharging;
+                    powerCacheInitialized = true;
+                    last_call_ns = now_ns; // Update last call time after successful hardware read
+                    return true;
+                }
+            }
+    
+            // Use cached values if the hardware read fails
+            if (powerCacheInitialized) {
+                *_batteryCharge = powerCacheCharge;
+                *_isCharging = powerCacheIsCharging;
+                return hwReadsSucceeded; // Return false if hardware read failed but cache is valid
+            }
+    
+            // Return false if cache is not initialized and hardware read failed
+            return false;
+        }
+    
+        // Use cached values if not enough time has passed
+        *_batteryCharge = powerCacheCharge;
+        *_isCharging = powerCacheIsCharging;
+        return true; // Return true as cache is used
+    }
+    
+    
+    void powerInit(void) {
+        uint32_t charge = 0;
+        bool charging = false;
+    
+        powerCacheInitialized = false;
+        powerCacheCharge = 0;
+        powerCacheIsCharging = false;
+    
+        if (!powerInitialized) {
+            Result rc = psmInitialize();
+            if (R_SUCCEEDED(rc)) {
+                rc = psmBindStateChangeEvent(&powerSession, 1, 1, 1);
+    
+                if (R_FAILED(rc))
+                    psmExit();
+    
+                if (R_SUCCEEDED(rc)) {
+                    powerInitialized = true;
+                    ult::powerGetDetails(&charge, &charging);
+                    ult::batteryCharge.store(charge, std::memory_order_release);
+                    ult::isCharging.store(charging, std::memory_order_release);
+                    //prevBatteryCharge = charge; // if needed
+                }
+            }
+        }
+    }
+    
+    void powerExit(void) {
+        if (powerInitialized) {
+            psmUnbindStateChangeEvent(&powerSession);
+            psmExit();
+            powerInitialized = false;
+            powerCacheInitialized = false;
+        }
+    }
+#endif
+    
+    
+    // Temperature Implementation
+    std::atomic<float> PCB_temperature{0.0f};
+    std::atomic<float> SOC_temperature{0.0f};
+    
+    /*
+    I2cReadRegHandler was taken from Switch-OC-Suite source code made by KazushiMe
+    Original repository link (Deleted, last checked 15.04.2023): https://github.com/KazushiMe/Switch-OC-Suite
+    */
+    
+    Result I2cReadRegHandler(u8 reg, I2cDevice dev, u16 *out) {
+        struct readReg {
+            u8 send;
+            u8 sendLength;
+            u8 sendData;
+            u8 receive;
+            u8 receiveLength;
+        };
+    
+        I2cSession _session;
+    
+        Result res = i2cOpenSession(&_session, dev);
+        if (res)
+            return res;
+    
+        u16 val;
+    
+        struct readReg readRegister = {
+            .send = 0 | (I2cTransactionOption_Start << 6),
+            .sendLength = sizeof(reg),
+            .sendData = reg,
+            .receive = 1 | (I2cTransactionOption_All << 6),
+            .receiveLength = sizeof(val),
+        };
+    
+        res = i2csessionExecuteCommandList(&_session, &val, sizeof(val), &readRegister, sizeof(readRegister));
+        if (res) {
+            i2csessionClose(&_session);
+            return res;
+        }
+    
+        *out = val;
+        i2csessionClose(&_session);
+        return 0;
+    }
+    
+    
+    // Common helper function to read temperature (integer and fractional parts)
+    Result ReadTemperature(float *temperature, u8 integerReg, u8 fractionalReg, bool integerOnly) {
+        u16 rawValue;
+        u8 val;
+        s32 integerPart = 0;
+        float fractionalPart = 0.0f;  // Change this to a float to retain fractional precision
+    
+        // Read the integer part of the temperature
+        Result res = I2cReadRegHandler(integerReg, I2cDevice_Tmp451, &rawValue);
+        if (R_FAILED(res)) {
+            return res;  // Error during I2C read
+        }
+    
+        val = (u8)rawValue;  // Cast the value to an 8-bit unsigned integer
+        integerPart = val;    // Integer part of temperature in Celsius
+    
+        if (integerOnly)
+        {
+            *temperature = static_cast<float>(integerPart);  // Ensure it's treated as a float
+            return 0;  // Return only integer part if requested
+        }
+    
+        // Read the fractional part of the temperature
+        res = I2cReadRegHandler(fractionalReg, I2cDevice_Tmp451, &rawValue);
+        if (R_FAILED(res)) {
+            return res;  // Error during I2C read
+        }
+    
+        val = (u8)rawValue;  // Cast the value to an 8-bit unsigned integer
+        fractionalPart = static_cast<float>(val >> 4) * 0.0625f;  // Convert upper 4 bits into fractional part
+    
+        // Combine integer and fractional parts
+        *temperature = static_cast<float>(integerPart) + fractionalPart;
+        
+        return 0;
+    }
+    
+    // Function to get the SOC temperature
+    Result ReadSocTemperature(float *temperature, bool integerOnly) {
+        return ReadTemperature(temperature, TMP451_SOC_TEMP_REG, TMP451_SOC_TMP_DEC_REG, integerOnly);
+    }
+    
+    // Function to get the PCB temperature
+    Result ReadPcbTemperature(float *temperature, bool integerOnly) {
+        return ReadTemperature(temperature, TMP451_PCB_TEMP_REG, TMP451_PCB_TMP_DEC_REG, integerOnly);
+    }
+    
+    
+    // Time implementation
+    CONSTEXPR_STRING std::string DEFAULT_DT_FORMAT = "'%a %T'";
+    std::string datetimeFormat = "%a %T";
+    
+    
+    // Widget settings
+    //std::string hideClock, hideBattery, hidePCBTemp, hideSOCTemp;
+    bool hideClock, hideBattery, hidePCBTemp, hideSOCTemp, dynamicWidgetColors;
+    bool hideWidgetBackdrop, centerWidgetAlignment, extendedWidgetBackdrop;
+
+    #if IS_LAUNCHER_DIRECTIVE
+    void reinitializeWidgetVars() {
+        // Load INI data once instead of 8 separate file reads
+        auto ultrahandSection = getKeyValuePairsFromSection(ULTRAHAND_CONFIG_INI_PATH, ULTRAHAND_PROJECT_NAME);
+        
+        // Helper lambda to safely get boolean values with proper defaults
+        auto getBoolValue = [&](const std::string& key, bool defaultValue = false) -> bool {
+            if (ultrahandSection.count(key) > 0) {
+                return (ultrahandSection.at(key) != FALSE_STR);
+            }
+            return defaultValue;
+        };
+        
+        // Set all values from the loaded section with correct defaults (matching initialization)
+        hideClock = getBoolValue("hide_clock", false);                           // FALSE_STR default
+        hideBattery = getBoolValue("hide_battery", true);                        // TRUE_STR default
+        hideSOCTemp = getBoolValue("hide_soc_temp", true);                       // TRUE_STR default  
+        hidePCBTemp = getBoolValue("hide_pcb_temp", true);                       // TRUE_STR default
+        dynamicWidgetColors = getBoolValue("dynamic_widget_colors", true);       // TRUE_STR default
+        hideWidgetBackdrop = getBoolValue("hide_widget_backdrop", false);        // FALSE_STR default
+        centerWidgetAlignment = getBoolValue("center_widget_alignment", true);   // TRUE_STR default
+        extendedWidgetBackdrop = getBoolValue("extended_widget_backdrop", false); // FALSE_STR default
+    }
+    #endif
+    
+    bool cleanVersionLabels, hideOverlayVersions, hidePackageVersions, useLibultrahandTitles, useLibultrahandVersions, usePackageTitles, usePackageVersions;
+    
+    const std::string loaderInfo = envGetLoaderInfo();
+    const std::string loaderTitle = extractTitle(loaderInfo);
+    const bool expandedMemory = (loaderTitle == "nx-ovlloader+");
+    
+    std::string versionLabel;
+    
+    #if IS_LAUNCHER_DIRECTIVE
+    void reinitializeVersionLabels() {
+        // Load INI data once instead of 6 separate file reads
+        auto ultrahandSection = getKeyValuePairsFromSection(ULTRAHAND_CONFIG_INI_PATH, ULTRAHAND_PROJECT_NAME);
+        
+        // Helper lambda to safely get boolean values with proper defaults
+        auto getBoolValue = [&](const std::string& key, bool defaultValue = false) -> bool {
+            if (ultrahandSection.count(key) > 0) {
+                return (ultrahandSection.at(key) != FALSE_STR);
+            }
+            return defaultValue;
+        };
+        
+        // Set all values from the loaded section with correct defaults (matching initialization)
+        cleanVersionLabels = getBoolValue("clean_version_labels", false);        // FALSE_STR default
+        hideOverlayVersions = getBoolValue("hide_overlay_versions", false);      // FALSE_STR default  
+        hidePackageVersions = getBoolValue("hide_package_versions", false);      // FALSE_STR default
+        //libultrahandTitles = getBoolValue("libultrahand_titles", false);               // FALSE_STR default
+        //useLibultrahandVersions = getBoolValue("libultrahand_versions", true);            // TRUE_STR default
+        //matchPackages = getBoolValue("match_packages", true);            // TRUE_STR default
+        
+        //#ifdef APP_VERSION
+        //versionLabel = cleanVersionLabel(APP_VERSION) + "  (" + loaderTitle + " " + cleanVersionLabel(loaderInfo) + ")";
+        //#endif
+        //versionLabel = (cleanVersionLabels) ? std::string(APP_VERSION) : (std::string(APP_VERSION) + "   (" + extractTitle(loaderInfo) + " v" + cleanVersionLabel(loaderInfo) + ")");
+    }
+    #endif
+    
+    
+    // Number of renderer threads to use
+    const unsigned numThreads = expandedMemory ? 4 : 0;
+    std::vector<std::thread> renderThreads(numThreads);
+    const s32 bmpChunkSize = (numThreads > 0) ? ((720 + numThreads - 1) / numThreads) : 0;
+    std::atomic<s32> currentRow;
+    
+    //std::atomic<unsigned int> barrierCounter{0};
+    //std::mutex barrierMutex;
+    //std::condition_variable barrierCV;
+    //
+    //void barrierWait() {
+    //    std::unique_lock<std::mutex> lock(barrierMutex);
+    //    if (++barrierCounter == numThreads) {
+    //        barrierCounter = 0; // Reset for the next round
+    //        barrierCV.notify_all();
+    //    } else {
+    //        barrierCV.wait(lock, [] { return barrierCounter == 0; });
+    //    }
+    //}
+}
diff --git a/Source/sys-clk/overlay/lib/libultrahand/ultrahand.mk b/Source/sys-clk/overlay/lib/libultrahand/ultrahand.mk
new file mode 100644
index 00000000..4e0cc197
--- /dev/null
+++ b/Source/sys-clk/overlay/lib/libultrahand/ultrahand.mk
@@ -0,0 +1,30 @@
+#--------------------------------------------------------------------------------- 
+# Ultrahand Library Configuration
+# Auto-detects libultrahand directory location
+#--------------------------------------------------------------------------------- 
+
+# Assume TOPDIR is the root project directory where you run make
+TOPDIR ?= $(CURDIR)
+
+# Get the absolute path of this .mk file directory
+ULTRA_ABS := $(patsubst %/,%,$(dir $(lastword $(MAKEFILE_LIST))))
+
+# Convert absolute path to relative path from TOPDIR
+ULTRA_DIR := $(subst $(TOPDIR)/,,$(ULTRA_ABS))
+
+# If ULTRA_DIR equals ULTRA_ABS, then ULTRA_ABS is outside TOPDIR,
+# fallback to just ULTRA_ABS (rare case)
+ifeq ($(ULTRA_DIR),$(ULTRA_ABS))
+  ULTRA_DIR := $(ULTRA_ABS)
+endif
+
+
+# Now add folder paths relative to TOPDIR (or absolute if fallback)
+SOURCES += \
+  $(ULTRA_DIR)/common \
+  $(ULTRA_DIR)/libultra/source
+
+INCLUDES += \
+  $(ULTRA_DIR)/common \
+  $(ULTRA_DIR)/libultra/include \
+  $(ULTRA_DIR)/libtesla/include
diff --git a/Source/sys-clk/sysmodule/Makefile b/Source/sys-clk/sysmodule/Makefile
index cc97fab7..c5bd564a 100644
--- a/Source/sys-clk/sysmodule/Makefile
+++ b/Source/sys-clk/sysmodule/Makefile
@@ -17,7 +17,7 @@ include $(DEVKITPRO)/libnx/switch_rules
 # INCLUDES is a list of directories containing header files
 # EXEFS_SRC is the optional input directory containing data copied into exefs, if anything this normally should only contain "main.npdm".
 #---------------------------------------------------------------------------------
-TARGET		:=	sys-clk
+TARGET		:=	horizon-oc
 BUILD		:=	build
 OUTDIR		:=	out
 RESOURCES	:=	res