fix: whoops, committed the original

.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.css

@@ -27,7 +27,7 @@
   opacity: 0;
 }
 
-.ytp-autohide .vcs-show {
+.ytp-autohide .vsc-show {
   visibility: visible;
   opacity: 1;
 }

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,
@@ -21,14 +24,491 @@ var tc = {
     `.replace(regStrip, ""),
     defaultLogLevel: 4,
     logLevel: 5, // Set to 5 to see your debug logs
-    enableSubtitleNudge: true,
-    subtitleNudgeInterval: 25,
+    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
 };
 
+var MIN_SPEED = 0.0625;
+var MAX_SPEED = 16;
+var vscObservedRoots = new WeakSet();
+var requestIdle =
+  typeof window.requestIdleCallback === "function"
+    ? window.requestIdleCallback.bind(window)
+    : function (callback, options) {
+        return setTimeout(callback, (options && options.timeout) || 1);
+      };
+
+var keyCodeToEventKey = {
+  32: " ",
+  37: "ArrowLeft",
+  38: "ArrowUp",
+  39: "ArrowRight",
+  40: "ArrowDown",
+  96: "0",
+  97: "1",
+  98: "2",
+  99: "3",
+  100: "4",
+  101: "5",
+  102: "6",
+  103: "7",
+  104: "8",
+  105: "9",
+  106: "*",
+  107: "+",
+  109: "-",
+  110: ".",
+  111: "/",
+  112: "F1",
+  113: "F2",
+  114: "F3",
+  115: "F4",
+  116: "F5",
+  117: "F6",
+  118: "F7",
+  119: "F8",
+  120: "F9",
+  121: "F10",
+  122: "F11",
+  123: "F12",
+  186: ";",
+  188: "<",
+  189: "-",
+  187: "+",
+  190: ">",
+  191: "/",
+  192: "~",
+  219: "[",
+  220: "\\",
+  221: "]",
+  222: "'",
+  59: ";",
+  61: "+",
+  173: "-"
+};
+
+function createDefaultBinding(action, key, keyCode, value) {
+  return {
+    action: action,
+    key: key,
+    keyCode: keyCode,
+    value: value,
+    force: false,
+    predefined: true
+  };
+}
+
+function defaultKeyBindings(storage) {
+  return [
+    createDefaultBinding(
+      "slower",
+      "S",
+      Number(storage.slowerKeyCode) || 83,
+      Number(storage.speedStep) || 0.1
+    ),
+    createDefaultBinding(
+      "faster",
+      "D",
+      Number(storage.fasterKeyCode) || 68,
+      Number(storage.speedStep) || 0.1
+    ),
+    createDefaultBinding(
+      "rewind",
+      "Z",
+      Number(storage.rewindKeyCode) || 90,
+      Number(storage.rewindTime) || 10
+    ),
+    createDefaultBinding(
+      "advance",
+      "X",
+      Number(storage.advanceKeyCode) || 88,
+      Number(storage.advanceTime) || 10
+    ),
+    createDefaultBinding(
+      "reset",
+      "R",
+      Number(storage.resetKeyCode) || 82,
+      1.0
+    ),
+    createDefaultBinding(
+      "fast",
+      "G",
+      Number(storage.fastKeyCode) || 71,
+      Number(storage.fastSpeed) || 1.8
+    )
+  ];
+}
+
+function getLegacyKeyCode(binding) {
+  if (!binding) return null;
+  if (Number.isInteger(binding.keyCode)) return binding.keyCode;
+  if (typeof binding.key === "number" && Number.isInteger(binding.key)) {
+    return binding.key;
+  }
+  return null;
+}
+
+function normalizeBindingKey(key) {
+  if (typeof key !== "string" || key.length === 0) return null;
+  if (key === "Spacebar") return " ";
+  if (key === "Esc") return "Escape";
+  if (key.length === 1 && /[a-z]/i.test(key)) return key.toUpperCase();
+  return key;
+}
+
+function legacyKeyCodeToBinding(keyCode) {
+  if (!Number.isInteger(keyCode)) return null;
+  var key = keyCodeToEventKey[keyCode];
+  if (!key && keyCode >= 48 && keyCode <= 57) {
+    key = String.fromCharCode(keyCode);
+  }
+  if (!key && keyCode >= 65 && keyCode <= 90) {
+    key = String.fromCharCode(keyCode);
+  }
+  return {
+    key: normalizeBindingKey(key),
+    keyCode: keyCode,
+    code: null,
+    disabled: false
+  };
+}
+
+function normalizeStoredBinding(binding, fallbackKeyCode) {
+  var fallbackBinding = legacyKeyCodeToBinding(fallbackKeyCode);
+  if (!binding) return fallbackBinding;
+
+  if (
+    binding.disabled === true ||
+    (binding.key === null &&
+      binding.keyCode === null &&
+      binding.code === null)
+  ) {
+    return {
+      action: binding.action,
+      key: null,
+      keyCode: null,
+      code: null,
+      disabled: true,
+      value: Number(binding.value),
+      force: String(binding.force) === "true" ? "true" : "false",
+      predefined: Boolean(binding.predefined)
+    };
+  }
+
+  var normalized = {
+    action: binding.action,
+    key: null,
+    keyCode: null,
+    code:
+      typeof binding.code === "string" && binding.code.length > 0
+        ? binding.code
+        : null,
+    disabled: false,
+    value: Number(binding.value),
+    force: String(binding.force) === "true" ? "true" : "false",
+    predefined: Boolean(binding.predefined)
+  };
+
+  if (typeof binding.key === "string") {
+    normalized.key = normalizeBindingKey(binding.key);
+  }
+
+  var legacyKeyCode = getLegacyKeyCode(binding);
+  if (Number.isInteger(legacyKeyCode)) {
+    var legacyBinding = legacyKeyCodeToBinding(legacyKeyCode);
+    if (legacyBinding) {
+      normalized.key = normalized.key || legacyBinding.key;
+      normalized.keyCode = legacyKeyCode;
+    }
+  }
+
+  if (Number.isInteger(binding.keyCode)) {
+    normalized.keyCode = binding.keyCode;
+  }
+
+  if (!normalized.key && fallbackBinding) {
+    normalized.key = fallbackBinding.key;
+    if (normalized.keyCode === null) normalized.keyCode = fallbackBinding.keyCode;
+  }
+
+  if (!normalized.key && !normalized.code && normalized.keyCode === null) {
+    return null;
+  }
+
+  return normalized;
+}
+
+function isValidSpeed(speed) {
+  return !isNaN(speed) && speed >= MIN_SPEED && speed <= MAX_SPEED;
+}
+
+function sanitizeSpeed(speed, fallback) {
+  var numericSpeed = Number(speed);
+  return isValidSpeed(numericSpeed) ? numericSpeed : fallback;
+}
+
+function getVideoSourceKey(video) {
+  return (video && (video.currentSrc || video.src)) || "unknown_src";
+}
+
+function getControllerTargetSpeed(video) {
+  if (!video || !video.vsc) return null;
+  return isValidSpeed(video.vsc.targetSpeed) ? video.vsc.targetSpeed : null;
+}
+
+function getRememberedSpeed(video) {
+  var sourceKey = getVideoSourceKey(video);
+  if (sourceKey !== "unknown_src") {
+    var videoSpeed = tc.settings.speeds[sourceKey];
+    if (isValidSpeed(videoSpeed)) return videoSpeed;
+  }
+  if (tc.settings.forceLastSavedSpeed && isValidSpeed(tc.settings.lastSpeed)) {
+    return tc.settings.lastSpeed;
+  }
+  if (tc.settings.rememberSpeed && isValidSpeed(tc.settings.lastSpeed)) {
+    return tc.settings.lastSpeed;
+  }
+  return null;
+}
+
+function getDesiredSpeed(video) {
+  return getControllerTargetSpeed(video) || getRememberedSpeed(video) || 1.0;
+}
+
+function resolveTargetSpeed(video) {
+  return getDesiredSpeed(video);
+}
+
+function extendSpeedRestoreWindow(video, duration) {
+  if (!video || !video.vsc) return;
+
+  var restoreDuration = Number(duration) || 1500;
+  var restoreUntil = Date.now() + restoreDuration;
+  var currentUntil = Number(video.vsc.speedRestoreUntil) || 0;
+
+  video.vsc.speedRestoreUntil = Math.max(currentUntil, restoreUntil);
+}
+
+function scheduleSpeedRestore(video, desiredSpeed, reason) {
+  if (!video || !video.vsc || !isValidSpeed(desiredSpeed)) return;
+
+  if (video.vsc.restoreSpeedTimer) {
+    clearTimeout(video.vsc.restoreSpeedTimer);
+  }
+
+  video.vsc.restoreSpeedTimer = setTimeout(function () {
+    if (!video.vsc) return;
+
+    if (Math.abs(video.playbackRate - desiredSpeed) > 0.01) {
+      log(
+        `Restoring playbackRate to ${desiredSpeed.toFixed(2)} after ${reason}`,
+        4
+      );
+      setSpeed(video, desiredSpeed, false, false);
+    }
+
+    if (video.vsc) {
+      video.vsc.restoreSpeedTimer = null;
+    }
+  }, 0);
+}
+
+function rememberPendingRateChange(video, speed) {
+  if (!video || !video.vsc || !isValidSpeed(speed)) return;
+
+  video.vsc.pendingRateChange = {
+    speed: Number(speed),
+    expiresAt: Date.now() + 1000
+  };
+}
+
+function takePendingRateChange(video, currentSpeed) {
+  if (!video || !video.vsc || !video.vsc.pendingRateChange) return null;
+
+  var pendingRateChange = video.vsc.pendingRateChange;
+  if (
+    !isValidSpeed(pendingRateChange.speed) ||
+    pendingRateChange.expiresAt <= Date.now()
+  ) {
+    video.vsc.pendingRateChange = null;
+    return null;
+  }
+
+  if (Math.abs(Number(pendingRateChange.speed) - currentSpeed) > 0.01) {
+    return null;
+  }
+
+  video.vsc.pendingRateChange = null;
+  return pendingRateChange;
+}
+
+function matchesKeyBinding(binding, event) {
+  if (!binding || binding.disabled) return false;
+
+  var normalizedEventKey = normalizeBindingKey(event.key);
+  if (binding.key && normalizedEventKey) {
+    return binding.key === normalizedEventKey;
+  }
+
+  if (binding.code && event.code) {
+    return binding.code === event.code;
+  }
+
+  var legacyKeyCode = getLegacyKeyCode(binding);
+  return Number.isInteger(legacyKeyCode) && legacyKeyCode === event.keyCode;
+}
+
+function mediaSelector() {
+  return tc.settings.audioBoolean ? "video,audio" : "video";
+}
+
+function isMediaElement(node) {
+  return (
+    node &&
+    node.nodeType === Node.ELEMENT_NODE &&
+    (node.nodeName === "VIDEO" ||
+      (node.nodeName === "AUDIO" && tc.settings.audioBoolean))
+  );
+}
+
+function hasUsableMediaSource(node) {
+  if (!isMediaElement(node) || !node.isConnected) return false;
+  if (node.currentSrc || node.src || node.srcObject) return true;
+  if (typeof node.readyState === "number" && node.readyState > 0) return true;
+  if (
+    typeof node.networkState === "number" &&
+    typeof HTMLMediaElement !== "undefined" &&
+    (node.networkState === HTMLMediaElement.NETWORK_IDLE ||
+      node.networkState === HTMLMediaElement.NETWORK_LOADING)
+  ) {
+    return true;
+  }
+
+  if (node.querySelectorAll) {
+    return Array.from(node.querySelectorAll("source[src]")).some(function (
+      source
+    ) {
+      var src = source.getAttribute("src");
+      return typeof src === "string" && src.trim().length > 0;
+    });
+  }
+
+  return false;
+}
+
+function ensureController(node, parent) {
+  if (!isMediaElement(node) || node.vsc) return node && node.vsc;
+  if (!hasUsableMediaSource(node)) {
+    log(
+      `Deferring controller creation for ${node.tagName}: no usable source yet`,
+      5
+    );
+    return null;
+  }
+  log(
+    `Creating controller for ${node.tagName}: ${node.src || node.currentSrc || "no src"}`,
+    4
+  );
+  node.vsc = new tc.videoController(
+    node,
+    parent || node.parentElement || node.parentNode
+  );
+  return node.vsc;
+}
+
+function removeController(node) {
+  if (node && node.vsc) node.vsc.remove();
+}
+
+function scanNodeForMedia(node, parent, added) {
+  if (!node || typeof node === "function") return;
+
+  if (node.nodeType === Node.DOCUMENT_NODE) {
+    scanNodeForMedia(node.body || node.documentElement, node.body, added);
+    return;
+  }
+
+  if (
+    node.nodeType !== Node.ELEMENT_NODE &&
+    node.nodeType !== Node.DOCUMENT_FRAGMENT_NODE
+  ) {
+    return;
+  }
+
+  var ownerDocument = node.ownerDocument || document;
+  if (!added && ownerDocument.body && ownerDocument.body.contains(node)) return;
+
+  if (isMediaElement(node)) {
+    if (added) ensureController(node, parent);
+    else removeController(node);
+  }
+
+  if (node.children) {
+    Array.from(node.children).forEach(function (child) {
+      scanNodeForMedia(child, child.parentNode || parent, added);
+    });
+  }
+
+  if (node.shadowRoot) {
+    observeRoot(node.shadowRoot);
+    scanNodeForMedia(node.shadowRoot, node, added);
+  }
+}
+
+function getScanNodeForRoot(root) {
+  if (!root) return null;
+  if (root.nodeType === Node.DOCUMENT_NODE) {
+    return root.body || root.documentElement;
+  }
+  return root;
+}
+
+function scanRootForMedia(root) {
+  var scanRoot = getScanNodeForRoot(root);
+  if (!scanRoot) return;
+  scanNodeForMedia(scanRoot, root.host || scanRoot.parentNode || scanRoot, true);
+  if (root.nodeType === Node.DOCUMENT_NODE) {
+    attachIframeListeners(root);
+  }
+}
+
+function observeRoot(root) {
+  if (!root || vscObservedRoots.has(root)) return;
+  vscObservedRoots.add(root);
+  setupListener(root);
+  attachMutationObserver(root);
+  attachMediaDetectionListeners(root);
+  scanRootForMedia(root);
+}
+
+function patchAttachShadow() {
+  if (
+    window.vscAttachShadowPatched ||
+    typeof Element === "undefined" ||
+    typeof Element.prototype.attachShadow !== "function"
+  ) {
+    return;
+  }
+
+  var originalAttachShadow = Element.prototype.attachShadow;
+  Element.prototype.attachShadow = function () {
+    var shadowRoot = originalAttachShadow.apply(this, arguments);
+    try {
+      if (shadowRoot) {
+        observeRoot(shadowRoot);
+      }
+    } catch (error) {
+      log(`Unable to observe shadow root: ${error.message}`, 3);
+    }
+    return shadowRoot;
+  };
+  window.vscAttachShadowPatched = true;
+}
+
 /* Log levels */
 function log(message, level) {
   verbosity = tc.settings.logLevel;
@@ -47,51 +527,16 @@ function log(message, level) {
 }
 
 chrome.storage.sync.get(tc.settings, function (storage) {
-  // 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
-    });
+  var storedBindings = Array.isArray(storage.keyBindings)
+    ? storage.keyBindings
+    : [];
+
+  tc.settings.keyBindings = storedBindings
+    .map((binding) => normalizeStoredBinding(binding))
+    .filter(Boolean);
+
+  if (tc.settings.keyBindings.length === 0) {
+    tc.settings.keyBindings = defaultKeyBindings(storage);
     tc.settings.version = "0.5.3";
     chrome.storage.sync.set({
       keyBindings: tc.settings.keyBindings,
@@ -107,6 +552,13 @@ chrome.storage.sync.get(tc.settings, function (storage) {
     });
   }
   tc.settings.lastSpeed = Number(storage.lastSpeed);
+  if (!isValidSpeed(tc.settings.lastSpeed) && tc.settings.lastSpeed !== 1.0) {
+    log(`Invalid lastSpeed detected: ${storage.lastSpeed}, resetting to 1.0`, 3);
+    tc.settings.lastSpeed = 1.0;
+    chrome.storage.sync.set({ lastSpeed: 1.0 });
+  } else if (!isValidSpeed(tc.settings.lastSpeed)) {
+    tc.settings.lastSpeed = 1.0;
+  }
   tc.settings.displayKeyCode = Number(storage.displayKeyCode);
   tc.settings.rememberSpeed = Boolean(storage.rememberSpeed);
   tc.settings.forceLastSavedSpeed = Boolean(storage.forceLastSavedSpeed);
@@ -120,19 +572,43 @@ chrome.storage.sync.get(tc.settings, function (storage) {
       ? 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: Number(storage.displayKeyCode) || 86,
-      value: 0,
-      force: false,
-      predefined: true
-    });
+    tc.settings.keyBindings.push(
+      createDefaultBinding(
+        "display",
+        "V",
+        Number(storage.displayKeyCode) || 86,
+        0
+      )
+    );
+    chrome.storage.sync.set({ keyBindings: tc.settings.keyBindings });
+  }
+  patchAttachShadow();
+  // 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);
+          initializeWhenReady(document, true);
+
+          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);
 });
@@ -156,37 +632,79 @@ function defineVideoController() {
     target.vsc = this;
     this.video = target;
     this.parent = target.parentElement || parent;
-    this.nudgeIntervalId = null;
-    let storedSpeed = tc.settings.speeds[target.currentSrc];
-    if (!tc.settings.rememberSpeed) {
-      if (!storedSpeed) {
-        storedSpeed = 1.0;
-      }
+    this.nudgeAnimationId = null;
+    this.restoreSpeedTimer = null;
+    this.pendingRateChange = null;
+    this.speedRestoreUntil = 0;
+
+    log(`Creating video controller for ${target.tagName} with src: ${target.src || target.currentSrc || 'none'}`, 4);
+
+    let storedSpeed = sanitizeSpeed(resolveTargetSpeed(target), 1.0);
+    this.targetSpeed = storedSpeed;
+    if (!tc.settings.rememberSpeed && !tc.settings.forceLastSavedSpeed) {
       setKeyBindings("reset", getKeyBindings("fast"));
-    } else {
-      storedSpeed = tc.settings.lastSpeed;
-    }
-    if (tc.settings.forceLastSavedSpeed) {
-      storedSpeed = tc.settings.lastSpeed;
     }
+
+    log("Explicitly setting playbackRate to: " + storedSpeed, 5);
     target.playbackRate = storedSpeed;
+
     this.div = this.initializeControls();
+
+    if (!this.div) {
+      log("ERROR: Failed to create controller div!", 2);
+      return;
+    }
+
+    log(`Controller created and attached to DOM. Hidden: ${this.div.classList.contains('vsc-hidden')}`, 4);
+
     var mediaEventAction = function (event) {
-      let storedSpeed = tc.settings.speeds[event.target.currentSrc];
-      if (!tc.settings.rememberSpeed) {
-        if (!storedSpeed) {
-          storedSpeed = 1.0;
+      if (event.type === "play") {
+        extendSpeedRestoreWindow(event.target);
+
+        if (!tc.settings.rememberSpeed && !tc.settings.forceLastSavedSpeed) {
+          setKeyBindings("reset", getKeyBindings("fast"));
         }
-        setKeyBindings("reset", getKeyBindings("fast"));
-      } else {
-        storedSpeed = tc.settings.lastSpeed;
-      }
-      if (tc.settings.forceLastSavedSpeed) storedSpeed = tc.settings.lastSpeed;
-      setSpeed(event.target, storedSpeed);
-      if (event.type === "play") this.startSubtitleNudge();
-      else if (event.type === "pause" || event.type === "ended")
+
+        var playSpeed = sanitizeSpeed(resolveTargetSpeed(event.target), 1.0);
+        if (Math.abs(event.target.playbackRate - playSpeed) > 0.01) {
+          log("Play event: setting playbackRate to: " + playSpeed, 4);
+          setSpeed(event.target, playSpeed, false, false);
+        } else if (playSpeed === 1.0 || event.target.paused) {
+          this.stopSubtitleNudge();
+        } else {
+          this.startSubtitleNudge();
+        }
+      } else if (event.type === "pause") {
+        extendSpeedRestoreWindow(event.target);
         this.stopSubtitleNudge();
+        tc.isNudging = false;
+      } else if (event.type === "seeking") {
+        extendSpeedRestoreWindow(event.target);
+      } else if (event.type === "ended") {
+        this.speedRestoreUntil = 0;
+        this.stopSubtitleNudge();
+        tc.isNudging = false;
+      } else if (event.type === "seeked") {
+        extendSpeedRestoreWindow(event.target);
+        var expectedSpeed = sanitizeSpeed(resolveTargetSpeed(event.target), 1.0);
+        var currentSpeed = event.target.playbackRate;
+
+        if (
+          Math.abs(currentSpeed - expectedSpeed) > 0.01
+        ) {
+          log(
+            `Seeked: speed changed from ${expectedSpeed} to ${currentSpeed}, restoring`,
+            4
+          );
+          setSpeed(event.target, expectedSpeed, false, false);
+        }
+
+        if (isUserSeek) {
+          isUserSeek = false;
+        }
+      }
     };
+
     target.addEventListener(
       "play",
       (this.handlePlay = mediaEventAction.bind(this))
@@ -195,6 +713,10 @@ function defineVideoController() {
       "pause",
       (this.handlePause = mediaEventAction.bind(this))
     );
+    target.addEventListener(
+      "seeking",
+      (this.handleSeeking = mediaEventAction.bind(this))
+    );
     target.addEventListener(
       "ended",
       (this.handleEnded = mediaEventAction.bind(this))
@@ -203,6 +725,7 @@ function defineVideoController() {
       "seeked",
       (this.handleSeek = mediaEventAction.bind(this))
     );
+
     var srcObserver = new MutationObserver((mutations) => {
       mutations.forEach((mutation) => {
         if (
@@ -210,6 +733,7 @@ function defineVideoController() {
           (mutation.attributeName === "src" ||
             mutation.attributeName === "currentSrc")
         ) {
+          log("mutation of A/V element", 5);
           if (this.div) {
             this.stopSubtitleNudge();
             if (!mutation.target.src && !mutation.target.currentSrc) {
@@ -222,6 +746,7 @@ function defineVideoController() {
         }
       });
     });
+    this.srcObserver = srcObserver;
     srcObserver.observe(target, { attributeFilter: ["src", "currentSrc"] });
     if (!target.paused && target.playbackRate !== 1.0)
       this.startSubtitleNudge();
@@ -230,107 +755,130 @@ function defineVideoController() {
   tc.videoController.prototype.remove = function () {
     this.stopSubtitleNudge();
     if (this.div) this.div.remove();
+    if (this.restoreSpeedTimer) clearTimeout(this.restoreSpeedTimer);
     if (this.video) {
       this.video.removeEventListener("play", this.handlePlay);
       this.video.removeEventListener("pause", this.handlePause);
+      this.video.removeEventListener("seeking", this.handleSeeking);
       this.video.removeEventListener("ended", this.handleEnded);
       this.video.removeEventListener("seeked", this.handleSeek);
       delete this.video.vsc;
     }
+    if (this.srcObserver) this.srcObserver.disconnect();
     let idx = tc.mediaElements.indexOf(this.video);
     if (idx != -1) tc.mediaElements.splice(idx, 1);
   };
 
-  // MODIFIED: Using your debug-enhanced startSubtitleNudge function
   tc.videoController.prototype.startSubtitleNudge = function () {
-    console.log("[VSC DEBUG] startSubtitleNudge called");
-    console.log("[VSC DEBUG] location.hostname:", location.hostname);
-    console.log(
-      "[VSC DEBUG] enableSubtitleNudge:",
-      tc.settings.enableSubtitleNudge
-    );
-    console.log("[VSC DEBUG] video element:", this.video);
-    console.log(
-      "[VSC DEBUG] video src:",
-      this.video ? this.video.src : "no video"
-    );
-    console.log(
-      "[VSC DEBUG] video currentSrc:",
-      this.video ? this.video.currentSrc : "no video"
-    );
-    console.log(
-      "[VSC DEBUG] video paused:",
-      this.video ? this.video.paused : "no video"
-    );
-    console.log(
-      "[VSC DEBUG] video playbackRate:",
-      this.video ? this.video.playbackRate : "no video"
-    );
     const isYouTube =
       (this.video &&
         this.video.currentSrc &&
         this.video.currentSrc.includes("googlevideo.com")) ||
       location.hostname.includes("youtube.com");
-    if (!isYouTube) return;
     if (
+      !isYouTube ||
       !tc.settings.enableSubtitleNudge ||
-      this.nudgeIntervalId !== null ||
-      !this.video
+      this.nudgeAnimationId !== null ||
+      !this.video ||
+      this.video.paused ||
+      this.video.playbackRate === 1.0
     ) {
-      console.log("[VSC DEBUG] Nudge blocked - reasons:", {
-        enableSubtitleNudge: tc.settings.enableSubtitleNudge,
-        nudgeIntervalId: this.nudgeIntervalId,
-        hasVideo: !!this.video
-      });
       return;
     }
-    if (this.video.paused || this.video.playbackRate === 1.0) {
-      console.log("[VSC DEBUG] Nudge stopped - video paused or 1.0x speed");
-      this.stopSubtitleNudge();
-      return;
-    }
-    console.log("[VSC DEBUG] Starting nudge interval");
-    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
-      ) {
+
+    // 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;
       }
-      const currentRate = this.video.playbackRate;
-      const nudgeAmount = tc.settings.subtitleNudgeAmount;
+
+      // 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;
-      this.video.playbackRate = currentRate + nudgeAmount;
-      requestAnimationFrame(() => {
-        if (
-          this.video &&
-          Math.abs(this.video.playbackRate - (currentRate + nudgeAmount)) <
-            nudgeAmount * 1.5
-        ) {
-          this.video.playbackRate = currentRate;
+
+      // 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;
       });
-    }, tc.settings.subtitleNudgeInterval);
+
+      // 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.nudgeIntervalId !== null) {
+    if (this.nudgeAnimationId !== null) {
+      clearTimeout(this.nudgeAnimationId);
+      this.nudgeAnimationId = null;
       log(`Nudge: Stopping.`, 5);
-      clearInterval(this.nudgeIntervalId);
-      this.nudgeIntervalId = null;
     }
+    // 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 () {
     const doc = this.video.ownerDocument;
     const speed = this.video.playbackRate.toFixed(2);
-    var top = Math.max(this.video.offsetTop, 0) + "px",
-      left = Math.max(this.video.offsetLeft, 0) + "px";
+    var top = "0px",
+      left = "0px";
     var wrapper = doc.createElement("div");
     wrapper.classList.add("vsc-controller");
     if (!this.video.src && !this.video.currentSrc)
@@ -345,8 +893,7 @@ function defineVideoController() {
         runAction(
           e.target.dataset["action"],
           getKeyBindings(e.target.dataset["action"], "value"),
-          e,
-          this.video
+          e
         );
         e.stopPropagation();
       },
@@ -359,8 +906,7 @@ function defineVideoController() {
           runAction(
             e.target.dataset["action"],
             getKeyBindings(e.target.dataset["action"]),
-            e,
-            this.video
+            e
           );
           e.stopPropagation();
         },
@@ -376,32 +922,49 @@ function defineVideoController() {
     var fragment = doc.createDocumentFragment();
     fragment.appendChild(wrapper);
     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;
     }
-    switch (true) {
-      case location.hostname == "www.amazon.com":
-      case location.hostname == "www.reddit.com":
-      case /hbogo\./.test(location.hostname):
-        parentEl.parentElement.insertBefore(fragment, parentEl);
-        break;
-      case location.hostname == "www.facebook.com":
-        let p =
-          parentEl.parentElement.parentElement.parentElement.parentElement
-            .parentElement.parentElement.parentElement;
-        if (p && p.firstChild) p.insertBefore(fragment, p.firstChild);
-        else parentEl.insertBefore(fragment, parentEl.firstChild);
-        break;
-      case location.hostname == "tv.apple.com":
-        const r = parentEl.getRootNode();
-        const s = r && r.querySelector ? r.querySelector(".scrim") : null;
-        if (s) s.prepend(fragment);
-        else parentEl.insertBefore(fragment, pEl.firstChild);
-        break;
-      default:
-        parentEl.insertBefore(fragment, parentEl.firstChild);
+
+    try {
+      switch (true) {
+        case location.hostname == "www.amazon.com":
+        case location.hostname == "www.reddit.com":
+        case /hbogo\./.test(location.hostname):
+          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 =
+            parentEl.parentElement.parentElement.parentElement.parentElement
+              .parentElement.parentElement.parentElement;
+          if (p && p.firstChild) p.insertBefore(fragment, p.firstChild);
+          else parentEl.insertBefore(fragment, parentEl.firstChild);
+          break;
+        case location.hostname == "tv.apple.com":
+          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 parentEl.insertBefore(fragment, parentEl.firstChild);
+          break;
+        default:
+          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;
   };
 }
@@ -432,70 +995,133 @@ function isBlacklisted() {
   if (b) log(`Page ${location.href} blacklisted.`, 4);
   return b;
 }
-var coolDown = false;
-function refreshCoolDown() {
-  if (coolDown) clearTimeout(coolDown);
-  coolDown = setTimeout(function () {
-    coolDown = false;
-  }, 1000);
+
+function shouldPreserveDesiredSpeed(video, speed) {
+  if (!video || !video.vsc) return false;
+  var desiredSpeed = getDesiredSpeed(video);
+  if (!isValidSpeed(desiredSpeed) || Math.abs(speed - desiredSpeed) <= 0.01) {
+    return false;
+  }
+
+  return (
+    video.paused === true ||
+    (typeof video.vsc.speedRestoreUntil === "number" &&
+      video.vsc.speedRestoreUntil > Date.now())
+  );
 }
 
-function setupListener() {
-  if (document.vscRateListenerAttached) return;
-  function updateSpeedFromEvent(video, fromUserInput = false) {
+function setupListener(root) {
+  root = root || document;
+  if (root.vscRateListenerAttached) return;
+  function updateSpeedFromEvent(video) {
     if (!video.vsc || !video.vsc.speedIndicator) return;
     var speed = Number(video.playbackRate.toFixed(2));
     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 }, () => {});
-    if (fromUserInput) {
-      runAction("blink", getKeyBindings("blink", "value") || 1000, null, video);
+    video.vsc.targetSpeed = speed;
+    var sourceKey = getVideoSourceKey(video);
+    if (sourceKey !== "unknown_src") {
+      tc.settings.speeds[sourceKey] = speed;
     }
+    tc.settings.lastSpeed = speed;
+    chrome.storage.sync.set({ lastSpeed: speed }, () => { });
     if (video.vsc) {
       if (speed === 1.0 || video.paused) video.vsc.stopSubtitleNudge();
       else video.vsc.startSubtitleNudge();
     }
   }
-  document.addEventListener(
+  root.addEventListener(
     "ratechange",
     function (event) {
       if (tc.isNudging) return;
-      if (coolDown) {
-        event.stopImmediatePropagation();
-        return;
-      }
       var video = event.target;
       if (!video || typeof video.playbackRate === "undefined" || !video.vsc)
         return;
       if (tc.settings.forceLastSavedSpeed) {
         if (event.detail && event.detail.origin === "videoSpeed") {
           video.playbackRate = event.detail.speed;
-          updateSpeedFromEvent(video, event.detail.fromUserInput === true);
+          updateSpeedFromEvent(video);
         } else {
-          video.playbackRate = tc.settings.lastSpeed;
+          video.playbackRate = sanitizeSpeed(tc.settings.lastSpeed, 1.0);
         }
         event.stopImmediatePropagation();
       } else {
-        updateSpeedFromEvent(video, video.vscIsDirectlySettingRate === true);
-        if (video.vscIsDirectlySettingRate)
-          delete video.vscIsDirectlySettingRate;
+        var currentSpeed = Number(video.playbackRate.toFixed(2));
+        var desiredSpeed = getDesiredSpeed(video);
+        var pendingRateChange = takePendingRateChange(video, currentSpeed);
+
+        if (pendingRateChange) {
+          updateSpeedFromEvent(video);
+          return;
+        }
+
+        if (shouldPreserveDesiredSpeed(video, currentSpeed)) {
+          log(
+            `Ignoring external rate change to ${currentSpeed.toFixed(2)} while preserving ${desiredSpeed.toFixed(2)}`,
+            4
+          );
+          video.vsc.speedIndicator.textContent = desiredSpeed.toFixed(2);
+          scheduleSpeedRestore(video, desiredSpeed, "pause/play or seek");
+          return;
+        }
+
+        updateSpeedFromEvent(video);
       }
     },
     true
   );
-  document.vscRateListenerAttached = true;
+  root.vscRateListenerAttached = true;
 }
 
 var vscInitializedDocuments = new Set();
-function initializeWhenReady(doc) {
-  if (vscInitializedDocuments.has(doc) || !doc.body) return;
-  if (doc.readyState === "complete") {
-    initializeNow(doc);
+function clearPendingInitialization(doc) {
+  if (!doc || !doc.vscPendingInitializeHandler) return;
+
+  var handler = doc.vscPendingInitializeHandler;
+  doc.removeEventListener("DOMContentLoaded", handler);
+  doc.removeEventListener("readystatechange", handler);
+
+  if (doc.defaultView) {
+    doc.defaultView.removeEventListener("load", handler);
+  }
+
+  delete doc.vscPendingInitializeHandler;
+  doc.vscPendingForceReinit = false;
+}
+
+function tryInitializeDocument(doc, forceReinit) {
+  if (!doc) return false;
+  if ((!forceReinit && vscInitializedDocuments.has(doc)) || !doc.body) {
+    return false;
+  }
+
+  initializeNow(doc, forceReinit);
+  clearPendingInitialization(doc);
+  return true;
+}
+
+function initializeWhenReady(doc, forceReinit = false) {
+  if (!doc) return;
+  doc.vscPendingForceReinit = doc.vscPendingForceReinit === true || forceReinit;
+
+  if (tryInitializeDocument(doc, doc.vscPendingForceReinit)) {
+    return;
+  }
+
+  if (doc.vscPendingInitializeHandler) return;
+
+  var pendingInitializeHandler = function () {
+    tryInitializeDocument(doc, doc.vscPendingForceReinit === true);
+  };
+
+  doc.vscPendingInitializeHandler = pendingInitializeHandler;
+  doc.addEventListener("DOMContentLoaded", pendingInitializeHandler);
+  doc.addEventListener("readystatechange", pendingInitializeHandler);
+
+  if (doc.defaultView) {
+    doc.defaultView.addEventListener("load", pendingInitializeHandler);
+    doc.defaultView.setTimeout(pendingInitializeHandler, 0);
   } else {
-    doc.addEventListener("DOMContentLoaded", () => initializeNow(doc), {
-      once: true
-    });
+    setTimeout(pendingInitializeHandler, 0);
   }
 }
 function inIframe() {
@@ -505,47 +1131,18 @@ function inIframe() {
     return true;
   }
 }
-function getShadow(parent) {
-  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));
-        c = c.nextElementSibling;
-      } while (c);
-    }
-  }
-  gC(parent);
-  return r;
-}
 
-// MODIFIED: Replaced with your debug-enhanced initializeNow
-function initializeNow(doc) {
-  console.log(
-    "[VSC DEBUG] initializeNow called for:",
-    doc.location ? doc.location.hostname : "unknown doc"
-  );
-  if (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();
-
-  // Re-inserting original keydown listener logic from your codebase
-  var docs = Array(doc);
+function attachKeydownListeners(doc) {
+  var docs = [doc];
   try {
-    if (inIframe()) docs.push(window.top.document);
+    if (inIframe() && window.top.document !== doc) docs.push(window.top.document);
   } catch (e) {}
-  docs.forEach(function (d) {
-    if (d.vscKeydownListenerAttached) return; // Prevent duplicate listeners
-    d.addEventListener(
+
+  docs.forEach(function (keyDoc) {
+    if (keyDoc.vscKeydownListenerAttached) return;
+    keyDoc.addEventListener(
       "keydown",
       function (event) {
-        var keyCode = event.keyCode;
         if (
           !event.getModifierState ||
           event.getModifierState("Alt") ||
@@ -554,16 +1151,24 @@ function initializeNow(doc) {
           event.getModifierState("Meta") ||
           event.getModifierState("Hyper") ||
           event.getModifierState("OS")
-        )
+        ) {
           return;
+        }
+
         if (
           event.target.nodeName === "INPUT" ||
           event.target.nodeName === "TEXTAREA" ||
           event.target.isContentEditable
-        )
+        ) {
           return;
+        }
+
         if (!tc.mediaElements.length) return;
-        var item = tc.settings.keyBindings.find((item) => item.key === keyCode);
+
+        var item = tc.settings.keyBindings.find(function (binding) {
+          return matchesKeyBinding(binding, event);
+        });
+
         if (item) {
           runAction(item.action, item.value, event);
           if (item.force === "true") {
@@ -571,130 +1176,172 @@ function initializeNow(doc) {
             event.stopPropagation();
           }
         }
-        return false;
       },
       true
     );
-    d.vscKeydownListenerAttached = true;
+    keyDoc.vscKeydownListenerAttached = true;
+  });
+}
+
+function attachMutationObserver(root) {
+  if (root.vscMutationObserverAttached) return;
+
+  var pendingMutations = [];
+  var mutationProcessingScheduled = false;
+  var observer = new MutationObserver(function (mutations) {
+    pendingMutations.push(...mutations);
+    if (mutationProcessingScheduled) return;
+
+    mutationProcessingScheduled = true;
+    requestIdle(
+      function () {
+        var mutationsToProcess = pendingMutations.splice(0);
+        mutationProcessingScheduled = false;
+
+        mutationsToProcess.forEach(function (mutation) {
+          if (mutation.type === "childList") {
+            mutation.addedNodes.forEach(function (node) {
+              scanNodeForMedia(node, node.parentNode || mutation.target, true);
+            });
+            mutation.removedNodes.forEach(function (node) {
+              scanNodeForMedia(node, node.parentNode || mutation.target, false);
+            });
+            return;
+          }
+
+          if (mutation.type !== "attributes") return;
+
+          var target = mutation.target;
+          if (
+            isMediaElement(target) &&
+            (mutation.attributeName === "src" ||
+              mutation.attributeName === "currentSrc")
+          ) {
+            ensureController(target, target.parentElement || target.parentNode);
+            return;
+          }
+
+          if (
+            mutation.attributeName === "aria-hidden" &&
+            target.attributes["aria-hidden"] &&
+            target.attributes["aria-hidden"].value === "false"
+          ) {
+            scanRootForMedia(root);
+          }
+        });
+      },
+      { timeout: 1000 }
+    );
   });
 
-  // Original MutationObserver logic
-  if (!doc.vscMutationObserverAttached) {
-    const observer = new MutationObserver(function (mutations) {
-      requestIdleCallback(
-        (_) => {
-          mutations.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);
-                });
-                mutation.removedNodes.forEach(function (node) {
-                  if (typeof node === "function") return;
-                  checkForVideo(
-                    node,
-                    node.parentNode || mutation.target,
-                    false
-                  );
-                });
-                break;
-              case "attributes":
-                if (
-                  mutation.target.attributes["aria-hidden"] &&
-                  mutation.target.attributes["aria-hidden"].value == "false"
-                ) {
-                  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) node.vsc = new tc.videoController(node, parent);
-        } else {
-          if (node.vsc) node.vsc.remove();
-        }
-      } 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(root, {
+    attributeFilter: ["aria-hidden", "src", "currentSrc"],
+    childList: true,
+    subtree: true,
+    attributes: true
+  });
+
+  root.vscMutationObserverAttached = true;
+}
+
+function attachMediaDetectionListeners(root) {
+  if (root.vscMediaEventListenersAttached) return;
+
+  var handleDetectedMedia = function (event) {
+    var target = event.target;
+    if (!isMediaElement(target)) return;
+    ensureController(target, target.parentElement || target.parentNode);
+  };
+
+  [
+    "loadstart",
+    "loadeddata",
+    "loadedmetadata",
+    "canplay",
+    "playing",
+    "play"
+  ].forEach(function (eventName) {
+    root.addEventListener(eventName, handleDetectedMedia, true);
+  });
+  root.vscMediaEventListenersAttached = true;
+}
+
+function attachIframeListeners(doc) {
+  Array.from(doc.getElementsByTagName("iframe")).forEach(function (frame) {
+    if (!frame.vscLoadListenerAttached) {
+      frame.addEventListener("load", function () {
+        try {
+          if (frame.contentDocument) {
+            initializeWhenReady(frame.contentDocument, true);
+          }
+        } catch (e) {}
+      });
+      frame.vscLoadListenerAttached = true;
     }
-    observer.observe(doc, {
-      attributeFilter: ["aria-hidden"],
-      childList: true,
-      subtree: true
-    });
-    doc.vscMutationObserverAttached = true;
+
+    try {
+      if (frame.contentDocument) {
+        initializeWhenReady(frame.contentDocument);
+      }
+    } catch (e) {}
+  });
+}
+
+function attachNavigationListeners() {
+  if (window.vscNavigationListenersAttached) return;
+
+  var scheduleRescan = function () {
+    clearTimeout(window.vscNavigationRescanTimer);
+    window.vscNavigationRescanTimer = setTimeout(function () {
+      initializeWhenReady(document, true);
+    }, 300);
+  };
+
+  ["pushState", "replaceState"].forEach(function (method) {
+    if (typeof history[method] !== "function") return;
+    var original = history[method];
+    history[method] = function () {
+      var result = original.apply(this, arguments);
+      scheduleRescan();
+      return result;
+    };
+  });
+
+  window.addEventListener("popstate", scheduleRescan);
+  window.addEventListener("hashchange", scheduleRescan);
+  window.vscNavigationListenersAttached = true;
+}
+
+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();
+  attachKeydownListeners(doc);
+  attachNavigationListeners();
+  observeRoot(doc);
+
+  if (forceReinit) {
+    log("Force re-initialization requested", 4);
   }
 
-  const q = tc.settings.audioBoolean ? "video,audio" : "video";
-  const foundVideos = doc.querySelectorAll(q);
-  console.log(
-    "[VSC DEBUG] Found videos:",
-    foundVideos.length,
-    "in doc:",
-    doc.location ? doc.location.hostname : "unknown"
-  );
-  foundVideos.forEach((v) => {
-    if (!v.vsc) new tc.videoController(v, v.parentElement);
-  });
-
-  // Your enhanced iframe handling
-  Array.from(doc.getElementsByTagName("iframe")).forEach((f) => {
-    console.log("[VSC DEBUG] Found iframe:", f.src);
-    if (f.vscLoadListenerAttached) return; // Prevent attaching multiple load listeners
-    f.addEventListener("load", () => {
-      console.log("[VSC DEBUG] Iframe loaded, attempting to access");
-      try {
-        if (f.contentDocument) {
-          initializeWhenReady(f.contentDocument);
-        }
-      } catch (e) {
-        console.log(
-          "[VSC DEBUG] Still cannot access iframe after load:",
-          e.message
-        );
-      }
-    });
-    f.vscLoadListenerAttached = true;
-    try {
-      if (f.contentDocument) {
-        initializeWhenReady(f.contentDocument);
-      }
-    } catch (e) {
-      console.log("[VSC DEBUG] Error accessing iframe immediately:", e.message);
-    }
-  });
   vscInitializedDocuments.add(doc);
 }
 
-// MODIFIED: setSpeed now takes isUserKeyPress for blink logic
 function setSpeed(video, speed, isInitialCall = false, isUserKeyPress = false) {
   const numericSpeed = Number(speed);
-  if (isNaN(numericSpeed) || numericSpeed <= 0 || numericSpeed > 16) return;
+  
+  if (!isValidSpeed(numericSpeed)) {
+    log(
+      `Invalid speed rejected: ${speed}, must be between ${MIN_SPEED} and ${MAX_SPEED}`,
+      2
+    );
+    return;
+  }
+  
   if (!video || !video.vsc || !video.vsc.speedIndicator) return;
 
   log(
@@ -704,8 +1351,11 @@ function setSpeed(video, speed, isInitialCall = false, isUserKeyPress = false) {
   tc.settings.lastSpeed = numericSpeed;
   video.vsc.speedIndicator.textContent = numericSpeed.toFixed(2);
 
+  // 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", null, null, video); // Pass video to blink
+    runAction("blink", 1000, null, video); // Pass video to blink
   }
 
   if (tc.settings.forceLastSavedSpeed) {
@@ -720,24 +1370,24 @@ function setSpeed(video, speed, isInitialCall = false, isUserKeyPress = false) {
     );
   } else {
     if (Math.abs(video.playbackRate - numericSpeed) > 0.001) {
-      if (isUserKeyPress && !isInitialCall) {
-        video.vscIsDirectlySettingRate = true; // Set flag for ratechange listener
-      }
+      rememberPendingRateChange(video, numericSpeed);
       video.playbackRate = numericSpeed;
     }
   }
-  if (!isInitialCall) refreshCoolDown();
   if (video.vsc) {
     if (numericSpeed === 1.0 || video.paused) video.vsc.stopSubtitleNudge();
     else video.vsc.startSubtitleNudge();
   }
 }
 
-// MODIFIED: runAction is now context-aware and calls the new simpler resetSpeed
 function runAction(action, value, e) {
   log("runAction Begin", 5);
   var mediaTagsToProcess;
-  if (e && e.target && e.target.getRootNode) {
+  const specificVideo = arguments[3] || null;
+
+  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(
@@ -746,20 +1396,18 @@ function runAction(action, value, e) {
     const targetController = e.target.getRootNode().host;
     if (targetController) {
       // If it's a click on a controller, only use that one video
-      const specificVideo = tc.mediaElements.find(
+      const videoFromController = tc.mediaElements.find(
         (v) => v.vsc && v.vsc.div === targetController
       );
-      if (specificVideo) mediaTagsToProcess = [specificVideo];
+      if (videoFromController) mediaTagsToProcess = [videoFromController];
     }
   } else {
-    // No event context (e.g., internal blink call) or a passed specificVideo
-    const specificVideo = arguments[3] || null; // The optional 4th argument
-    if (specificVideo) mediaTagsToProcess = [specificVideo];
-    else mediaTagsToProcess = tc.mediaElements;
+    mediaTagsToProcess = tc.mediaElements;
   }
   if (mediaTagsToProcess.length === 0 && action !== "display") return;
 
   mediaTagsToProcess.forEach(function (v) {
+    if (!v.vsc) return; // Don't process videos without a controller
     var controller = v.vsc.div;
     const userDrivenActionsThatShowController = [
       "rewind",
@@ -781,53 +1429,74 @@ function runAction(action, value, e) {
     const numValue = parseFloat(value);
     switch (action) {
       case "rewind":
+        isUserSeek = true;
+        extendSpeedRestoreWindow(v);
         v.currentTime -= numValue;
         break;
       case "advance":
+        isUserSeek = true;
+        extendSpeedRestoreWindow(v);
         v.currentTime += numValue;
         break;
       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 < MIN_SPEED ? MIN_SPEED : v.playbackRate) + fasterStep;
+        newFasterSpeed = Math.round(newFasterSpeed * fasterPrecision) / fasterPrecision;
+        setSpeed(v, Math.min(newFasterSpeed, MAX_SPEED), 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, MIN_SPEED), false, true);
         break;
       case "reset":
-        resetSpeed(v, 1.0);
-        break; // Use new simpler resetSpeed
+        resetSpeed(v, 1.0, false); // Use enhanced resetSpeed
+        break;
       case "fast":
-        resetSpeed(v, numValue, true);
-        break; // Use new simpler resetSpeed
+        resetSpeed(v, numValue, true); // Use enhanced resetSpeed
+        break;
       case "display":
-        controller.classList.add("vsc-manual");
-        controller.classList.toggle("vsc-hidden");
+        if (controller.classList.contains("vsc-hidden")) {
+          controller.classList.remove("vsc-hidden");
+          controller.classList.add("vsc-manual");
+        } else {
+          controller.classList.add("vsc-hidden");
+          controller.classList.remove("vsc-manual");
+        }
         break;
       case "blink":
+        log(`Blink action: controller hidden=${controller.classList.contains("vsc-hidden")}, timeout=${controller.blinkTimeOut !== undefined}, duration=${numValue}`, 5);
+
         if (
           controller.classList.contains("vsc-hidden") ||
           controller.blinkTimeOut !== undefined
         ) {
-          clearTimeout(controller.blinkTimeOut);
+          var restoreHidden =
+            controller.restoreHiddenAfterBlink === true ||
+            controller.classList.contains("vsc-hidden");
+
+          if (controller.blinkTimeOut !== undefined) {
+            clearTimeout(controller.blinkTimeOut);
+          }
+
+          controller.restoreHiddenAfterBlink = restoreHidden;
           controller.classList.remove("vsc-hidden");
+          log(`Controller shown, setting timeout for ${numValue || 1000}ms`, 5);
+
           controller.blinkTimeOut = setTimeout(() => {
-            if (
-              !(
-                controller.classList.contains("vsc-manual") &&
-                !controller.classList.contains("vsc-hidden")
-              )
-            ) {
+            if (controller.restoreHiddenAfterBlink === true) {
               controller.classList.add("vsc-hidden");
+              log("Controller auto-hidden after blink timeout", 5);
+            } else {
+              log("Controller kept visible", 5);
             }
+            controller.restoreHiddenAfterBlink = false;
             controller.blinkTimeOut = undefined;
-          }, value || 1000);
+          }, numValue || 1000);
         }
         break;
       case "drag":
@@ -855,22 +1524,39 @@ function pause(v) {
   else v.pause();
 }
 
-// MODIFIED: Replaced with new, simpler resetSpeed function
 function resetSpeed(v, target, isFastKey = false) {
-  const fastSpeed = getKeyBindings("fast", "value") || 1.8;
+  const videoId = getVideoSourceKey(v);
+  const currentSpeed = v.playbackRate;
+
   if (isFastKey) {
-    // Called by 'fast' action
-    if (Math.abs(v.playbackRate - target) < 0.01) {
-      setSpeed(v, 1.0, false, true); // Toggle to 1.0
+    // 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, target, false, true); // Set to preferred speed
+      // Not at preferred speed, save current as toggle speed and go to preferred
+      lastToggleSpeed[videoId] = currentSpeed;
+      setSpeed(v, preferredSpeed, false, true);
     }
   } else {
-    // Called by 'reset' action
-    if (Math.abs(v.playbackRate - 1.0) < 0.01) {
-      setSpeed(v, fastSpeed, false, true); // Toggle to fast speed
+    // 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 {
-      setSpeed(v, 1.0, false, true); // Set to 1.0
+      // Not at 1.0, save current as toggle speed and go to 1.0
+      lastToggleSpeed[videoId] = currentSpeed;
+      setSpeed(v, resetSpeedValue, false, true);
     }
   }
 }
@@ -882,10 +1568,12 @@ function setMark(v) {
   v.vsc.mark = v.currentTime;
 }
 function jumpToMark(v) {
-  if (v.vsc && typeof v.vsc.mark === "number") v.currentTime = v.vsc.mark;
+  if (v.vsc && typeof v.vsc.mark === "number") {
+    extendSpeedRestoreWindow(v);
+    v.currentTime = v.vsc.mark;
+  }
 }
 function handleDrag(video, e) {
-  /* ... Same original logic ... */
   const c = video.vsc.div;
   const sC = c.shadowRoot.querySelector("#controller");
   var pE = c.parentElement;
@@ -915,14 +1603,26 @@ function handleDrag(video, e) {
   pE.addEventListener("mouseleave", eD);
   pE.addEventListener("mousemove", sD);
 }
-var timer = null;
-function showController(controller) {
-  /* ... Same original logic ... */
+function showController(controller, duration = 2000) {
   if (!controller || typeof controller.classList === "undefined") return;
-  controller.classList.add("vcs-show");
-  if (timer) clearTimeout(timer);
-  timer = setTimeout(function () {
+  var restoreHidden =
+    controller.restoreHiddenAfterShow === true ||
+    controller.classList.contains("vsc-hidden");
+
+  controller.restoreHiddenAfterShow = restoreHidden;
+  controller.classList.remove("vsc-hidden");
+  controller.classList.add("vsc-show");
+
+  if (controller.showTimeOut !== undefined) {
+    clearTimeout(controller.showTimeOut);
+  }
+
+  controller.showTimeOut = setTimeout(function () {
     controller.classList.remove("vsc-show");
-    timer = false;
-  }, 2000);
+    if (controller.restoreHiddenAfterShow === true) {
+      controller.classList.add("vsc-hidden");
+    }
+    controller.restoreHiddenAfterShow = false;
+    controller.showTimeOut = undefined;
+  }, duration);
 }

manifest.json

@@ -1,7 +1,7 @@
 {
   "name": "Video Speed Controller",
   "short_name": "videospeed",
-  "version": "1.1.3",
+  "version": "2.1.1",
   "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,
@@ -19,6 +20,11 @@ h1 {
   font-size: 1.5em;
   margin: 21px 0 13px;
 }
+.version {
+  margin: 0 0 12px;
+  color: #6b6b6b;
+  font-size: 0.95em;
+}
 h3 {
   font-size: 1.2em;
   margin-bottom: 0.8em;
@@ -110,3 +116,80 @@ 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;
+  }
+
+  .version {
+    color: #a8a8a8;
+  }
+
+  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;
+  }
+}

options.html

@@ -8,6 +8,7 @@
   <body>
     <header>
       <h1>Video Speed Controller</h1>
+      <div class="version">Version <span id="app-version"></span></div>
     </header>
 
     <section id="customs">

options.js

@@ -1,38 +1,9 @@
 var regStrip = /^[\r\t\f\v ]+|[\r\t\f\v ]+$/gm;
 
-var tcDefaults = {
-  speed: 1.0, // default:
-  displayKeyCode: 86, // default: V
-  rememberSpeed: false, // default: false
-  audioBoolean: false, // default: false
-  startHidden: false, // default: false
-  forceLastSavedSpeed: false, //default: false
-  enabled: true, // default enabled
-  controllerOpacity: 0.3, // default: 0.3
-  keyBindings: [
-    { action: "display", key: 86, value: 0, force: false, predefined: true }, // V
-    { action: "slower", key: 83, value: 0.1, force: false, predefined: true }, // S
-    { action: "faster", key: 68, value: 0.1, force: false, predefined: true }, // D
-    { action: "rewind", key: 90, value: 10, force: false, predefined: true }, // Z
-    { action: "advance", key: 88, value: 10, force: false, predefined: true }, // X
-    { action: "reset", key: 82, value: 1, force: false, predefined: true }, // R
-    { action: "fast", key: 71, value: 1.8, force: false, predefined: true } // G
-  ],
-  blacklist: `www.instagram.com
-    twitter.com
-    imgur.com
-    teams.microsoft.com
-  `.replace(regStrip, ""),
-  // ADDED: Nudge defaults
-  enableSubtitleNudge: true,
-  subtitleNudgeInterval: 25,
-  subtitleNudgeAmount: 0.001
-};
-
-var keyBindings = []; // This is populated during save/restore
+var keyBindings = [];
 
 var keyCodeAliases = {
-  /* ... same as your original ... */ 0: "null",
+  0: "null",
   null: "null",
   undefined: "null",
   32: "Space",
@@ -83,76 +54,347 @@ var keyCodeAliases = {
   173: "-"
 };
 
-function recordKeyPress(e) {
-  /* ... same as your original ... */
+var keyCodeToKey = {
+  32: " ",
+  37: "ArrowLeft",
+  38: "ArrowUp",
+  39: "ArrowRight",
+  40: "ArrowDown",
+  96: "0",
+  97: "1",
+  98: "2",
+  99: "3",
+  100: "4",
+  101: "5",
+  102: "6",
+  103: "7",
+  104: "8",
+  105: "9",
+  106: "*",
+  107: "+",
+  109: "-",
+  110: ".",
+  111: "/",
+  112: "F1",
+  113: "F2",
+  114: "F3",
+  115: "F4",
+  116: "F5",
+  117: "F6",
+  118: "F7",
+  119: "F8",
+  120: "F9",
+  121: "F10",
+  122: "F11",
+  123: "F12",
+  186: ";",
+  188: "<",
+  189: "-",
+  187: "+",
+  190: ">",
+  191: "/",
+  192: "~",
+  219: "[",
+  220: "\\",
+  221: "]",
+  222: "'",
+  59: ";",
+  61: "+",
+  173: "-"
+};
+
+var modifierKeys = new Set([
+  "Alt",
+  "AltGraph",
+  "Control",
+  "Fn",
+  "Hyper",
+  "Meta",
+  "OS",
+  "Shift"
+]);
+
+var displayKeyAliases = {
+  " ": "Space",
+  ArrowLeft: "Left",
+  ArrowUp: "Up",
+  ArrowRight: "Right",
+  ArrowDown: "Down"
+};
+
+function createDefaultBinding(action, key, keyCode, value) {
+  return {
+    action: action,
+    key: key,
+    keyCode: keyCode,
+    value: value,
+    force: false,
+    predefined: true
+  };
+}
+
+var tcDefaults = {
+  speed: 1.0,
+  lastSpeed: 1.0,
+  displayKeyCode: 86,
+  rememberSpeed: false,
+  audioBoolean: false,
+  startHidden: false,
+  forceLastSavedSpeed: false,
+  enabled: true,
+  controllerOpacity: 0.3,
+  keyBindings: [
+    createDefaultBinding("display", "V", 86, 0),
+    createDefaultBinding("slower", "S", 83, 0.1),
+    createDefaultBinding("faster", "D", 68, 0.1),
+    createDefaultBinding("rewind", "Z", 90, 10),
+    createDefaultBinding("advance", "X", 88, 10),
+    createDefaultBinding("reset", "R", 82, 1),
+    createDefaultBinding("fast", "G", 71, 1.8)
+  ],
+  blacklist: `www.instagram.com
+    twitter.com
+    imgur.com
+    teams.microsoft.com
+  `.replace(regStrip, ""),
+  enableSubtitleNudge: true,
+  subtitleNudgeInterval: 25,
+  subtitleNudgeAmount: 0.001
+};
+
+var customActionsNoValues = ["pause", "muted", "mark", "jump", "display"];
+
+function normalizeBindingKey(key) {
+  if (typeof key !== "string" || key.length === 0) return null;
+  if (key === "Spacebar") return " ";
+  if (key === "Esc") return "Escape";
+  if (key.length === 1 && /[a-z]/i.test(key)) return key.toUpperCase();
+  return key;
+}
+
+function getLegacyKeyCode(binding) {
+  if (!binding) return null;
+  if (Number.isInteger(binding.keyCode)) return binding.keyCode;
+  if (typeof binding.key === "number" && Number.isInteger(binding.key)) {
+    return binding.key;
+  }
+  return null;
+}
+
+function legacyKeyCodeToBinding(keyCode) {
+  if (!Number.isInteger(keyCode)) return null;
+  var normalizedKey = keyCodeToKey[keyCode];
+  if (!normalizedKey && keyCode >= 48 && keyCode <= 57) {
+    normalizedKey = String.fromCharCode(keyCode);
+  }
+  if (!normalizedKey && keyCode >= 65 && keyCode <= 90) {
+    normalizedKey = String.fromCharCode(keyCode);
+  }
+  return {
+    key: normalizeBindingKey(normalizedKey),
+    keyCode: keyCode,
+    code: null,
+    disabled: false
+  };
+}
+
+function createDisabledBinding() {
+  return {
+    key: null,
+    keyCode: null,
+    code: null,
+    disabled: true
+  };
+}
+
+function normalizeStoredBinding(binding, fallbackKeyCode) {
+  var fallbackBinding = legacyKeyCodeToBinding(fallbackKeyCode);
+  if (!binding) {
+    return fallbackBinding;
+  }
+
   if (
-    (e.keyCode >= 48 && e.keyCode <= 57) ||
-    (e.keyCode >= 65 && e.keyCode <= 90) ||
-    keyCodeAliases[e.keyCode]
+    binding.disabled === true ||
+    (binding.key === null &&
+      binding.keyCode === null &&
+      binding.code === null)
   ) {
-    e.target.value =
-      keyCodeAliases[e.keyCode] || String.fromCharCode(e.keyCode);
-    e.target.keyCode = e.keyCode;
-    e.preventDefault();
-    e.stopPropagation();
-  } else if (e.keyCode === 8) {
-    e.target.value = "";
-  } else if (e.keyCode === 27) {
-    e.target.value = "null";
-    e.target.keyCode = null;
+    return createDisabledBinding();
+  }
+
+  var normalized = {
+    key: null,
+    keyCode: null,
+    code:
+      typeof binding.code === "string" && binding.code.length > 0
+        ? binding.code
+        : null,
+    disabled: false
+  };
+
+  if (typeof binding.key === "string") {
+    normalized.key = normalizeBindingKey(binding.key);
+  }
+
+  var legacyKeyCode = getLegacyKeyCode(binding);
+  if (Number.isInteger(legacyKeyCode)) {
+    var legacyBinding = legacyKeyCodeToBinding(legacyKeyCode);
+    if (legacyBinding) {
+      normalized.key = normalized.key || legacyBinding.key;
+      normalized.keyCode = legacyKeyCode;
+    }
+  }
+
+  if (Number.isInteger(binding.keyCode)) {
+    normalized.keyCode = binding.keyCode;
+  }
+
+  if (!normalized.key && fallbackBinding) {
+    normalized.key = fallbackBinding.key;
+    if (normalized.keyCode === null) normalized.keyCode = fallbackBinding.keyCode;
+  }
+
+  if (!normalized.key && !normalized.code && normalized.keyCode === null) {
+    return null;
+  }
+
+  return normalized;
+}
+
+function getBindingLabel(binding) {
+  if (!binding) return "";
+  if (binding.disabled) return "null";
+  if (binding.key) {
+    return displayKeyAliases[binding.key] || binding.key;
+  }
+  var legacyKeyCode = getLegacyKeyCode(binding);
+  if (keyCodeAliases[legacyKeyCode]) return keyCodeAliases[legacyKeyCode];
+  if (Number.isInteger(legacyKeyCode)) return String.fromCharCode(legacyKeyCode);
+  return "";
+}
+
+function setShortcutInputBinding(input, binding) {
+  input.vscBinding = binding ? Object.assign({}, binding) : null;
+  input.keyCode =
+    binding && Number.isInteger(binding.keyCode) ? binding.keyCode : null;
+  input.value = getBindingLabel(binding);
+}
+
+function captureBindingFromEvent(event) {
+  var normalizedKey = normalizeBindingKey(event.key);
+  if (!normalizedKey || modifierKeys.has(normalizedKey)) return null;
+  return {
+    key: normalizedKey,
+    keyCode: Number.isInteger(event.keyCode) ? event.keyCode : null,
+    code: event.code || null,
+    disabled: false
+  };
+}
+
+function recordKeyPress(event) {
+  if (event.key === "Tab") return;
+
+  if (event.key === "Backspace") {
+    setShortcutInputBinding(event.target, null);
+    event.preventDefault();
+    event.stopPropagation();
+    return;
+  }
+
+  if (event.key === "Escape") {
+    setShortcutInputBinding(event.target, createDisabledBinding());
+    event.preventDefault();
+    event.stopPropagation();
+    return;
+  }
+
+  var binding = captureBindingFromEvent(event);
+  if (!binding) return;
+
+  setShortcutInputBinding(event.target, binding);
+  event.preventDefault();
+  event.stopPropagation();
+}
+
+function inputFilterNumbersOnly(event) {
+  var char = String.fromCharCode(event.keyCode);
+  if (
+    !/[\d\.]$/.test(char) ||
+    !/^\d+(\.\d*)?$/.test(event.target.value + char)
+  ) {
+    event.preventDefault();
+    event.stopPropagation();
   }
 }
-function inputFilterNumbersOnly(e) {
-  /* ... same as your original ... */
-  var char = String.fromCharCode(e.keyCode);
-  if (!/[\d\.]$/.test(char) || !/^\d+(\.\d*)?$/.test(e.target.value + char)) {
-    e.preventDefault();
-    e.stopPropagation();
+
+function inputFocus(event) {
+  event.target.value = "";
+}
+
+function inputBlur(event) {
+  setShortcutInputBinding(event.target, event.target.vscBinding || null);
+}
+
+function updateCustomShortcutInputText(inputItem, bindingOrKeyCode) {
+  if (
+    bindingOrKeyCode &&
+    typeof bindingOrKeyCode === "object" &&
+    !Array.isArray(bindingOrKeyCode)
+  ) {
+    setShortcutInputBinding(inputItem, bindingOrKeyCode);
+    return;
   }
+
+  setShortcutInputBinding(inputItem, legacyKeyCodeToBinding(bindingOrKeyCode));
 }
-function inputFocus(e) {
-  /* ... same as your original ... */ e.target.value = "";
-}
-function inputBlur(e) {
-  /* ... same as your original ... */ e.target.value =
-    keyCodeAliases[e.target.keyCode] || String.fromCharCode(e.target.keyCode);
-}
-// function updateShortcutInputText(inputId, keyCode) { /* ... same as your original ... */ } // Not directly used in provided options.js logic flow
-function updateCustomShortcutInputText(inputItem, keyCode) {
-  /* ... same as your original ... */ inputItem.value =
-    keyCodeAliases[keyCode] || String.fromCharCode(keyCode);
-  inputItem.keyCode = keyCode;
-}
-var customActionsNoValues = ["pause", "muted", "mark", "jump", "display"]; // Original
+
 function add_shortcut() {
-  /* ... same as your original ... */
   var html = `<select class="customDo"><option value="slower">Decrease speed</option><option value="faster">Increase speed</option><option value="rewind">Rewind</option><option value="advance">Advance</option><option value="reset">Reset speed</option><option value="fast">Preferred speed</option><option value="muted">Mute</option><option value="pause">Pause</option><option value="mark">Set marker</option><option value="jump">Jump to marker</option><option value="display">Show/hide controller</option></select><input class="customKey" type="text" placeholder="press a key"/><input class="customValue" type="text" placeholder="value (0.10)"/><select class="customForce"><option value="false">Do not disable website key bindings</option><option value="true">Disable website key bindings</option></select><button class="removeParent">X</button>`;
   var div = document.createElement("div");
   div.setAttribute("class", "row customs");
   div.innerHTML = html;
-  var customs_element = document.getElementById("customs");
-  customs_element.insertBefore(
+  var customsElement = document.getElementById("customs");
+  customsElement.insertBefore(
     div,
-    customs_element.children[customs_element.childElementCount - 1]
+    customsElement.children[customsElement.childElementCount - 1]
   );
 }
+
 function createKeyBindings(item) {
-  /* ... same as your original ... */
-  const action = item.querySelector(".customDo").value;
-  const key = item.querySelector(".customKey").keyCode;
-  const value = Number(item.querySelector(".customValue").value);
-  const force = item.querySelector(".customForce").value;
-  const predefined = !!item.id;
+  var action = item.querySelector(".customDo").value;
+  var input = item.querySelector(".customKey");
+  var valueInput = item.querySelector(".customValue");
+  var predefined = !!item.id;
+  var fallbackKeyCode =
+    predefined && action === "display"
+      ? tcDefaults.displayKeyCode
+      : undefined;
+  var binding = normalizeStoredBinding(input.vscBinding, fallbackKeyCode);
+
+  if (!binding) {
+    return {
+      valid: false,
+      message: "Error: Shortcut for " + action + " is invalid. Unable to save"
+    };
+  }
+
   keyBindings.push({
     action: action,
-    key: key,
-    value: value,
-    force: force,
+    key: binding.key,
+    keyCode: binding.keyCode,
+    code: binding.code,
+    disabled: binding.disabled === true,
+    value: customActionsNoValues.includes(action)
+      ? 0
+      : Number(valueInput.value),
+    force: item.querySelector(".customForce").value,
     predefined: predefined
   });
+
+  return { valid: true };
 }
+
 function validate() {
-  /* ... same as your original ... */
   var valid = true;
   var status = document.getElementById("status");
   document
@@ -174,45 +416,56 @@ function validate() {
   return valid;
 }
 
-// MODIFIED: save_options to include nudge settings
 function save_options() {
   if (validate() === false) return;
 
-  keyBindings = []; // Reset global keyBindings before populating from DOM
-  Array.from(document.querySelectorAll(".customs")).forEach((item) =>
-    createKeyBindings(item)
-  );
+  keyBindings = [];
+  var status = document.getElementById("status");
+  var saveError = null;
 
-  var s = {}; // Object to hold all settings to be saved
-  s.rememberSpeed = document.getElementById("rememberSpeed").checked;
-  s.forceLastSavedSpeed = document.getElementById(
-    "forceLastSavedSpeed"
-  ).checked;
-  s.audioBoolean = document.getElementById("audioBoolean").checked;
-  s.enabled = document.getElementById("enabled").checked;
-  s.startHidden = document.getElementById("startHidden").checked;
-  s.controllerOpacity = document.getElementById("controllerOpacity").value;
-  s.blacklist = document
+  Array.from(document.querySelectorAll(".customs")).forEach((item) => {
+    if (saveError) return;
+    var result = createKeyBindings(item);
+    if (!result.valid) saveError = result.message;
+  });
+
+  if (saveError) {
+    status.textContent = saveError;
+    return;
+  }
+
+  var settings = {};
+  settings.rememberSpeed = document.getElementById("rememberSpeed").checked;
+  settings.forceLastSavedSpeed =
+    document.getElementById("forceLastSavedSpeed").checked;
+  settings.audioBoolean = document.getElementById("audioBoolean").checked;
+  settings.enabled = document.getElementById("enabled").checked;
+  settings.startHidden = document.getElementById("startHidden").checked;
+  settings.controllerOpacity =
+    document.getElementById("controllerOpacity").value;
+  settings.blacklist = document
     .getElementById("blacklist")
     .value.replace(regStrip, "");
-  s.keyBindings = keyBindings; // Use the populated global keyBindings
-
-  // ADDED: Save nudge settings
-  s.enableSubtitleNudge = document.getElementById(
-    "enableSubtitleNudge"
-  ).checked;
-  s.subtitleNudgeInterval =
+  settings.keyBindings = keyBindings;
+  settings.enableSubtitleNudge =
+    document.getElementById("enableSubtitleNudge").checked;
+  settings.subtitleNudgeInterval =
     parseInt(document.getElementById("subtitleNudgeInterval").value, 10) ||
     tcDefaults.subtitleNudgeInterval;
-  s.subtitleNudgeAmount =
+  settings.subtitleNudgeAmount =
     parseFloat(document.getElementById("subtitleNudgeAmount").value) ||
     tcDefaults.subtitleNudgeAmount;
-  // Basic validation for nudge interval and amount
-  if (s.subtitleNudgeInterval < 10) s.subtitleNudgeInterval = 10; // Min 10ms
-  if (s.subtitleNudgeAmount <= 0 || s.subtitleNudgeAmount > 0.1)
-    s.subtitleNudgeAmount = tcDefaults.subtitleNudgeAmount;
 
-  // Remove old flat settings (original logic)
+  if (settings.subtitleNudgeInterval < 10) {
+    settings.subtitleNudgeInterval = 10;
+  }
+  if (
+    settings.subtitleNudgeAmount <= 0 ||
+    settings.subtitleNudgeAmount > 0.1
+  ) {
+    settings.subtitleNudgeAmount = tcDefaults.subtitleNudgeAmount;
+  }
+
   chrome.storage.sync.remove([
     "resetSpeed",
     "speedStep",
@@ -227,8 +480,7 @@ function save_options() {
     "fastKeyCode"
   ]);
 
-  chrome.storage.sync.set(s, function () {
-    var status = document.getElementById("status");
+  chrome.storage.sync.set(settings, function () {
     status.textContent = "Options saved";
     setTimeout(function () {
       status.textContent = "";
@@ -236,7 +488,18 @@ function save_options() {
   });
 }
 
-// MODIFIED: restore_options to include nudge settings
+function ensureDisplayBinding(storage) {
+  if (storage.keyBindings.some((item) => item.action === "display")) return;
+  storage.keyBindings.push(
+    createDefaultBinding(
+      "display",
+      "V",
+      storage.displayKeyCode || tcDefaults.displayKeyCode,
+      0
+    )
+  );
+}
+
 function restore_options() {
   chrome.storage.sync.get(tcDefaults, function (storage) {
     document.getElementById("rememberSpeed").checked = storage.rememberSpeed;
@@ -248,8 +511,6 @@ function restore_options() {
     document.getElementById("controllerOpacity").value =
       storage.controllerOpacity;
     document.getElementById("blacklist").value = storage.blacklist;
-
-    // ADDED: Restore nudge settings
     document.getElementById("enableSubtitleNudge").checked =
       storage.enableSubtitleNudge;
     document.getElementById("subtitleNudgeInterval").value =
@@ -257,78 +518,52 @@ function restore_options() {
     document.getElementById("subtitleNudgeAmount").value =
       storage.subtitleNudgeAmount;
 
-    // Original key binding restoration logic
-    if (
-      !Array.isArray(storage.keyBindings) ||
-      storage.keyBindings.length === 0
-    ) {
-      // If keyBindings missing or not an array, use defaults from tcDefaults
-      storage.keyBindings = tcDefaults.keyBindings;
-    }
-    if (storage.keyBindings.filter((x) => x.action == "display").length == 0) {
-      storage.keyBindings.push({
-        action: "display",
-        value: 0,
-        force: false,
-        predefined: true,
-        key: storage.displayKeyCode || tcDefaults.displayKeyCode
-      });
+    if (!Array.isArray(storage.keyBindings) || storage.keyBindings.length === 0) {
+      storage.keyBindings = tcDefaults.keyBindings.slice();
     }
 
-    // Clear existing dynamic shortcuts before restoring (if any were added by mistake)
-    const dynamicShortcuts = document.querySelectorAll(".customs:not([id])");
-    dynamicShortcuts.forEach((sc) => sc.remove());
+    ensureDisplayBinding(storage);
+
+    document.querySelectorAll(".customs:not([id])").forEach((row) => row.remove());
+
+    storage.keyBindings.forEach((item) => {
+      var fallbackKeyCode =
+        item.action === "display"
+          ? storage.displayKeyCode || tcDefaults.displayKeyCode
+          : undefined;
+      var normalizedBinding = normalizeStoredBinding(item, fallbackKeyCode);
+      var row;
 
-    for (let i in storage.keyBindings) {
-      var item = storage.keyBindings[i];
       if (item.predefined) {
-        if (item["action"] == "display" && typeof item["key"] === "undefined") {
-          item["key"] = storage.displayKeyCode || tcDefaults.displayKeyCode;
-        }
-        if (customActionsNoValues.includes(item["action"])) {
-          const el = document.querySelector(
-            "#" + item["action"] + " .customValue"
-          );
-          if (el) el.disabled = true;
-        }
-        const keyEl = document.querySelector(
-          "#" + item["action"] + " .customKey"
-        );
-        const valEl = document.querySelector(
-          "#" + item["action"] + " .customValue"
-        );
-        const forceEl = document.querySelector(
-          "#" + item["action"] + " .customForce"
-        );
-        if (keyEl) updateCustomShortcutInputText(keyEl, item["key"]);
-        if (valEl) valEl.value = item["value"];
-        if (forceEl) forceEl.value = String(item["force"]); // Ensure string for select value
+        row = document.getElementById(item.action);
       } else {
-        // Non-predefined, dynamically added shortcuts
         add_shortcut();
-        const dom = document.querySelector(".customs:last-of-type"); // Gets the newly added one
-        dom.querySelector(".customDo").value = item["action"];
-        if (customActionsNoValues.includes(item["action"])) {
-          dom.querySelector(".customValue").disabled = true;
-        }
-        updateCustomShortcutInputText(
-          dom.querySelector(".customKey"),
-          item["key"]
-        );
-        dom.querySelector(".customValue").value = item["value"];
-        dom.querySelector(".customForce").value = String(item["force"]);
+        row = document.querySelector(".customs:last-of-type");
+        row.querySelector(".customDo").value = item.action;
       }
-    }
+
+      if (!row) return;
+
+      var valueInput = row.querySelector(".customValue");
+      if (customActionsNoValues.includes(item.action)) {
+        valueInput.disabled = true;
+      }
+
+      updateCustomShortcutInputText(
+        row.querySelector(".customKey"),
+        normalizedBinding || createDisabledBinding()
+      );
+      valueInput.value = item.value;
+      row.querySelector(".customForce").value = String(item.force);
+    });
   });
 }
 
 function restore_defaults() {
-  /* ... same as your original, tcDefaults now includes nudge defaults ... */
-  // Remove all dynamically added shortcuts first
   document.querySelectorAll(".customs:not([id])").forEach((el) => el.remove());
-  // Then set defaults and restore options, which will re-add predefined ones correctly
+
   chrome.storage.sync.set(tcDefaults, function () {
-    restore_options(); // This will populate based on tcDefaults
+    restore_options();
     var status = document.getElementById("status");
     status.textContent = "Default options restored";
     setTimeout(function () {
@@ -338,14 +573,18 @@ function restore_defaults() {
 }
 
 function show_experimental() {
-  /* ... same as your original ... */
   document
     .querySelectorAll(".customForce")
     .forEach((item) => (item.style.display = "inline-block"));
 }
 
 document.addEventListener("DOMContentLoaded", function () {
-  /* ... same as your original event listeners setup ... */
+  var manifest = chrome.runtime.getManifest();
+  var versionElement = document.getElementById("app-version");
+  if (versionElement) {
+    versionElement.textContent = manifest.version;
+  }
+
   restore_options();
   document.getElementById("save").addEventListener("click", save_options);
   document.getElementById("add").addEventListener("click", add_shortcut);
@@ -357,10 +596,12 @@ document.addEventListener("DOMContentLoaded", function () {
     .addEventListener("click", show_experimental);
 
   function eventCaller(event, className, funcName) {
-    if (!event.target.classList || !event.target.classList.contains(className))
+    if (!event.target.classList || !event.target.classList.contains(className)) {
       return;
+    }
     funcName(event);
   }
+
   document.addEventListener("keypress", (event) =>
     eventCaller(event, "customValue", inputFilterNumbersOnly)
   );
@@ -380,11 +621,12 @@ document.addEventListener("DOMContentLoaded", function () {
   );
   document.addEventListener("change", (event) => {
     eventCaller(event, "customDo", function () {
+      var valueInput = event.target.nextElementSibling.nextElementSibling;
       if (customActionsNoValues.includes(event.target.value)) {
-        event.target.nextElementSibling.nextElementSibling.disabled = true;
-        event.target.nextElementSibling.nextElementSibling.value = 0; // Or "" if placeholder is preferred
+        valueInput.disabled = true;
+        valueInput.value = 0;
       } else {
-        event.target.nextElementSibling.nextElementSibling.disabled = false;
+        valueInput.disabled = false;
       }
     });
   });

popup.css

@@ -1,6 +1,15 @@
-body {
-  min-width: 8em;
-}
+body {
+  min-width: 8em;
+  background-color: white;
+  color: #333;
+}
+
+.version {
+  margin-top: 0.7em;
+  font-size: 0.85em;
+  text-align: center;
+  color: #666;
+}
 
 hr {
   width: 100%;
@@ -32,3 +41,39 @@ 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;
+  }
+
+  .version {
+    color: #aaa;
+  }
+}

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>
@@ -14,5 +16,6 @@
     <hr />
     <button id="feedback" class="secondary">Send feedback</button>
     <button id="about" class="secondary">About</button>
+    <div class="version">Version <span id="app-version"></span></div>
   </body>
 </html>

popup.js

@@ -1,4 +1,10 @@
 document.addEventListener("DOMContentLoaded", function () {
+  var manifest = chrome.runtime.getManifest();
+  var versionElement = document.querySelector("#app-version");
+  if (versionElement) {
+    versionElement.innerText = manifest.version;
+  }
+
   document.querySelector("#config").addEventListener("click", function () {
     window.open(chrome.runtime.getURL("options.html"));
   });
@@ -19,6 +25,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 +73,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
       }
     });
   }