diff --git a/src/controls/FilePreviewer.qml b/src/controls/FilePreviewer.qml
index 18a58f0..abaf07e 100644
--- a/src/controls/FilePreviewer.qml
+++ b/src/controls/FilePreviewer.qml
@@ -1,306 +1,305 @@
 
 import QtQuick 2.9
 import QtQuick.Controls 2.2
 import QtQuick.Layouts 1.3
 import org.kde.kirigami 2.7 as Kirigami
 import org.kde.mauikit 1.0 as Maui
 import "private"
 
 Maui.Dialog
 {
     id: control
 
     property url currentUrl: ""
     property var iteminfo : ({})
 
 	property bool isFav : false
     property bool isDir : false
     property string mimetype : ""
     property bool showInfo: true
 
     property alias infoModel : _infoModel
     property alias tagBar : _tagsBar
 
     signal shareButtonClicked(url url)
 
     maxHeight: Maui.Style.unit * 800
     maxWidth: Maui.Style.unit * 500
 
     defaultButtons: false
 
     page.padding: 0
 
     footBar.leftContent: ToolButton
     {
         icon.name: "document-open"
         text: qsTr("Open...")
         onClicked:
         {           
             openFile(control.currentUrl)
 			control.close()
         }
     }
 
     footBar.middleContent: [
 
         ToolButton
         {
             visible: !isDir
             icon.name: "document-share"
             text: qsTr("Share...")
             onClicked:
             {
                 shareButtonClicked(currentUrl)
                 close()
             }
         },
 
         ToolButton
         {
             icon.name: "love"
-            text: control.isFav ? qsTr("Remove from Favorites") : qsTr("Add to Favorites")
 			checkable: true
 			checked: control.isFav
 			onClicked: 
 			{
 				if(control.isFav)
 					_tagsBar.list.removeFromUrls("fav")
 				else
 					_tagsBar.list.insertToUrls("fav")
 					
 					control.isFav = !control.isFav
 			}
         }
     ]
 
     footBar.rightContent:  ToolButton
     {
         icon.name: "documentinfo"
         text: qsTr("Info...")
 
         checkable: true
         checked: control.showInfo
         onClicked: control.showInfo = !control.showInfo
     }
 
     Component
     {
 		id: defaultPreview
 		Item
 		{
 			anchors.fill: parent
 			Kirigami.Icon
 			{
 				anchors.centerIn: parent
 				source:control.iteminfo.icon
 				height: Maui.Style.iconSizes.huge
 				width: height
 			}
 		}
 	}
     
     Component
     {
         id: imagePreview
         ImagePreview {}
     }
 
     Component
     {
         id: audioPreview
         AudioPreview {}
     }
 
     Component
     {
         id: videoPreview
         VideoPreview {}
     }
 
     Component
     {
         id: textPreview
         TextPreview {}
     }
 
     ColumnLayout
     {
         anchors.fill: parent
         spacing: 0
 
         Label
         {
             Layout.fillWidth: true
             Layout.margins: Maui.Style.space.big
             horizontalAlignment: Qt.AlignHCenter
             verticalAlignment: Qt.AlignVCenter
             elide: Qt.ElideMiddle
             wrapMode: Text.Wrap
             font.pointSize: Maui.Style.fontSizes.big
             font.weight: Font.Bold
             font.bold: true
             text: iteminfo.name
             color: Kirigami.Theme.textColor
         }
 
         Loader
         {
             id: previewLoader
             visible: !control.showInfo
             Layout.fillWidth: true
             Layout.fillHeight: true
         }
 
         Kirigami.ScrollablePage
         {
             id: _infoContent
             visible: control.showInfo
             Layout.fillWidth: true
             Layout.fillHeight: true
             Layout.margins: Maui.Style.space.big
 
             Kirigami.Theme.backgroundColor: "transparent"
             padding: 0
             leftPadding: padding
             rightPadding: padding
             topPadding: padding
             bottomPadding: padding
 
             ColumnLayout
             {
                 width: parent.width
                 spacing: Maui.Style.space.large
 
                 Repeater
                 {
                     model: ListModel { id: _infoModel }
 
                     Column
                     {
                         spacing: Maui.Style.space.small
                         width: parent.width
 
                         Label
                         {
                             width: parent.width
                             visible: _valueLabel.visible
                             text: model.key
                             color: Kirigami.Theme.textColor
 
                             elide: Text.ElideRight
                             wrapMode: Text.NoWrap
 
                             horizontalAlignment: Qt.AlignLeft
 
                             font.weight: Font.Bold
                             font.bold: true
                         }
 
                         Label
                         {
                             id: _valueLabel
 
                             width: parent.width
                             visible: text.length
                             text: model.value
                             color: Kirigami.Theme.textColor
 
                             elide: Qt.ElideMiddle
                             wrapMode: Text.Wrap
 
                             horizontalAlignment: Qt.AlignLeft
 
                             font.weight: Font.Light
                         }
                     }
                 }
 
             }
         }
 
         Maui.TagsBar
         {
             id: _tagsBar
             position: ToolBar.Footer
             Layout.fillWidth: true
             Layout.margins: 0
             list.urls: [control.currentUrl]
             allowEditMode: true
             onTagRemovedClicked: list.removeFromUrls(index)
             onTagsEdited: list.updateToUrls(tags)
             Kirigami.Theme.textColor: control.Kirigami.Theme.textColor
             Kirigami.Theme.backgroundColor: control.Kirigami.Theme.backgroundColor
             onAddClicked:
             {
                 dialogLoader.sourceComponent = tagsDialogComponent
                 dialog.composerList.urls = [control.currentUrl]
                 dialog.open()
             }
         }
     }
 
     onClosed:
     {
 		if(previewLoader.item && previewLoader.item.player != null)
             previewLoader.item.player.stop()
 			
 			previewLoader.sourceComponent = null
     }
 
     function show(path)
     {
         control.iteminfo = Maui.FM.getFileInfo(path)
         control.initModel()
 
         if(iteminfo.mime.indexOf("/"))
         {
             control.mimetype = iteminfo.mime.slice(0, iteminfo.mime.indexOf("/"))
         }else
         {
             control.mimetype = ""
         }
         
         control.isDir = mimetype === "inode"
         control.showInfo = control.mimetype === "audio" || control.mimetype === "image" || control.mimetype === "video" || control.mimetype === "text"? false : true       
 		control.currentUrl = path
 		control.isFav =  _tagsBar.list.contains("fav")
 		
 		var component;
 		 switch(mimetype)
 		{
 			case "audio" :
 				component = audioPreview
 				break
 			case "video" :
 				component = videoPreview
 				break
 			case "text" :
 				component = textPreview
 				break
 			case "image" :
 				component = imagePreview
 				break
 			case "inode" :
 			default:
 				component = defaultPreview
 		}
 		
 		previewLoader.sourceComponent = component
 		open()
     }
 
     function initModel()
     {
         control.infoModel.clear()
         control.infoModel.append({key: "Type", value: iteminfo.mime})
         control.infoModel.append({key: "Date", value: iteminfo.date})
         control.infoModel.append({key: "Modified", value: iteminfo.modified})
         control.infoModel.append({key: "Last Read", value: iteminfo.lastread})
         control.infoModel.append({key: "Owner", value: iteminfo.owner})
         control.infoModel.append({key: "Group", value: iteminfo.group})
         control.infoModel.append({key: "Size", value: Maui.FM.formatSize(iteminfo.size)})
 		control.infoModel.append({key: "Symbolic Link", value: iteminfo.symlink})
         control.infoModel.append({key: "Path", value: iteminfo.path})
         control.infoModel.append({key: "Icon Name", value: iteminfo.icon})
     }
 }
