From 18e332cab9007f2f277020b8e7a50f56ed2275d5 Mon Sep 17 00:00:00 2001
From: Isaiah Inuwa <isaiah.inuwa@gmail.com>
Date: Wed, 6 Aug 2025 17:49:26 -0500
Subject: [PATCH 1/3] Rename 'ExampleApplication' to 'CredentialsUi'

---
 credentialsd-ui/data/resources/ui/window.ui   | 20 ++++++------
 .../src/gui/view_model/gtk/application.rs     | 30 ++++++++---------
 credentialsd-ui/src/gui/view_model/gtk/mod.rs |  4 +--
 .../src/gui/view_model/gtk/window.rs          | 32 +++++++++----------
 4 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/credentialsd-ui/data/resources/ui/window.ui b/credentialsd-ui/data/resources/ui/window.ui
index 555028b4..e299d8db 100644
--- a/credentialsd-ui/data/resources/ui/window.ui
+++ b/credentialsd-ui/data/resources/ui/window.ui
@@ -16,7 +16,7 @@
       </item>
     </section>
   </menu>
-  <template class="ExampleApplicationWindow" parent="GtkApplicationWindow">
+  <template class="CredentialsUiWindow" parent="GtkApplicationWindow">
     <child type="titlebar">
       <object class="GtkHeaderBar" id="headerbar">
         <child type="end">
@@ -37,7 +37,7 @@
             <binding name="label">
               <lookup name="title">
                 <lookup name="view-model">
-                  ExampleApplicationWindow
+                  CredentialsUiWindow
                 </lookup>
               </lookup>
             </binding>
@@ -67,7 +67,7 @@
                         <binding name="child">
                           <lookup name="devices">
                             <lookup name="view-model">
-                              ExampleApplicationWindow
+                              CredentialsUiWindow
                             </lookup>
                           </lookup>
                         </binding>
@@ -95,7 +95,7 @@
                         <binding name="label">
                           <lookup name="prompt">
                             <lookup name="view-model">
-                              ExampleApplicationWindow
+                              CredentialsUiWindow
                             </lookup>
                           </lookup>
                         </binding>
@@ -107,7 +107,7 @@
                         <binding name="visible">
                           <lookup name="usb_pin_entry_visible">
                             <lookup name="view-model">
-                              ExampleApplicationWindow
+                              CredentialsUiWindow
                             </lookup>
                           </lookup>
                         </binding>
@@ -131,7 +131,7 @@
                         <binding name="visible">
                           <lookup name="qr_spinner_visible">
                             <lookup name="view-model">
-                              ExampleApplicationWindow
+                              CredentialsUiWindow
                             </lookup>
                           </lookup>
                         </binding>
@@ -142,7 +142,7 @@
                         <binding name="visible">
                           <lookup name="qr_code_visible">
                             <lookup name="view-model">
-                              ExampleApplicationWindow
+                              CredentialsUiWindow
                             </lookup>
                           </lookup>
                         </binding>
@@ -153,7 +153,7 @@
                         <binding name="label">
                           <lookup name="prompt">
                             <lookup name="view-model">
-                              ExampleApplicationWindow
+                              CredentialsUiWindow
                             </lookup>
                           </lookup>
                         </binding>
@@ -182,7 +182,7 @@
                         <binding name="child">
                           <lookup name="credentials">
                             <lookup name="view-model">
-                              ExampleApplicationWindow
+                              CredentialsUiWindow
                             </lookup>
                           </lookup>
                         </binding>
@@ -222,7 +222,7 @@
                         <binding name="label">
                           <lookup name="prompt">
                             <lookup name="view-model">
-                              ExampleApplicationWindow
+                              CredentialsUiWindow
                             </lookup>
                           </lookup>
                         </binding>
diff --git a/credentialsd-ui/src/gui/view_model/gtk/application.rs b/credentialsd-ui/src/gui/view_model/gtk/application.rs
index ded3c493..42c22739 100644
--- a/credentialsd-ui/src/gui/view_model/gtk/application.rs
+++ b/credentialsd-ui/src/gui/view_model/gtk/application.rs
@@ -6,7 +6,7 @@ use gtk::prelude::*;
 use gtk::subclass::prelude::*;
 use gtk::{gdk, gio, glib};
 
