diff --git a/Vivaldi.scm b/Vivaldi.scm
index 0c09585..52e964f 100644
--- a/Vivaldi.scm
+++ b/Vivaldi.scm
@@ -75,47 +75,48 @@
                         (share (string-append #$output "/share"))
                         (opt "./opt")
                         (usr/share "./usr/share")
-                        (old-exe (string-append "/opt/vivaldi/" #$appname "/vivaldi-" #$appname))
-                        (exe (string-append bin "/vivaldi-" #$appname)))
+                        (old-exe (string-append "/opt/vivaldi/" #$appname))
+                        (exe (string-append bin "/vivaldi")))
                    ;; This allows us to override CHROME_WRAPPER later.
-                   (substitute* (string-append opt "/vivaldi/" #$appname "/vivaldi-" #$appname)
+                   (substitute* (string-append opt "/vivaldi/vivaldi")
                      (("CHROME_WRAPPER") "WRAPPER"))
-                   (substitute* (string-append usr/share "/applications/vivaldi-" #$appname ".desktop")
+                   (substitute* (string-append usr/share "/applications/vivaldi-stable.desktop")
                      (("^Exec=.*") (string-append "Exec=" exe "\n")))
-                   (substitute* (string-append usr/share "/gnome-control-center/default-apps/vivaldi-" #$appname ".xml")
-                     ((old-exe) exe))
-                   (substitute* (string-append usr/share "/menu/vivaldi-" #$appname ".menu")
+                   ;;(substitute* (string-append usr/share "/gnome-control-center/default-apps/vivaldi-" #$appname ".xml")
+                   ;;  ((old-exe) exe))
+                   (substitute* (string-append usr/share "/menu/vivaldi" ".menu")
                      (("/opt") share)
                      ((old-exe) exe)))))
-        #!(add-after 'install 'install-icons
+        (add-after 'install 'install-icons
                      (lambda _
                        (define (format-icon-size name)
                          (car
                            (string-split
                             (string-drop-right (string-drop name 13) 4)
                             #\_)))
-                       (let ((icons (string-append #$output "/usr/share/icons/hicolor"))
-                             (share (string-append #$output "/usr/share/vivaldi/" #$appname)))
+                       (let ((icons (string-append #$output "/share/icons/hicolor"))
+                             (share (string-append #$output "/share/vivaldi")))
                          (for-each (lambda (icon)
                                      (let* ((icon-name (basename icon))
                                             (icon-size (format-icon-size icon-name))
-                                            (target (string-append icons "/" icon-size "x" icon-size "/apps/vivaldi-" #$appname ".png")))
+                                            (target (string-append icons "/" icon-size "x" icon-size "/apps/" #$appname ".png")))
                                        (mkdir-p (dirname target))
                                        (rename-file icon target)))
                                    (find-files share "product_logo_.*\\.png")))))
+                                   
                   (add-before 'install-wrapper 'install-exe
                    (lambda _
-                     (let* ((bin (string-append #$output "/usr/bin"))
-                            (exe (string-append bin "/vivaldi-" #$appname "-stable"))
-                            (share (string-append #$output "/usr/share"))
-                            (edge-target (string-append share "/vivaldi/" #$appname "/vivaldi-" #$appname)))
+                     (let* ((bin (string-append #$output "/bin"))
+                            (exe (string-append bin "/" #$appname))
+                            (share (string-append #$output "/share"))
+                            (chromium-target (string-append #$output "/share/vivaldi/" #$appname )))
                        (mkdir-p bin)
-                       (symlink edge-target exe)
+                       (symlink chromium-target exe)
                        (wrap-program exe
-                         '("CHROME_WRAPPER" = (#$appname))))))
-                         !#
-                (delete 'patch-assets)
-                (delete 'install-wrapper))))
+                       '("CHROME_WRAPPER" = (#$appname))
+                       ))))
+                         
+      )))
      (inputs
       (list bzip2
             curl