diff --git a/src/controls/private/FileMenu.qml b/src/controls/private/FileMenu.qml
index 24f24c9..bd62d13 100644
--- a/src/controls/private/FileMenu.qml
+++ b/src/controls/private/FileMenu.qml
@@ -1,181 +1,181 @@
 import QtQuick 2.9
 import QtQuick.Controls 2.3
 import QtQuick.Layouts 1.3
 import org.kde.mauikit 1.0 as Maui
 import org.kde.kirigami 2.2 as Kirigami
 
 Menu
 {
 	id: control
 	implicitWidth: colorBar.implicitWidth + Maui.Style.space.big
 	
     property var item : ({})
 	property int index : -1
 	property bool isDir : false
 	property bool isExec : false
 	property bool isFav: false
 	
 	signal bookmarkClicked(var item)
 	signal removeClicked(var item)
 	signal shareClicked(var item)
 	signal copyClicked(var item)
 	signal cutClicked(var item)
 	signal renameClicked(var item)
 	signal tagsClicked(var item)	
 	
 	MenuItem
 	{
 		visible: !control.isExec
 		text: qsTr("Select")
 		onTriggered:
 		{			
 			addToSelection(currentFMList.get(index))
             if(Kirigami.Settings.isMobile)
                 selectionMode = true
 		}
 	}
 	
 	MenuItem
 	{
-		text: control.isFav ? qsTr("UnFav") : qsTr("Fav")
+		text: control.isFav ? qsTr("Remove from Favorites") : qsTr("Add to Favorites")
 		onTriggered:
 		{			
 			if(currentFMList.favItem(item.path))
 				control.isFav = !control.isFav
 		}
 	}
 	MenuSeparator{}
 	
 	MenuItem
 	{
 		visible: control.isDir
 		text: qsTr("Open in new tab...")
 		onTriggered: openTab(item.path)
 	}
 	
     MenuSeparator{visible: isDir}
 	MenuItem
 	{
 		visible: !control.isExec
         text: qsTr("Copy")
 		onTriggered:
 		{
 			copyClicked(control.item)
 			close()
 		}
 	}
 	
 	MenuItem
 	{
 		visible: !control.isExec
         text: qsTr("Cut")
 		onTriggered:
 		{
 			cutClicked(control.item)
 			close()
 		}
 	}
 	
 	MenuItem
 	{
 		visible: !control.isExec
         text: qsTr("Rename...")
 		onTriggered:
 		{
 			renameClicked(control.item)
 			close()
 		}
 	}	
 	
 	MenuSeparator{}
 	
 	MenuItem
 	{
 		visible: !control.isExec && control.isDir
 		text: qsTr("Add to Bookmarks")
 		onTriggered:
 		{
 			bookmarkClicked(control.item)
 			close()
 		}
 	}
 	
 	MenuItem
 	{
 		visible: !control.isExec
         text: qsTr("Tags...")
 		onTriggered:
 		{
 			tagsClicked(control.item)
 			close()
 		}
 	}
 	
 	MenuItem
 	{
 		visible: !control.isExec		
         text: qsTr("Share...")
 		onTriggered:
 		{
 			shareClicked(control.item)
 			close()
 		}
 	}
 		
 	MenuItem
 	{
 		visible: !control.isExec
         text: qsTr("Properties")
 		onTriggered:
 		{
 			previewer.show(control.item.path)
 			close()
 		}
 	}
 	
 	MenuSeparator{}
 	
 	MenuItem
 	{
         text: qsTr("Remove")
 		Kirigami.Theme.textColor: Kirigami.Theme.negativeTextColor
 		
 		onTriggered:
 		{
 			removeClicked(control.item)
 			close()
 		}
 	}
 	
 	MenuSeparator{ visible: colorBar.visible }	
 	
 	MenuItem
 	{		
 		width: parent.width
 		height: visible ? Maui.Style.iconSizes.medium + Maui.Style.space.big : 0
 		visible: control.isDir
 		Maui.ColorsBar
         {
 			id: colorBar
 			
 			visible: parent.visible
             anchors.centerIn: parent
             size: Maui.Style.iconSizes.medium
 			onColorPicked: currentFMList.setDirIcon(index, color)
 		}
 	}	
 	
 	function show(index)
 	{		
 		control.item = currentFMList.get(index)
 
 		if(item)
 		{
 			control.index = index
 			control.isDir = item.isdir == true || item.isdir == "true"
 			control.isExec = item.executable == true || item.executable == "true"
 			control.isFav = currentFMList.itemIsFav(item.path)
 			popup()
 		}
 	}
 }