-use super::{ViewModel, window::ExampleApplicationWindow};
+use super::{ViewModel, window::CredentialsUiWindow};
 use crate::config::{APP_ID, PKGDATADIR, PROFILE, VERSION};
 use crate::gui::view_model::{ViewEvent, ViewUpdate};
 
@@ -21,25 +21,25 @@ mod imp {
     };
 
     #[derive(Debug, Default)]
-    pub struct ExampleApplication {
-        pub window: OnceCell<WeakRef<ExampleApplicationWindow>>,
+    pub struct CredentialsUi {
+        pub window: OnceCell<WeakRef<CredentialsUiWindow>>,
 
         pub(super) tx: RefCell<Option<Sender<ViewEvent>>>,
         pub(super) rx: RefCell<Option<Receiver<ViewUpdate>>>,
     }
 
     #[glib::object_subclass]
-    impl ObjectSubclass for ExampleApplication {
-        const NAME: &'static str = "ExampleApplication";
-        type Type = super::ExampleApplication;
+    impl ObjectSubclass for CredentialsUi {
+        const NAME: &'static str = "CredentialsUi";
+        type Type = super::CredentialsUi;
         type ParentType = gtk::Application;
     }
 
-    impl ObjectImpl for ExampleApplication {}
+    impl ObjectImpl for CredentialsUi {}
 
-    impl ApplicationImpl for ExampleApplication {
+    impl ApplicationImpl for CredentialsUi {
         fn activate(&self) {
-            debug!("GtkApplication<ExampleApplication>::activate");
+            debug!("GtkApplication<CredentialsUi>::activate");
             self.parent_activate();
             let app = self.obj();
 
@@ -53,7 +53,7 @@ mod imp {
             let rx = self.rx.take().expect("receiver to be initiated");
             let view_model = ViewModel::new(tx, rx);
             let vm2 = view_model.clone();
-            let window = ExampleApplicationWindow::new(&app, view_model);
+            let window = CredentialsUiWindow::new(&app, view_model);
             let window2 = window.clone();
             vm2.clone().connect_completed_notify(move |vm| {
                 if vm.completed() {
@@ -91,7 +91,7 @@ mod imp {
         }
 
         fn startup(&self) {
-            debug!("GtkApplication<ExampleApplication>::startup");
+            debug!("GtkApplication<CredentialsUi>::startup");
             self.parent_startup();
             let app = self.obj();
 
@@ -104,17 +104,17 @@ mod imp {
         }
     }
 
-    impl GtkApplicationImpl for ExampleApplication {}
+    impl GtkApplicationImpl for CredentialsUi {}
 }
 
 glib::wrapper! {
-    pub struct ExampleApplication(ObjectSubclass<imp::ExampleApplication>)
+    pub struct CredentialsUi(ObjectSubclass<imp::CredentialsUi>)
         @extends gio::Application, gtk::Application,
         @implements gio::ActionMap, gio::ActionGroup;
 }
 
-impl ExampleApplication {
-    fn main_window(&self) -> ExampleApplicationWindow {
+impl CredentialsUi {
+    fn main_window(&self) -> CredentialsUiWindow {
         self.imp().window.get().unwrap().upgrade().unwrap()
     }
 
diff --git a/credentialsd-ui/src/gui/view_model/gtk/mod.rs b/credentialsd-ui/src/gui/view_model/gtk/mod.rs
index a1d5b1b2..966c5f60 100644
--- a/credentialsd-ui/src/gui/view_model/gtk/mod.rs
+++ b/credentialsd-ui/src/gui/view_model/gtk/mod.rs
@@ -16,7 +16,7 @@ use qrcode::QrCode;
 use tracing::debug;
 
 use crate::config::{GETTEXT_PACKAGE, LOCALEDIR, RESOURCES_FILE};
-use application::ExampleApplication;
+use application::CredentialsUi;
 
 use super::Transport;
 use super::{Credential, Device};
@@ -365,7 +365,7 @@ pub fn start_gtk_app(
     let res = gio::Resource::load(RESOURCES_FILE).expect("Could not load gresource file");
     gio::resources_register(&res);
 
-    let app = ExampleApplication::new(tx_event, rx_update);
+    let app = CredentialsUi::new(tx_event, rx_update);
     app.run();
 }
 
diff --git a/credentialsd-ui/src/gui/view_model/gtk/window.rs b/credentialsd-ui/src/gui/view_model/gtk/window.rs
index ab6de9bc..121fc63b 100644
--- a/credentialsd-ui/src/gui/view_model/gtk/window.rs
+++ b/credentialsd-ui/src/gui/view_model/gtk/window.rs
@@ -9,7 +9,7 @@ use gtk::{
     glib::{self, clone},
 };
 
-use super::application::ExampleApplication;
+use super::application::CredentialsUi;
 use super::{ViewModel, device::DeviceObject};
 use crate::config::{APP_ID, PROFILE};
 use crate::gui::view_model::Transport;
@@ -22,9 +22,9 @@ mod imp {
     use super::*;
 
     #[derive(Debug, Properties, gtk::CompositeTemplate)]
-    #[properties(wrapper_type = super::ExampleApplicationWindow)]
+    #[properties(wrapper_type = super::CredentialsUiWindow)]
     #[template(resource = "/xyz/iinuwa/credentialsd/CredentialsUi/ui/window.ui")]
-    pub struct ExampleApplicationWindow {
+    pub struct CredentialsUiWindow {
         #[template_child]
         pub headerbar: TemplateChild<gtk::HeaderBar>,
         pub settings: gio::Settings,
@@ -42,7 +42,7 @@ mod imp {
     }
 
     #[gtk::template_callbacks]
-    impl ExampleApplicationWindow {
+    impl CredentialsUiWindow {
         #[template_callback]
         fn handle_usb_pin_entered(&self, entry: &gtk::PasswordEntry) {
             let view_model = &self.view_model.borrow();
@@ -58,7 +58,7 @@ mod imp {
         }
     }
 
-    impl Default for ExampleApplicationWindow {
+    impl Default for CredentialsUiWindow {
         fn default() -> Self {
             Self {
                 headerbar: TemplateChild::default(),
@@ -72,9 +72,9 @@ mod imp {
     }
 
     #[glib::object_subclass]
-    impl ObjectSubclass for ExampleApplicationWindow {
-        const NAME: &'static str = "ExampleApplicationWindow";
-        type Type = super::ExampleApplicationWindow;
+    impl ObjectSubclass for CredentialsUiWindow {
+        const NAME: &'static str = "CredentialsUiWindow";
+        type Type = super::CredentialsUiWindow;
         type ParentType = gtk::ApplicationWindow;
 
         fn class_init(klass: &mut Self::Class) {
@@ -89,7 +89,7 @@ mod imp {
     }
 
     #[glib::derived_properties]
-    impl ObjectImpl for ExampleApplicationWindow {
+    impl ObjectImpl for CredentialsUiWindow {
         fn constructed(&self) {
             self.parent_constructed();
             let obj = self.obj();
@@ -104,8 +104,8 @@ mod imp {
         }
     }
 
-    impl WidgetImpl for ExampleApplicationWindow {}
-    impl WindowImpl for ExampleApplicationWindow {
+    impl WidgetImpl for CredentialsUiWindow {}
+    impl WindowImpl for CredentialsUiWindow {
         // Save window state on delete event
         fn close_request(&self) -> glib::Propagation {
             if let Some(vm) = self.view_model.borrow().as_ref() {
@@ -128,19 +128,19 @@ mod imp {
         }
     }
 
-    impl ApplicationWindowImpl for ExampleApplicationWindow {}
+    impl ApplicationWindowImpl for CredentialsUiWindow {}
 }
 
 glib::wrapper! {
-    pub struct ExampleApplicationWindow(ObjectSubclass<imp::ExampleApplicationWindow>)
+    pub struct CredentialsUiWindow(ObjectSubclass<imp::CredentialsUiWindow>)
         @extends gtk::Widget, gtk::Window, gtk::ApplicationWindow,
         @implements gio::ActionMap, gio::ActionGroup, gtk::Root;
 
 }
 
-impl ExampleApplicationWindow {
-    pub fn new(app: &ExampleApplication, view_model: ViewModel) -> Self {
-        let window: ExampleApplicationWindow = glib::Object::builder()
+impl CredentialsUiWindow {
+    pub fn new(app: &CredentialsUi, view_model: ViewModel) -> Self {
+        let window: CredentialsUiWindow = glib::Object::builder()
             .property("application", app)
             .property("view-model", view_model)
             .build();

From c05433c18af13f5ce9c7881ab62a59ad892533cf Mon Sep 17 00:00:00 2001
From: Isaiah Inuwa <isaiah.inuwa@gmail.com>
Date: Wed, 6 Aug 2025 17:54:09 -0500
Subject: [PATCH 2/3] Remove unused GUI stuff

---
 credentialsd-ui/data/resources/ui/window.ui   | 12 ----------
 .../src/gui/view_model/gtk/application.rs     | 24 +------------------
 2 files changed, 1 insertion(+), 35 deletions(-)

diff --git a/credentialsd-ui/data/resources/ui/window.ui b/credentialsd-ui/data/resources/ui/window.ui
index e299d8db..c3c1639f 100644
--- a/credentialsd-ui/data/resources/ui/window.ui
+++ b/credentialsd-ui/data/resources/ui/window.ui
@@ -10,23 +10,11 @@
         <attribute name="label" translatable="yes">_Keyboard Shortcuts</attribute>
         <attribute name="action">win.show-help-overlay</attribute>
       </item>
-      <item>
-        <attribute name="label" translatable="yes">_About Credential Manager</attribute>
-        <attribute name="action">app.about</attribute>
-      </item>
     </section>
   </menu>
   <template class="CredentialsUiWindow" parent="GtkApplicationWindow">
     <child type="titlebar">
       <object class="GtkHeaderBar" id="headerbar">
-        <child type="end">
-          <object class="GtkMenuButton" id="appmenu_button">
-            <property name="icon-name">open-menu-symbolic</property>
-            <property name="menu-model">primary_menu</property>
-            <property name="primary">True</property>
-            <property name="tooltip-text" translatable="yes">Main Menu</property>
-          </object>
-        </child>
       </object>
     </child>
     <child>
diff --git a/credentialsd-ui/src/gui/view_model/gtk/application.rs b/credentialsd-ui/src/gui/view_model/gtk/application.rs
index 42c22739..82216cdd 100644
--- a/credentialsd-ui/src/gui/view_model/gtk/application.rs
+++ b/credentialsd-ui/src/gui/view_model/gtk/application.rs
@@ -1,5 +1,4 @@
 use async_std::channel::{Receiver, Sender};
-use gettextrs::gettext;
 use tracing::{debug, info};
 
 use gtk::prelude::*;
@@ -128,13 +127,7 @@ impl CredentialsUi {
             })
             .build();
 
-        // About
-        let action_about = gio::ActionEntry::builder("about")
-            .activate(|app: &Self, _, _| {
-                app.show_about_dialog();
-            })
-            .build();
-        self.add_action_entries([action_quit, action_about]);
+        self.add_action_entries([action_quit]);
     }
 
     // Sets up keyboard shortcuts
@@ -155,21 +148,6 @@ impl CredentialsUi {
         }
     }
 
-    fn show_about_dialog(&self) {
-        let dialog = gtk::AboutDialog::builder()
-            .logo_icon_name(APP_ID)
-            .license_type(gtk::License::Lgpl30Only)
-            .website("https://github.com/linux-credentials/linux-webauthn-portal-api")
-            .version(VERSION)
-            .transient_for(&self.main_window())
-            .translator_credits(gettext("translator-credits"))
-            .modal(true)
-            .authors(vec!["Isaiah Inuwa <isaiah.inuwa@gmail.com>"])
-            .build();
-
-        dialog.present();
-    }
-
     pub fn run(&self) -> glib::ExitCode {
         info!("Credentials UI ({})", APP_ID);
         info!("Version: {} ({})", VERSION, PROFILE);

From 7a7f93a75a29748bc5ad9a9baabd9cb22d0527ef Mon Sep 17 00:00:00 2001
From: Isaiah Inuwa <isaiah.inuwa@gmail.com>
Date: Wed, 6 Aug 2025 17:54:09 -0500
Subject: [PATCH 3/3] Install web extension

---
 contrib/meson.build                        |  4 ++
 meson.build                                |  5 +-
 systemd/meson.build                        |  2 +-
 webext/README.md                           | 26 ++++++--
 webext/add-on/background.js                |  5 +-
 webext/add-on/content.js                   |  2 +-
 webext/add-on/icons/LICENSE                |  1 -
 webext/add-on/icons/logo.svg               | 71 ++++++++++++++++++++++
 webext/add-on/icons/message.svg            |  8 ---
 webext/add-on/manifest.json                | 14 ++---
 webext/add-on/meson.build                  | 24 ++++++++
 webext/app/credential_manager_shim.json    |  7 ---
 webext/app/credential_manager_shim.json.in |  7 +++
 webext/app/credential_manager_shim.py      |  4 +-
 webext/app/meson.build                     | 23 +++++++
 webext/meson.build                         |  2 +
 16 files changed, 172 insertions(+), 33 deletions(-)
 create mode 100644 contrib/meson.build
 delete mode 100644 webext/add-on/icons/LICENSE
 create mode 100644 webext/add-on/icons/logo.svg
 delete mode 100644 webext/add-on/icons/message.svg
 create mode 100644 webext/add-on/meson.build
 delete mode 100644 webext/app/credential_manager_shim.json
 create mode 100644 webext/app/credential_manager_shim.json.in
 create mode 100644 webext/app/meson.build
 create mode 100644 webext/meson.build

diff --git a/contrib/meson.build b/contrib/meson.build
new file mode 100644
index 00000000..3b1b10f1
--- /dev/null
+++ b/contrib/meson.build
@@ -0,0 +1,4 @@
+install_data(
+  'xyz.iinuwa.credentialsd.Credentials.xml',
+  install_dir: datadir / 'credentialsd',
+)
\ No newline at end of file
diff --git a/meson.build b/meson.build
index 120308bc..e61c74fa 100644
--- a/meson.build
+++ b/meson.build
@@ -10,6 +10,7 @@ version = meson.project_version()
 
 prefix = get_option('prefix')
 bindir = prefix / get_option('bindir')
+libdir = prefix / get_option('libdir')
 localedir = prefix / get_option('localedir')
 
 cargo_home = get_option('cargo_home')
@@ -29,4 +30,6 @@ subdir('credentialsd-common')
 subdir('credentialsd')
 subdir('credentialsd-ui')
 subdir('dbus')
-subdir('systemd')
\ No newline at end of file
+subdir('systemd')
+subdir('webext')
+subdir('contrib')
\ No newline at end of file
diff --git a/systemd/meson.build b/systemd/meson.build
index f38275c4..2773dada 100644
--- a/systemd/meson.build
+++ b/systemd/meson.build
@@ -24,4 +24,4 @@ configure_file(
   install_dir: systemd_user_service_dir,
   output: 'xyz.iinuwa.credentialsd.UiControl.service',
   configuration: systemd_config,
-)
\ No newline at end of file
+)
diff --git a/webext/README.md b/webext/README.md
index 0092eb6f..501968b4 100644
--- a/webext/README.md
+++ b/webext/README.md
@@ -7,9 +7,9 @@ This requires some setup to make it work:
 
 # Prerequisites
 
-Currently, this web extension relies on the `dbus-next` to interact with D-Bus
-services. If you have that package installed in your system Python, this
-should work. You can test using the following:
+Currently, this web extension relies on the `dbus-next` Python package to
+interact with D-Bus services. If you have that package installed in your system
+Python, this should work. You can test using the following:
 
 ```shell
 python3 -c 'import dbus_next; print("dbus-next is installed")'
@@ -35,11 +35,29 @@ couple of options:
   pip3 install dbus-next
   echo "Change the first line in webext/app/credential_manager_shim.py to:"
   echo "#!$(readlink -f ./env/bin/python3)"
-  # Update the shebang to point to the absolute path to webext/env/bin/python3
   ```
 
 # Setup Instructions
 
+## For Testing
+
+1. Run the install script for the repository:
+    ```shell
+    meson setup -Dprofile=default -Dprefix=/usr/local build-release
+    cd build-release
+    meson install
+    mkdir -p ~/.mozilla/native-messaging-hosts/
+    ln -s /usr/local/lib64/mozilla/native-messaging-hosts/xyz.iinuwa.credentialsd_helper.json ~/.mozilla/native-messaging-hosts/
+    ```
+   Note that since it is installing to `/usr/local`, Meson will ask you to use `sudo` to elevate privileges to install.
+2. Log out and log back in again to restart the D-Bus session bus.
+2. Open Firefox and go to `about:debugging`.
+3. Click "This Firefox" > Load Temporary Extension. Select `/usr/local/share/credentialsd/credentialsd-firefox-helper.xpi`.
+4. Navigate to [https://webauthn.io]().
+5. Run through the registration and creation process.
+
+## For Development
+
 (Note: Paths are relative to root of this repository)
 
 1. Copy `webext/app/credential_manager_shim.json` to `~/.mozilla/native-messaging-hosts/credential_manager_shim.json`.
diff --git a/webext/add-on/background.js b/webext/add-on/background.js
index 3bb820b1..4d153420 100644
--- a/webext/add-on/background.js
+++ b/webext/add-on/background.js
@@ -12,8 +12,9 @@ function connected(port) {
   console.log(contentPort);
 
   // Initialize native port
-  nativePort = browser.runtime.connectNative("credential_manager_shim");
-  if (nativePort.error) {
+  nativePort = browser.runtime.connectNative("xyz.iinuwa.credentialsd_helper");
+  console.debug(nativePort);
+  if (nativePort.error !== null) {
     console.error(nativePort.error)
     throw nativePort.error
   }
diff --git a/webext/add-on/content.js b/webext/add-on/content.js
index da10999b..b150b782 100644
--- a/webext/add-on/content.js
+++ b/webext/add-on/content.js
@@ -1,6 +1,6 @@
 let requestCounter = 0;
 const pendingRequests = {}
-var webauthnPort = browser.runtime.connect({ name: "credential_manager_shim" });
+var webauthnPort = browser.runtime.connect({ name: "credentialsd-helper" });
 console.log("loading content")
 
 webauthnPort.onMessage.addListener(({ requestId, data, error }) => {
diff --git a/webext/add-on/icons/LICENSE b/webext/add-on/icons/LICENSE
deleted file mode 100644
index c4e7bdc4..00000000
--- a/webext/add-on/icons/LICENSE
+++ /dev/null
@@ -1 +0,0 @@
-The icon used here is taken from the "Miscellany Web icons" set by Maria & Guillem (https://www.iconfinder.com/andromina), and is used under the Creative Commons (Attribution 3.0 Unported) license.
diff --git a/webext/add-on/icons/logo.svg b/webext/add-on/icons/logo.svg
new file mode 100644
index 00000000..a7695f43
--- /dev/null
+++ b/webext/add-on/icons/logo.svg
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="32mm"
+   height="32mm"
+   viewBox="0 0 32 32"
+   version="1.1"
+   id="svg1"
+   inkscape:export-filename="credentialsd-logo"
+   inkscape:export-xdpi="203.2"
+   inkscape:export-ydpi="203.2"
+   inkscape:version="1.4.2 (ebf0e940d0, 2025-05-08)"
+   sodipodi:docname="credentialsd-logo.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="mm"
+     inkscape:zoom="2.8149659"
+     inkscape:cx="-18.117449"
+     inkscape:cy="65.720157"
+     inkscape:window-width="1920"
+     inkscape:window-height="1051"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs1" />
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-79.663099,-105.5317)">
+    <rect
+       style="fill:#1ad6c6;fill-opacity:1;stroke-width:0.210073"
+       id="rect1-3"
+       width="29.191242"
+       height="29.659765"
+       x="81.033966"
+       y="105.5317"
+       ry="2.5238431" />
+    <path
+       d="m 111.68507,108.79525 -32.021971,14.42332 v 14.46995 h 30.045621 c 1.75732,0.0121 1.96527,-0.0367 1.97635,-2.31328 z"
+       style="fill:#000000;fill-opacity:1;stroke-width:0.389799"
+       id="path5"
+       sodipodi:nodetypes="cccccc" />
+    <path
+       d="m 203.43665,126.286 v 33.61914 h -28.30473 v -16.8367 l -13.18628,7.81864 32.42852,39.75262 42.29768,-25.07909 -32.42903,-39.75262 z"
+       style="fill:#00ff00;stroke-width:0.395313"
+       id="path4" />
+    <rect
+       style="fill:#1a1a1a;fill-opacity:1;stroke:none;stroke-width:0.339351"
+       id="rect8"
+       width="4.8095722"
+       height="7.328196"
+       x="86.818855"
+       y="107.8616"
+       ry="1.7360102" />
+  </g>
+</svg>
diff --git a/webext/add-on/icons/message.svg b/webext/add-on/icons/message.svg
deleted file mode 100644
index 7ee68e2f..00000000
--- a/webext/add-on/icons/message.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'><svg height="128px" style="enable-background:new 0 0 143 128;" version="1.1" viewBox="0 0 143 128" width="143px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><style type="text/css">
-<![CDATA[
-	.st0{fill:#EF3E42;}
-	.st1{fill:#FFFFFF;}
-	.st2{fill:none;}
-	.st3{fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;}
-]]>
-</style><defs/><path d="M132.2,105.3L96.1,69l36.2-36.1V105.3L132.2,105.3z M14.9,112.1l36.4-36.4l8,7.9c3,3,6.6,5,11,5s8-2,11-5l8-7.9l36.4,36.4  H14.9L14.9,112.1z M125.9,25.3L74,77.4c-1,1-1.9,1.6-3.7,1.6s-2.7-0.6-3.7-1.6L14.7,25.3H125.9L125.9,25.3z M8.4,32.9L44.6,69  L8.4,105.3V32.9L8.4,32.9z"/><rect class="st2" height="128" id="_x3C_Slice_x3E__100_" width="143"/></svg>
\ No newline at end of file
diff --git a/webext/add-on/manifest.json b/webext/add-on/manifest.json
index f2135a1a..f2e66355 100644
--- a/webext/add-on/manifest.json
+++ b/webext/add-on/manifest.json
@@ -1,16 +1,16 @@
 {
-  "description": "Linux WebAuthn Desktop Portal Shim",
+  "description": "Helper to integrate credentialsd with the browser",
   "manifest_version": 3,
-  "name": "WebAuthn Portal",
-  "version": "1.0",
+  "name": "credentialsd-helper",
+  "version": "0.1.0",
   "icons": {
-    "48": "icons/message.svg"
+    "48": "icons/logo.svg"
   },
 
   "browser_specific_settings": {
     "gecko": {
-      "id": "credential_manager_shim@iinuwa.xyz",
-      "strict_min_version": "50.0"
+      "id": "credentialsd-helper@iinuwa.xyz",
+      "strict_min_version": "140.0"
     }
   },
 
@@ -26,7 +26,7 @@
   ],
 
   "action": {
-    "default_icon": "icons/message.svg"
+    "default_icon": "icons/logo.svg"
   },
 
   "permissions": ["nativeMessaging"]
diff --git a/webext/add-on/meson.build b/webext/add-on/meson.build
new file mode 100644
index 00000000..f543670a
--- /dev/null
+++ b/webext/add-on/meson.build
@@ -0,0 +1,24 @@
+fs = import('fs')
+zip = find_program('zip')
+
+addon_dir = datadir / 'credentialsd'
+xpi_files = ['manifest.json', 'background.js', 'content.js', 'icons' / 'logo.svg']
+custom_target(
+  'xpi',
+  output: 'credentialsd-firefox-helper.xpi',
+  input: xpi_files,
+  command: [
+    'pwd',
+    '&&',
+    'cd',
+    '@CURRENT_SOURCE_DIR@',
+    '&&',
+    zip,
+    '-r',
+    '-FS', meson.project_build_root() / '@OUTPUT@',
+    xpi_files,
+    '--exclude', 'icons/LICENSE',
+  ],
+  install: true,
+  install_dir: addon_dir,
+)
diff --git a/webext/app/credential_manager_shim.json b/webext/app/credential_manager_shim.json
deleted file mode 100644
index c1289a3e..00000000
--- a/webext/app/credential_manager_shim.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "credential_manager_shim",
-  "description": "Example host for native messaging",
-  "path": "/home/isaiah/Development/rust/linux-webauthn-platform-api/webext/app/credential_manager_shim.py",
-  "type": "stdio",
-  "allowed_extensions": [ "credential_manager_shim@iinuwa.xyz" ]
-}
diff --git a/webext/app/credential_manager_shim.json.in b/webext/app/credential_manager_shim.json.in
new file mode 100644
index 00000000..f38ae7f0
--- /dev/null
+++ b/webext/app/credential_manager_shim.json.in
@@ -0,0 +1,7 @@
+{
+  "name": "xyz.iinuwa.credentialsd_helper",
+  "description": "Helper for integrating browser with credentialsd project",
+  "path": "@SHIM_SCRIPT@",
+  "type": "stdio",
+  "allowed_extensions": [ "credentialsd-helper@iinuwa.xyz" ]
+}
diff --git a/webext/app/credential_manager_shim.py b/webext/app/credential_manager_shim.py
index 0aa60f54..f4167a73 100755
--- a/webext/app/credential_manager_shim.py
+++ b/webext/app/credential_manager_shim.py
@@ -18,6 +18,8 @@
     filename="/tmp/credential_manager_shim.log", encoding="utf-8", level=logging.DEBUG
 )
 
+DBUS_DOC_FILE = "@DBUS_DOC_FILE@"
+
 
 def getMessage():
     logging.debug("blocking on read")
@@ -353,7 +355,7 @@ async def run(cmd, options, origin, top_origin):
 
     logging.info(os.getcwd())
 
-    with open("../../contrib/xyz.iinuwa.credentialsd.Credentials.xml", "r") as f:
+    with open(DBUS_DOC_FILE, "r") as f:
         introspection = f.read()
 
     proxy_object = bus.get_proxy_object(
diff --git a/webext/app/meson.build b/webext/app/meson.build
new file mode 100644
index 00000000..532b24e0
--- /dev/null
+++ b/webext/app/meson.build
@@ -0,0 +1,23 @@
+addon_app_executable_name = 'credentialsd-firefox-helper'
+addon_app_config = configuration_data()
+addon_app_config.set('SHIM_SCRIPT', bindir / addon_app_executable_name)
+addon_app_config.set(
+  'DBUS_DOC_FILE',
+  datadir / 'credentialsd' / 'xyz.iinuwa.credentialsd.Credentials.xml',
+)
+
+native_messaging_manifest_dir = libdir / 'mozilla' / 'native-messaging-hosts'
+
+configure_file(
+  input: 'credential_manager_shim.json.in',
+  install_dir: native_messaging_manifest_dir,
+  output: 'xyz.iinuwa.credentialsd_helper.json',
+  configuration: addon_app_config,
+)
+
+configure_file(
+  input: 'credential_manager_shim.py',
+  install_dir: bindir,
+  output: addon_app_executable_name,
+  configuration: addon_app_config,
+)
\ No newline at end of file
diff --git a/webext/meson.build b/webext/meson.build
new file mode 100644
index 00000000..8256b889
--- /dev/null
+++ b/webext/meson.build
@@ -0,0 +1,2 @@
+subdir('add-on')
+subdir('app')
\ No newline at end of file