Update building toolsv0.5.2

8 files changed, 95 insertions, 125 deletions

diff --git a/doc/Makefile b/doc/Makefile
index b9c0b0c9..1537c7dc 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1 +1,5 @@
 include sphinx.mk
+
+ifdef ENV
+SPHINXBUILD   = ../env/bin/sphinx-build
+endif
diff --git a/doc/build/man/papis-config.1 b/doc/build/man/papis-config.1
index 45a821d2..5b192ce6 100644
--- a/doc/build/man/papis-config.1
+++ b/doc/build/man/papis-config.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "PAPIS-CONFIG" "1" "Dec 23, 2017" "0.5.1" "papis"
+.TH "PAPIS-CONFIG" "1" "Jan 31, 2018" "0.5.2" "papis"
 .SH NAME
 papis-config \- Papis Configuration
 .
@@ -179,7 +179,7 @@ directory or in the base directory of a given library.
 .sp
 Papis is a modal program and it can be configured to support different
 operating modes. The default is considering that every papis document
-or entry is a ‘document’.
+or entry is a \(aqdocument\(aq.
 .INDENT 0.0
 .TP
 \fBopentool\fP (\fI\%config\-settings\-opentool\fP)
@@ -206,7 +206,7 @@ For mac users you might set this to \fBopen\fP\&.
 .UNINDENT
 .sp
 This is the default \fBumask\fP that will be used to create the new
-documents’ directories.
+documents\(aq directories.
 .INDENT 0.0
 .TP
 \fBbrowser\fP (\fI\%config\-settings\-browser\fP)
@@ -672,7 +672,7 @@ bookmarks:
 .UNINDENT
 .sp
 This is the name of the mark to be passed to the options
-\fBmark\-header\-format\fP etc… E.g. if you set \fBmark\-format\-name = m\fP
+\fBmark\-header\-format\fP etc... E.g. if you set \fBmark\-format\-name = m\fP
 then you could set \fBmark\-header\-format = {m[value]} \- {m[name]}\fP\&.
 .INDENT 0.0
 .TP
diff --git a/doc/build/man/papis.1 b/doc/build/man/papis.1
index 855c6ca7..f787c074 100644
--- a/doc/build/man/papis.1
+++ b/doc/build/man/papis.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "PAPIS" "1" "Dec 23, 2017" "0.5.1" "papis"
+.TH "PAPIS" "1" "Jan 31, 2018" "0.5.2" "papis"
 .SH NAME
 papis \- Papis Documentation
 .
@@ -48,7 +48,7 @@ should be familiar with opening a terminal window in your system.
 We will illustrate the process by creating a first library with a couple of
 \fB\(gapdf\(ga\fP documents in it. Papis can be highly configured using configuration
 files. Many programs use configuration files without you maybe being aware of
-it. Papis’ configuration files are stored together inside the folder
+it. Papis\(aq configuration files are stored together inside the folder
 .INDENT 0.0
 .INDENT 3.5
 .sp
@@ -60,7 +60,7 @@ it. Papis’ configuration files are stored together inside the folder
 .UNINDENT
 .UNINDENT
 .sp
-Bear in mind that \fB~\fP means “Home Directory”. Inside this directory a
+Bear in mind that \fB~\fP means "Home Directory". Inside this directory a
 configuration file is found,
 .INDENT 0.0
 .INDENT 3.5
@@ -77,8 +77,8 @@ Right now we will open this file to edit and we will create a library.  In
 papis everything should be human\-readabale and human\-editable. So adding a
 library is as easy as adding two lines to this configuration file.
 .sp
-Say that you want to create a “papers” library, where you can finally order
-all those pdf’s hanging around in your computer. We can create this library
+Say that you want to create a "papers" library, where you can finally order
+all those pdf\(aqs hanging around in your computer. We can create this library
 by putting inside the config file the two lines:
 .INDENT 0.0
 .INDENT 3.5
@@ -103,7 +103,7 @@ So now add the two lines to the \fB~/.config/papis/config\fP file and save it, a
 proceed to add some documents.
 .SS Adding the first document
 .sp
-If you don’t have any special pdf lying around let me choose one for you:
+If you don\(aqt have any special pdf lying around let me choose one for you:
 \fI\%link\fP\&.
 You can download this document and we are going to add it into the \fBpapers\fP
 library.
@@ -122,13 +122,13 @@ papis add document.pdf \-\-author "Newton" \-\-title "Principia Mathematica"
 .UNINDENT
 .UNINDENT
 .sp
-And it’s done! We have added our first book to the library.
+And it\(aqs done! We have added our first book to the library.
 .sp
 Let us see how this works exactly. Papis consists of many commands, and one of
 these commands is \fBadd\fP\&. \fBAdd\fP itself has many flags, which are options for the
 given command. In the example above we have used the flags \fBauthor\fP and
-\fBtitle\fP to tell papis to use \fBNewton\fP as the author’s name and \fBPrincipia
-Mathematica\fP as the document’s title. You can see all the posible flags
+\fBtitle\fP to tell papis to use \fBNewton\fP as the author\(aqs name and \fBPrincipia
+Mathematica\fP as the document\(aqs title. You can see all the posible flags
 for the command \fBadd\fP if you use the \fBhelp\fP flag, i.e., if you issue the
 following command
 .INDENT 0.0
@@ -186,7 +186,7 @@ You can change the default pdf viewer in your configuration file
 .sp
 Now you can try to repeat the same process with another pdf file lying around.
 When you hit \fBpapis open\fP again, it will ask you which one you want.
-If you input parts of the title or the author’s name it will try to match
+If you input parts of the title or the author\(aqs name it will try to match
 what you typed with the paper you are looking for, so that you can get the
 paper that you are looking for very easily.
 .sp
@@ -323,7 +323,7 @@ python3 setup\&.py install
 .UNINDENT
 .UNINDENT
 .sp
-Again, if you want to install it locally because you don’t have administrative rights
+Again, if you want to install it locally because you don\(aqt have administrative rights
 in your computer you can just simply type
 .INDENT 0.0
 .INDENT 3.5
@@ -537,7 +537,7 @@ directory or in the base directory of a given library.
 .sp
 Papis is a modal program and it can be configured to support different
 operating modes. The default is considering that every papis document
-or entry is a ‘document’.
+or entry is a \(aqdocument\(aq.
 .INDENT 0.0
 .TP
 \fBopentool\fP (\fI\%config\-settings\-opentool\fP)
@@ -564,7 +564,7 @@ For mac users you might set this to \fBopen\fP\&.
 .UNINDENT
 .sp
 This is the default \fBumask\fP that will be used to create the new
-documents’ directories.
+documents\(aq directories.
 .INDENT 0.0
 .TP
 \fBbrowser\fP (\fI\%config\-settings\-browser\fP)
@@ -1030,7 +1030,7 @@ bookmarks:
 .UNINDENT
 .sp
 This is the name of the mark to be passed to the options
-\fBmark\-header\-format\fP etc… E.g. if you set \fBmark\-format\-name = m\fP
+\fBmark\-header\-format\fP etc... E.g. if you set \fBmark\-format\-name = m\fP
 then you could set \fBmark\-header\-format = {m[value]} \- {m[name]}\fP\&.
 .INDENT 0.0
 .TP
@@ -1770,7 +1770,7 @@ As an example let us consider the following library
 .sp
 The first thing that you might notice is that there are really many folders of
 course. Just to check that you undeerstand exactly what is a document, just
-please think about which of these pdfs is not a valid papis document… That’s
+please think about which of these pdfs is not a valid papis document... That\(aqs
 right!, \fBfolder1/paper.pdf\fP is not a valid document since the folder1 does not
 contain any \fBinfo.yaml\fP file. You see also that it does not matter how deep the
 folder structure is, you can have in your library a \fBphysics\fP folder, where you
@@ -1934,7 +1934,7 @@ Default: []
 .B\-d, \-\-dir
 Subfolder in the library
 .sp
-Default: “”
+Default: ""
 .TP
 .B\-i, \-\-interactive
 Do some of the actions interactively
@@ -1942,9 +1942,9 @@ Do some of the actions interactively
 Default: False
 .TP
 .B\-\-name
-Name for the document’s folder (papis format)
+Name for the document\(aqs folder (papis format)
 .sp
-Default: “”
+Default: ""
 .TP
 .B\-\-file\-name
 File name for the document (papis format)
@@ -1952,32 +1952,32 @@ File name for the document (papis format)
 .B\-\-title
 Title for document
 .sp
-Default: “”
+Default: ""
 .TP
 .B\-\-author
 Author(s) for document
 .sp
-Default: “”
+Default: ""
 .TP
 .B\-\-from\-bibtex
 Parse information from a bibtex file
 .sp
-Default: “”
+Default: ""
 .TP
 .B\-\-from\-yaml
 Parse information from a yaml file
 .sp
-Default: “”
+Default: ""
 .TP
 .B\-\-from\-folder
 Add document from folder being a valid papis document (containing info.yaml)
 .sp
-Default: “”
+Default: ""
 .TP
 .B\-\-from\-url
 Get document and information from agiven url, a parser must be implemented
 .sp
-Default: “”
+Default: ""
 .TP
 .B\-\-from\-doi
 Doi to try to get information from
@@ -1988,13 +1988,13 @@ PMID to try to get information from
 .B\-\-from\-lib
 Add document from another library
 .sp
-Default: “”
+Default: ""
 .TP
 .B\-\-from\-vcf
 Get contact information from a vcard (.vcf) file
 .TP
 .B\-\-to
-When –to is specified, the document will be added to the selected already existing document entry.
+When \-\-to is specified, the document will be added to the selected already existing document entry.
 .TP
 .B\-\-confirm
 Ask to confirm before adding to the collection
@@ -2038,7 +2038,7 @@ usage: papis open [\-h] [\-\-tool TOOL] [\-d] [\-\-all] [\-m] [search]
 .Bsearch
 Search query string
 .sp
-Default: “.”
+Default: "."
 .UNINDENT
 .SS Named Arguments
 .INDENT 0.0
@@ -2046,7 +2046,7 @@ Default: “.”
 .B\-\-tool
 Tool for opening the file (opentool)
 .sp
-Default: “”
+Default: ""
 .TP
 .B\-d, \-\-dir
 Open directory
@@ -2080,7 +2080,7 @@ usage: papis edit [\-h] [\-n] [search]
 .Bsearch
 Search query string
 .sp
-Default: “.”
+Default: "."
 .UNINDENT
 .SS Named Arguments
 .INDENT 0.0
@@ -2100,7 +2100,7 @@ Some examples of the usage are given below
 Update a document automatically and interactively
 .UNINDENT
 .sp
-(searching by \fBdoi\fP number in \fIcrossref\fP, or in other sources…)
+(searching by \fBdoi\fP number in \fIcrossref\fP, or in other sources...)
 .INDENT 0.0
 .INDENT 3.5
 .INDENT 0.0
@@ -2157,7 +2157,7 @@ usage: papis update [\-h] [\-i] [\-f] [\-d DOCUMENT]
 .Bsearch
 Search query string
 .sp
-Default: “.”
+Default: "."
 .UNINDENT
 .SS Named Arguments
 .INDENT 0.0
@@ -2281,7 +2281,7 @@ usage: papis export [\-h] [\-\-yaml] [\-\-bibtex] [\-\-json] [\-\-folder] [\-\-n
 .Bsearch
 Search query string
 .sp
-Default: “.”
+Default: "."
 .UNINDENT
 .SS Named Arguments
 .INDENT 0.0
@@ -2314,7 +2314,7 @@ Default: False
 .B\-o, \-\-out
 Outfile or outdir
 .sp
-Default: “”
+Default: ""
 .TP
 .B\-t, \-\-text
 Text formated reference
@@ -2355,7 +2355,7 @@ usage: papis explore [\-h] [\-\-isbnplus] [\-\-arxiv] [\-\-libgen] [\-\-crossref
 .Bsearch
 Search string
 .sp
-Default: “”
+Default: ""
 .UNINDENT
 .SS Named Arguments
 .INDENT 0.0
@@ -2410,7 +2410,7 @@ usage: papis rm [\-h] [\-\-file] [\-f] [search]
 .Bsearch
 Search query string
 .sp
-Default: “.”
+Default: "."
 .UNINDENT
 .SS Named Arguments
 .INDENT 0.0
@@ -2536,7 +2536,7 @@ usage: papis list [\-h] [\-i] [\-f] [\-d] [\-\-format FORMAT] [\-\-template TEMP
 .Bsearch
 Search query string
 .sp
-Default: “.”
+Default: "."
 .UNINDENT
 .SS Named Arguments
 .INDENT 0.0
@@ -2557,7 +2557,7 @@ Show the folder name associated with the document
 Default: False
 .TP
 .B\-\-format
-List entries using a custom papis format, e.g. ‘{doc[year] {doc[title]}
+List entries using a custom papis format, e.g. \(aq{doc[year] {doc[title]}
 .TP
 .B\-\-template
 Template file containing a papis format to list entries
@@ -2587,7 +2587,7 @@ to open it in a browser.  Also if it has a doc_url key, or a doi, it will try
 to compose urls out of these to open it.
 .sp
 If none of the above work, then it will try to use a search engine with the
-document’s information (using the \fBbrowse\-query\-format\fP).  You can select
+document\(aqs information (using the \fBbrowse\-query\-format\fP).  You can select
 wich search engine you want to use using the \fBsearch\-engine\fP setting.
 .INDENT 0.0
 .INDENT 3.5
@@ -2605,15 +2605,15 @@ usage: papis browse [\-h] [search]
 .Bsearch
 Search query string
 .sp
-Default: “.”
+Default: "."
 .UNINDENT
 .SS Config
 .sp
 The command config is a useful command because it allows you to check
-the configuration settings’ values that your current \fIpapis\fP session
+the configuration settings\(aq values that your current \fIpapis\fP session
 is using.
 .sp
-For example let’s say that you want to see which \fBdir\fP setting your
+For example let\(aqs say that you want to see which \fBdir\fP setting your
 current library is using (i.e., the directory or the dir that appears
 in the definition of the library in the configuration file), then you
 would simply do:
@@ -2673,7 +2673,7 @@ usage: papis config [\-h] option
 .Boption
 Variable to print
 .sp
-Default: “”
+Default: ""
 .UNINDENT
 .SS Run
 .sp
@@ -2728,7 +2728,7 @@ usage: papis run [\-h] ...
 .Brun_command
 Command name or command
 .sp
-Default: “”
+Default: ""
 .UNINDENT
 .SS Git
 .sp
@@ -2785,7 +2785,7 @@ usage: papis git [\-h] ...
 .Bcommands
 Commands
 .sp
-Default: “”
+Default: ""
 .UNINDENT
 .SS Sync
 .sp
@@ -2844,8 +2844,8 @@ of documents. To illustrate it here are some examples:
 .INDENT 3.5
 .INDENT 0.0
 .IP \(bu 2
-Open documents where the author key matches ‘albert’ (ignoring case),
-year matches ‘19’ (i.e., 1990, 2019, 1920):
+Open documents where the author key matches \(aqalbert\(aq (ignoring case),
+year matches \(aq19\(aq (i.e., 1990, 2019, 1920):
 .INDENT 2.0
 .INDENT 3.5
 .sp
@@ -2858,7 +2858,7 @@ papis open \(aqauthor = albert year = 05\(aq
 .UNINDENT
 .IP \(bu 2
 Add the restriction to the previous search that the usual matching matches
-the substring ‘licht’ in addition to the previously selected
+the substring \(aqlicht\(aq in addition to the previously selected
 .INDENT 2.0
 .INDENT 3.5
 .sp
@@ -2871,7 +2871,7 @@ papis open \(aqauthor = albert year = 05 licht\(aq
 .UNINDENT
 .sp
 This is not to be mixed with the restriction that the key \fIyear\fP matches
-\fI‘05 licht’\fP, which will not match any year, i.e.
+\fI\(aq05 licht\(aq\fP, which will not match any year, i.e.
 .INDENT 2.0
 .INDENT 3.5
 .sp
@@ -3010,7 +3010,7 @@ then the current library is used.
 .INDENT 7.0
 .TP
 .B Parameters
-\fBlib\fP (\fIstr\fP) – Library name.
+\fBlib\fP (\fIstr\fP) \-\- Library name.
 .UNINDENT
 .UNINDENT
 .INDENT 0.0
@@ -3023,9 +3023,9 @@ handle file_path.
 .B Parameters
 .INDENT 7.0
 .IP \(bu 2
-\fBfile_path\fP (\fIstr\fP) – File path to be handled.
+\fBfile_path\fP (\fIstr\fP) \-\- File path to be handled.
 .IP \(bu 2
-\fBwait\fP (\fIbool\fP) – Wait for the completion of the opener program to continue
+\fBwait\fP (\fIbool\fP) \-\- Wait for the completion of the opener program to continue
 .UNINDENT
 .UNINDENT
 .UNINDENT
@@ -3039,9 +3039,9 @@ string.
 .B Parameters
 .INDENT 7.0
 .IP \(bu 2
-\fBdirectory\fP (\fIstr\fP) – Folder path.
+\fBdirectory\fP (\fIstr\fP) \-\- Folder path.
 .IP \(bu 2
-\fBsearch\fP (\fIstr\fP) – Search string
+\fBsearch\fP (\fIstr\fP) \-\- Search string
 .UNINDENT
 .TP
 .B Returns
@@ -3069,9 +3069,9 @@ string.
 .B Parameters
 .INDENT 7.0
 .IP \(bu 2
-\fBlibrary\fP (\fIstr\fP) – Library name.
+\fBlibrary\fP (\fIstr\fP) \-\- Library name.
 .IP \(bu 2
-\fBsearch\fP (\fIstr\fP) – Search string
+\fBsearch\fP (\fIstr\fP) \-\- Search string
 .UNINDENT
 .TP
 .B Returns
@@ -3130,9 +3130,9 @@ open dir_path.
 .B Parameters
 .INDENT 7.0
 .IP \(bu 2
-\fBdir_path\fP (\fIstr\fP) – Folder path to be handled.
+\fBdir_path\fP (\fIstr\fP) \-\- Folder path to be handled.
 .IP \(bu 2
-\fBwait\fP (\fIbool\fP) – Wait for the completion of the opener program to continue
+\fBwait\fP (\fIbool\fP) \-\- Wait for the completion of the opener program to continue
 .UNINDENT
 .UNINDENT
 .UNINDENT
@@ -3146,9 +3146,9 @@ handle file_path.
 .B Parameters
 .INDENT 7.0
 .IP \(bu 2
-\fBfile_path\fP (\fIstr\fP) – File path to be handled.
+\fBfile_path\fP (\fIstr\fP) \-\- File path to be handled.
 .IP \(bu 2
-\fBwait\fP (\fIbool\fP) – Wait for the completion of the opener program to continue
+\fBwait\fP (\fIbool\fP) \-\- Wait for the completion of the opener program to continue
 .UNINDENT
 .UNINDENT
 .UNINDENT
@@ -3156,18 +3156,18 @@ handle file_path.
 .TP
 .B papis.api.pick(options, pick_config={})
 This is a wrapper for the various pickers that are supported.
-Depending on the configuration different selectors or ‘pickers’
+Depending on the configuration different selectors or \(aqpickers\(aq
 are used.
 .INDENT 7.0
 .TP
 .B Parameters
 .INDENT 7.0
 .IP \(bu 2
-\fBoptions\fP (\fIlist\fP) – List of different objects. The type of the objects within
+\fBoptions\fP (\fIlist\fP) \-\- List of different objects. The type of the objects within
 the list must be supported by the pickers. This is the reason why this
 function is difficult to generalize for external picker programs.
 .IP \(bu 2
-\fBpick_config\fP (\fIdict\fP) – Dictionary with additional configuration for the used
+\fBpick_config\fP (\fIdict\fP) \-\- Dictionary with additional configuration for the used
 picker. This depends on the picker.
 .UNINDENT
 .TP
@@ -3208,7 +3208,7 @@ args passed by the user.
 .INDENT 7.0
 .TP
 .B Parameters
-\fBlibrary\fP (\fIstr\fP) – Name of library or path to a given library
+\fBlibrary\fP (\fIstr\fP) \-\- Name of library or path to a given library
 .UNINDENT
 .UNINDENT
 .SH GIT
@@ -3220,7 +3220,7 @@ or \fI\%subversion\fP\&.
 Here you will find a description of a possible workflow using git with papis.
 This is not the only workflow, but it is the most obvious.
 .sp
-Let’s say you have a library named \fBbooks\fP in the directory
+Let\(aqs say you have a library named \fBbooks\fP in the directory
 \fB~/Documents/MyNiceBooks\fP\&. You could turn the \fBbooks\fP library into
 a \fIgit\fP repository, just doing for example
 .INDENT 0.0
@@ -3248,7 +3248,7 @@ git init
 .UNINDENT
 .sp
 Now you can add everything you have in the library with \fBgit add .\fP
-if you are in the library’s directory or
+if you are in the library\(aqs directory or
 .INDENT 0.0
 .INDENT 3.5
 .sp
@@ -3260,7 +3260,7 @@ papis \-l books git add .
 .UNINDENT
 .UNINDENT
 .sp
-if you want to do it using the \fIpapis\fP’ \fBgit\fP command.
+if you want to do it using the \fIpapis\fP\(aq \fBgit\fP command.
 .SS Interplay with other commands
 .sp
 Some papis commands give you the opportunity of using \fBgit\fP to manage
@@ -3285,7 +3285,7 @@ offer such functionality, and they indeed do through the \fB\-\-git\fP flag.
 Go to their documentation for more information.
 .SS Updating the libray
 .sp
-You can use the papis’ simple \fBgit\fP wrapper,
+You can use the papis\(aq simple \fBgit\fP wrapper,
 .INDENT 0.0
 .INDENT 3.5
 .sp
@@ -3349,7 +3349,7 @@ papis git status
 .UNINDENT
 .UNINDENT
 .sp
-When editing a document’s info file:
+When editing a document\(aqs info file:
 .INDENT 0.0
 .INDENT 3.5
 .INDENT 0.0
@@ -3517,7 +3517,7 @@ intended for \fBzotero\fP but that is general enought to work
 for other programs too.
 .sp
 To install this script you can copy the file \fBpapis\-zotero\fP in the
-repository’s example directory to your papis \fBconfig/scripts\fP directory.
+repository\(aqs example directory to your papis \fBconfig/scripts\fP directory.
 .sp
 You can do this automatically issuing the following commands
 .INDENT 0.0
@@ -3715,6 +3715,16 @@ source /usr/local/etc/bash_completion.d/papis
 .sp
 or get the bash script from
 \fI\%here\fP\&.
+.SH CLASSES
+.sp
+Here there is an overview of the main classes that
+exist in papis. Their inheritance relations if any
+are also drawn.
+.SS Document
+.SS Downloaders
+.SS Commands
+.sp
+An example of the add command class:
 .SH FAQ
 .sp
 Here are some problems that users have come accross with often:
diff --git a/papis/__init__.py b/papis/__init__.py
index 21668286..4f035c12 100644
--- a/papis/__init__.py
+++ b/papis/__init__.py
@@ -1,7 +1,7 @@
 
 # Information
 __license__ = 'GPLv3'
-__version__ = '0.5.1'
+__version__ = '0.5.2'
 __author__ = __maintainer__ = 'Alejandro Gallo'
 __email__ = 'aamsgallo@gmail.com'
 
diff --git a/scripts/shell_completion/build/bash/papis b/scripts/shell_completion/build/bash/papis
index d333d972..40e81048 100644
--- a/scripts/shell_completion/build/bash/papis
+++ b/scripts/shell_completion/build/bash/papis
@@ -13,13 +13,13 @@ case "$cur" in
   -*)
   COMPREPLY=( $( compgen -W " -c	 --cc	 --clear-cache	 --config	 --cores	 -h	 --help	 -j	 -l	 --lib	 --log	 --pick-lib	 --picktool	 --set	 -v	 -V	 --verbose	 --version" -- $cur ) );;
   * )
-  COMPREPLY=( $( compgen -W "add	check	config	edit	export	explore	list	rm	mv	rename	open	browse	update	run	git	gui	sync	zotero	doi	call	scihub	hubation	crawl	mutt	update-scripts	add-from-mail	ga	mail" -- $cur ) );;
+  COMPREPLY=( $( compgen -W "add	check	config	edit	export	explore	list	rm	mv	rename	open	browse	update	run	git	gui	sync" -- $cur ) );;
 esac
 
 case "$prev" in
 
   config)
-    COMPREPLY=( $( compgen -W " -h	 --help info-allow-unicode	browser	export-text-format	mode	extra-bibtex-types	format-doc-name	add-open	editor	add-interactive	search-engine	file-name	doc-url-key-name	xeditor	add-name	dir-umask	database-backend	ref-format	notes-name	use-cache	mvtool	cache-dir	open-mark	user-agent	mark-format-name	local-config-file	sync-command	add-confirm	extra-bibtex-keys	use-git	browse-query-format	mark-match-format	mark-opener-format	header-format	default-library	opentool	scripts-short-help-regex	info-name	match-format	mark-key-name	default-gui	mark-header-format	add-edit	file-browser	picktool	check-keys	rofi-gui-key-browse	rofi-gui-multi_select	rofi-gui-key-normal-window	rofi-gui-key-delete	rofi-gui-key-help	rofi-gui-fullscreen	rofi-gui-fixed_lines	rofi-gui-markup_rows	rofi-gui-key-edit	rofi-gui-lines	rofi-gui-normal_window	rofi-gui-header-format	rofi-gui-sep	rofi-gui-width	rofi-gui-key-open	rofi-gui-key-quit	rofi-gui-eh	rofi-gui-key-open-stay	rofi-gui-case_sensitive	tk-gui-entry-bg-odd	tk-gui-print_info	tk-gui-prompt-fg	tk-gui-header-format	tk-gui-entry-bg-size	tk-gui-move_down	tk-gui-help	tk-gui-labels-per-page	tk-gui-entry-lines	tk-gui-window-height	tk-gui-move_bottom	tk-gui-entry-fg	tk-gui-entry-font-name	tk-gui-cursor	tk-gui-insertbackground	tk-gui-window-width	tk-gui-borderwidth	tk-gui-entry-font-size	tk-gui-edit	tk-gui-scroll_up	tk-gui-focus_prompt	tk-gui-activeforeground	tk-gui-open	tk-gui-entry-font-style	tk-gui-prompt-font-size	tk-gui-match-format	tk-gui-activebackground	tk-gui-move_up	tk-gui-clear	tk-gui-move_top	tk-gui-exit	tk-gui-height	tk-gui-entry-bg-pair	tk-gui-prompt-bg	tk-gui-window-bg	tk-gui-scroll_down	tk-gui-half_down	tk-gui-half_up	urwid-gui-redraw-key	urwid-gui-show-fields	urwid-gui-prompt-key	urwid-gui-quit-key	urwid-gui-kill-buffer-key	urwid-gui-search-key	urwid-gui-help-key	vim-gui-delete-key	vim-gui-open-dir-key	vim-gui-header-format	vim-gui-open-key	vim-gui-next-search-key	vim-gui-edit-key	vim-gui-search-key	vim-gui-help-key	vim-gui-prev-search-key" -- $cur ) )
+    COMPREPLY=( $( compgen -W " -h	 --help add-interactive	dir-umask	mark-match-format	doc-url-key-name	use-cache	cache-dir	file-name	ref-format	header-format	mark-opener-format	picktool	add-open	browser	match-format	check-keys	add-confirm	mark-format-name	info-allow-unicode	opentool	add-edit	xeditor	mark-header-format	format-doc-name	notes-name	editor	add-name	scripts-short-help-regex	open-mark	default-gui	extra-bibtex-types	default-library	mark-key-name	mvtool	info-name	sync-command	search-engine	local-config-file	export-text-format	mode	user-agent	use-git	browse-query-format	file-browser	database-backend	extra-bibtex-keys	rofi-gui-fixed_lines	rofi-gui-multi_select	rofi-gui-key-edit	rofi-gui-key-open	rofi-gui-key-help	rofi-gui-case_sensitive	rofi-gui-width	rofi-gui-key-quit	rofi-gui-key-open-stay	rofi-gui-key-normal-window	rofi-gui-eh	rofi-gui-header-format	rofi-gui-key-delete	rofi-gui-lines	rofi-gui-fullscreen	rofi-gui-markup_rows	rofi-gui-key-browse	rofi-gui-sep	rofi-gui-normal_window	vim-gui-open-dir-key	vim-gui-delete-key	vim-gui-edit-key	vim-gui-next-search-key	vim-gui-header-format	vim-gui-search-key	vim-gui-prev-search-key	vim-gui-help-key	vim-gui-open-key	urwid-gui-prompt-key	urwid-gui-quit-key	urwid-gui-search-key	urwid-gui-redraw-key	urwid-gui-kill-buffer-key	urwid-gui-show-fields	urwid-gui-help-key	tk-gui-window-bg	tk-gui-clear	tk-gui-half_down	tk-gui-entry-bg-pair	tk-gui-window-height	tk-gui-move_bottom	tk-gui-prompt-fg	tk-gui-move_top	tk-gui-borderwidth	tk-gui-activeforeground	tk-gui-window-width	tk-gui-header-format	tk-gui-match-format	tk-gui-labels-per-page	tk-gui-prompt-bg	tk-gui-exit	tk-gui-help	tk-gui-half_up	tk-gui-entry-font-name	tk-gui-height	tk-gui-entry-font-style	tk-gui-print_info	tk-gui-activebackground	tk-gui-move_up	tk-gui-prompt-font-size	tk-gui-entry-lines	tk-gui-cursor	tk-gui-insertbackground	tk-gui-focus_prompt	tk-gui-entry-bg-odd	tk-gui-move_down	tk-gui-open	tk-gui-entry-fg	tk-gui-entry-font-size	tk-gui-entry-bg-size	tk-gui-scroll_down	tk-gui-edit	tk-gui-scroll_up" -- $cur ) )
     ;;
 
   add)
@@ -90,50 +90,6 @@ case "$prev" in
     COMPREPLY=( $( compgen -W " -h	 --help" -- $cur ) )
     ;;
 
-  zotero)
-    COMPREPLY=( $( compgen -W "" -- $cur ) )
-    ;;
-
-  doi)
-    COMPREPLY=( $( compgen -W "" -- $cur ) )
-    ;;
-
-  call)
-    COMPREPLY=( $( compgen -W "" -- $cur ) )
-    ;;
-
-  scihub)
-    COMPREPLY=( $( compgen -W " -d	 --from-doi	 --name" -- $cur ) )
-    ;;
-
-  hubation)
-    COMPREPLY=( $( compgen -W "" -- $cur ) )
-    ;;
-
-  crawl)
-    COMPREPLY=( $( compgen -W "" -- $cur ) )
-    ;;
-
-  mutt)
-    COMPREPLY=( $( compgen -W "" -- $cur ) )
-    ;;
-
-  update-scripts)
-    COMPREPLY=( $( compgen -W "" -- $cur ) )
-    ;;
-
-  add-from-mail)
-    COMPREPLY=( $( compgen -W "" -- $cur ) )
-    ;;
-
-  ga)
-    COMPREPLY=( $( compgen -W "" -- $cur ) )
-    ;;
-
-  mail)
-    COMPREPLY=( $( compgen -W "" -- $cur ) )
-    ;;
-
 
   --picktool)
     COMPREPLY=( $( compgen -W "papis.pick vim rofi" -- $cur ) )
@@ -156,7 +112,7 @@ case "$prev" in
     ;;
 
   --set)
-    COMPREPLY=( $( compgen -W "default-gui=	mark-header-format=	mode=	ref-format=	add-name=	extra-bibtex-keys=	mark-match-format=	export-text-format=	match-format=	search-engine=	mark-opener-format=	add-open=	format-doc-name=	mark-key-name=	header-format=	xeditor=	add-edit=	user-agent=	file-name=	opentool=	scripts-short-help-regex=	info-name=	add-interactive=	browser=	picktool=	doc-url-key-name=	use-git=	cache-dir=	sync-command=	mvtool=	local-config-file=	default-library=	file-browser=	dir-umask=	editor=	check-keys=	use-cache=	browse-query-format=	extra-bibtex-types=	open-mark=	info-allow-unicode=	add-confirm=	database-backend=	mark-format-name=	notes-name=	vim-gui-delete-key=	vim-gui-search-key=	vim-gui-open-dir-key=	vim-gui-prev-search-key=	vim-gui-next-search-key=	vim-gui-help-key=	vim-gui-edit-key=	vim-gui-header-format=	vim-gui-open-key=	tk-gui-edit=	tk-gui-entry-bg-pair=	tk-gui-height=	tk-gui-half_up=	tk-gui-cursor=	tk-gui-entry-font-size=	tk-gui-entry-bg-size=	tk-gui-entry-font-name=	tk-gui-activeforeground=	tk-gui-open=	tk-gui-entry-lines=	tk-gui-entry-bg-odd=	tk-gui-half_down=	tk-gui-scroll_down=	tk-gui-move_up=	tk-gui-entry-font-style=	tk-gui-borderwidth=	tk-gui-help=	tk-gui-prompt-bg=	tk-gui-move_bottom=	tk-gui-scroll_up=	tk-gui-header-format=	tk-gui-activebackground=	tk-gui-entry-fg=	tk-gui-window-width=	tk-gui-match-format=	tk-gui-move_top=	tk-gui-prompt-fg=	tk-gui-window-bg=	tk-gui-labels-per-page=	tk-gui-move_down=	tk-gui-prompt-font-size=	tk-gui-exit=	tk-gui-focus_prompt=	tk-gui-insertbackground=	tk-gui-window-height=	tk-gui-print_info=	tk-gui-clear=	rofi-gui-fullscreen=	rofi-gui-case_sensitive=	rofi-gui-key-delete=	rofi-gui-lines=	rofi-gui-multi_select=	rofi-gui-key-normal-window=	rofi-gui-header-format=	rofi-gui-key-quit=	rofi-gui-key-edit=	rofi-gui-key-open-stay=	rofi-gui-eh=	rofi-gui-key-help=	rofi-gui-key-open=	rofi-gui-normal_window=	rofi-gui-sep=	rofi-gui-fixed_lines=	rofi-gui-markup_rows=	rofi-gui-width=	rofi-gui-key-browse=	urwid-gui-prompt-key=	urwid-gui-search-key=	urwid-gui-quit-key=	urwid-gui-redraw-key=	urwid-gui-help-key=	urwid-gui-show-fields=	urwid-gui-kill-buffer-key=" -- $cur ) )
+    COMPREPLY=( $( compgen -W "open-mark=	default-gui=	picktool=	add-name=	add-interactive=	editor=	check-keys=	add-open=	export-text-format=	search-engine=	mark-key-name=	add-edit=	mark-header-format=	mark-opener-format=	local-config-file=	use-cache=	notes-name=	mode=	info-allow-unicode=	doc-url-key-name=	cache-dir=	browse-query-format=	mark-match-format=	extra-bibtex-keys=	opentool=	xeditor=	default-library=	header-format=	sync-command=	format-doc-name=	info-name=	match-format=	scripts-short-help-regex=	file-browser=	user-agent=	ref-format=	dir-umask=	add-confirm=	extra-bibtex-types=	file-name=	mark-format-name=	mvtool=	use-git=	browser=	database-backend=	rofi-gui-key-quit=	rofi-gui-key-help=	rofi-gui-key-edit=	rofi-gui-fullscreen=	rofi-gui-sep=	rofi-gui-width=	rofi-gui-fixed_lines=	rofi-gui-key-browse=	rofi-gui-case_sensitive=	rofi-gui-header-format=	rofi-gui-lines=	rofi-gui-key-open-stay=	rofi-gui-key-normal-window=	rofi-gui-normal_window=	rofi-gui-multi_select=	rofi-gui-key-delete=	rofi-gui-markup_rows=	rofi-gui-key-open=	rofi-gui-eh=	vim-gui-open-dir-key=	vim-gui-header-format=	vim-gui-help-key=	vim-gui-next-search-key=	vim-gui-search-key=	vim-gui-prev-search-key=	vim-gui-edit-key=	vim-gui-open-key=	vim-gui-delete-key=	urwid-gui-redraw-key=	urwid-gui-show-fields=	urwid-gui-help-key=	urwid-gui-prompt-key=	urwid-gui-kill-buffer-key=	urwid-gui-search-key=	urwid-gui-quit-key=	tk-gui-half_up=	tk-gui-window-bg=	tk-gui-height=	tk-gui-prompt-font-size=	tk-gui-borderwidth=	tk-gui-entry-font-name=	tk-gui-entry-font-style=	tk-gui-move_bottom=	tk-gui-cursor=	tk-gui-window-height=	tk-gui-scroll_up=	tk-gui-entry-bg-size=	tk-gui-entry-fg=	tk-gui-entry-bg-odd=	tk-gui-focus_prompt=	tk-gui-header-format=	tk-gui-clear=	tk-gui-scroll_down=	tk-gui-entry-bg-pair=	tk-gui-half_down=	tk-gui-prompt-fg=	tk-gui-entry-font-size=	tk-gui-edit=	tk-gui-help=	tk-gui-entry-lines=	tk-gui-open=	tk-gui-insertbackground=	tk-gui-activeforeground=	tk-gui-window-width=	tk-gui-move_up=	tk-gui-match-format=	tk-gui-labels-per-page=	tk-gui-exit=	tk-gui-move_top=	tk-gui-prompt-bg=	tk-gui-activebackground=	tk-gui-print_info=	tk-gui-move_down=" -- $cur ) )
     ;;
 
 esac
diff --git a/scripts/shell_completion/tools/lib.sh b/scripts/shell_completion/tools/lib.sh
index 8f021cab..a063cb60 100755
--- a/scripts/shell_completion/tools/lib.sh
+++ b/scripts/shell_completion/tools/lib.sh
@@ -2,7 +2,7 @@
 
 get_papis_commands(){
   local cmd=$1
-  papis ${cmd} -h                                 |
+  env XDG_CONFIG_HOME=/tmp papis ${cmd} -h        |
   awk '
     /positional arguments/,/optional arguments/ {
     print $1
diff --git a/setup.py b/setup.py
index ed47a428..f14d0f3c 100644
--- a/setup.py
+++ b/setup.py
@@ -56,7 +56,7 @@ setup(
         "python-magic>=0.4.13",
         "pylibgen>=1.3.0",
         "urwid>=1.3.1",
-        "habanero==0.6.0",
+        "habanero>=0.6.0",
     ],
     python_requires='>=3',
     classifiers=[
diff --git a/tools/update-pypi.sh b/tools/update-pypi.sh
index a2176476..bffd9973 100755
--- a/tools/update-pypi.sh
+++ b/tools/update-pypi.sh
@@ -3,8 +3,8 @@
 DIST_DIR=dist
 
 echo "Updating man pages"
-make -C doc man
-make bash-autocomplete
+make -C doc man ENV=${ENV}
+make bash-autocomplete ENV=${ENV}
 
 rm -rf ${DIST_DIR}
 python3 setup.py sdist