diff --git a/.emacs b/.emacs
index 365ba6a..9a9afe0 100644
--- a/.emacs
+++ b/.emacs
@@ -3,53 +3,26 @@
 ;; installed packages.  Don't delete this line.  If you don't want it,
 ;; just comment it out by adding a semicolon to the start of the line.
 ;; You may delete these explanatory comments.
-(package-initialize)
-
-(custom-set-variables
- ;; custom-set-variables was added by Custom.
- ;; If you edit it by hand, you could mess it up, so be careful.
- ;; Your init file should contain only one such instance.
- ;; If there is more than one, they won't work right.
- '(custom-enabled-themes (quote (tsdh-light)))
- '(package-selected-packages (quote (helm projectile use-package)))
- '(safe-local-variable-values
-   (quote
-    ((TeX-master . "../theLatexBookSci.tex")
-     (TeX-master . t)))))
-(custom-set-faces
- ;; custom-set-faces was added by Custom.
- ;; If you edit it by hand, you could mess it up, so be careful.
- ;; Your init file should contain only one such instance.
- ;; If there is more than one, they won't work right.
- )
-;; My basic configuration Gerardo Marx 15/Jul/2020
-;; Set default font:
-(add-to-list 'default-frame-alist
-                       '(font . "Source Code Pro-18"))
-;; line numbers:
-;;(when (version<= "26.0.50" emacs-version )
-;;  (global-display-line-numbers-mode))
-;; package manager:
+;; (package-initialize)
+;; Set up package.el to work with MELPA
 (require 'package)
-(setq package-enable-at-startup nil)
-(add-to-list 'package-archives '("melpa" . "http://melpa.org/packages/"))
-(add-to-list 'package-archives '("gnu" . "http://elpa.gnu.org/packages/"))
+(add-to-list 'package-archives
+             '("melpa" . "https://melpa.org/packages/"))
 (package-initialize)
-
-(unless (package-installed-p 'use-package)
-n  (package-refresh-contents)
-  (package-install 'use-package))
-
-(eval-when-compile
-  (require 'use-package))
-;; projectile configuration:
+;;(package-refresh-contents)
+;;--------------
+;; Packages Gerardo Marx/Jul/2020:
+;; Enable Evil
+(require 'evil)
+(evil-mode 1)
+;; Projectile configuration:
 (projectile-mode +1)
 (define-key projectile-mode-map (kbd "s-p") 'projectile-command-map)
 (define-key projectile-mode-map (kbd "C-c p") 'projectile-command-map)
 (projectile-global-mode)
 (setq projectile-completion-system 'helm)
 (helm-projectile-on)
-;; helm
+;; Helm
 (require 'helm-config)
 (global-set-key (kbd "M-x") #'helm-M-x)
 (global-set-key (kbd "C-x r b") #'helm-filtered-bookmarks)
@@ -61,7 +34,49 @@ n  (package-refresh-contents)
 ;; Use pdf-tools to open PDF files
 (setq TeX-view-program-selection '((output-pdf "PDF Tools"))
       TeX-source-correlate-start-server t)
-
 ;; Update PDF buffers after successful LaTeX runs
 (add-hook 'TeX-after-compilation-finished-functions
            #'TeX-revert-document-buffer)
+;;--------------------
+(custom-set-variables
+ ;; custom-set-variables was added by Custom.
+ ;; If you edit it by hand, you could mess it up, so be careful.
+ ;; Your init file should contain only one such instance.
+ ;; If there is more than one, they won't work right.
+ '(custom-enabled-themes (quote (misterioso)))
+ '(package-selected-packages (quote (virtualenvwrapper helm projectile use-package)))
+ '(safe-local-variable-values
+   (quote
+    ((pyvenv-workon . keesman_env)
+     (org-edit-src-content . 0)
+     (org-src-preserve-indentation . t)
+     (TeX-master . "../theLatexBookSci.tex")
+     (TeX-master . t))))
+ '(tool-bar-mode nil))
+(custom-set-faces
+ ;; custom-set-faces was added by Custom.
+ ;; If you edit it by hand, you could mess it up, so be careful.
+ ;; Your init file should contain only one such instance.
+ ;; If there is more than one, they won't work right.
+ )
+;; My basic configuration Gerardo Marx 15/Jul/2020
+;; Set default font:
+(add-to-list 'default-frame-alist
+                       '(font . "Source Code Pro-20"))
+;; line numbers:
+;;(when (version<= "26.0.50" emacs-version )
+;;  (global-display-line-numbers-mode))
+;; toolbar
+(tool-bar-mode -1)
+;; windmove:
+(windmove-default-keybindings 'meta)
+;;-------
+;;Python:
+(require 'virtualenvwrapper)
+(venv-initialize-interactive-shells) ;; if you want interactive shell support
+(venv-initialize-eshell) ;; if you want eshell support
+;; note that setting `venv-location` is not necessary if you
+;; use the default location (`~/.virtualenvs`), or if the
+;; the environment variable `WORKON_HOME` points to the right place
+(setq venv-location "~/.virtualenvs")
+;;---------