general performance updates

.gitignore

@@ -2,5 +2,6 @@
 local
 
 # IntelliJ IDEA
+*.xpi
 .idea/
 node_modules

LICENSE

@@ -0,0 +1,674 @@
+                    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>.

README.md

@@ -84,4 +84,4 @@ repository contains the code behind the [Chrome Extension](https://chrome.google
 
 ### License
 
-(MIT License) - Copyright (c) 2025 Josh Patra
+(GPLv3) - Copyright (c) 2025 Josh Patra

build.py

@@ -0,0 +1,130 @@
+import glob
+import os
+import re
+import shutil
+import tempfile
+import zipfile
+
+SCRIPT_NAME = os.path.basename(__file__)
+TARGET_FILE = "manifest.json"
+
+
+def zip_folder(output_name, folder, exclude_files, exclude_dirs):
+    with zipfile.ZipFile(output_name, "w", zipfile.ZIP_DEFLATED) as zipf:
+        for root, dirs, files in os.walk(folder):
+            dirs[:] = [
+                d
+                for d in dirs
+                if os.path.relpath(os.path.join(root, d), folder) not in exclude_dirs
+            ]
+            for file in files:
+                rel_path = os.path.relpath(os.path.join(root, file), folder)
+                if (
+                    file in exclude_files
+                    or rel_path in exclude_files
+                    or any(rel_path.startswith(ed + os.sep) for ed in exclude_dirs)
+                ):
+                    continue
+                zipf.write(os.path.join(root, file), arcname=rel_path)
+
+
+def update_version_line(file_path, new_version):
+    with open(file_path, "r", encoding="utf-8") as f:
+        lines = f.readlines()
+
+    updated = False
+    for i, line in enumerate(lines):
+        match = re.match(r'\s*"version":\s*"([^"]+)"', line)
+        if match:
+            old_version = match.group(1)
+            lines[i] = re.sub(
+                r'"version":\s*".+?"', f'"version": "{new_version}"', line
+            )
+            updated = True
+            print(
+                f"🛠️ Changed version in {file_path} from {old_version} ➜ {new_version}"
+            )
+            break
+
+    if updated:
+        with open(file_path, "w", encoding="utf-8") as f:
+            f.writelines(lines)
+    else:
+        print(f"⚠️ No version line found in {file_path}.")
+
+
+def main():
+    # Step 0: Remove all existing .xpi files upfront
+    xpi_files = glob.glob("*.xpi")
+    for f in xpi_files:
+        try:
+            os.remove(f)
+            print(f"🗑️ Removed existing archive: {f}")
+        except Exception as e:
+            print(f"⚠️ Failed to remove {f}: {e}")
+
+    # Read current version from manifest.json
+    current_dir = os.getcwd()
+    manifest_path = os.path.join(current_dir, TARGET_FILE)
+    current_version = "unknown"
+    
+    if os.path.exists(manifest_path):
+        with open(manifest_path, "r", encoding="utf-8") as f:
+            for line in f:
+                match = re.match(r'\s*"version":\s*"([^"]+)"', line)
+                if match:
+                    current_version = match.group(1)
+                    break
+    
+    print(f"📦 Current version: {current_version}")
+    base_version = input("Enter the new base version (e.g., 2.0.1): ").strip()
+    if not base_version:
+        print("❌ No version entered. Exiting.")
+        return
+
+    firefox_version = f"{base_version}.0"
+
+    # Step 1: Update manifest.json on disk to base_version
+    if os.path.exists(manifest_path):
+        update_version_line(manifest_path, base_version)
+    else:
+        print(f"❌ {TARGET_FILE} not found. Aborting.")
+        return
+
+    # Step 2: Create videospeed-github.xpi (exclude script, .git, AND videospeed-github.xpi itself)
+    exclude_files = [SCRIPT_NAME, "videospeed-github.xpi"]
+    exclude_dirs = [".git"]
+    zip_folder("videospeed-github.xpi", current_dir, exclude_files, exclude_dirs)
+    print("✅ Created videospeed-github.xpi")
+
+    # Step 3: Re-scan for .xpi files after GitHub archive creation, exclude them for Firefox zip
+    current_xpi_files = set(glob.glob("*.xpi"))
+    exclude_temp_files = current_xpi_files.union({SCRIPT_NAME})
+    exclude_temp_dirs = set(exclude_dirs)
+
+    # Step 4: Create videospeed-firefox.xpi from temp folder with version bumped to .0
+    with tempfile.TemporaryDirectory() as temp_dir:
+        for item in os.listdir(current_dir):
+            if item in exclude_temp_files or item in exclude_temp_dirs:
+                continue
+            src = os.path.join(current_dir, item)
+            dst = os.path.join(temp_dir, item)
+            if os.path.isdir(src):
+                shutil.copytree(src, dst)
+            else:
+                shutil.copy2(src, dst)
+
+        temp_manifest = os.path.join(temp_dir, TARGET_FILE)
+        if os.path.exists(temp_manifest):
+            update_version_line(temp_manifest, firefox_version)
+        else:
+            print(f"⚠️ {TARGET_FILE} not found in temp folder.")
+
+        zip_folder(
+            "videospeed-firefox.xpi", temp_dir, exclude_files=[], exclude_dirs=[]
+        )
+        print("✅ Created videospeed-firefox.xpi")
+
+
+if __name__ == "__main__":
+    main()

inject.js

@@ -1,5 +1,8 @@
 var regStrip = /^[\r\t\f\v ]+|[\r\t\f\v ]+$/gm;
 
+var isUserSeek = false; // Track if seek was user-initiated
+var lastToggleSpeed = {}; // Store last toggle speeds per video
+
 var tc = {
   settings: {
     lastSpeed: 1.0,
@@ -20,14 +23,13 @@ var tc = {
       teams.microsoft.com
     `.replace(regStrip, ""),
     defaultLogLevel: 4,
-    logLevel: 3,
-    // --- Nudge settings (ADDED) ---
-    enableSubtitleNudge: true,
-    subtitleNudgeInterval: 25,
+    logLevel: 5, // Set to 5 to see your debug logs
+    enableSubtitleNudge: true, // Enabled by default, but only activates on YouTube
+    subtitleNudgeInterval: 100, // Reduced from 25ms to 100ms (10x/sec instead of 40x/sec)
     subtitleNudgeAmount: 0.001
   },
   mediaElements: [],
-  isNudging: false // ADDED: Flag for nudge operation
+  isNudging: false
 };
 
 /* Log levels */
@@ -48,132 +50,131 @@ function log(message, level) {
 }
 
 chrome.storage.sync.get(tc.settings, function (storage) {
-  tc.settings.keyBindings =
-    Array.isArray(storage.keyBindings) &&
-    storage.keyBindings.length > 0 &&
-    storage.keyBindings[0].hasOwnProperty("predefined")
-      ? storage.keyBindings
-      : [
-          {
+  // Original initialization from your code
+  tc.settings.keyBindings = storage.keyBindings;
+  if (storage.keyBindings.length == 0) {
+    tc.settings.keyBindings.push({
       action: "slower",
       key: Number(storage.slowerKeyCode) || 83,
       value: Number(storage.speedStep) || 0.1,
       force: false,
       predefined: true
-          },
-          {
+    });
+    tc.settings.keyBindings.push({
       action: "faster",
       key: Number(storage.fasterKeyCode) || 68,
       value: Number(storage.speedStep) || 0.1,
       force: false,
       predefined: true
-          },
-          {
+    });
+    tc.settings.keyBindings.push({
       action: "rewind",
       key: Number(storage.rewindKeyCode) || 90,
       value: Number(storage.rewindTime) || 10,
       force: false,
       predefined: true
-          },
-          {
+    });
+    tc.settings.keyBindings.push({
       action: "advance",
       key: Number(storage.advanceKeyCode) || 88,
       value: Number(storage.advanceTime) || 10,
       force: false,
       predefined: true
-          },
-          {
+    });
+    tc.settings.keyBindings.push({
       action: "reset",
       key: Number(storage.resetKeyCode) || 82,
       value: 1.0,
       force: false,
       predefined: true
-          },
-          {
+    });
+    tc.settings.keyBindings.push({
       action: "fast",
       key: Number(storage.fastKeyCode) || 71,
       value: Number(storage.fastSpeed) || 1.8,
       force: false,
       predefined: true
-          }
-        ];
-  if (
-    !Array.isArray(storage.keyBindings) ||
-    storage.keyBindings.length === 0 ||
-    (storage.keyBindings.length > 0 &&
-      !storage.keyBindings[0].hasOwnProperty("predefined"))
-  ) {
+    });
+    tc.settings.version = "0.5.3";
     chrome.storage.sync.set({
       keyBindings: tc.settings.keyBindings,
-      version: "0.6.3.14"
-    }); // Incremented version
+      version: tc.settings.version,
+      displayKeyCode: tc.settings.displayKeyCode,
+      rememberSpeed: tc.settings.rememberSpeed,
+      forceLastSavedSpeed: tc.settings.forceLastSavedSpeed,
+      audioBoolean: tc.settings.audioBoolean,
+      startHidden: tc.settings.startHidden,
+      enabled: tc.settings.enabled,
+      controllerOpacity: tc.settings.controllerOpacity,
+      blacklist: tc.settings.blacklist.replace(regStrip, "")
+    });
   }
-
-  tc.settings.lastSpeed = Number(storage.lastSpeed) || 1.0;
-  tc.settings.displayKeyCode = Number(storage.displayKeyCode) || 86;
+  tc.settings.lastSpeed = Number(storage.lastSpeed);
+  tc.settings.displayKeyCode = Number(storage.displayKeyCode);
   tc.settings.rememberSpeed = Boolean(storage.rememberSpeed);
   tc.settings.forceLastSavedSpeed = Boolean(storage.forceLastSavedSpeed);
   tc.settings.audioBoolean = Boolean(storage.audioBoolean);
-  tc.settings.enabled =
-    typeof storage.enabled !== "undefined" ? Boolean(storage.enabled) : true;
+  tc.settings.enabled = Boolean(storage.enabled);
   tc.settings.startHidden = Boolean(storage.startHidden);
-  tc.settings.controllerOpacity = Number(storage.controllerOpacity) || 0.3;
-  tc.settings.blacklist = String(storage.blacklist || tc.settings.blacklist);
-  if (typeof storage.logLevel !== "undefined")
-    tc.settings.logLevel = Number(storage.logLevel);
-
+  tc.settings.controllerOpacity = Number(storage.controllerOpacity);
+  tc.settings.blacklist = String(storage.blacklist);
   tc.settings.enableSubtitleNudge =
     typeof storage.enableSubtitleNudge !== "undefined"
       ? Boolean(storage.enableSubtitleNudge)
       : tc.settings.enableSubtitleNudge;
   tc.settings.subtitleNudgeInterval =
-    Number(storage.subtitleNudgeInterval) || 25;
+    Number(storage.subtitleNudgeInterval) || 100; // Default 100ms for better performance
   tc.settings.subtitleNudgeAmount =
     Number(storage.subtitleNudgeAmount) || tc.settings.subtitleNudgeAmount;
-
   if (
     tc.settings.keyBindings.filter((x) => x.action == "display").length == 0
   ) {
     tc.settings.keyBindings.push({
       action: "display",
-      key: tc.settings.displayKeyCode,
+      key: Number(storage.displayKeyCode) || 86,
       value: 0,
       force: false,
       predefined: true
     });
   }
+  // Add a listener for messages from the popup.
+  // We use a global flag to ensure the listener is only attached once.
+  if (!window.vscMessageListener) {
+    chrome.runtime.onMessage.addListener(
+      function (request, sender, sendResponse) {
+        // Check if the message is a request to re-scan the page.
+        if (request.action === "rescan_page") {
+          log("Re-scan command received from popup.", 4);
+
+          // Call the main initialization function. It's designed to be safe
+          // to run multiple times and will pick up any new videos.
+          initializeWhenReady(document);
+
+          // Send a response to the popup to confirm completion.
+          sendResponse({ status: "complete" });
+        }
+
+        // Required to allow for asynchronous responses.
+        return true;
+      }
+    );
+
+    // Set the flag to prevent adding the listener again.
+    window.vscMessageListener = true;
+  }
   initializeWhenReady(document);
 });
 
 function getKeyBindings(action, what = "value") {
-  if (!tc.settings.keyBindings) return false;
   try {
-    const binding = tc.settings.keyBindings.find(
-      (item) => item.action === action
-    );
-    if (binding) return binding[what];
-    if (what === "value") {
-      if (action === "slower" || action === "faster") return 0.1;
-      if (action === "rewind" || action === "advance") return 10;
-      if (action === "reset") return 1.0;
-      if (action === "fast") return 1.8;
-    }
-    return false;
+    return tc.settings.keyBindings.find((item) => item.action === action)[what];
   } catch (e) {
-    log(`Error in getKeyBindings for ${action} (${what}): ${e.message}`, 2);
     return false;
   }
 }
-
 function setKeyBindings(action, value) {
-  // Original setKeyBindings
-  if (!tc.settings.keyBindings) return;
-  const binding = tc.settings.keyBindings.find(
-    (item) => item.action === action
-  );
-  if (binding) {
-    binding["value"] = value;
-  }
+  tc.settings.keyBindings.find((item) => item.action === action)["value"] =
+    value;
 }
 
 function defineVideoController() {
@@ -182,75 +183,88 @@ function defineVideoController() {
     tc.mediaElements.push(target);
     target.vsc = this;
     this.video = target;
-    this.parent = parent || target.parentElement;
-    this.nudgeIntervalId = null; // ADDED
+    this.parent = target.parentElement || parent;
+    this.nudgeAnimationId = null;
 
-    let storedSpeed; // Original logic for initial speed determination
+    log(`Creating video controller for ${target.tagName} with src: ${target.src || target.currentSrc || 'none'}`, 4);
+
+    // Determine what speed to use
+    let storedSpeed = tc.settings.speeds[target.currentSrc];
     if (!tc.settings.rememberSpeed) {
-      storedSpeed = tc.settings.speeds[target.currentSrc];
-      if (!storedSpeed) storedSpeed = 1.0;
-      setKeyBindings("reset", getKeyBindings("fast")); // Original call
-    } else {
-      storedSpeed =
-        tc.settings.speeds[target.currentSrc] || tc.settings.lastSpeed;
+      if (!storedSpeed) {
+        storedSpeed = 1.0;
       }
-    if (tc.settings.forceLastSavedSpeed) storedSpeed = tc.settings.lastSpeed;
+    } else {
+      storedSpeed = tc.settings.lastSpeed;
+    }
+    if (tc.settings.forceLastSavedSpeed) {
+      storedSpeed = tc.settings.lastSpeed;
+    }
+
+    // FIXED: Actually apply the speed to the video element
+    // Use setSpeed function to properly set the speed with all the necessary logic
+    setTimeout(() => {
+      if (this.video && this.video.vsc) {
+        setSpeed(this.video, storedSpeed, true, false);
+      }
+    }, 0);
 
     this.div = this.initializeControls();
 
-    if (Math.abs(target.playbackRate - storedSpeed) > 0.001) {
-      // MODIFIED: Pass isUserKeyPress = false for initial/automatic speed settings
-      setSpeed(target, storedSpeed, true, false);
-    } else {
-      if (this.speedIndicator)
-        this.speedIndicator.textContent = storedSpeed.toFixed(2);
-      if (
-        !tc.settings.forceLastSavedSpeed &&
-        tc.settings.lastSpeed !== storedSpeed
-      ) {
-        tc.settings.lastSpeed = storedSpeed;
-      }
+    if (!this.div) {
+      log("ERROR: Failed to create controller div!", 2);
+      return;
     }
 
-    // MODIFIED: mediaEventAction to correctly maintain speed on play/pause/seek/ended
+    log(`Controller created and attached to DOM. Hidden: ${this.div.classList.contains('vsc-hidden')}`, 4);
+
+    // Make the controller visible for 5 seconds on startup
+    runAction("blink", 5000, null, this.video);
+
+    // Rewritten mediaEventAction to prevent speed reset on pause.
     var mediaEventAction = function (event) {
-      const video = event.target;
-      if (!video.vsc) return;
-
-      let speedToMaintain;
-      if (tc.settings.forceLastSavedSpeed) {
-        speedToMaintain = tc.settings.lastSpeed;
-      } else if (tc.settings.rememberSpeed) {
-        speedToMaintain =
-          tc.settings.speeds[video.currentSrc] || tc.settings.lastSpeed;
-      } else {
-        // Not forcing, not remembering per-video. Maintain the current session's tc.settings.lastSpeed.
-        speedToMaintain = tc.settings.lastSpeed;
-      }
-
-      // The original setKeyBindings("reset", getKeyBindings("fast")) from old mediaEventAction
-      // was related to the complex 'R' key toggle. That logic is within the main `resetSpeed` function.
-      // Here, we just ensure the determined `speedToMaintain` is applied if needed.
-
-      if (Math.abs(video.playbackRate - speedToMaintain) > 0.001) {
-        log(
-          `Media event '${event.type}': video rate ${video.playbackRate.toFixed(2)} vs target ${speedToMaintain.toFixed(2)}. Correcting.`,
-          4
-        );
-        // Corrections from play/pause/seek/ended are not direct user key presses for blink.
-        setSpeed(video, speedToMaintain, false, false); // isInitialCall=false, isUserKeyPress=false
-      } else {
-        log(
-          `Media event '${event.type}': video rate ${video.playbackRate.toFixed(2)} matches target. No speed change needed.`,
-          6
-        );
-      }
-
-      // Manage nudge based on event type
+      // Handle subtitle nudging based on the event type first.
       if (event.type === "play") {
-        if (video.playbackRate !== 1.0) video.vsc.startSubtitleNudge(); // Only start if not 1.0x
+        this.startSubtitleNudge();
+
+        // FIXED: Only reapply speed if there's a significant mismatch AND it's a new video
+        const currentSpeed = event.target.playbackRate;
+        const videoId =
+          event.target.currentSrc || event.target.src || "default";
+
+        // Get the expected speed based on settings
+        let expectedSpeed;
+        if (tc.settings.forceLastSavedSpeed) {
+          expectedSpeed = tc.settings.lastSpeed;
+        } else {
+          expectedSpeed = tc.settings.speeds[videoId] || tc.settings.lastSpeed;
+        }
+
+        // Only reapply speed if:
+        // 1. The current speed is 1.0 (default) AND we have a stored speed that's different
+        // 2. OR if forceLastSavedSpeed is enabled and speeds don't match
+        const shouldReapplySpeed =
+          (Math.abs(currentSpeed - 1.0) < 0.01 &&
+            Math.abs(expectedSpeed - 1.0) > 0.01) ||
+          (tc.settings.forceLastSavedSpeed &&
+            Math.abs(currentSpeed - expectedSpeed) > 0.01);
+
+        if (shouldReapplySpeed) {
+          setTimeout(() => {
+            if (event.target.vsc) {
+              setSpeed(event.target, expectedSpeed, false, false);
+            }
+          }, 10);
+        }
       } else if (event.type === "pause" || event.type === "ended") {
-        video.vsc.stopSubtitleNudge();
+        this.stopSubtitleNudge();
+        tc.isNudging = false;
+      }
+
+      // For seek events, don't mess with speed
+      if (event.type === "seeked" && isUserSeek) {
+        isUserSeek = false;
+        return;
       }
     };
 
@@ -271,118 +285,206 @@ function defineVideoController() {
       (this.handleSeek = mediaEventAction.bind(this))
     );
 
+    // ADDITIONAL FIX: Listen for loadedmetadata to reapply speed when video source changes
+    target.addEventListener("loadedmetadata", () => {
+      if (this.video && this.video.vsc) {
+        const currentSpeed = this.video.playbackRate;
+        const videoId = this.video.currentSrc || this.video.src || "default";
+
+        // Get expected speed
+        let expectedSpeed;
+        if (tc.settings.forceLastSavedSpeed) {
+          expectedSpeed = tc.settings.lastSpeed;
+        } else {
+          expectedSpeed = tc.settings.speeds[videoId] || tc.settings.lastSpeed;
+        }
+
+        // Only reapply if current speed is default (1.0) and we have a different stored speed
+        const shouldReapplySpeed =
+          Math.abs(currentSpeed - 1.0) < 0.01 &&
+          Math.abs(expectedSpeed - 1.0) > 0.01;
+
+        if (shouldReapplySpeed) {
+          setSpeed(this.video, expectedSpeed, false, false);
+        }
+      }
+    });
+
     var srcObserver = new MutationObserver((mutations) => {
-      // Original srcObserver
       mutations.forEach((mutation) => {
         if (
           mutation.type === "attributes" &&
           (mutation.attributeName === "src" ||
             mutation.attributeName === "currentSrc")
         ) {
-          if (!this.div) return;
+          if (this.div) {
             this.stopSubtitleNudge();
-          if (!mutation.target.src && !mutation.target.currentSrc)
+            if (!mutation.target.src && !mutation.target.currentSrc) {
               this.div.classList.add("vsc-nosource");
-          else {
-            this.div.classList.remove("vsc-nosource");
-            let newSrcSpeed = tc.settings.speeds[mutation.target.currentSrc];
-            if (!tc.settings.rememberSpeed) {
-              if (!newSrcSpeed) newSrcSpeed = 1.0;
             } else {
-              newSrcSpeed = newSrcSpeed || tc.settings.lastSpeed;
+              this.div.classList.remove("vsc-nosource");
+
+              // FIXED: Reapply speed when source changes (like in shorts)
+              const expectedSpeed = tc.settings.forceLastSavedSpeed
+                ? tc.settings.lastSpeed
+                : tc.settings.speeds[mutation.target.currentSrc] ||
+                tc.settings.lastSpeed;
+
+              setTimeout(() => {
+                if (mutation.target.vsc) {
+                  setSpeed(mutation.target, expectedSpeed, false, false);
+                }
+              }, 100);
+
+              if (!mutation.target.paused) this.startSubtitleNudge();
             }
-            if (tc.settings.forceLastSavedSpeed)
-              newSrcSpeed = tc.settings.lastSpeed;
-            setSpeed(mutation.target, newSrcSpeed, true, false); // isInitialCall=true, isUserKeyPress=false
-            if (!mutation.target.paused && mutation.target.playbackRate !== 1.0)
-              this.startSubtitleNudge();
           }
         }
       });
     });
     srcObserver.observe(target, { attributeFilter: ["src", "currentSrc"] });
-
     if (!target.paused && target.playbackRate !== 1.0)
       this.startSubtitleNudge();
   };
 
-  tc.videoController.prototype.startSubtitleNudge = function () {
-    // ADDED
-    if (!location.hostname.includes("youtube.com")) return;
-    if (
-      !tc.settings.enableSubtitleNudge ||
-      this.nudgeIntervalId !== null ||
-      !this.video
-    )
-      return;
-    if (this.video.paused || this.video.playbackRate === 1.0) {
-      this.stopSubtitleNudge();
-      return;
-    }
-    log(`Nudge: Starting interval: ${tc.settings.subtitleNudgeInterval}ms.`, 5);
-    this.nudgeIntervalId = setInterval(() => {
-      if (
-        !this.video ||
-        this.video.paused ||
-        this.video.playbackRate === 1.0 ||
-        tc.isNudging
-      ) {
-        this.stopSubtitleNudge();
-        return;
-      }
-      const currentRate = this.video.playbackRate;
-      const nudgeAmount = tc.settings.subtitleNudgeAmount;
-      tc.isNudging = true;
-      this.video.playbackRate = currentRate + nudgeAmount;
-      requestAnimationFrame(() => {
-        if (
-          this.video &&
-          Math.abs(this.video.playbackRate - (currentRate + nudgeAmount)) <
-            nudgeAmount * 1.5
-        ) {
-          this.video.playbackRate = currentRate;
-        }
-        tc.isNudging = false;
-      });
-    }, tc.settings.subtitleNudgeInterval);
-  };
-  tc.videoController.prototype.stopSubtitleNudge = function () {
-    // ADDED
-    if (this.nudgeIntervalId !== null) {
-      log(`Nudge: Stopping.`, 5);
-      clearInterval(this.nudgeIntervalId);
-      this.nudgeIntervalId = null;
-    }
-  };
-
   tc.videoController.prototype.remove = function () {
-    // Original remove
-    this.stopSubtitleNudge(); // ADDED
-    if (this.div && this.div.parentNode) this.div.remove();
+    this.stopSubtitleNudge();
+    if (this.div) this.div.remove();
     if (this.video) {
       this.video.removeEventListener("play", this.handlePlay);
-      this.video.removeEventListener("pause", this.handlePause); // ADDED
-      this.video.removeEventListener("ended", this.handleEnded); // ADDED
-      this.video.removeEventListener("seeked", this.handleSeek); // Original was "seek"
+      this.video.removeEventListener("pause", this.handlePause);
+      this.video.removeEventListener("ended", this.handleEnded);
+      this.video.removeEventListener("seeked", this.handleSeek);
       delete this.video.vsc;
     }
     let idx = tc.mediaElements.indexOf(this.video);
-    if (idx !== -1) tc.mediaElements.splice(idx, 1);
+    if (idx != -1) tc.mediaElements.splice(idx, 1);
+  };
+
+  tc.videoController.prototype.startSubtitleNudge = function () {
+    const isYouTube =
+      (this.video &&
+        this.video.currentSrc &&
+        this.video.currentSrc.includes("googlevideo.com")) ||
+      location.hostname.includes("youtube.com");
+    if (
+      !isYouTube ||
+      !tc.settings.enableSubtitleNudge ||
+      this.nudgeAnimationId !== null ||
+      !this.video ||
+      this.video.paused ||
+      this.video.playbackRate === 1.0
+    ) {
+      return;
+    }
+
+    // Store the target speed so we can always revert to it
+    this.targetSpeed = this.video.playbackRate;
+
+    const performNudge = () => {
+      // Check if we should stop
+      if (!this.video || this.video.paused || this.video.playbackRate === 1.0) {
+        this.stopSubtitleNudge();
+        return;
+      }
+
+      // CRITICAL: Don't nudge if tab is hidden - prevents speed drift
+      if (document.hidden) {
+        this.nudgeAnimationId = setTimeout(performNudge, tc.settings.subtitleNudgeInterval);
+        return;
+      }
+
+      // Set flag to prevent ratechange listener from interfering
+      tc.isNudging = true;
+
+      // Cache values to avoid repeated property access
+      const targetSpeed = this.targetSpeed;
+      const nudgeAmount = tc.settings.subtitleNudgeAmount;
+
+      // Apply nudge from the stored target speed (not current rate)
+      this.video.playbackRate = targetSpeed + nudgeAmount;
+
+      // Revert synchronously after a microtask to ensure it happens immediately
+      Promise.resolve().then(() => {
+        if (this.video && targetSpeed) {
+          this.video.playbackRate = targetSpeed;
+        }
+        tc.isNudging = false;
+      });
+
+      // Schedule next nudge
+      this.nudgeAnimationId = setTimeout(performNudge, tc.settings.subtitleNudgeInterval);
+    };
+
+    // Start the first nudge
+    this.nudgeAnimationId = setTimeout(performNudge, tc.settings.subtitleNudgeInterval);
+    log(`Nudge: Starting with interval ${tc.settings.subtitleNudgeInterval}ms.`, 5);
+  };
+
+  tc.videoController.prototype.stopSubtitleNudge = function () {
+    if (this.nudgeAnimationId !== null) {
+      clearTimeout(this.nudgeAnimationId);
+      this.nudgeAnimationId = null;
+      log(`Nudge: Stopping.`, 5);
+    }
+    // Clear the target speed when stopping
+    this.targetSpeed = null;
+  };
+
+  tc.videoController.prototype.performImmediateNudge = function () {
+    const isYouTube =
+      (this.video &&
+        this.video.currentSrc &&
+        this.video.currentSrc.includes("googlevideo.com")) ||
+      location.hostname.includes("youtube.com");
+    
+    if (
+      !isYouTube ||
+      !tc.settings.enableSubtitleNudge ||
+      !this.video ||
+      this.video.paused ||
+      this.video.playbackRate === 1.0 ||
+      document.hidden
+    ) {
+      return;
+    }
+
+    const targetRate = this.targetSpeed || this.video.playbackRate;
+    const nudgeAmount = tc.settings.subtitleNudgeAmount;
+
+    tc.isNudging = true;
+    this.video.playbackRate = targetRate + nudgeAmount;
+
+    // Revert synchronously via microtask
+    Promise.resolve().then(() => {
+      if (this.video) {
+        this.video.playbackRate = targetRate;
+      }
+      tc.isNudging = false;
+    });
+
+    log(`Immediate nudge performed at rate ${targetRate.toFixed(2)}`, 5);
   };
 
   tc.videoController.prototype.initializeControls = function () {
-    /* ... Same as your provided ... */
     const doc = this.video.ownerDocument;
-    const speedForUI = this.video.playbackRate.toFixed(2);
-    var top = Math.max(this.video.offsetTop, 0) + "px",
+    const speed = this.video.playbackRate.toFixed(2);
+    // Fix for videos rendered after page load - use relative positioning
+    var top = "10px",
+      left = "10px";
+
+    // Try to get actual position, but fallback to default if not available
+    if (this.video.offsetTop > 0 || this.video.offsetLeft > 0) {
+      top = Math.max(this.video.offsetTop, 0) + "px";
       left = Math.max(this.video.offsetLeft, 0) + "px";
+    }
     var wrapper = doc.createElement("div");
     wrapper.classList.add("vsc-controller");
     if (!this.video.src && !this.video.currentSrc)
       wrapper.classList.add("vsc-nosource");
     if (tc.settings.startHidden) wrapper.classList.add("vsc-hidden");
     var shadow = wrapper.attachShadow({ mode: "open" });
-    shadow.innerHTML = `<style> @import "${chrome.runtime.getURL("shadow.css")}"; </style><div id="controller" style="top:${top}; left:${left}; opacity:${tc.settings.controllerOpacity}"><span data-action="drag" class="draggable">${speedForUI}</span><span id="controls"><button data-action="rewind" class="rw">«</button><button data-action="slower">−</button><button data-action="faster">+</button><button data-action="advance" class="rw">»</button><button data-action="display" class="hideButton">×</button></span></div>`;
+    shadow.innerHTML = `<style> @import "${chrome.runtime.getURL("shadow.css")}"; </style><div id="controller" style="top:${top}; left:${left}; opacity:${tc.settings.controllerOpacity}"><span data-action="drag" class="draggable">${speed}</span><span id="controls"><button data-action="rewind" class="rw">«</button><button data-action="slower">−</button><button data-action="faster">+</button><button data-action="advance" class="rw">»</button><button data-action="display" class="hideButton">×</button></span></div>`;
     this.speedIndicator = shadow.querySelector(".draggable");
     shadow.querySelector(".draggable").addEventListener(
       "mousedown",
@@ -390,28 +492,26 @@ function defineVideoController() {
         runAction(
           e.target.dataset["action"],
           getKeyBindings(e.target.dataset["action"], "value"),
-          e,
-          this.video
+          e
         );
         e.stopPropagation();
       },
       true
     );
-    shadow.querySelectorAll("button").forEach((btn) =>
-      btn.addEventListener(
+    shadow.querySelectorAll("button").forEach((button) => {
+      button.addEventListener(
         "click",
         (e) => {
           runAction(
             e.target.dataset["action"],
             getKeyBindings(e.target.dataset["action"]),
-            e,
-            this.video
+            e
           );
           e.stopPropagation();
         },
         true
-      )
       );
+    });
     shadow
       .querySelector("#controller")
       .addEventListener("click", (e) => e.stopPropagation(), false);
@@ -420,34 +520,50 @@ function defineVideoController() {
       .addEventListener("mousedown", (e) => e.stopPropagation(), false);
     var fragment = doc.createDocumentFragment();
     fragment.appendChild(wrapper);
-    const pEl = this.parent || this.video.parentElement;
-    if (!pEl || !pEl.parentNode) {
+    const parentEl = this.parent || this.video.parentElement;
+
+    log(`Inserting controller: parentEl=${!!parentEl}, parentNode=${!!parentEl?.parentNode}, hostname=${location.hostname}`, 4);
+
+    if (!parentEl || !parentEl.parentNode) {
+      log("No suitable parent found, appending to body", 4);
       doc.body.appendChild(fragment);
       return wrapper;
     }
+
+    try {
       switch (true) {
         case location.hostname == "www.amazon.com":
         case location.hostname == "www.reddit.com":
         case /hbogo\./.test(location.hostname):
-        pEl.parentElement.insertBefore(fragment, pEl);
+          log("Using parentElement.parentElement insertion", 5);
+          parentEl.parentElement.insertBefore(fragment, parentEl);
           break;
         case location.hostname == "www.facebook.com":
+          log("Using Facebook-specific insertion", 5);
           let p =
-          pEl.parentElement.parentElement.parentElement.parentElement
+            parentEl.parentElement.parentElement.parentElement.parentElement
               .parentElement.parentElement.parentElement;
           if (p && p.firstChild) p.insertBefore(fragment, p.firstChild);
-        else if (pEl.firstChild) pEl.insertBefore(fragment, pEl.firstChild);
-        else pEl.appendChild(fragment);
+          else parentEl.insertBefore(fragment, parentEl.firstChild);
           break;
         case location.hostname == "tv.apple.com":
-        const r = pEl.getRootNode();
+          log("Using Apple TV-specific insertion", 5);
+          const r = parentEl.getRootNode();
           const s = r && r.querySelector ? r.querySelector(".scrim") : null;
           if (s) s.prepend(fragment);
-        else pEl.insertBefore(fragment, pEl.firstChild);
+          else parentEl.insertBefore(fragment, parentEl.firstChild);
           break;
         default:
-        pEl.insertBefore(fragment, pEl.firstChild);
+          log("Using default insertion method", 5);
+          parentEl.insertBefore(fragment, parentEl.firstChild);
       }
+      log("Controller successfully inserted into DOM", 4);
+    } catch (error) {
+      log(`Error inserting controller: ${error.message}`, 2);
+      // Fallback to body insertion
+      doc.body.appendChild(fragment);
+    }
+
     return wrapper;
   };
 }
@@ -457,107 +573,75 @@ function escapeStringRegExp(str) {
   return str.replace(m, "\\$&");
 }
 function isBlacklisted() {
-  /* ... Same as your provided ... */
-  let blacklisted = false;
-  const bl = tc.settings.blacklist ? tc.settings.blacklist.split("\n") : [];
-  bl.forEach((m) => {
-    if (blacklisted) return;
+  let b = false;
+  const l = tc.settings.blacklist ? tc.settings.blacklist.split("\n") : [];
+  l.forEach((m) => {
+    if (b) return;
     m = m.replace(regStrip, "");
     if (m.length == 0) return;
-    let rgx;
+    let r;
     if (m.startsWith("/") && m.lastIndexOf("/") > 0) {
       try {
         const ls = m.lastIndexOf("/");
-        rgx = new RegExp(m.substring(1, ls), m.substring(ls + 1));
+        r = new RegExp(m.substring(1, ls), m.substring(ls + 1));
       } catch (e) {
         log(`Invalid regex: ${m}. ${e.message}`, 2);
         return;
       }
-    } else rgx = new RegExp(escapeStringRegExp(m));
-    if (rgx && rgx.test(location.href)) blacklisted = true;
+    } else r = new RegExp(escapeStringRegExp(m));
+    if (r && r.test(location.href)) b = true;
   });
-  if (blacklisted) log(`Page ${location.href} blacklisted.`, 4);
-  return blacklisted;
+  if (b) log(`Page ${location.href} blacklisted.`, 4);
+  return b;
 }
 var coolDown = false;
 function refreshCoolDown() {
-  /* ... Same as your provided ... */
   if (coolDown) clearTimeout(coolDown);
-  coolDown = setTimeout(() => {
+  coolDown = setTimeout(function () {
     coolDown = false;
   }, 1000);
 }
 
 function setupListener() {
   if (document.vscRateListenerAttached) return;
-
-  // MODIFIED: This function NO LONGER calls runAction("blink")
-  function updateSpeedFromEvent(video) {
+  function updateSpeedFromEvent(video, fromUserInput = false) {
     if (!video.vsc || !video.vsc.speedIndicator) return;
     var speed = Number(video.playbackRate.toFixed(2));
-    log(`updateSpeedFromEvent: Rate is ${speed}.`, 4);
-
     video.vsc.speedIndicator.textContent = speed.toFixed(2);
     tc.settings.speeds[video.currentSrc || "unknown_src"] = speed;
     tc.settings.lastSpeed = speed;
-    chrome.storage.sync.set({ lastSpeed: speed }, () => {
-      /* ... */
-    });
-
-    // Blink is now handled directly in setSpeed for user key presses
-
+    chrome.storage.sync.set({ lastSpeed: speed }, () => { });
+    if (fromUserInput) {
+      runAction("blink", 1000, null, video);
+    }
     if (video.vsc) {
       if (speed === 1.0 || video.paused) video.vsc.stopSubtitleNudge();
       else video.vsc.startSubtitleNudge();
     }
   }
-
   document.addEventListener(
     "ratechange",
     function (event) {
-      if (tc.isNudging) return; // ADDED: Ignore nudge events
-
+      if (tc.isNudging) return;
       if (coolDown) {
-        log("Blocked by coolDown", 4);
         event.stopImmediatePropagation();
         return;
       }
-
       var video = event.target;
       if (!video || typeof video.playbackRate === "undefined" || !video.vsc)
         return;
-
-      const eventOrigin = event.detail && event.detail.origin;
-      // The 'fromUserInput' flag previously passed to updateSpeedFromEvent is removed.
-      // Blinking is now directly triggered by `setSpeed` if it's a user key press.
-
       if (tc.settings.forceLastSavedSpeed) {
-        if (eventOrigin === "videoSpeed") {
-          // This event is from setSpeed's forceLastSavedSpeed path.
-          // setSpeed would have already handled blinking if it was a user key press.
-          if (event.detail.speed) {
-            const detailSpeedNum = Number(event.detail.speed);
-            if (
-              !isNaN(detailSpeedNum) &&
-              Math.abs(video.playbackRate - detailSpeedNum) > 0.001
-            ) {
-              video.playbackRate = detailSpeedNum;
-            }
-          }
-          updateSpeedFromEvent(video); // Update state
-          event.stopImmediatePropagation();
+        if (event.detail && event.detail.origin === "videoSpeed") {
+          video.playbackRate = event.detail.speed;
+          updateSpeedFromEvent(video, event.detail.fromUserInput === true);
         } else {
-          if (Math.abs(video.playbackRate - tc.settings.lastSpeed) > 0.001) {
           video.playbackRate = tc.settings.lastSpeed;
+        }
         event.stopImmediatePropagation();
       } else {
-            updateSpeedFromEvent(video); // Just confirming speed
-          }
-        }
-      } else {
-        // forceLastSavedSpeed is OFF
-        updateSpeedFromEvent(video); // Update state
-        // DO NOT stop propagation
+        updateSpeedFromEvent(video, video.vscIsDirectlySettingRate === true);
+        if (video.vscIsDirectlySettingRate)
+          delete video.vscIsDirectlySettingRate;
       }
     },
     true
@@ -566,44 +650,48 @@ function setupListener() {
 }
 
 var vscInitializedDocuments = new Set();
-function initializeWhenReady(doc) {
-  /* ... Same robust init from your code ... */
-  if (doc.vscInitWhenReadyUniqueFlag1 && doc.readyState !== "loading") return;
-  doc.vscInitWhenReadyUniqueFlag1 = true;
-  if (isBlacklisted()) return;
-  if (doc === window.document && !window.vscPageLoadListenerUniqueFlag1) {
-    window.addEventListener("load", () => initializeNow(window.document), {
+function initializeWhenReady(doc, forceReinit = false) {
+  if (!forceReinit && vscInitializedDocuments.has(doc) || !doc.body) return;
+
+  // For navigation changes, we want to re-scan even if already initialized
+  if (forceReinit) {
+    log("Force re-initialization requested", 4);
+  }
+
+  if (doc.readyState === "complete") {
+    initializeNow(doc, forceReinit);
+  } else {
+    doc.addEventListener("DOMContentLoaded", () => initializeNow(doc, forceReinit), {
       once: true
     });
-    window.vscPageLoadListenerUniqueFlag1 = true;
-  }
-  if (doc.readyState === "complete") initializeNow(doc);
-  else if (!doc.vscReadyStateListenerUniqueFlag1) {
-    doc.addEventListener("readystatechange", function onRSChangeUnique1() {
-      if (doc.readyState === "complete") {
-        doc.removeEventListener("readystatechange", onRSChangeUnique1);
-        initializeNow(doc);
-      }
-    });
-    doc.vscReadyStateListenerUniqueFlag1 = true;
   }
 }
 function inIframe() {
-  /* ... Same ... */ try {
+  try {
     return window.self !== window.top;
   } catch (e) {
     return true;
   }
 }
 function getShadow(parent) {
-  /* ... Same ... */ let r = [];
+  let r = [];
   function gC(p) {
     if (p.firstElementChild) {
       var c = p.firstElementChild;
       do {
         r.push(c);
         gC(c);
-        if (c.shadowRoot) r.push(...getShadow(c.shadowRoot));
+        if (c.shadowRoot) {
+          r.push(...getShadow(c.shadowRoot));
+          // Also check for videos in shadow DOM
+          const shadowVideos = c.shadowRoot.querySelectorAll(tc.settings.audioBoolean ? "video,audio" : "video");
+          shadowVideos.forEach(video => {
+            if (!video.vsc) {
+              log(`Found video in shadow DOM`, 5);
+              checkForVideo(video, video.parentElement, true);
+            }
+          });
+        }
         c = c.nextElementSibling;
       } while (c);
     }
@@ -612,160 +700,371 @@ function getShadow(parent) {
   return r;
 }
 
-function initializeNow(doc) {
-  /* ... Same robust init from your code ... */
-  if (vscInitializedDocuments.has(doc) || !doc.body) return;
+function initializeNow(doc, forceReinit = false) {
+  if (!forceReinit && (vscInitializedDocuments.has(doc) || !doc.body)) return;
   if (!tc.settings.enabled) return;
+
   if (!doc.body.classList.contains("vsc-initialized"))
     doc.body.classList.add("vsc-initialized");
   if (typeof tc.videoController === "undefined") defineVideoController();
   setupListener();
-  if (
-    inIframe() &&
-    doc !== window.top.document &&
-    !doc.head.querySelector('link[href*="inject.css"]')
-  ) {
-    var l = doc.createElement("link");
-    l.href = chrome.runtime.getURL("inject.css");
-    l.type = "text/css";
-    l.rel = "stylesheet";
-    doc.head.appendChild(l);
-  }
-  const dFK = new Set([doc]);
+
+  var docs = Array(doc);
   try {
-    if (inIframe() && window.top.document) dFK.add(window.top.document);
+    if (inIframe()) docs.push(window.top.document);
   } catch (e) { }
-  dFK.forEach((lD) => {
-    if (!lD.vscKDLFlagC) {
-      lD.addEventListener(
+  docs.forEach(function (d) {
+    if (d.vscKeydownListenerAttached) return; // Prevent duplicate listeners
+    d.addEventListener(
       "keydown",
-        function (evt) {
-          if (!tc.settings.enabled) return;
-          const tgt = evt.target;
+      function (event) {
+        var keyCode = event.keyCode;
         if (
-            tgt.nodeName === "INPUT" ||
-            tgt.nodeName === "TEXTAREA" ||
-            tgt.isContentEditable
+          !event.getModifierState ||
+          event.getModifierState("Alt") ||
+          event.getModifierState("Control") ||
+          event.getModifierState("Fn") ||
+          event.getModifierState("Meta") ||
+          event.getModifierState("Hyper") ||
+          event.getModifierState("OS")
         )
           return;
         if (
-            evt.getModifierState &&
-            (evt.getModifierState("Alt") ||
-              evt.getModifierState("Control") ||
-              evt.getModifierState("Meta") ||
-              evt.getModifierState("Fn") ||
-              evt.getModifierState("Hyper") ||
-              evt.getModifierState("OS"))
+          event.target.nodeName === "INPUT" ||
+          event.target.nodeName === "TEXTAREA" ||
+          event.target.isContentEditable
         )
           return;
-          if (tc.mediaElements.length === 0 && !lD.querySelector("video,audio"))
-            return;
-          var itm = tc.settings.keyBindings.find((k) => k.key === evt.keyCode);
-          if (itm) {
-            runAction(itm.action, itm.value, evt);
-            if (itm.force === "true" || itm.force === true) {
-              evt.preventDefault();
-              evt.stopPropagation();
+        if (!tc.mediaElements.length) return;
+        var item = tc.settings.keyBindings.find((item) => item.key === keyCode);
+        if (item) {
+          runAction(item.action, item.value, event);
+          if (item.force === "true") {
+            event.preventDefault();
+            event.stopPropagation();
           }
         }
+        return false;
       },
       true
     );
-      lD.vscKDLFlagC = true;
-    }
+    d.vscKeydownListenerAttached = true;
   });
-  if (!doc.vscMOFlagC) {
-    const o = new MutationObserver((m) => {
-      if (typeof requestIdleCallback === "function")
-        requestIdleCallback(() => pM(m), { timeout: 1000 });
-      else setTimeout(() => pM(m), 200);
+
+  if (!doc.vscMutationObserverAttached) {
+    // Throttle mutation processing to reduce CPU usage
+    let mutationProcessingScheduled = false;
+    let pendingMutations = [];
+
+    const observer = new MutationObserver(function (mutations) {
+      pendingMutations.push(...mutations);
+      
+      if (!mutationProcessingScheduled) {
+        mutationProcessingScheduled = true;
+        requestIdleCallback(
+          (_) => {
+            const mutationsToProcess = pendingMutations.splice(0);
+            mutationProcessingScheduled = false;
+
+            mutationsToProcess.forEach(function (mutation) {
+              switch (mutation.type) {
+                case "childList":
+                  mutation.addedNodes.forEach(function (node) {
+                    if (typeof node === "function") return;
+                    checkForVideo(node, node.parentNode || mutation.target, true);
                   });
-    function pM(ml) {
-      for (const m of ml) {
-        if (m.type === "childList") {
-          m.addedNodes.forEach((n) => {
-            if (n instanceof Element) cV(n, n.parentNode || m.target, true);
-          });
-          m.removedNodes.forEach((n) => {
-            if (n instanceof Element) cV(n, n.parentNode || m.target, false);
-          });
-        } else if (
-          m.type === "attributes" &&
-          m.attributeName === "aria-hidden" &&
-          m.target instanceof Element &&
-          m.target.getAttribute("aria-hidden") === "false"
-        ) {
-          const vIT = Array.from(getShadow(m.target)).filter(
-            (el) => el.tagName === "VIDEO"
+                  mutation.removedNodes.forEach(function (node) {
+                    if (typeof node === "function") return;
+                    checkForVideo(
+                      node,
+                      node.parentNode || mutation.target,
+                      false
                     );
-          vIT.forEach((vE) => {
-            if (!vE.vsc) cV(vE, vE.parentNode || m.target, true);
                   });
+                  break;
+                case "attributes":
+                  // Enhanced attribute monitoring for video detection
+                  const target = mutation.target;
+                  if (target.tagName === "VIDEO" || target.tagName === "AUDIO") {
+                    // Video/audio element had attributes changed - check if it needs controller
+                    if (!target.vsc && (target.src || target.currentSrc)) {
+                      checkForVideo(target, target.parentNode, true);
                     }
-      }
-    }
-    function cV(n, p, a) {
-      if (!a && !n.isConnected) {
-      } else if (!a && n.isConnected) return;
-      if (
-        n.nodeName === "VIDEO" ||
-        (n.nodeName === "AUDIO" && tc.settings.audioBoolean)
+                  } else if (
+                    target.attributes["aria-hidden"] &&
+                    target.attributes["aria-hidden"].value == "false"
                   ) {
-        if (a) {
-          if (!n.vsc) new tc.videoController(n, p);
+                    // Only scan shadow DOM if absolutely necessary (expensive operation)
+                    var flattenedNodes = getShadow(document.body);
+                    var node = flattenedNodes.filter(
+                      (x) => x.tagName == "VIDEO"
+                    )[0];
+                    if (node) {
+                      if (node.vsc) node.vsc.remove();
+                      checkForVideo(
+                        node,
+                        node.parentNode || mutation.target,
+                        true
+                      );
+                    }
+                  }
+                  break;
+              }
+            });
+          },
+          { timeout: 1000 }
+        );
+      }
+    });
+    function checkForVideo(node, parent, added) {
+      if (!added && document.body.contains(node)) return;
+      if (
+        node.nodeName === "VIDEO" ||
+        (node.nodeName === "AUDIO" && tc.settings.audioBoolean)
+      ) {
+        if (added) {
+          if (!node.vsc) {
+            log(`Creating controller for ${node.tagName}: ${node.src || node.currentSrc || 'no src'}`, 4);
+            node.vsc = new tc.videoController(node, parent);
+
+            // Verify controller was created successfully
+            if (!node.vsc || !node.vsc.div) {
+              log(`ERROR: Controller creation failed for ${node.tagName}`, 2);
             } else {
-          if (n.vsc) n.vsc.remove();
+              log(`Controller created successfully, div in DOM: ${document.contains(node.vsc.div)}`, 4);
             }
-      } else if (n.children && n.children.length > 0) {
-        for (let i = 0; i < n.children.length; i++)
-          cV(n.children[i], n.children[i].parentNode || p, a);
+
+            // Add to intersection observer if available
+            if (doc.vscVideoIntersectionObserver) {
+              doc.vscVideoIntersectionObserver.observe(node);
             }
           }
-    o.observe(doc, {
+        } else {
+          if (node.vsc) {
+            node.vsc.remove();
+            // Remove from intersection observer if available
+            if (doc.vscVideoIntersectionObserver) {
+              doc.vscVideoIntersectionObserver.unobserve(node);
+            }
+          }
+        }
+      } else if (node.children != undefined) {
+        for (var i = 0; i < node.children.length; i++) {
+          const child = node.children[i];
+          checkForVideo(child, child.parentNode || parent, added);
+        }
+      }
+    }
+    observer.observe(doc, {
+      attributeFilter: ["aria-hidden", "src", "currentSrc"], // Removed "style" and "class" for better performance
       childList: true,
       subtree: true,
-      attributes: true,
-      attributeFilter: ["aria-hidden"]
+      attributes: true
     });
-    doc.vscMOFlagC = true;
+    doc.vscMutationObserverAttached = true;
   }
+
   const q = tc.settings.audioBoolean ? "video,audio" : "video";
-  doc.querySelectorAll(q).forEach((v) => {
+  const foundVideos = doc.querySelectorAll(q);
+  foundVideos.forEach((v) => {
     if (!v.vsc) new tc.videoController(v, v.parentElement);
   });
-  Array.from(doc.getElementsByTagName("iframe")).forEach((f) => {
-    try {
-      if (f.contentDocument) initializeWhenReady(f.contentDocument);
-    } catch (e) {}
+
+  // Enhanced video detection via media events
+  if (!doc.vscMediaEventListenersAttached) {
+    const mediaEvents = ['loadstart', 'loadedmetadata', 'canplay', 'play'];
+    mediaEvents.forEach(eventType => {
+      doc.addEventListener(eventType, function (event) {
+        const target = event.target;
+        if ((target.tagName === 'VIDEO' || (target.tagName === 'AUDIO' && tc.settings.audioBoolean)) && !target.vsc) {
+          log(`Media event ${eventType} detected new ${target.tagName.toLowerCase()}`, 5);
+          checkForVideo(target, target.parentElement, true);
+        }
+      }, true);
     });
+    doc.vscMediaEventListenersAttached = true;
+  }
+
+  // Intersection Observer for lazy-loaded videos
+  if (!doc.vscIntersectionObserverAttached && 'IntersectionObserver' in window) {
+    const videoIntersectionObserver = new IntersectionObserver((entries) => {
+      entries.forEach(entry => {
+        if (entry.isIntersecting) {
+          const target = entry.target;
+          if ((target.tagName === 'VIDEO' || (target.tagName === 'AUDIO' && tc.settings.audioBoolean)) && !target.vsc) {
+            log(`Intersection observer detected visible ${target.tagName.toLowerCase()}`, 5);
+            checkForVideo(target, target.parentElement, true);
+          }
+        }
+      });
+    }, { threshold: 0.1 });
+
+    // Observe existing videos that might not have been processed
+    doc.querySelectorAll(q).forEach(video => {
+      videoIntersectionObserver.observe(video);
+    });
+
+    // Store observer to add new videos to it
+    doc.vscVideoIntersectionObserver = videoIntersectionObserver;
+    doc.vscIntersectionObserverAttached = true;
+  }
+
+  Array.from(doc.getElementsByTagName("iframe")).forEach((f) => {
+    if (f.vscLoadListenerAttached) return;
+    f.addEventListener("load", () => {
+      try {
+        if (f.contentDocument) {
+          initializeWhenReady(f.contentDocument);
+        }
+      } catch (e) {
+        // Silently ignore CORS errors
+      }
+    });
+    f.vscLoadListenerAttached = true;
+    try {
+      if (f.contentDocument) {
+        initializeWhenReady(f.contentDocument);
+      }
+    } catch (e) {
+      // Silently ignore CORS errors
+    }
+  });
+  // Navigation change detection for SPAs
+  if (!doc.vscNavigationListenersAttached) {
+    let currentUrl = location.href;
+
+    const handleNavigation = (source) => {
+      if (location.href !== currentUrl) {
+        const oldUrl = currentUrl;
+        currentUrl = location.href;
+        log(`Navigation detected via ${source}: ${oldUrl} -> ${currentUrl}`, 4);
+
+        // Wait a bit for the new content to load, then force re-scan
+        setTimeout(() => {
+          const q = tc.settings.audioBoolean ? "video,audio" : "video";
+          const videos = document.querySelectorAll(q);
+          log(`Post-navigation scan found ${videos.length} videos`, 4);
+
+          videos.forEach(video => {
+            if (!video.vsc) {
+              log(`Adding controller to post-navigation video`, 4);
+              checkForVideo(video, video.parentElement, true);
+            }
+          });
+        }, 500); // Increased delay for content to load
+
+        // Also do a quicker scan
+        setTimeout(() => {
+          const q = tc.settings.audioBoolean ? "video,audio" : "video";
+          const videos = document.querySelectorAll(q);
+          videos.forEach(video => {
+            if (!video.vsc && (video.src || video.currentSrc)) {
+              checkForVideo(video, video.parentElement, true);
+            }
+          });
+        }, 100);
+      }
+    };
+
+    // Listen for popstate (back/forward navigation)
+    window.addEventListener('popstate', () => handleNavigation('popstate'));
+
+    // Override pushState and replaceState to catch programmatic navigation
+    const originalPushState = history.pushState;
+    const originalReplaceState = history.replaceState;
+
+    history.pushState = function (...args) {
+      originalPushState.apply(this, args);
+      handleNavigation('pushState');
+    };
+
+    history.replaceState = function (...args) {
+      originalReplaceState.apply(this, args);
+      handleNavigation('replaceState');
+    };
+
+    // Listen for hashchange as well
+    window.addEventListener('hashchange', () => handleNavigation('hashchange'));
+
+    // Throttle fetch-based video scanning to reduce CPU usage
+    let lastFetchScanTime = 0;
+    const FETCH_SCAN_THROTTLE = 2000; // Only scan once every 2 seconds max
+
+    const originalFetch = window.fetch;
+    window.fetch = function (...args) {
+      return originalFetch.apply(this, args).then(response => {
+        // Throttle video scanning after fetch to avoid excessive CPU usage
+        const now = Date.now();
+        if (now - lastFetchScanTime > FETCH_SCAN_THROTTLE) {
+          lastFetchScanTime = now;
+          setTimeout(() => {
+            const q = tc.settings.audioBoolean ? "video,audio" : "video";
+            const videos = document.querySelectorAll(q);
+            videos.forEach(video => {
+              if (!video.vsc && (video.src || video.currentSrc || video.readyState > 0)) {
+                log(`Post-fetch scan found video`, 5);
+                checkForVideo(video, video.parentElement, true);
+              }
+            });
+          }, 200);
+        }
+        return response;
+      });
+    };
+
+    doc.vscNavigationListenersAttached = true;
+  }
+
+  // Periodic fallback scan for missed videos
+  if (!doc.vscPeriodicScanAttached) {
+    const periodicScan = () => {
+      const q = tc.settings.audioBoolean ? "video,audio" : "video";
+      const allVideos = doc.querySelectorAll(q);
+      let foundNewCount = 0;
+
+      allVideos.forEach(video => {
+        if (!video.vsc && (video.src || video.currentSrc || video.readyState > 0)) {
+          log(`Periodic scan found missed ${video.tagName.toLowerCase()}`, 4);
+          checkForVideo(video, video.parentElement, true);
+          foundNewCount++;
+        }
+      });
+
+      if (foundNewCount > 0) {
+        log(`Periodic scan found ${foundNewCount} new videos`, 4);
+      }
+    };
+
+    // Run periodic scan every 5 seconds (reduced frequency), only if we have videos
+    setInterval(() => {
+      if (tc.mediaElements.length > 0 || doc.querySelector(tc.settings.audioBoolean ? "video,audio" : "video")) {
+        periodicScan();
+      }
+    }, 5000); // Increased from 3s to 5s for better performance
+
+    doc.vscPeriodicScanAttached = true;
+  }
+
   vscInitializedDocuments.add(doc);
 }
 
-// MODIFIED: setSpeed now takes `isInitialCall` and `isUserKeyPress`
 function setSpeed(video, speed, isInitialCall = false, isUserKeyPress = false) {
   const numericSpeed = Number(speed);
   if (isNaN(numericSpeed) || numericSpeed <= 0 || numericSpeed > 16) return;
   if (!video || !video.vsc || !video.vsc.speedIndicator) return;
+
   log(
     `setSpeed: Target ${numericSpeed.toFixed(2)}. Initial: ${isInitialCall}. UserKeyPress: ${isUserKeyPress}`,
     4
   );
-
   tc.settings.lastSpeed = numericSpeed;
   video.vsc.speedIndicator.textContent = numericSpeed.toFixed(2);
 
-  // MODIFIED: Directly trigger blink here if it's a user key press and not initial setup
-  if (isUserKeyPress && !isInitialCall && video.vsc) {
-    // Ensure controller is available before trying to blink
-    if (video.vsc.div) {
-      // Check if controller div exists
-      log(
-        `setSpeed: User key press detected, triggering blink for controller.`,
-        5
-      );
-      // Pass the specific video to runAction for blink
-      runAction("blink", getKeyBindings("blink", "value") || 1000, null, video);
-    }
+  // Update the target speed for nudge so it knows what to revert to
+  video.vsc.targetSpeed = numericSpeed;
+
+  if (isUserKeyPress && !isInitialCall && video.vsc && video.vsc.div) {
+    runAction("blink", 1000, null, video); // Pass video to blink
   }
 
   if (tc.settings.forceLastSavedSpeed) {
@@ -775,80 +1074,54 @@ function setSpeed(video, speed, isInitialCall = false, isUserKeyPress = false) {
           origin: "videoSpeed",
           speed: numericSpeed.toFixed(2),
           fromUserInput: isUserKeyPress
-        } // Pass isUserKeyPress
+        }
       })
     );
   } else {
     if (Math.abs(video.playbackRate - numericSpeed) > 0.001) {
+      if (isUserKeyPress && !isInitialCall) {
+        video.vscIsDirectlySettingRate = true; // Set flag for ratechange listener
+      }
       video.playbackRate = numericSpeed;
     }
   }
-
-  if (!isInitialCall) refreshCoolDown(); // Original call
-
+  if (!isInitialCall) refreshCoolDown();
   if (video.vsc) {
     if (numericSpeed === 1.0 || video.paused) video.vsc.stopSubtitleNudge();
     else video.vsc.startSubtitleNudge();
   }
 }
 
-// MODIFIED: runAction passes `isUserKeyPress=true` to setSpeed for relevant actions
-function runAction(action, value, e, specificVideo = null) {
-  var mediaTagsToProcess = []; // ... (same robust mediaTagsToProcess logic as before) ...
-  if (specificVideo) mediaTagsToProcess = [specificVideo];
-  else if (e && e.target) {
-    const dC = e.target.ownerDocument || document;
-    let aV = tc.mediaElements.find(
-      (v) =>
-        v.ownerDocument === dC &&
-        (dC.activeElement === v || v.contains(dC.activeElement))
-    );
-    if (aV) mediaTagsToProcess = [aV];
-    else {
-      aV = tc.mediaElements.find(
-        (v) =>
-          v.ownerDocument === dC &&
-          v.offsetParent !== null &&
-          (!v.paused || v.readyState > 0)
-      );
-      if (aV) mediaTagsToProcess = [aV];
-      else {
-        mediaTagsToProcess = tc.mediaElements.filter(
-          (v) => v.ownerDocument === dC
-        );
-        if (mediaTagsToProcess.length === 0 && tc.mediaElements.length > 0)
-          mediaTagsToProcess = [tc.mediaElements[0]];
-        else if (mediaTagsToProcess.length === 0) mediaTagsToProcess = [];
-      }
-    }
-  } else mediaTagsToProcess = tc.mediaElements;
-  if (
-    mediaTagsToProcess.length === 0 &&
-    action !== "display" &&
-    action !== "blink"
-  )
-    return; // Allow blink even if no media for global feedback
+function runAction(action, value, e) {
+  log("runAction Begin", 5);
+  var mediaTagsToProcess;
+  const specificVideo = arguments[3] || null;
 
-  var targetControllerFromEvent =
-    e && e.target && e.target.getRootNode && e.target.getRootNode().host
-      ? e.target.getRootNode().host
-      : null;
-  const currentActionContext = action;
+  if (specificVideo) {
+    mediaTagsToProcess = [specificVideo];
+  } else if (e && e.target && e.target.getRootNode) {
+    // Event-driven action
+    const docContext = e.target.ownerDocument || document;
+    mediaTagsToProcess = tc.mediaElements.filter(
+      (v) => v.ownerDocument === docContext
+    );
+    const targetController = e.target.getRootNode().host;
+    if (targetController) {
+      // If it's a click on a controller, only use that one video
+      const videoFromController = tc.mediaElements.find(
+        (v) => v.vsc && v.vsc.div === targetController
+      );
+      if (videoFromController) mediaTagsToProcess = [videoFromController];
+    }
+  } else {
+    mediaTagsToProcess = tc.mediaElements;
+  }
+  if (mediaTagsToProcess.length === 0 && action !== "display") return;
 
   mediaTagsToProcess.forEach(function (v) {
-    if (!v || !v.vsc || !v.vsc.div || !v.vsc.speedIndicator) return;
-    var controllerDiv = v.vsc.div;
-    if (
-      targetControllerFromEvent &&
-      targetControllerFromEvent !== controllerDiv &&
-      action !== "blink"
-    )
-      return;
-    if (action === "blink" && specificVideo && v !== specificVideo) return;
-
-    // MODIFIED: `showController` is only called if action implies user directly interacting with speed/video state.
-    // "display" handles its own visibility. "blink" is for feedback *after* a state change.
-    const actionsThatShouldShowControllerTemporarily = [
+    if (!v.vsc) return; // Don't process videos without a controller
+    var controller = v.vsc.div;
+    const userDrivenActionsThatShowController = [
       "rewind",
       "advance",
       "faster",
@@ -861,75 +1134,71 @@ function runAction(action, value, e, specificVideo = null) {
       "jump",
       "drag"
     ];
-    if (actionsThatShouldShowControllerTemporarily.includes(action)) {
-      // The original showController is a timed visibility.
-      // The "blink" action also provides timed visibility.
-      // By having setSpeed call blink directly for user key presses, this might be redundant here for speed changes.
-      // However, for seek, pause etc., this existing showController is still relevant.
-      showController(controllerDiv);
+    if (userDrivenActionsThatShowController.includes(action)) {
+      showController(controller);
     }
-
     if (v.classList.contains("vsc-cancelled")) return;
     const numValue = parseFloat(value);
     switch (action) {
       case "rewind":
+        isUserSeek = true;
         v.currentTime -= numValue;
         break;
       case "advance":
+        isUserSeek = true;
         v.currentTime += numValue;
         break;
-      // MODIFIED: Pass `isUserKeyPress = true`
       case "faster":
-        setSpeed(
-          v,
-          Math.min(
-            (v.playbackRate < 0.07 ? 0.07 : v.playbackRate) + numValue,
-            16
-          ),
-          false,
-          true
-        );
+        // Round to the step precision to avoid floating-point issues (e.g., 1.80 + 0.1 = 1.9000000000000001)
+        var fasterStep = numValue;
+        var fasterPrecision = Math.round(1 / fasterStep); // e.g., 0.1 -> 10, 0.05 -> 20, 0.25 -> 4
+        var newFasterSpeed = (v.playbackRate < 0.07 ? 0.07 : v.playbackRate) + fasterStep;
+        newFasterSpeed = Math.round(newFasterSpeed * fasterPrecision) / fasterPrecision;
+        setSpeed(v, Math.min(newFasterSpeed, 16), false, true);
         break;
       case "slower":
-        setSpeed(v, Math.max(v.playbackRate - numValue, 0.07), false, true);
+        var slowerStep = numValue;
+        var slowerPrecision = Math.round(1 / slowerStep);
+        var newSlowerSpeed = v.playbackRate - slowerStep;
+        newSlowerSpeed = Math.round(newSlowerSpeed * slowerPrecision) / slowerPrecision;
+        setSpeed(v, Math.max(newSlowerSpeed, 0.07), false, true);
         break;
-      // MODIFIED: Calls original resetSpeed, passing currentActionContext
       case "reset":
-        resetSpeed(v, 1.0, currentActionContext);
+        resetSpeed(v, 1.0, false); // Use enhanced resetSpeed
         break;
       case "fast":
-        resetSpeed(v, numValue, currentActionContext);
+        resetSpeed(v, numValue, true); // Use enhanced resetSpeed
         break;
       case "display":
-        controllerDiv.classList.add("vsc-manual");
-        controllerDiv.classList.toggle("vsc-hidden");
+        controller.classList.add("vsc-manual");
+        controller.classList.toggle("vsc-hidden");
         break;
-      case "blink": // This action is now primarily called by setSpeed itself for user key presses
-        if (!controllerDiv) return; // Safety check
+      case "blink":
+        log(`Blink action: controller hidden=${controller.classList.contains("vsc-hidden")}, timeout=${controller.blinkTimeOut !== undefined}, duration=${numValue}`, 5);
+
+        // Always clear existing timeout and show controller
+        if (controller.blinkTimeOut !== undefined) {
+          clearTimeout(controller.blinkTimeOut);
+        }
+
+        // Always show the controller
+        controller.classList.remove("vsc-hidden");
+        log(`Controller shown, setting timeout for ${numValue || 1000}ms`, 5);
+
+        controller.blinkTimeOut = setTimeout(() => {
           if (
-          controllerDiv.classList.contains("vsc-hidden") ||
-          controllerDiv.blinkTimeOut !== undefined
+            !(
+              controller.classList.contains("vsc-manual") &&
+              !controller.classList.contains("vsc-hidden")
+            )
           ) {
-          clearTimeout(controllerDiv.blinkTimeOut);
-          controllerDiv.classList.remove("vsc-hidden");
-          controllerDiv.blinkTimeOut = setTimeout(
-            () => {
-              // If user manually set controller to be visible (vsc-manual and NOT vsc-hidden), blink should not hide it.
-              if (
-                controllerDiv.classList.contains("vsc-manual") &&
-                !controllerDiv.classList.contains("vsc-hidden")
-              ) {
-                // Do nothing, respect manual visibility
+            controller.classList.add("vsc-hidden");
+            log("Controller auto-hidden after blink timeout", 5);
           } else {
-                // Otherwise, (it was auto-shown by blink, or was already hidden, or user manually hid it)
-                // blink will ensure it ends up hidden.
-                controllerDiv.classList.add("vsc-hidden");
-              }
-              controllerDiv.blinkTimeOut = undefined;
-            },
-            typeof value === "number" && !isNaN(value) ? value : 1000
-          ); // Value for blink duration
+            log("Controller kept visible (manual mode)", 5);
           }
+          controller.blinkTimeOut = undefined;
+        }, numValue || 1000);
         break;
       case "drag":
         if (e) handleDrag(v, e);
@@ -946,125 +1215,98 @@ function runAction(action, value, e, specificVideo = null) {
       case "jump":
         jumpToMark(v);
         break;
-      default:
-        log(`Unknown action: ${action}`, 3);
     }
   });
+  log("runAction End", 5);
 }
 
 function pause(v) {
-  /* ... Same as your original ... */ if (v.paused)
-    v.play().catch((e) => log(`Play err:${e.message}`, 2));
+  if (v.paused) v.play().catch((e) => log(`Play err:${e.message}`, 2));
   else v.pause();
 }
 
-// MODIFIED: resetSpeed now calls setSpeed with isUserKeyPress = true
-function resetSpeed(v, target, currentActionContext = null) {
-  log(
-    `resetSpeed (original): Video current: ${v.playbackRate.toFixed(2)}, Target: ${target.toFixed(2)}, Context: ${currentActionContext}`,
-    4
-  );
-  if (Math.abs(v.playbackRate - target) < 0.01) {
-    if (v.playbackRate === (getKeyBindings("reset", "value") || 1.0)) {
-      if (target !== 1.0) {
-        setSpeed(v, 1.0, false, true);
+function resetSpeed(v, target, isFastKey = false) {
+  const videoId = v.currentSrc || v.src || "default";
+  const currentSpeed = v.playbackRate;
+
+  if (isFastKey) {
+    // G key: Toggle between current speed and preferred speed (e.g., 1.8)
+    const preferredSpeed = target;
+    const lastToggle = lastToggleSpeed[videoId] || currentSpeed;
+
+    if (Math.abs(currentSpeed - preferredSpeed) < 0.01) {
+      // Currently at preferred speed, toggle to the last speed
+      setSpeed(v, lastToggle, false, true);
     } else {
-        setSpeed(v, getKeyBindings("fast", "value"), false, true);
+      // Not at preferred speed, save current as toggle speed and go to preferred
+      lastToggleSpeed[videoId] = currentSpeed;
+      setSpeed(v, preferredSpeed, false, true);
     }
   } else {
-      setSpeed(v, getKeyBindings("reset", "value") || 1.0, false, true);
-    }
+    // R key: Toggle between current speed and 1.0
+    const resetSpeedValue = 1.0;
+    const lastToggle = lastToggleSpeed[videoId] || currentSpeed;
+
+    if (Math.abs(currentSpeed - resetSpeedValue) < 0.01) {
+      // Currently at 1.0, toggle to the last speed (or 1.8 if no history)
+      const speedToRestore =
+        Math.abs(lastToggle - 1.0) < 0.01
+          ? getKeyBindings("fast") || 1.8
+          : lastToggle;
+      setSpeed(v, speedToRestore, false, true);
     } else {
-    if (currentActionContext === "reset") {
-      setKeyBindings("reset", v.playbackRate);
+      // Not at 1.0, save current as toggle speed and go to 1.0
+      lastToggleSpeed[videoId] = currentSpeed;
+      setSpeed(v, resetSpeedValue, false, true);
     }
-    setSpeed(v, target, false, true);
   }
 }
 
 function muted(v) {
-  /* ... Same as your original ... */ v.muted = !v.muted;
-  log(`Mute: ${v.muted}`, 5);
+  v.muted = !v.muted;
 }
 function setMark(v) {
-  /* ... Same as your original ... */ if (!v.vsc) v.vsc = {};
   v.vsc.mark = v.currentTime;
-  log(`Mark: ${v.vsc.mark.toFixed(2)}`, 5);
 }
 function jumpToMark(v) {
-  /* ... Same as your original ... */ if (
-    v.vsc &&
-    typeof v.vsc.mark === "number"
-  )
-    v.currentTime = v.vsc.mark;
-  else log("No mark.", 4);
+  if (v.vsc && typeof v.vsc.mark === "number") v.currentTime = v.vsc.mark;
 }
 function handleDrag(video, e) {
-  /* ... Same as your original ... */
-  if (!video || !video.vsc || !video.vsc.div || !video.vsc.div.shadowRoot)
-    return;
-  const ctl = video.vsc.div;
-  const sCtl = ctl.shadowRoot.querySelector("#controller");
-  if (!sCtl) return;
-  var pE = ctl.parentElement;
+  const c = video.vsc.div;
+  const sC = c.shadowRoot.querySelector("#controller");
+  var pE = c.parentElement;
   while (
-    pE &&
     pE.parentNode &&
-    pE.parentNode !== document &&
     pE.parentNode.offsetHeight === pE.offsetHeight &&
     pE.parentNode.offsetWidth === pE.offsetWidth
   )
     pE = pE.parentNode;
-  const dB = pE || video.ownerDocument.body;
   video.classList.add("vcs-dragging");
-  sCtl.classList.add("dragging");
+  sC.classList.add("dragging");
   const iXY = [e.clientX, e.clientY],
-    iCtlXY = [
-      parseInt(sCtl.style.left, 10) || 0,
-      parseInt(sCtl.style.top, 10) || 0
-    ];
-  const sD = (mE) => {
-    let s = sCtl.style;
-    s.left = iCtlXY[0] + mE.clientX - iXY[0] + "px";
-    s.top = iCtlXY[1] + mE.clientY - iXY[1] + "px";
-    mE.preventDefault();
+    iCXY = [parseInt(sC.style.left), parseInt(sC.style.top)];
+  const sD = (e) => {
+    let s = sC.style;
+    s.left = iCXY[0] + e.clientX - iXY[0] + "px";
+    s.top = iCXY[1] + e.clientY - iXY[1] + "px";
   };
   const eD = () => {
-    dB.removeEventListener("mousemove", sD);
-    dB.removeEventListener("mouseup", eD);
-    dB.removeEventListener("mouseleave", eD);
-    sCtl.classList.remove("dragging");
+    pE.removeEventListener("mousemove", sD);
+    pE.removeEventListener("mouseup", eD);
+    pE.removeEventListener("mouseleave", eD);
+    sC.classList.remove("dragging");
     video.classList.remove("vcs-dragging");
   };
-  dB.addEventListener("mousemove", sD);
-  dB.addEventListener("mouseup", eD);
-  dB.addEventListener("mouseleave", eD);
+  pE.addEventListener("mouseup", eD);
+  pE.addEventListener("mouseleave", eD);
+  pE.addEventListener("mousemove", sD);
 }
 var timer = null;
 function showController(controller) {
-  /* ... Same as your original ... */
   if (!controller || typeof controller.classList === "undefined") return;
-  // If controller is manually hidden by user (V pressed to hide), don't auto-show it
-  // The vsc-manual class is added when 'display' action is triggered.
-  // vsc-hidden is toggled by 'display' action.
-  // So, if vsc-manual AND vsc-hidden are present, user explicitly hid it.
-  if (
-    controller.classList.contains("vsc-manual") &&
-    controller.classList.contains("vsc-hidden")
-  ) {
-    // log("Controller is manually hidden by user, showController will not override.", 5);
-    return;
-  }
-  controller.classList.add("vcs-show"); // For autohide sites like YouTube
-  // The blink action has its own logic for vsc-hidden and vsc-manual.
-  // This showController is for the general "make it visible for a bit" from user actions.
-  // It should not remove vsc-hidden if it was there before adding vsc-show, because blink handles that.
-  // The original showController just adds vsc-show and sets a timer to remove it.
-  // The "blink" action in runAction explicitly removes vsc-hidden if present, then adds it back.
-
+  controller.classList.add("vsc-show");
   if (timer) clearTimeout(timer);
   timer = setTimeout(function () {
-    if (controller && controller.classList)
     controller.classList.remove("vsc-show");
     timer = false;
   }, 2000);

manifest.json

@@ -1,7 +1,7 @@
 {
   "name": "Video Speed Controller",
   "short_name": "videospeed",
-  "version": "1.1.2",
+  "version": "2.1.0",
   "manifest_version": 2,
   "description": "Speed up, slow down, advance and rewind HTML5 audio/video with shortcuts",
   "homepage_url": "https://github.com/SoPat712/videospeed",

options.css

@@ -5,6 +5,7 @@ body {
   font-family: sans-serif;
   font-size: 12px;
   color: rgb(48, 57, 66);
+  background-color: white;
 }
 
 h1,
@@ -110,3 +111,76 @@ select {
   color: transparent;
   text-shadow: 0 0 0 #000000;
 }
+
+/* Dark mode styles */
+@media (prefers-color-scheme: dark) {
+  body {
+    background-color: #1a1a1a;
+    color: #e0e0e0;
+  }
+
+  h3 {
+    color: #ffffff;
+  }
+
+  header {
+    border-bottom: 1px solid #333;
+    background: linear-gradient(#1a1a1a, #1a1a1a 40%, rgba(26, 26, 26, 0.92));
+  }
+
+  button {
+    background-image: linear-gradient(#404040, #404040 38%, #353535);
+    border: 1px solid rgba(255, 255, 255, 0.25);
+    box-shadow: 0 1px 0 rgba(255, 255, 255, 0.08),
+      inset 0 1px 2px rgba(0, 0, 0, 0.75);
+    color: #e0e0e0;
+    text-shadow: 0 1px 0 rgb(20, 20, 20);
+  }
+
+  button:hover {
+    background-image: linear-gradient(#4a4a4a, #4a4a4a 38%, #3f3f3f);
+  }
+
+  input[type="text"], 
+  input[type="checkbox"],
+  select,
+  textarea {
+    background-color: #2a2a2a;
+    color: #e0e0e0;
+    border: 1px solid #555;
+  }
+
+  input[type="text"]:focus,
+  select:focus,
+  textarea:focus {
+    background-color: #333;
+    border-color: #777;
+    outline: none;
+  }
+
+  select option {
+    background-color: #2a2a2a;
+    color: #e0e0e0;
+  }
+
+  .customKey {
+    color: transparent;
+    text-shadow: 0 0 0 #e0e0e0;
+  }
+
+  #status {
+    color: #888;
+  }
+
+  a {
+    color: #66b3ff;
+  }
+
+  a:visited {
+    color: #cc99ff;
+  }
+
+  hr {
+    border-color: #333;
+  }
+}

popup.css

@@ -1,5 +1,7 @@
 body {
   min-width: 8em;
+  background-color: white;
+  color: #333;
 }
 
 hr {
@@ -32,3 +34,35 @@ button {
 .hide {
   display: none;
 }
+/* Dark mode styles */
+@media (prefers-color-scheme: dark) {
+  body {
+    background-color: #1a1a1a;
+    color: #e0e0e0;
+  }
+
+  hr {
+    border-top: 1px solid rgba(255, 255, 255, 0.3);
+  }
+
+  button {
+    background-image: linear-gradient(#404040, #404040 38%, #353535);
+    border: 1px solid rgba(255, 255, 255, 0.25);
+    box-shadow: 0 1px 0 rgba(255, 255, 255, 0.08),
+      inset 0 1px 2px rgba(0, 0, 0, 0.75);
+    color: #e0e0e0;
+    text-shadow: 0 1px 0 rgb(20, 20, 20);
+  }
+
+  button:hover {
+    background-image: linear-gradient(#4a4a4a, #4a4a4a 38%, #3f3f3f);
+  }
+
+  button:active {
+    background-image: linear-gradient(#353535, #353535 38%, #2a2a2a);
+  }
+
+  #status {
+    color: #ccc;
+  }
+}

popup.html

@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html>
   <head>
     <title>Video Speed Controller: Popup</title>
@@ -6,6 +6,8 @@
     <script src="popup.js"></script>
   </head>
   <body>
+    <button id="refresh">Re-scan Page for Videos</button>
+    <hr />
     <button id="enable" class="hide">Enable</button>
     <button id="disable">Disable</button>
     <span id="status" class="hide"></span>

popup.js

@@ -19,6 +19,31 @@ document.addEventListener("DOMContentLoaded", function () {
     toggleEnabled(false, settingsSavedReloadMessage);
   });
 
+  // --- REVISED: "Re-scan" button functionality ---
+  document.querySelector("#refresh").addEventListener("click", function () {
+    setStatusMessage("Re-scanning page...");
+    chrome.tabs.query({ active: true, currentWindow: true }, function (tabs) {
+      if (tabs[0] && tabs[0].id) {
+        // Send a message to the content script, asking it to re-initialize.
+        chrome.tabs.sendMessage(
+          tabs[0].id,
+          { action: "rescan_page" },
+          function (response) {
+            if (chrome.runtime.lastError) {
+              // This error is expected on pages where content scripts cannot run.
+              setStatusMessage("Cannot run on this page.");
+            } else if (response && response.status === "complete") {
+              setStatusMessage("Scan complete. Closing...");
+              setTimeout(() => window.close(), 500); // Close popup on success.
+            } else {
+              setStatusMessage("Scan failed. Please reload the page.");
+            }
+          }
+        );
+      }
+    });
+  });
+
   chrome.storage.sync.get({ enabled: true }, function (storage) {
     toggleEnabledUI(storage.enabled);
   });
@@ -42,9 +67,9 @@ document.addEventListener("DOMContentLoaded", function () {
     const suffix = `${enabled ? "" : "_disabled"}.png`;
     chrome.browserAction.setIcon({
       path: {
-        "19": "icons/icon19" + suffix,
-        "38": "icons/icon38" + suffix,
-        "48": "icons/icon48" + suffix
+        19: "icons/icon19" + suffix,
+        38: "icons/icon38" + suffix,
+        48: "icons/icon48" + suffix
       }
     });
   }