diff --git a/Borepin/Borepin/Dialog/ScanDialog.xaml b/Borepin/Borepin/Dialog/ScanDialog.xaml
deleted file mode 100644
index ff01a42..0000000
--- a/Borepin/Borepin/Dialog/ScanDialog.xaml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ContentView xmlns="http://xamarin.com/schemas/2014/forms" 
-             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" 
-             xmlns:zxing="clr-namespace:ZXing.Net.Mobile.Forms;assembly=ZXing.Net.Mobile.Forms"
-             x:Class="Borepin.Dialog.ScanDialog"
-             xmlns:resource_text="clr-namespace:Borepin.Resources.Text">
-  <ContentView.Content>
-        <StackLayout IsVisible="{Binding IsVisible}">
-            <zxing:ZXingScannerView Result="{Binding ScanResult, Mode=TwoWay}" ScanResultCommand="{Binding ScannedCommand}"  IsScanning="{Binding IsScanning}" WidthRequest="300" HeightRequest="500" VerticalOptions="CenterAndExpand" HorizontalOptions="CenterAndExpand"/>
-            <Button Text="{x:Static resource_text:TextResource.CANCEL}" Command="{Binding AbortCommand}"/>
-        </StackLayout>
-  </ContentView.Content>
-</ContentView>
\ No newline at end of file
diff --git a/Borepin/Borepin/Dialog/ScanDialog.xaml.cs b/Borepin/Borepin/Dialog/ScanDialog.xaml.cs
deleted file mode 100644
index e70fb4b..0000000
--- a/Borepin/Borepin/Dialog/ScanDialog.xaml.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-using Xamarin.Forms;
-using Xamarin.Forms.Xaml;
-
-namespace Borepin.Dialog
-{
-    [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class ScanDialog : ContentView
-    {
-        public ScanDialog()
-        {
-            InitializeComponent();
-        }
-    }
-}
\ No newline at end of file
diff --git a/Borepin/Borepin/DialogModel/ScanDialogModel.cs b/Borepin/Borepin/DialogModel/ScanDialogModel.cs
deleted file mode 100644
index 0543b8e..0000000
--- a/Borepin/Borepin/DialogModel/ScanDialogModel.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-using Prism.Commands;
-using Prism.Mvvm;
-using Prism.Services.Dialogs;
-using System;
-using System.Windows.Input;
-using ZXing;
-
-namespace Borepin.DialogModel
-{
-    public class ScanDialogModel : BindableBase, IDialogAware
-    {
-        #region Private Fields
-        private object _Instance;
-        #endregion
-
-        #region Constructors
-        public ScanDialogModel()
-        {
-            AbortCommand = new DelegateCommand(AbortCommandExecute);
-            ScannedCommand = new DelegateCommand(ScannedCommandExecute);
-
-            IsVisible = true;
-            IsScanning = true;
-        }
-        #endregion
-
-        #region Fields
-        public event Action<IDialogParameters> RequestClose;
-
-        public bool CanCloseDialog()
-        {
-            return true;
-        }
-
-        private Result _ScanResult;
-        public Result ScanResult
-        {
-            get => _ScanResult;
-            set => SetProperty(ref _ScanResult, value);
-        }
-
-        private bool _IsScanning;
-        public bool IsScanning
-        {
-            get => _IsScanning;
-            set => SetProperty(ref _IsScanning, value);
-        }
-
-        private bool _IsVisible;
-        public bool IsVisible
-        {
-            get => _IsVisible;
-            set => SetProperty(ref _IsVisible, value);
-        }
-        #endregion
-
-        #region Commands
-        private ICommand _ScannedCommand;
-
-        public ICommand ScannedCommand
-        {
-            get => _ScannedCommand;
-            set => SetProperty(ref _ScannedCommand, value);
-        }
-        public void ScannedCommandExecute()
-        {
-            IsScanning = false;
-            IsVisible = false;
-
-            IDialogParameters parameters = new DialogParameters()
-            {
-                { "result", "scanned" },
-                { "value", ScanResult.Text },
-                { "instance", _Instance },
-            };
-            RequestClose(parameters);
-        }
-
-        private ICommand _AbortCommand;
-        public ICommand AbortCommand
-        {
-            get => _AbortCommand;
-            set => SetProperty(ref _AbortCommand, value);
-        }
-        public void AbortCommandExecute()
-        {
-            IsScanning = false;
-            IsVisible = false;
-            
-            IDialogParameters parameters = new DialogParameters()
-            {
-                { "result", "abort" },
-                { "instance", _Instance },
-            };
-            RequestClose(parameters);
-        }
-        #endregion
-
-        #region IDialogAware
-        public void OnDialogClosed()
-        {
-
-        }
-
-        public void OnDialogOpened(IDialogParameters parameters)
-        {
-            _Instance = parameters.GetValue<object>("instance");
-        }
-        #endregion
-    }
-}
diff --git a/Borepin/Borepin/Page/ScanPage.xaml b/Borepin/Borepin/Page/ScanPage.xaml
index 4c89a67..8f29baa 100644
--- a/Borepin/Borepin/Page/ScanPage.xaml
+++ b/Borepin/Borepin/Page/ScanPage.xaml
@@ -6,7 +6,15 @@
              x:Class="Borepin.Page.ScanPage">
     <ContentPage.Content>
         <StackLayout IsVisible="{Binding IsVisible}">
-            <zxing:ZXingScannerView Result="{Binding ScanResult, Mode=TwoWay}" ScanResultCommand="{Binding ScannedCommand}"  IsScanning="{Binding IsScanning}" WidthRequest="300" HeightRequest="500" VerticalOptions="CenterAndExpand" HorizontalOptions="CenterAndExpand" Options="{Binding ScanOptions}"/>
+            <zxing:ZXingScannerView 
+                Result="{Binding ScanResult, Mode=TwoWay}" 
+                ScanResultCommand="{Binding ScannedCommand}"  
+                IsScanning="{Binding IsScanning}" 
+                Options="{Binding ScanOptions}" 
+                WidthRequest="300" 
+                HeightRequest="500" 
+                VerticalOptions="CenterAndExpand" 
+                HorizontalOptions="CenterAndExpand"/>
             <Button Text="{x:Static resource_text:TextResource.CANCEL}" Command="{Binding CancelCommand}"/>
         </StackLayout>
     </ContentPage.Content>
diff --git a/Borepin/Borepin/Page/ScanURNPage.xaml b/Borepin/Borepin/Page/ScanURNPage.xaml
index 02b7db1..cbaba29 100644
--- a/Borepin/Borepin/Page/ScanURNPage.xaml
+++ b/Borepin/Borepin/Page/ScanURNPage.xaml
@@ -6,7 +6,15 @@
              x:Class="Borepin.Page.ScanURNPage">
     <ContentPage.Content>
         <StackLayout IsVisible="{Binding IsVisible}">
-            <zxing:ZXingScannerView Result="{Binding ScanResult, Mode=TwoWay}" ScanResultCommand="{Binding ScannedCommand}"  IsScanning="{Binding IsScanning}" WidthRequest="300" HeightRequest="500" VerticalOptions="CenterAndExpand" HorizontalOptions="CenterAndExpand" Options="{Binding ScanOptions}"/>
+            <zxing:ZXingScannerView 
+                Result="{Binding ScanResult, Mode=TwoWay}" 
+                ScanResultCommand="{Binding ScannedCommand}"  
+                IsScanning="{Binding IsScanning}" 
+                Options="{Binding ScanOptions}" 
+                WidthRequest="300" 
+                HeightRequest="500" 
+                VerticalOptions="CenterAndExpand" 
+                HorizontalOptions="CenterAndExpand"/>
             <Button Text="{x:Static resource_text:TextResource.CANCEL}" Command="{Binding CancelCommand}"/>
         </StackLayout>
     </ContentPage.Content>